Fixed the fix
This commit is contained in:
parent
0eaa840e18
commit
d2ecdd03ce
@ -1,97 +1,4 @@
|
||||
<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">×</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">
|
||||
<table>
|
||||
<tr>
|
||||
@ -103,9 +10,8 @@
|
||||
<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 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">
|
||||
@ -118,16 +24,14 @@
|
||||
<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" />
|
||||
<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">
|
||||
<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>
|
||||
@ -139,59 +43,51 @@
|
||||
<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>
|
||||
<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
|
||||
}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="dropdown-divider"></div>
|
||||
<div class="form-group">
|
||||
<a class="dropdown-item" href="#">Neuer Status</a>
|
||||
<a class="dropdown-item" href="#">Status löschen</a>
|
||||
<input type="text" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <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><input type="text" class="form-control"/></option>
|
||||
<option *ngFor="let status of allStatus">{{
|
||||
<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">{{
|
||||
status.title
|
||||
}}</option>
|
||||
</select>
|
||||
<button type="button" data-type="plus" (click)="createTaskStatus()">
|
||||
<span class="glyphicon glyphicon-plus">Add</span>
|
||||
</button>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="dropdown-divider"></div>
|
||||
<div class="form-group">
|
||||
<label for="Inhalt">Assigned User</label>
|
||||
<input type="text" class="form-control" id="Author" required name="author" />
|
||||
<a class="dropdown-item" href="#">Neuer Status</a>
|
||||
<a class="dropdown-item" href="#">Status löschen</a>
|
||||
<input type="text" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">
|
||||
Abbrechen
|
||||
</button>
|
||||
<button type="submit" class="btn btn-primary">Erstellen</button>
|
||||
|
||||
<!-- <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><input type="text" class="form-control"/></option>
|
||||
<option *ngFor="let status of allStatus">{{
|
||||
status.title
|
||||
}}</option>
|
||||
</select>
|
||||
<button type="button" data-type="plus" (click)="createTaskStatus()">
|
||||
<span class="glyphicon glyphicon-plus">Add</span>
|
||||
</button>
|
||||
</div> -->
|
||||
<div class="form-group">
|
||||
<label for="Inhalt">Assigned User</label>
|
||||
<input type="text" class="form-control" id="Author" required name="author"/>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">
|
||||
Abbrechen
|
||||
</button>
|
||||
<button type="submit" class="btn btn-primary">Erstellen</button>
|
||||
</div>
|
||||
</form></div>
|
||||
</div>
|
||||
Loading…
x
Reference in New Issue
Block a user