fix(schedule): fix get event appointment in middle scale

TemainfoSoftware · Apr 18, 2021 · 9654b71 · 9654b71
1 parent 4069fa4
commit 9654b71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/projects/truly-ui/src/components/schedule/views/day/view-day.component.ts b/projects/truly-ui/src/components/schedule/views/day/view-day.component.ts
@@ -202,8 +202,9 @@ export class ViewDayComponent implements OnInit, AfterViewInit, OnChanges, OnDes
   private addMiddleScales(events: ScheduleDataSource[], workScale: WorkScaleType[]) {
     let existsEventInMiddleScale = false;
     const scales = workScale.filter( work => work);
+
     for (let workScaleIndex = 0; workScaleIndex < workScale.length - 1; workScaleIndex++ ) {
-      for (let e = 0; e < events.length - 1; e++ ) {
+      for (let e = 0; e <= events.length - 1; e++ ) {
         const eventStartDate = new Date(events[e].date.start).setSeconds(0, 0);
         const eventEndDate = new Date(events[e].date.end).setSeconds(0, 0);
         const workStartDate = this.workScaleService.transformHourToMileseconds(workScale[workScaleIndex].end, new Date(eventStartDate));
@@ -230,7 +231,6 @@ export class ViewDayComponent implements OnInit, AfterViewInit, OnChanges, OnDes
         expansed: true,
       });
     }
-
     return this.sortScaleByStart( scales);
   }
 

diff --git a/src/app/components/schedule/overview/scheduledemo-overview.component.ts b/src/app/components/schedule/overview/scheduledemo-overview.component.ts
@@ -368,8 +368,8 @@ export class ScheduleDemoOverviewComponent {
       allday: false,
       tags: [{color : '#FF385C', title : 'Missed'}, {color : '#1d8bff', title : 'Not Met'}, {color : '#90ED5D', title : 'Attended Now'}],
       date: {
-        start: new Date(new Date().setHours(11, 10, 0)).getTime() ,
-        end: new Date( new Date().setHours(13, 0, 0) ).getTime()
+        start: new Date(new Date().setHours(12, 15, 0)).getTime() ,
+        end: new Date( new Date().setHours(12, 45, 0) ).getTime()
       }
     }];