From b78c3715cfc9501eda662cd5b2ca107131970309 Mon Sep 17 00:00:00 2001
From: Jakob Fahr <me@jfhr.de>
Date: Mon, 6 Jul 2020 22:27:16 +0200
Subject: [PATCH] Fix remaining merge issues

---
 src/app/dashboard/dashboard.component.html     |  2 --
 src/app/services/backend.service.ts            |  3 ++-
 src/app/sprint-form/sprint-form.component.ts   | 11 +----------
 src/app/sprint-table/sprint-table.component.ts |  4 ++--
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index ef0a57d..73238c1 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -94,6 +94,4 @@
     </div>
   </div>
 
-  </div>
-
 </div>
diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts
index 11e1d0f..3816388 100644
--- a/src/app/services/backend.service.ts
+++ b/src/app/services/backend.service.ts
@@ -242,6 +242,7 @@ export interface ScrumUserstory {
   priority?: Priority;
   statusid?: number;
   categoryid?: number;
+  sprintid?: number;
   createdbyid?: number;
   projectid?: number;
 }
@@ -252,7 +253,7 @@ export interface ScrumSprint{
     description?: string;
     startDate: string;
     endDate: string;
-    project: number;
+    projectid?: number;
 }
 
 export interface ScrumCategory {
diff --git a/src/app/sprint-form/sprint-form.component.ts b/src/app/sprint-form/sprint-form.component.ts
index b6360a2..d08d8b1 100644
--- a/src/app/sprint-form/sprint-form.component.ts
+++ b/src/app/sprint-form/sprint-form.component.ts
@@ -2,17 +2,8 @@ import { Component, OnInit, Input } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import {
 	BackendService,
-	ScrumTask,
-	Priority,
-	ScrumStatus,
-	ScrumCategory,
-	ScrumUser,
-	ScrumProject,
-	ScrumUserstory,
 	ScrumSprint
 } from '../services/backend.service';
-import { Observable } from 'rxjs';
-import { HttpResponse } from '@angular/common/http';
 
 @Component({
 	selector: 'app-task-form',
@@ -28,7 +19,7 @@ export class SprintFormComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.sprint === null || this.sprint === undefined) {
-      this.sprint = { title: '', startDate: new Date(), endDate: new Date()}; //project id missing...
+      this.sprint = { title: '', startDate: '', endDate: ''}; //project id missing...
       this.editing = false;
     } else {
       this.editing = true;
diff --git a/src/app/sprint-table/sprint-table.component.ts b/src/app/sprint-table/sprint-table.component.ts
index fc53bfc..eb646cb 100644
--- a/src/app/sprint-table/sprint-table.component.ts
+++ b/src/app/sprint-table/sprint-table.component.ts
@@ -78,10 +78,10 @@ export class SprintTableComponent extends TableComponentBase<ScrumSprint> {
   }
 
   sortByStartDate() {
-    this.doDateSort('startDate', sprint => sprint.startDate);
+    this.doStringSort('startDate', sprint => sprint.startDate);
   }
 
   sortByEndDate() {
-    this.doDateSort('endDate', sprint => sprint.endDate);
+    this.doStringSort('endDate', sprint => sprint.endDate);
   }
 }