diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml
index 21b19b8..d202286 100644
--- a/.gitea/workflows/demo.yaml
+++ b/.gitea/workflows/demo.yaml
@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
on: [push]
jobs:
- build:
+ test:
runs-on: ubuntu-latest
@@ -22,6 +22,53 @@ jobs:
- name: Build with Maven
run: mvn -B package --file backend/pom.xml
- # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- # - name: Update dependency graph
- #uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
\ No newline at end of file
+ build-and-push-frontend:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Log into registry at Gitea
+ uses: docker/login-action@v2
+ with:
+ registry: https://git.fawkes100.de
+ username: ${{ secrets.REGISTRY_USER }}
+ password: ${{ secrets.REGISTRY_PASSWORD }}
+ - name: Setup Docker buildx
+ uses: docker/setup-buildx-action@v3
+ - name: Extract Docker metadata
+ id: meta
+ uses: docker/metadata-action@v2
+ with:
+ images: git.fawkes100.de/TimeManager/timemanager-frontend
+ - name: Build and Push Latest Docker Image
+ id: build-and-push-latest
+ uses: docker/build-push-action@v4
+ if: ${{ github.ref == 'refs/heads/master' }}
+ with:
+ file: frontend/Dockerfile
+ push: true
+ tags: git.fawkes100.de/TimeManager/timemanager-frontend:latest
+ build-and-push-backend:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Log into registry at Gitea
+ uses: docker/login-action@v2
+ with:
+ registry: https://git.fawkes100.de
+ username: ${{ secrets.REGISTRY_USER }}
+ password: ${{ secrets.REGISTRY_PASSWORD }}
+ - name: Setup Docker buildx
+ uses: docker/setup-buildx-action@v3
+ - name: Extract Docker metadata
+ id: meta
+ uses: docker/metadata-action@v2
+ with:
+ images: git.fawkes100.de/TimeManager/timemanager-backend
+ - name: Build and Push Latest Docker Image
+ id: build-and-push-latest
+ uses: docker/build-push-action@v4
+ if: ${{ github.ref == 'refs/heads/master' }}
+ with:
+ file: backend/Dockerfile
+ push: true
+ tags: git.fawkes100.de/TimeManager/timemanager-backend:latest
\ No newline at end of file
diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index e1c6a0d..2afbcaf 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,7 +4,9 @@
-
+
+
+
@@ -174,11 +176,11 @@
-
-
-
+
+
+
@@ -218,7 +220,6 @@
-
@@ -572,29 +573,15 @@
1699806194258
-
-
- 1699809089060
-
-
-
- 1699809089060
-
-
-
- 1699824923378
-
-
-
- 1699824923378
-
-
+
+
+
@@ -618,9 +605,7 @@
-
-
-
+
@@ -630,31 +615,11 @@
57
-
- file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java
- 98
-
-
file://$PROJECT_DIR$/src/main/java/core/services/TaskService.java
93
-
- file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java
- 83
-
-
-
- file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java
- 99
-
-
-
- file://$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java
- 100
-
-
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
index d4f2cf9..1cf7335 100644
--- a/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java
@@ -1,5 +1,6 @@
package core.api.models.timemanager.tasks;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@@ -11,7 +12,11 @@ public class TaskFieldInfo {
@Length(max = 255)
private String taskName;
private int eta;
+
+ @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
private LocalDate startDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
private LocalDate deadline;
public TaskFieldInfo() {
diff --git a/frontend/src/app/tasks/task-editor/task-editor.component.ts b/frontend/src/app/tasks/task-editor/task-editor.component.ts
index 7752773..ab05b42 100644
--- a/frontend/src/app/tasks/task-editor/task-editor.component.ts
+++ b/frontend/src/app/tasks/task-editor/task-editor.component.ts
@@ -7,6 +7,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
import {TaskService} from "../../../api";
import {TaskEditorData} from "./TaskEditorData";
import {MatSnackBar} from "@angular/material/snack-bar";
+import * as moment from "moment/moment";
@Component({
@@ -53,8 +54,8 @@ export class TaskEditorComponent implements OnInit {
this.taskService.tasksTaskgroupIDPut(this.editorData.taskgroupID, {
taskName: this.nameCtrl.value,
eta: this.etaCtrl.value,
- startDate: this.startDate.value,
- deadline: this.endDate.value
+ startDate: moment(this.startDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+ deadline: moment(this.endDate.value).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
}).subscribe({
next: resp => {
this.dialog.close(resp);