Display existing schedules in forgetten schedules scheduler
This commit is contained in:
		
							parent
							
								
									ed89c18f93
								
							
						
					
					
						commit
						edcd0f6c77
					
				| @ -17,7 +17,7 @@ public abstract class ScheduleInfo { | |||||||
|     @JsonProperty |     @JsonProperty | ||||||
|     private LocalDateTime startTime; |     private LocalDateTime startTime; | ||||||
|     @JsonProperty |     @JsonProperty | ||||||
|     private LocalDateTime stopTime; |     private LocalDateTime finishedTime; | ||||||
|     @JsonProperty |     @JsonProperty | ||||||
|     private int activeMinutes; |     private int activeMinutes; | ||||||
|     @JsonProperty |     @JsonProperty | ||||||
| @ -29,7 +29,7 @@ public abstract class ScheduleInfo { | |||||||
|         this.scheduleID = scheduleID; |         this.scheduleID = scheduleID; | ||||||
|         this.scheduleType = scheduleType; |         this.scheduleType = scheduleType; | ||||||
|         this.startTime = startTime; |         this.startTime = startTime; | ||||||
|         this.stopTime = stopTime; |         this.finishedTime = stopTime; | ||||||
|         this.activeMinutes = activeMinutes; |         this.activeMinutes = activeMinutes; | ||||||
|         this.task = new TaskShortInfo(task); |         this.task = new TaskShortInfo(task); | ||||||
|         this.taskgroupPath = taskgroupPath; |         this.taskgroupPath = taskgroupPath; | ||||||
|  | |||||||
| @ -39,6 +39,7 @@ public class Task { | |||||||
|     private int workTime; |     private int workTime; | ||||||
| 
 | 
 | ||||||
|     public Task() { |     public Task() { | ||||||
|  |         this.basicTaskSchedules = new ArrayList<>(); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public Task(Taskgroup taskgroup, TaskFieldInfo taskFieldInfo) { |     public Task(Taskgroup taskgroup, TaskFieldInfo taskFieldInfo) { | ||||||
|  | |||||||
| @ -61,7 +61,27 @@ export class ForgottenTaskStartDialogComponent implements OnInit{ | |||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   ngOnInit() { |   ngOnInit() { | ||||||
|  |     this.scheduleService.schedulesDateStartableGet(moment().format("yyyy-MM-DD"), false).subscribe({ | ||||||
|  |       next: resp => { | ||||||
|  |         resp.forEach(schedule => { | ||||||
|  |           console.log(schedule.startTime) | ||||||
|  |           console.log(schedule.finishedTime) | ||||||
|  |           this.events.push({ | ||||||
|  |             title: this.computeTaskPath(schedule.taskgroupPath, schedule.task), | ||||||
|  |             color: colors['red'], | ||||||
|  |             start: new Date(schedule.startTime), | ||||||
|  |             end: new Date(schedule.finishedTime!), | ||||||
|  |             draggable: false, | ||||||
|  |             resizable: { | ||||||
|  |               beforeStart: false, | ||||||
|  |               afterEnd: false | ||||||
|  |             } | ||||||
|  |           }) | ||||||
|  |         }) | ||||||
|  |         this.refresh.next() | ||||||
|  |       } | ||||||
| 
 | 
 | ||||||
|  |     }) | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user