김유현

Modify calcular time & 출근 전일 경우

node_modules/
*.json
public/css/
test.js
\ No newline at end of file
......
......@@ -4,16 +4,13 @@
</head>
<body>
<link rel="stylesheet" href="css/graph_style.css">
<div style = "padding: 20px" class="out">
<div style= "padding : 20px;"class="out">
<div id = "dpTime" class="in"></div>
<br>
<div id = "salary" class="in"></div>
<br>
<div id = "payPerDay" class="in"></div>
<br>
<div id = "moneyPerSec" class="in"></div>
<div style="font-weight: bold;" id = "moneyPerSec" class="in"></div>
<br>
</div>
<div class="progress-bar"></div>
<h1 class="count"></h1>
......@@ -30,26 +27,44 @@
return sval;
}
String.format = function() {
// The string containing the format items (e.g. "{0}")
// will and always has to be the first argument.
var theString = arguments[0];
// start with the second argument (i = 1)
for (var i = 1; i < arguments.length; i++) {
// "gm" = RegEx options for Global search (more than one instance)
// and for Multiline search
var regEx = new RegExp("\\{" + (i - 1) + "\\}", "gm");
theString = theString.replace(regEx, arguments[i]);
}
return theString;
}
//document.getElementById("payDay").innerHTML = "pay day : " + getParam("payDay");
var salary = Number(getParam("salary"));
var workTime = Number(getParam("workTime"));
var offWork = Number(getParam("offWork"));
var workingDayNum = getParam("workDay").length / 9;
var payPerDay = salary/(4*workingDayNum);
document.getElementById("salary").innerHTML = "salary : " + salary;
document.getElementById("payPerDay").innerHTML = "charge per day : " + payPerDay;
//document.getElementById("salary").innerHTML = "salary : " + salary;
document.getElementById("payPerDay").innerHTML = "The daily wage is " + payPerDay + "won";
//document.getElementById("workDay").innerHTML = "working day : " + getParam("workDay");
//document.getElementById("workTime").innerHTML = "working time : " + workTime;
//document.getElementById("offWork").innerHTML = "time of work : " + offWork;
//document.getElementById("workedHour").innerHTML = "worked hour : " + String(offWork - workTime);
var nowTime = new Date();
var workStart = new Date(nowTime.getFullYear(), nowTime.getMonth(), nowTime.getDate(), workTime,00, 00);
var diff = (nowTime.getTime() - workStart.getTime())/1000;
//document.getElementById("diff").innerHTML = diff;
var moneyPerSec = diff*salary/(60*60*(offWork - workTime)*workingDayNum*4);
var strWorkTime = workTime
if (strWorkTime < 10){
strWorkTime = "0" + strWorkTime;
}
var dayStr = String.format("{0}-{1}-{2}T{3}:00:00",nowTime.getFullYear(), nowTime.getMonth()+1, nowTime.getDate(), strWorkTime);
var workStart = new Date(dayStr);
var diff = (nowTime.getTime() - workStart.getTime());
var moneyPerSec = diff*(payPerDay/(1000*60*60*(offWork - workTime)));
setInterval("dpTime()",1);
function dpTime(){
var now = new Date();
......@@ -70,13 +85,18 @@
} if (seconds < 10){
seconds = "0" + seconds;
}
document.getElementById("dpTime").innerHTML = "현재 시간 : "+ hours + ":" + minutes + ":" + seconds;
document.getElementById("dpTime").innerHTML = "The current time is "+ hours + ":" + minutes + ":" + seconds;
if (hours < workTime){
document.getElementById("moneyPerSec").innerHTML = "출근할 때까지 " + String(workTime - hours) + "시간 남았당";
var diff2 = (workStart.getTime() - now.getTime());
var hour2 = (diff2/(1000*60*60))%24 - ((diff2/(1000*60*60))%24)%1;
var min2 = (diff2/(1000*60))%60 - ((diff2/(1000*60))%60)%1;
var sec2 = (diff2/1000)%60;
document.getElementById("moneyPerSec").innerHTML = "출근할 때까지 "+ String(hour2) + "시간" + String(min2) + "분" + String(sec2.toFixed(2)) + "초 남았당";
}
else{
moneyPerSec += salary/(60*60*(offWork - workTime)*workingDayNum*30);
document.getElementById("moneyPerSec").innerHTML = moneyPerSec.toFixed(3) + "원 버는중..";
moneyPerSec += payPerDay/(1000*60*60*(offWork - workTime));
document.getElementById("moneyPerSec").innerHTML = + moneyPerSec.toFixed(3) + "won earging today !!";
}
}
......