diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java index 4ef4130..3949347 100644 --- a/backend/src/main/java/core/api/controller/ScheduleController.java +++ b/backend/src/main/java/core/api/controller/ScheduleController.java @@ -75,6 +75,9 @@ public class ScheduleController { if(scheduleFieldInfo instanceof BasicScheduleFieldInfo) { ServiceResult scheduleResult = taskScheduleService.scheduleBasic(permissionResult.getResult(), (BasicScheduleFieldInfo) scheduleFieldInfo); + if(scheduleResult.getExitCode() == ServiceExitCode.INVALID_OPERATION) { + return ResponseEntity.status(400).body(new SimpleStatusResponse("failed")); + } return ResponseEntity.ok(scheduleResult.getResult().toScheduleInfo()); } else if(scheduleFieldInfo instanceof AdvancedScheduleFieldInfo) { ServiceResult scheduleResult = taskScheduleService.scheduleAdvanced(permissionResult.getResult(), (AdvancedScheduleFieldInfo) scheduleFieldInfo); diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts index f3c81e7..473ff71 100644 --- a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts +++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts @@ -9,6 +9,7 @@ import { } from "../../../api"; import {MatSnackBar} from "@angular/material/snack-bar"; import {Router} from "@angular/router"; +import * as moment from "moment"; @Component({ selector: 'app-basic-scheduler', @@ -36,7 +37,7 @@ export class BasicSchedulerComponent implements OnChanges{ if(this.task != undefined) { if(this.scheduleEntityInfo == undefined) { this.scheduleService.schedulesTaskIDBasicPut(this.task.taskID, { - scheduleDate: this.dateCtrl.value + scheduleDate: moment(this.dateCtrl.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ') }).subscribe({ next: resp => { this.scheduleEmitter.emit(resp as BasicScheduleInfo); @@ -44,7 +45,7 @@ export class BasicSchedulerComponent implements OnChanges{ }) } else { this.scheduleService.schedulesScheduleIDBasicPost(this.scheduleEntityInfo!.scheduleID, { - scheduleDate: this.dateCtrl.value + scheduleDate: moment(this.dateCtrl.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ') }).subscribe({ next: resp => { this.router.navigateByUrl("/taskgroups/" + this.taskgroup!.taskgroupID + "/tasks/" + this.task!.taskID);