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

Fixed the fix

Browse Source
This commit is contained in:
Nicolai Ort 2020-06-30 15:00:06 +02:00
parent 0eaa840e18
commit d2ecdd03ce
1 changed files with 36 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
<div class="modal-content p-3"> <div class="modal-content p-3">
<<<<<<< HEAD
<div class="modal-header"> <div class="modal-header">
<table> <table>
<tr> <tr>
@ -11,18 +10,8 @@
<a href="#" id="userstoryTitle">{{ this.userstoryId }}</a> <a href="#" id="userstoryTitle">{{ this.userstoryId }}</a>
</h6> </h6>
</tr> </tr>
<select <select class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.priority">
class="form-control custom-select mr-sm-2" <option *ngFor="let userstory of userstories" [value]="userstory.title">{{ userstory.title }}</option>
id="prio"
required
name="prio"
[(ngModel)]="task.priority"
>
<option
*ngFor="let userstory of userstories"
[value]="userstory.title"
>{{ userstory.title }}</option
>
</select> </select>
</table> </table>
<button (click)="onClose()" type="button" class="close" aria-label="Close"> <button (click)="onClose()" type="button" class="close" aria-label="Close">
@ -35,28 +24,14 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="form-group"> <div class="form-group">
<label for="Title">Titel</label> <label for="Title">Titel</label>
<input <input type="text" class="form-control" id="Title" required name="title" [(ngModel)]="task.title" id="titleField"/>
type="text"
class="form-control"
id="Title"
required
name="title"
[(ngModel)]="task.title"
id="titleField"
/>
</div> </div>
</div> </div>
<div class="col-md-1"></div> <div class="col-md-1"></div>
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label for="Prio">Prio</label> <label for="Prio">Prio</label>
<select <select class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.priority">
class="form-control custom-select mr-sm-2"
id="prio"
required
name="prio"
[(ngModel)]="task.priority"
>
<option value="low">Low</option> <option value="low">Low</option>
<option value="medium">Medium</option> <option value="medium">Medium</option>
<option value="high">High</option> <option value="high">High</option>
@ -68,92 +43,15 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="form-group"> <div class="form-group">
<label for="Inhalt">What to do?</label> <label for="Inhalt">What to do?</label>
<textarea <textarea type="text" class="form-control" id="Story" required name="story" rows="5" [(ngModel)]="task.content"></textarea>
type="text"
class="form-control"
id="Story"
required
name="story"
rows="5"
[(ngModel)]="task.content"
></textarea>
</div> </div>
</div> </div>
<div class="col-md-1"></div> <div class="col-md-1"></div>
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label for="Inhalt">Status</label> <label for="Inhalt">Status</label>
<select <select class="form-control custom-select mr-sm-2" id="prio" required name="prio" [(ngModel)]="task.statusid">
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">{{ <option *ngFor="let status of allStatus" [value]="status.title">{{
=======
<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.userstoryid">
<option *ngFor="let userstory of userstories" [(ngValue)]="userstory.id">{{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>
<div class="dropdown">
<div class="form-group">
<select class="form-control custom-select mr-sm-2" id="prio" required name="prio"
[(ngModel)]="task.statusid">
<option><input type="text" class="form-control" /></option>
<option *ngFor="let status of allStatus">{{
>>>>>>> dropdown-add
status.title status.title
}}</option> }}</option>
</select> </select>
@ -162,7 +60,7 @@
<div class="form-group"> <div class="form-group">
<a class="dropdown-item" href="#">Neuer Status</a> <a class="dropdown-item" href="#">Neuer Status</a>
<a class="dropdown-item" href="#">Status löschen</a> <a class="dropdown-item" href="#">Status löschen</a>
<input type="text" class="form-control" /> <input type="text" class="form-control"/>
</div> </div>
</div> </div>
</div> </div>
@ -182,16 +80,14 @@
</div> --> </div> -->
<div class="form-group"> <div class="form-group">
<label for="Inhalt">Assigned User</label> <label for="Inhalt">Assigned User</label>
<input type="text" class="form-control" id="Author" required name="author" /> <input type="text" class="form-control" id="Author" required name="author"/>
</div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal"> <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">
Abbrechen Abbrechen
</button> </button>
<button type="submit" class="btn btn-primary">Erstellen</button> <button type="submit" class="btn btn-primary">Erstellen</button>
</div> </div>
</form> </form></div>
</div>
</div> </div>