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

Merge branch 'master' into feature/sidebar

Browse Source
This commit is contained in:
Nicolai Ort 2020-07-02 17:19:02 +02:00
commit 2c31338e2b
6 changed files with 108 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/sprint-table/sprint-table.component.css
View File

@ -1,8 +1,3 @@
table { th.sortable:hover {
table-layout: fixed;
}
th.sortable:hover {
text-decoration: underline; text-decoration: underline;
} }

44
src/app/sprint-table/sprint-table.component.html
View File

@ -1,40 +1,44 @@
<div class="mx-5 my-3"> <div class="container-fluid">
<h3 class="my-1"> <h3>
Sprints Sprints
</h3> </h3>
<button class="btn btn-secondary my-3" (click)="openSprintForm()">Neuer Sprint</button> <button class="btn btn-secondary" (click)="openSprintForm()">Neuer Sprint</button>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th (click)="sortById()" class="sortable"> <th (click)="sortById()" class="sortable">
<span>ID</span> <span>ID</span>
<span *ngIf="sortBy === 'id'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByTitle()" class="sortable"> <th (click)="sortByTitle()" class="sortable">
<span>Titel</span> <span>Titel</span>
<span *ngIf="sortBy === 'title'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByStartDate()" class="sortable"> <th (click)="sortByStartDate()" class="sortable">
<span>Start</span> <span>Start</span>
<span *ngIf="sortBy === 'startDate'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'startDate'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'startDate'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'startDate'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByEndDate()" class="endDate"> <th (click)="sortByEndDate()" class="sortable">
<span>End</span> <span>End</span>
<span *ngIf="sortBy === 'endDate'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'endDate'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'endDate'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'endDate'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th></th> <th></th>
</tr> </tr>

4
src/app/task-table/task-table.component.css
View File

@ -1,7 +1,3 @@
table {
table-layout: fixed;
}
th.sortable:hover { th.sortable:hover {
text-decoration: underline; text-decoration: underline;
} }

68
src/app/task-table/task-table.component.html
View File

@ -1,6 +1,6 @@
<div class="mx-5 my-3"> <div class="container-fluid">
<h3 class="my-1"> <h3>
<a *ngIf="filterUserstoryId" [routerLink]="['/userstories', {id: filterUserstoryId}]"> <a *ngIf="filterUserstoryId" [routerLink]="['/userstories', {id: filterUserstoryId}]">
Userstory #{{filterUserstoryId}} Userstory #{{filterUserstoryId}}
&gt; &gt;
@ -11,70 +11,74 @@
<a [routerLink]="'/tasks'">Alle Tasks anzeigen</a> <a [routerLink]="'/tasks'">Alle Tasks anzeigen</a>
</div> </div>
<button class="btn btn-secondary my-3" (click)="openTaskForm()">Neuer Task</button> <button class="btn btn-secondary" (click)="openTaskForm()">Neuer Task</button>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th (click)="sortById()" class="sortable"> <th (click)="sortById()" class="sortable">
<span>ID</span> <span>ID</span>
<span *ngIf="sortBy === 'id'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th (click)="sortByTitle()" class="sortable"> <th (click)="sortByTitle()" class="sortable">
<span>Titel</span> <span>Titel</span>
<span *ngIf="sortBy === 'title'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th (click)="sortByTasks()" class="sortable"> <th (click)="sortByTasks()" class="sortable">
<span>Userstory</span> <span>Userstory</span>
<span *ngIf="sortBy === 'userstory'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'userstory'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'userstory'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'userstory'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th (click)="sortByStatus()" class="sortable"> <th (click)="sortByStatus()" class="sortable">
<span>Status</span> <span>Status</span>
<span *ngIf="sortBy === 'statusid'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th class="sortable"> <th class="sortable">
<div class="d-inline-block"> <div class="d-inline-block">
<span (click)="sortByPrio()">Priorität: </span>
<div ngbDropdown class="d-inline-block"> <div ngbDropdown class="d-inline-block">
<span id="dropdownBasic1" ngbDropdownToggle>Priotität</span> <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<option (click)="filterPriority=null">All</option> <option ngbDropdownItem (click)="filterPriority=null">All</option>
<option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option> <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
</div> </div>
</div> </div>
<div (click)="sortByPrio()"> <span (click)="sortByPrio()">
<i class="fa fa-sort"></i> <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortBy === 'priority'" (click)="sortByPrio()" class="pl-3"> <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> </span>
</span>
</div>
</div> </div>
</th> </th>
<th (click)="sortByAssigned()" class="sortable"> <th (click)="sortByAssigned()" class="sortable">
<span>Assigned To</span> <span>Assigned To</span>
<span *ngIf="sortBy === 'assignedtoid'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'assignedtoid'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'assignedtoid'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'assignedtoid'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th (click)="sortByCategory()" class="sortable"> <th (click)="sortByCategory()" class="sortable">
<span>Category</span> <span>Category</span>
<span *ngIf="sortBy === 'categoryid'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
</span> </span>
</th> </th>
<th></th> <th></th>

