From f080c6db52909d8906e4b04cd04c811c477a617b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Sun, 17 Mar 2024 08:21:56 +0100 Subject: [PATCH] Adjust Frontend to removed DeadlineStrategy --- frontend/src/api/model/taskRepeatDayInfo.ts | 9 ------- .../src/api/model/taskRepeatWeekDayInfo.ts | 17 +++++++++++++ frontend/src/api/model/taskRepeatWeekInfo.ts | 9 ------- .../task-series-creator.component.html | 7 ------ .../task-series-creator.component.ts | 12 ---------- .../task-weekly-series-creator.component.html | 8 ------- .../task-weekly-series-creator.component.ts | 23 ++++++++++++++---- openapi.yaml | 24 +++++++++---------- 8 files changed, 47 insertions(+), 62 deletions(-) diff --git a/frontend/src/api/model/taskRepeatDayInfo.ts b/frontend/src/api/model/taskRepeatDayInfo.ts index 31b219e..e91f598 100644 --- a/frontend/src/api/model/taskRepeatDayInfo.ts +++ b/frontend/src/api/model/taskRepeatDayInfo.ts @@ -16,18 +16,9 @@ export interface TaskRepeatDayInfo { * number repeating days */ offset: number; - deadlineStrategy: TaskRepeatDayInfo.DeadlineStrategyEnum; /** * Date until the tasks repeat */ endingDate: string; } -export namespace TaskRepeatDayInfo { - export type DeadlineStrategyEnum = 'DEADLINE_EQUAL_START' | 'DEADLINE_FIT_START'; - export const DeadlineStrategyEnum = { - EqualStart: 'DEADLINE_EQUAL_START' as DeadlineStrategyEnum, - FitStart: 'DEADLINE_FIT_START' as DeadlineStrategyEnum - }; -} - diff --git a/frontend/src/api/model/taskRepeatWeekDayInfo.ts b/frontend/src/api/model/taskRepeatWeekDayInfo.ts index ed3390e..87b61f3 100644 --- a/frontend/src/api/model/taskRepeatWeekDayInfo.ts +++ b/frontend/src/api/model/taskRepeatWeekDayInfo.ts @@ -20,5 +20,22 @@ export interface TaskRepeatWeekDayInfo { * internal identifier of task */ taskID: number; + /** + * day of week + */ + dayOfWeek: TaskRepeatWeekDayInfo.DayOfWeekEnum; +} +export namespace TaskRepeatWeekDayInfo { + export type DayOfWeekEnum = 'MONDAY' | 'TUESDAY' | 'WEDNESDAY' | 'THURSDAY' | 'FRIDAY' | 'SATURDAY' | 'SUNDAY'; + export const DayOfWeekEnum = { + Monday: 'MONDAY' as DayOfWeekEnum, + Tuesday: 'TUESDAY' as DayOfWeekEnum, + Wednesday: 'WEDNESDAY' as DayOfWeekEnum, + Thursday: 'THURSDAY' as DayOfWeekEnum, + Friday: 'FRIDAY' as DayOfWeekEnum, + Saturday: 'SATURDAY' as DayOfWeekEnum, + Sunday: 'SUNDAY' as DayOfWeekEnum + }; } + diff --git a/frontend/src/api/model/taskRepeatWeekInfo.ts b/frontend/src/api/model/taskRepeatWeekInfo.ts index 6803c5c..e0e0b7a 100644 --- a/frontend/src/api/model/taskRepeatWeekInfo.ts +++ b/frontend/src/api/model/taskRepeatWeekInfo.ts @@ -13,19 +13,10 @@ import { TaskRepeatWeekDayInfo } from './taskRepeatWeekDayInfo'; export interface TaskRepeatWeekInfo { - deadlineStrategy: TaskRepeatWeekInfo.DeadlineStrategyEnum; /** * Date until the tasks repeat */ endDate: string; weekDayInfos: Array; } -export namespace TaskRepeatWeekInfo { - export type DeadlineStrategyEnum = 'DEADLINE_EQUAL_START' | 'DEADLINE_FIT_START'; - export const DeadlineStrategyEnum = { - EqualStart: 'DEADLINE_EQUAL_START' as DeadlineStrategyEnum, - FitStart: 'DEADLINE_FIT_START' as DeadlineStrategyEnum - }; -} - diff --git a/frontend/src/app/tasks/task-series-creator/task-series-creator.component.html b/frontend/src/app/tasks/task-series-creator/task-series-creator.component.html index e000da5..59ab72a 100644 --- a/frontend/src/app/tasks/task-series-creator/task-series-creator.component.html +++ b/frontend/src/app/tasks/task-series-creator/task-series-creator.component.html @@ -7,13 +7,6 @@ Offset - - Deadline Strategy - - Fit Next Start - Equal Same Start - -
diff --git a/frontend/src/app/tasks/task-series-creator/task-series-creator.component.ts b/frontend/src/app/tasks/task-series-creator/task-series-creator.component.ts index ed27ba5..36d5da1 100644 --- a/frontend/src/app/tasks/task-series-creator/task-series-creator.component.ts +++ b/frontend/src/app/tasks/task-series-creator/task-series-creator.component.ts @@ -2,7 +2,6 @@ import {Component, Inject} from '@angular/core'; import {FormBuilder, Validators} from "@angular/forms"; import {TaskEntityInfo, TaskRepeatDayInfo, TaskseriesService} from "../../../api"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; -import DeadlineStrategyEnum = TaskRepeatDayInfo.DeadlineStrategyEnum; import * as moment from "moment"; @@ -15,7 +14,6 @@ export class TaskSeriesCreatorComponent { dailyFormGroup = this._formBuilder.group({ offsetCtrl: ['', Validators.required], - deadlineStrategyCtrl: ['', Validators.required] }) endDateFormGroup = this._formBuilder.group({ @@ -32,7 +30,6 @@ export class TaskSeriesCreatorComponent { save() { this.taskSeriesService.tasksTaskIDTaskseriesDailyPost(this.task.taskID,{ offset: Number(this.dailyFormGroup.get('offsetCtrl')!.value!), - deadlineStrategy: this.convertDeadlineStrategyCtrlToDeadlineEnum(), endingDate: moment( this.endDateFormGroup.get('endDateCtrl')!.value!).format('YYYY-MM-DDTHH:mm:ss.SSSZ') }).subscribe({ next: resp => { @@ -40,13 +37,4 @@ export class TaskSeriesCreatorComponent { } }) } - - convertDeadlineStrategyCtrlToDeadlineEnum() { - const deadlineStrategy = this.dailyFormGroup.get('deadlineStrategyCtrl')!.value; - if(deadlineStrategy === DeadlineStrategyEnum.EqualStart) { - return DeadlineStrategyEnum.EqualStart; - } else { - return DeadlineStrategyEnum.FitStart; - } - } } diff --git a/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.html b/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.html index 2d18e9b..e4ebefb 100644 --- a/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.html +++ b/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.html @@ -24,14 +24,6 @@ - - Deadline-Strategy - - - {{deadlineStrategy}} - - - Ending Date diff --git a/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.ts b/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.ts index 9b40131..f062284 100644 --- a/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.ts +++ b/frontend/src/app/tasks/task-weekly-series-creator/task-weekly-series-creator.component.ts @@ -3,7 +3,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {TaskEntityInfo, TaskRepeatDayInfo, TaskRepeatWeekDayInfo, TaskseriesService} from "../../../api"; import * as moment from "moment"; import {FormArray, FormBuilder, FormGroup, Validators} from "@angular/forms"; -import DeadlineStrategyEnum = TaskRepeatDayInfo.DeadlineStrategyEnum; +import DayOfWeekEnum = TaskRepeatWeekDayInfo.DayOfWeekEnum; @Component({ @@ -14,7 +14,6 @@ import DeadlineStrategyEnum = TaskRepeatDayInfo.DeadlineStrategyEnum; export class TaskWeeklySeriesCreatorComponent implements OnInit{ repeatingOffsetForm: FormGroup | undefined - availableDeadlineStrategys: DeadlineStrategyEnum[] = ["DEADLINE_EQUAL_START", "DEADLINE_FIT_START"] constructor(private dialogRef: MatDialogRef, private taskRepeatingService: TaskseriesService, @@ -27,7 +26,6 @@ export class TaskWeeklySeriesCreatorComponent implements OnInit{ offsets: this.formbuilder.array(this.tasks.map(task => this.formbuilder.group({ offsetCtrl: ['', [Validators.required, Validators.min(1)]] }))), - deadlineStrategyCtrl: ['', Validators.required], endingDateCtrl: ['', Validators.required] }) @@ -62,12 +60,12 @@ export class TaskWeeklySeriesCreatorComponent implements OnInit{ for(let i=0; i