김유현 / How much are you earning now

Go to a project
Toggle navigation Toggle navigation pinning
김유현
287d44d6 1 parent 068aed5d

Modify 월간 graph -> 일간 graph

Inline Side-by-side
Showing 1 changed file with 22 additions and 10 deletions
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
9 <br> 9 <br>
10 <div id = "salary" class="in"></div> 10 <div id = "salary" class="in"></div>
11 <br> 11 <br>
12 + <div id = "payPerDay" class="in"></div>
13 + <br>
12 <div id = "moneyPerSec" class="in"></div> 14 <div id = "moneyPerSec" class="in"></div>
15 +
16 +
13 </div> 17 </div>
14 <div class="progress-bar"></div> 18 <div class="progress-bar"></div>
15 <h1 class="count"></h1> 19 <h1 class="count"></h1>
...@@ -31,14 +35,21 @@ ...@@ -31,14 +35,21 @@
31 var workTime = Number(getParam("workTime")); 35 var workTime = Number(getParam("workTime"));
32 var offWork = Number(getParam("offWork")); 36 var offWork = Number(getParam("offWork"));
33 var workingDayNum = getParam("workDay").length / 9; 37 var workingDayNum = getParam("workDay").length / 9;
38 + var payPerDay = salary/(4*workingDayNum);
34 document.getElementById("salary").innerHTML = "salary : " + salary; 39 document.getElementById("salary").innerHTML = "salary : " + salary;
40 + document.getElementById("payPerDay").innerHTML = "charge per day : " + payPerDay;
41 +
35 //document.getElementById("workDay").innerHTML = "working day : " + getParam("workDay"); 42 //document.getElementById("workDay").innerHTML = "working day : " + getParam("workDay");
36 //document.getElementById("workTime").innerHTML = "working time : " + workTime; 43 //document.getElementById("workTime").innerHTML = "working time : " + workTime;
37 //document.getElementById("offWork").innerHTML = "time of work : " + offWork; 44 //document.getElementById("offWork").innerHTML = "time of work : " + offWork;
38 //document.getElementById("workedHour").innerHTML = "worked hour : " + String(offWork - workTime); 45 //document.getElementById("workedHour").innerHTML = "worked hour : " + String(offWork - workTime);
39 46
47 + var nowTime = new Date();
48 + var workStart = new Date(nowTime.getFullYear(), nowTime.getMonth(), nowTime.getDate(), workTime,00, 00);
40 49
41 - var moneyPerSec = 0; 50 + var diff = (nowTime.getTime() - workStart.getTime())/1000;
51 + //document.getElementById("diff").innerHTML = diff;
52 + var moneyPerSec = diff*salary/(60*60*(offWork - workTime)*workingDayNum*4);
42 setInterval("dpTime()",1); 53 setInterval("dpTime()",1);
43 function dpTime(){ 54 function dpTime(){
44 var now = new Date(); 55 var now = new Date();
...@@ -46,12 +57,12 @@ ...@@ -46,12 +57,12 @@
46 minutes = now.getMinutes(); 57 minutes = now.getMinutes();
47 seconds = now.getSeconds(); 58 seconds = now.getSeconds();
48 59
49 - if (hours > 12) 60 + //if (hours > 12)
50 - { hours -= 12; 61 + //{ hours -= 12;
51 - ampm = "오후 "; 62 + // ampm = "오후 ";
52 - }else 63 + //}else
53 - { ampm = "오전 "; 64 + //{ ampm = "오전 ";
54 - } 65 + //}
55 if (hours < 10){ 66 if (hours < 10){
56 hours = "0" + hours; 67 hours = "0" + hours;
57 } if (minutes < 10){ 68 } if (minutes < 10){
...@@ -59,7 +70,7 @@ ...@@ -59,7 +70,7 @@
59 } if (seconds < 10){ 70 } if (seconds < 10){
60 seconds = "0" + seconds; 71 seconds = "0" + seconds;
61 } 72 }
62 - document.getElementById("dpTime").innerHTML = "현재 시간 : "+ ampm + hours + ":" + minutes + ":" + seconds; 73 + document.getElementById("dpTime").innerHTML = "현재 시간 : "+ hours + ":" + minutes + ":" + seconds;
63 if (hours < workTime){ 74 if (hours < workTime){
64 document.getElementById("moneyPerSec").innerHTML = "출근할 때까지 " + String(workTime - hours) + "시간 남았당"; 75 document.getElementById("moneyPerSec").innerHTML = "출근할 때까지 " + String(workTime - hours) + "시간 남았당";
65 } 76 }
...@@ -91,9 +102,10 @@ ...@@ -91,9 +102,10 @@
91 102
92 } 103 }
93 else{ 104 else{
94 - bar.style.width = i + '%'; 105 + i = (moneyPerSec / payPerDay) * 100;
106 +
107 + bar.style.width = i.toFixed(4) + '%';
95 counter.innerHTML = i.toFixed(4) + '%'; 108 counter.innerHTML = i.toFixed(4) + '%';
96 - i = moneyPerSec / salary * 100
97 } 109 }
98 //if(r < throttle) { // Simulate d/l speed and uneven bitrate 110 //if(r < throttle) { // Simulate d/l speed and uneven bitrate
99 // i = i + r; 111 // i = i + r;
......