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

Fixed Users not being displayed

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/components/forms/task/task-form.component.html
View File

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

6
src/app/components/forms/task/task-form.component.ts
View File

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

8
src/app/components/forms/userstory/userstory-form.component.html
View File

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

2
src/app/components/forms/userstory/userstory-form.component.ts
View File

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

4
src/app/components/tabels/task/task-table.component.html
View File

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

4
src/app/components/tabels/task/task-table.component.ts
View File

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

4
src/app/services/backend.service.ts
View File

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