niggl/srumboard_frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/dropdown-add' of git.informatik.fh-nuernberg.de:scrum-taskboard/frontend into feature/dropdown-add

Browse Source
This commit is contained in:
Nicolai Ort 2020-06-30 14:57:59 +02:00
commit 0eaa840e18
2 changed files with 94 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/app/task-form/task-form.component.html
View File

@ -1,4 +1,97 @@
<div class="modal-content p-3"> <div class="modal-content p-3">
<<<<<<< HEAD
<div class="modal-header">
<table>
<tr>
<h4 class="modal-title">Neuen Task anlegen</h4>
</tr>
<tr>
<h6 class="modal-caption text-muted">
Gehört zu Story:
<a href="#" id="userstoryTitle">{{ this.userstoryId }}</a>
</h6>
</tr>
<select
class="form-control custom-select mr-sm-2"
id="prio"
required
name="prio"
[(ngModel)]="task.priority"
>
<option
*ngFor="let userstory of userstories"
[value]="userstory.title"
>{{ userstory.title }}</option
>
</select>
</table>
<button (click)="onClose()" type="button" class="close" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form (ngSubmit)="onSubmit()">
<div class="row">
<div class="col-md-9">
<div class="form-group">
<label for="Title">Titel</label>
<input
type="text"
class="form-control"
id="Title"
required
name="title"
[(ngModel)]="task.title"
id="titleField"
/>
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-2">
<div class="form-group">
<label for="Prio">Prio</label>
<select
class="form-control custom-select mr-sm-2"
id="prio"
required
name="prio"
[(ngModel)]="task.priority"
>
<option value="low">Low</option>
<option value="medium">Medium</option>
<option value="high">High</option>
</select>
</div>
</div>
</div>
<div class="row">
<div class="col-md-9">
<div class="form-group">
<label for="Inhalt">What to do?</label>
<textarea
type="text"
class="form-control"
id="Story"
required
name="story"
rows="5"
[(ngModel)]="task.content"
></textarea>
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-2">
<div class="form-group">
<label for="Inhalt">Status</label>
<select
class="form-control custom-select mr-sm-2"
id="prio"
required
name="prio"
[(ngModel)]="task.statusid"
>
<option *ngFor="let status of allStatus" [value]="status.title">{{
=======
<div class="modal-header"> <div class="modal-header">
<table> <table>
<tr> <tr>
@ -60,6 +153,7 @@
[(ngModel)]="task.statusid"> [(ngModel)]="task.statusid">
<option><input type="text" class="form-control" /></option> <option><input type="text" class="form-control" /></option>
<option *ngFor="let status of allStatus">{{ <option *ngFor="let status of allStatus">{{
>>>>>>> dropdown-add
status.title status.title
}}</option> }}</option>
</select> </select>

4
src/app/task-form/task-form.component.ts
View File

@ -103,8 +103,4 @@ export class TaskFormComponent implements OnInit {
} }
}); });
} }
// addNewStatus() {
// this.allStatus;
// }
} }