From 5d0a62e3b459a69c402306b20e0ee54740162375 Mon Sep 17 00:00:00 2001
From: Sebastian <mail@fawkes100.de>
Date: Thu, 5 Oct 2023 20:07:39 +0200
Subject: [PATCH] Fix Datepicker Provider

---
 backend/.idea/workspace.xml                   | 10 ++-----
 frontend/package-lock.json                    | 28 ++++++++++++++-----
 frontend/package.json                         |  1 +
 frontend/src/app/app.module.ts                |  8 +++---
 .../task-editor/task-editor.component.ts      |  8 ++++--
 5 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index e58e44b..28d992a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,13 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Datastructure for Tasks">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/tasks/task-editor/task-editor.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/tasks/task-editor/task-editor.component.html" afterDir="false" />
-    </list>
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Datastructure for Tasks" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -85,7 +79,7 @@
       <workItem from="1695647249321" duration="397000" />
       <workItem from="1696183811713" duration="4994000" />
       <workItem from="1696399523081" duration="666000" />
-      <workItem from="1696517800445" duration="1732000" />
+      <workItem from="1696517800445" duration="1782000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3005d75..3e6f8ee 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -17,6 +17,7 @@
         "@angular/core": "^16.2.7",
         "@angular/forms": "^16.2.7",
         "@angular/material": "^16.2.6",
+        "@angular/material-moment-adapter": "^16.2.7",
         "@angular/platform-browser": "^16.2.7",
         "@angular/platform-browser-dynamic": "^16.2.7",
         "@angular/router": "^16.2.7",
@@ -524,9 +525,9 @@
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "16.2.6",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.6.tgz",
-      "integrity": "sha512-vSaPs69xutbxc6IbZz4I5fMzZhlypsMg5JKKNAufmyYNNHQYgSQytpUd1/RxHhPF/JoEvj/J8QjauRriZFN+SA==",
+      "version": "16.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.2.7.tgz",
+      "integrity": "sha512-LLbCu0pHHsZWGjSpQW0qRoKYRCm09TuFH2vzsViyaQF7umDKlk52QcDFB/nMioyiWPgqXkyHyGMFG1vFBNSIeg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -701,9 +702,9 @@
       }
     },
     "node_modules/@angular/material": {
-      "version": "16.2.6",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.6.tgz",
-      "integrity": "sha512-JFP12dLrsKwrQ4zZtSRJarYosnxikxLD2M9hfUtHVxgTJr7rdSQ8eE7G2l2zPALSUt+d44MWgQ79xu6inuvEOw==",
+      "version": "16.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.2.7.tgz",
+      "integrity": "sha512-f5J/YdbrgaoeRhqDVNhauY/nHMSbF4zTph5gYtkGu49MQHpf6vAxfW9m8E2Rs/RPmhb44e3671Z8nONbvP6yGg==",
       "dependencies": {
         "@material/animation": "15.0.0-canary.bc9ae6c9c.0",
         "@material/auto-init": "15.0.0-canary.bc9ae6c9c.0",
@@ -756,7 +757,7 @@
       },
       "peerDependencies": {
         "@angular/animations": "^16.0.0 || ^17.0.0",
-        "@angular/cdk": "16.2.6",
+        "@angular/cdk": "16.2.7",
         "@angular/common": "^16.0.0 || ^17.0.0",
         "@angular/core": "^16.0.0 || ^17.0.0",
         "@angular/forms": "^16.0.0 || ^17.0.0",
@@ -764,6 +765,19 @@
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
+    "node_modules/@angular/material-moment-adapter": {
+      "version": "16.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-16.2.7.tgz",
+      "integrity": "sha512-VvPkRvloja8lJ63b3ZmkLlXc5DZpDAiI5gvtlGDGpTBPRewhg+fraI1glKrmCHZKCQCTjwzF6UOzOwJMvvRaSA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/material": "16.2.7",
+        "moment": "^2.18.1"
+      }
+    },
     "node_modules/@angular/platform-browser": {
       "version": "16.2.7",
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.7.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 54bddaa..0c876cd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,6 +19,7 @@
     "@angular/core": "^16.2.7",
     "@angular/forms": "^16.2.7",
     "@angular/material": "^16.2.6",
+    "@angular/material-moment-adapter": "^16.2.7",
     "@angular/platform-browser": "^16.2.7",
     "@angular/platform-browser-dynamic": "^16.2.7",
     "@angular/router": "^16.2.7",
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 045f1ff..c8ce1e6 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -50,6 +50,8 @@ import {MatTableModule} from "@angular/material/table";
 import {MatCheckboxModule} from "@angular/material/checkbox";
 import {MatCardModule} from "@angular/material/card";
 import {MatListModule} from "@angular/material/list";
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule} from "@angular/material/core";
+import {MomentDateAdapter} from "@angular/material-moment-adapter";
 
 @NgModule({
   declarations: [
@@ -97,11 +99,10 @@ import {MatListModule} from "@angular/material/list";
         MatDatepickerModule,
         MatInputModule,
         MatDatepickerModule,
-        MatMomentDateModule,
+        MatNativeDateModule
     ],
   providers: [
     HttpClientModule,
-    {provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: {useUtc: true}},
     /*
      This is the configuration for the code generated by OpenApiGenerator.
      It specifies that the API code should use our `AuthService` to get the currently stored
@@ -125,8 +126,7 @@ import {MatListModule} from "@angular/material/list";
       ),
       deps: [AuthService],
       multi: false
-    }
-
+    },
   ],
   bootstrap: [AppComponent]
 })
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 3985063..bf196ee 100644
--- a/frontend/src/app/tasks/task-editor/task-editor.component.ts
+++ b/frontend/src/app/tasks/task-editor/task-editor.component.ts
@@ -1,16 +1,20 @@
 import { Component, OnInit } from '@angular/core';
 import {UntypedFormControl, Validators} from "@angular/forms";
+import * as _moment from 'moment';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from "@angular/material/core";
+import {MomentDateAdapter} from "@angular/material-moment-adapter";
 
+const moment = _moment;
 @Component({
   selector: 'app-task-editor',
   templateUrl: './task-editor.component.html',
-  styleUrls: ['./task-editor.component.css']
+  styleUrls: ['./task-editor.component.css'],
 })
 export class TaskEditorComponent implements OnInit {
 
   nameCtrl = new UntypedFormControl('', [Validators.required, Validators.maxLength(255)])
   etaCtrl = new UntypedFormControl(0, [Validators.required, Validators.min(0)])
-  startDate = new UntypedFormControl(Date.now(), [Validators.required])
+  startDate = new UntypedFormControl(moment.now, [Validators.required])
   constructor() { }
 
   ngOnInit(): void {