diff --git a/view-mode/function/ganttSettings.js b/view-mode/function/ganttSettings.js index 03e5de8..4cb0c48 100644 --- a/view-mode/function/ganttSettings.js +++ b/view-mode/function/ganttSettings.js @@ -77,15 +77,6 @@ $(document).ready(function() { } } } - else { - // default - // console.log('default'); - // $('#select_dayoff option[value="0"]').prop("selected", "selected"); // Sunday - // $('#select_dayoff option[value="6"]').prop("selected", "selected"); // Saturday - // $("#select_dayoff").choices.setValue([0, 6]); - selectDayOffChoices.setChoiceByValue('0'); - selectDayOffChoices.setChoiceByValue('6'); - } } }else{ // closeDialog('failed upload') diff --git a/view-mode/function/overlaySCurve.js b/view-mode/function/overlaySCurve.js index 1e19e64..636766c 100644 --- a/view-mode/function/overlaySCurve.js +++ b/view-mode/function/overlaySCurve.js @@ -98,11 +98,14 @@ function getChartScaleRange(){ function getProgressLine(){ // As long as the progress data length is same with chart scale range (period) then it's fine. getSCurveData(); + // console.log("apa ", return_first); var cumulativePlannedDurations = return_first.data[0].data.percentagePlan; var cumulativeRealDurations = return_first.data[0].data.percentageReal; + cumulativeRealDurations[cumulativeRealDurations.length - 1] = Math.ceil(cumulativeRealDurations[cumulativeRealDurations.length - 1]); var maxPlan = cumulativePlannedDurations[cumulativePlannedDurations.length - 1] var maxReal = cumulativeRealDurations[cumulativeRealDurations.length - 1] var dates = return_first.data[0].data.date; + //jika summary s curve if (maxReal > 100 || maxPlan > 100) { var plannedDurations = cumulativePlannedDurations.map((item) => { return item/maxPlan*100; diff --git a/view-mode/index.html b/view-mode/index.html index 8600e81..76d766c 100644 --- a/view-mode/index.html +++ b/view-mode/index.html @@ -12,8 +12,8 @@ - - + +