4
src/app/userstory-table/userstory-table.component.css
View File

@ -1,7 +1,3 @@
table {
table-layout: fixed;
}
th.sortable:hover { th.sortable:hover {
text-decoration: underline; text-decoration: underline;
} }

81
src/app/userstory-table/userstory-table.component.html
View File

@ -1,8 +1,8 @@
<div class="mx-5 my-3"> <div class="container-fluid">
<h3 class="my-1">Userstories</h3> <h3>Userstories</h3>
<button class="btn btn-secondary my-3" (click)="openUserstoryForm()">Neue Userstory</button> <button class="btn btn-secondary" (click)="openUserstoryForm()">Neue Userstory</button>
<table class="table"> <table class="table">
@ -10,51 +10,62 @@
<tr> <tr>
<th (click)="sortById()" class="sortable"> <th (click)="sortById()" class="sortable">
<span>ID</span> <span>ID</span>
<span *ngIf="sortBy === 'id'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByTitle()" class="sortable"> <th (click)="sortByTitle()" class="sortable">
<span>Titel</span> <span>Titel</span>
<span *ngIf="sortBy === 'title'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByTasks()" class="sortable"> <th (click)="sortByTasks()" class="sortable">
<span>Tasks</span> <span>Tasks</span>
<span *ngIf="sortBy === 'tasks'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'tasks'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'tasks'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'tasks'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByStatus()" class="sortable"> <th (click)="sortByStatus()" class="sortable">
<span>Status</span> <span>Status</span>
<span *ngIf="sortBy === 'statusid'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th (click)="sortByPrio()" class="sortable"> <th class="sortable">
<span>Priorität</span> <div class="d-inline-block">
<label class="pl-3" (click)="$event.stopPropagation()"> <div class="d-inline-block">
<select [(ngModel)]="filterPriority"> <span (click)="sortByPrio()">Priorität: </span>
<option [ngValue]="null" selected></option> <div ngbDropdown class="d-inline-block">
<option *ngFor="let p of getAllPriorities()" [ngValue]="p">{{p}}</option> <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
</select> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
</label> <option ngbDropdownItem (click)="filterPriority=null">All</option>
<span *ngIf="sortBy === 'priority'" class="pl-3"> <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> </div>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> </div>
</span> <span (click)="sortByPrio()">
<span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
<span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</div>
</div>
</th> </th>
<th (click)="sortByCategory()" class="sortable"> <th (click)="sortByCategory()" class="sortable">
<span>Category</span> <span>Category</span>
<span *ngIf="sortBy === 'categoryid'" class="pl-3"> <span>
<span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span> <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
<span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span> <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
</span> <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
</span>
</th> </th>
<th></th> <th></th>
</tr> </tr>