sebastian/timemanager
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Fix JSON Parse Error Invalid Date' (#90) from fix-issue-87 into master
All checks were successful
Java CI with Maven / test (push) Successful in 36s
Details
Java CI with Maven / build-and-push-frontend (push) Successful in 2m16s
Details
Java CI with Maven / build-and-push-backend (push) Successful in 1m20s
Details

Browse Source 
Reviewed-on: #90
This commit is contained in:
sebastian 2023-12-21 11:31:12 +01:00
commit 16048d9023
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/tasks/task-editor/task-editor.component.ts
View File

@ -53,13 +53,14 @@ export class TaskEditorComponent implements OnInit {
createTask() { createTask() {
let endDate_formatted: string|undefined = undefined; let endDate_formatted: string|undefined = undefined;
let startDate_formatted: string|undefined = undefined; let startDate_formatted: string|undefined = undefined;
if(this.endDate.value !== "") { if(this.endDate.value != undefined && this.endDate.value !== "") {
endDate_formatted = moment(this.endDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ'); endDate_formatted = moment(this.endDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
} }
if(this.startDate.value !== "") { if(this.endDate.value != undefined && this.startDate.value !== "") {
startDate_formatted = moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ'); startDate_formatted = moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
} }
this.taskService.tasksTaskgroupIDPut(this.editorData.taskgroupID, { this.taskService.tasksTaskgroupIDPut(this.editorData.taskgroupID, {
taskName: this.nameCtrl.value, taskName: this.nameCtrl.value,
eta: this.etaCtrl.value, eta: this.etaCtrl.value,
@ -87,13 +88,14 @@ export class TaskEditorComponent implements OnInit {
editTask() { editTask() {
let endDate_formatted: string|undefined = undefined; let endDate_formatted: string|undefined = undefined;
let startDate_formatted: string|undefined = undefined; let startDate_formatted: string|undefined = undefined;
if(this.endDate.value !== "") { if(this.endDate.value != undefined && this.endDate.value !== "") {
endDate_formatted = moment(this.endDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ'); endDate_formatted = moment(this.endDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
} }
if(this.startDate.value !== "") { if(this.startDate.value != undefined && this.startDate.value !== "") {
startDate_formatted = moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ'); startDate_formatted = moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ');
} }
this.taskService.tasksTaskIDPost(this.editorData.task!.taskID, { this.taskService.tasksTaskIDPost(this.editorData.task!.taskID, {
taskName: this.nameCtrl.value, taskName: this.nameCtrl.value,
eta: this.etaCtrl.value, eta: this.etaCtrl.value,