diff --git a/calculate.js b/calculate.js index 4bad8fa..b95e418 100644 --- a/calculate.js +++ b/calculate.js @@ -1,13 +1,19 @@ -var mission_length, mission_cleared, score_now, score_pre, score_change, score_rank; -var rank; +const score_daily, score_month; +const mission_daily_cleared, mission_daily_total; +const score_daily_pre, score_daily_change; +const days_in_month; +const rank; -score_now=(mission_cleared/score_length)*100; +score_daily=(mission_daily_cleared/mission_daily_total)*100; //일간 점수 계산 +score_daily_change=((score_daily/score_daily_pre)*100)-100; //main 에서 점수 변화를 반영하는 부분 -score_change = score_now / score_before + score_now % score_before; -score_rank = mission_cleared/score_length; +for (var i = 0; i < days_in_month; i++) { + month_score=month_score+(score_daily[i]/days_in_month); +} +month_score=month_score*100; //월간 점수 계산 -if (score_rank>0.8) rank = "A"; -else if (0.8>=score_rank>0.6) rank = "B"; -else if (0.6>=score_rank>0.4) rank = "C"; -else if (0.4>=score_rank>0.2) rank = "F"; -else rank = "D"; \ No newline at end of file +if (month_score/100>0.8) rank = "A"; +else if (month_score/100>0.6) rank = "B"; +else if (month_score/100>0.4) rank = "C"; +else if (month_score/100>0.2) rank = "F"; +else rank = "D"; //db에서 월간 점수 반영 diff --git a/main.css b/main.css index b2d6d97..f0b8a01 100644 --- a/main.css +++ b/main.css @@ -20,13 +20,11 @@ justify-content:center; } -.totalscore{ - display:flex; +.display{ + display: flex; justify-content:center; } - - .link-to-main1{ font-size: 30px; margin: 10px 10px 10px 10px; @@ -40,7 +38,7 @@ .show { float: left; border: 0.5px; - width: 400px; + width: 350px; height: 120px; } @@ -75,4 +73,8 @@ margin-block-end: 0em; margin-inline-start: 0px; margin-inline-end: 0px; -} \ No newline at end of file +} + +.special_text{ + font-size: 30px; +}