-
\ No newline at end of file
+
Index: arms/js/analysisResource.js
===================================================================
diff -u -r7815edbbced8f9cbb6dc392592dac3d1ce3a8878 -r8b51507922204f7bef5d8e8060bbbebf51330ab9
--- arms/js/analysisResource.js (.../analysisResource.js) (revision 7815edbbced8f9cbb6dc392592dac3d1ce3a8878)
+++ arms/js/analysisResource.js (.../analysisResource.js) (revision 8b51507922204f7bef5d8e8060bbbebf51330ab9)
@@ -863,20 +863,26 @@
}
}
}
+
+ if(earliestStartDate ==="start") { earliestStartDate = new Date(); }
+ if(lastEndDate ==="end") {lastEndDate = new Date(); }
let objectiveDateDiff = getDateDiff(earliestStartDate, lastEndDate);
let currentDateDiff = getDateDiff(earliestStartDate, new Date());
+ console.log(objectiveDateDiff);
+ console.log(currentDateDiff);
let 목표데이터_배열 = [resource_count, req_count, objectiveDateDiff];
let 현재진행데이터_배열 = [resource_count, req_in_action, currentDateDiff];
let dateDiff = Math.abs(objectiveDateDiff - currentDateDiff).toFixed(0);
- $("#progressDateRate").text((currentDateDiff*100/objectiveDateDiff).toFixed(0)+"%");
+ $("#progressDateRate").text((currentDateDiff*100/(objectiveDateDiff === 0 ? 1 : objectiveDateDiff)).toFixed(0)+"%");
if(objectiveDateDiff>= currentDateDiff) {
$("#remaining_days").text("D-"+dateDiff);
} else {
$("#remaining_days").text("D+"+dateDiff);
$("#remaining_days").css("color", "rgb(219,42,52)");
}
drawBasicRadar("radarPart",목표데이터_배열, 현재진행데이터_배열);
+
}
}
});