Fix remaining merge issues

This commit is contained in:
Jakob Fahr
2020-07-06 22:27:16 +02:00
parent 594839d2ff
commit b78c3715cf
4 changed files with 5 additions and 15 deletions

View File

@@ -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;