Fixed Users not being displayed

This commit is contained in:
Nicolai Ort 2020-07-20 11:54:00 +02:00
parent 12e60097bd
commit 8f924ae0b7
7 changed files with 19 additions and 19 deletions

View File

@ -179,7 +179,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Bearbeiter: {{ getAuthorById(task.assignedtoId) }}
Bearbeiter: {{ getAuthorNameById(task.assignedToId) }}
</button>
<div
ngbDropdownMenu
@ -191,7 +191,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let user of allUser"
(click)="task.assignedtoId = user.id"
(click)="task.assignedToId = user.id"
>{{ user.name }}</option
>
<div class="dropdown-divider"></div>
@ -202,7 +202,7 @@
id="username"
class="dropdown-item"
(change)="user.name = username.value"
placeholder="New Title..."
placeholder="New Username..."
style="background-color: rgba(211, 211, 211, 0.342);"
/>
<button
@ -219,7 +219,7 @@
ngbDropdownItem
class="dropdown-item"
type="button"
(click)="deleteUser(task.assignedtoId)"
(click)="deleteUser(task.assignedToId)"
>
User löschen
</button>
@ -231,7 +231,7 @@
id="assignedto"
required
name="assignedto"
[(ngModel)]="task.assignedtoId"
[(ngModel)]="task.assignedToId"
>
<option *ngFor="let user of allUser" [value]="user.id">{{
user.name

View File

@ -200,7 +200,7 @@ class TaskFormComponent implements OnInit {
this.allUser.splice(index, 1);
}
}
this.task.assignedtoId = null;
this.task.assignedToId = null;
});
}
@ -258,12 +258,12 @@ class TaskFormComponent implements OnInit {
* Shows the before assigned user in the author-field in the popup window.
* @param id reference to the author object
*/
getAuthorById(id: number): string {
getAuthorNameById(id: number): string {
if (!id) {
return null;
}
var user = this.allUser.find((x) => x.id === id);
if (!user) {
if (user == null) {
return null;
}
return user.name;

View File

@ -227,7 +227,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Bearbeiter: {{ getAuthorById(userstory.createdbyId) }}
Author: {{ getAuthorById(userstory.createdById) }}
</button>
<div
ngbDropdownMenu
@ -239,7 +239,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let user of allUser"
(click)="userstory.createdbyId = user.id"
(click)="userstory.createdById = user.id"
>{{ user.name }}</option
>
<div class="dropdown-divider"></div>
@ -267,7 +267,7 @@
ngbDropdownItem
class="dropdown-item"
type="button"
(click)="deleteUser(task.assignedtoId)"
(click)="deleteUser(userstory.createdById)"
>
User löschen
</button>
@ -279,7 +279,7 @@
id="prio"
required
name="prio"
[(ngModel)]="userstory.createdbyId"
[(ngModel)]="userstory.createdById"
>
<option *ngFor="let user of allUser" [value]="user.id">{{
user.name

View File

@ -254,7 +254,7 @@ class UserstoryFormComponent implements OnInit {
this.allUser.splice(index, 1);
}
}
this.userstory.createdbyId = null;
this.userstory.createdById = null;
});
}

View File

@ -161,8 +161,8 @@
</td>
<td>{{ task.priority }}</td>
<td>
<a [routerLink]="['/users', { id: task.assignedtoId }]">
{{ getUserNameById(task.assignedtoId) }}
<a [routerLink]="['/users', { id: task.assignedToId }]">
{{ getUserNameById(task.assignedToId) }}
</a>
</td>
<td>

View File

@ -99,7 +99,7 @@ export class TaskTableComponent extends TableComponentBase<ScrumTask> {
*/
getUserNameById(id) {
var user = this.users.find((x) => x.id === id);
if (!user) {
if (user == null) {
return 'N/A';
}
return user.name;
@ -165,7 +165,7 @@ export class TaskTableComponent extends TableComponentBase<ScrumTask> {
* Sorts the tabel's items by assignedtoid
*/
sortByAssigned() {
this.doNumericSort('assignedtoid', (task) => task.assignedtoId);
this.doNumericSort('assignedtoid', (task) => task.assignedToId);
}
/**

View File

@ -350,7 +350,7 @@ export interface ScrumTask {
content?: string;
statusId?: number;
categoryId?: number;
assignedtoId?: number;
assignedToId?: number;
sprintId?: number;
projectId?: number;
userstoryId?: number;
@ -370,7 +370,7 @@ export interface ScrumUserstory {
statusId?: number;
categoryId?: number;
sprintId?: number;
createdbyId?: number;
createdById?: number;
projectId?: number;
}