fix: review code

worktile · Jun 30, 2021 · 51d583f · 51d583f
1 parent 9ac28e7
commit 51d583f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/example/src/app/gantt/gantt.component.ts b/example/src/app/gantt/gantt.component.ts
@@ -28,7 +28,7 @@ export class AppGanttExampleComponent implements OnInit {
     groups = mockGroups;
 
     options = {
-        viewType: GanttViewType.month,
+        viewType: GanttViewType.day,
         draggable: true,
         linkable: true,
         async: true,

diff --git a/packages/gantt/src/class/item.ts b/packages/gantt/src/class/item.ts
@@ -78,24 +78,24 @@ export class GanttItemInternal {
         this.progress = this.origin.progress;
         // fill one month when start or end is null
         if (item.start && !item.end) {
-            this.end = this.fillItemByViewType(item.start, true);
+            this.end = this.fillItemByViewType(item);
         }
         if (!item.start && item.end) {
-            this.start = this.fillItemByViewType(item.end, false);
+            this.start = this.fillItemByViewType(item);
         }
     }
 
-    fillItemByViewType(date: Date | string | number, hasStart?: boolean) {
-        let _date: GanttDate;
+    fillItemByViewType(item: GanttItem) {
+        let date: GanttDate;
         switch (this.viewType) {
-            case GanttViewType.day:
-                _date = hasStart ? new GanttDate(date).endOfDay() : new GanttDate(date).startOfDay();
+            case GanttViewType.day || GanttViewType.week:
+                date = item.start ? new GanttDate(item.start).endOfDay() : new GanttDate(item.end).startOfDay();
                 break;
             default:
-                _date = hasStart ? new GanttDate(date).addMonths(1).endOfDay() : new GanttDate(date).addMonths(-1).startOfDay();
+                date = item.start ? new GanttDate(item.start).addMonths(1).endOfDay() : new GanttDate(item.end).addMonths(-1).startOfDay();
                 break;
         }
-        return _date;
+        return date;
     }
 
     updateRefs(refs: GanttItemRefs) {