Merge branch 'master' of https://git.oslog.id/ordo/adw-gantt

view-mode/function/function.js

@@ -241,6 +241,7 @@ function initialProperty()
 			let data = result.data;
 			if(data.status && data.status=="not have"){
 				toggleCollapseTasks();
+				gantt.ext.zoom.setLevel("month");
 			}else{
 				if(data.id){
 					userToVersionGanttId = data.id

view-mode/function/ganttSettings.js

@@ -239,7 +239,7 @@ async function initHolidays(){
 async function initGanttSettings() {
     console.log('initGanttSettings');
     // if zoom is day
-    $("#scale1").attr('checked', true);
+    $("#scale3").attr('checked', true);
     // toggleCollapseTasks();
 
     // init to gantt chart view (holidays)

view-mode/function/overlaySCurve.js

@@ -151,12 +151,12 @@ function adjustDataToZoom(dates, data, chartScaleRange, zoomLevel) {
     for (var i = 0; i < data.length; i++) {
         aggregateValue = data[i];
 
-        if (zoomLevel === 2 && i % 30 === 29) {
+        if (zoomLevel === 2 && i % 30 === 0) {
             // Aggregate data for each month (assuming 30 days in a month)
             newData.push(aggregateValue);
             newDates.push(dates[i]);
             aggregateValue = 0;
-        } else if (zoomLevel === 1 && (i + 1) % 7 === 0) {
+        } else if (zoomLevel === 1 && (i + 1) % 7 === 1) {
             // Aggregate data for each week
             newData.push(aggregateValue);
             newDates.push(dates[i]);