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

Properly capitalize properties

Browse Source
This commit is contained in:
Jakob Fahr
2020-07-15 11:35:46 +02:00
parent 3360a330d4
commit e624dfdc15
13 changed files with 105 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/backlog/backlog.component.html
View File

@@ -74,10 +74,10 @@
<p class="card-text">{{ story.content }}</p>
<div title="Badges">
<span class="badge badge-primary"
>Category: {{ story.categoryid || "N/A" }}</span
>Category: {{ story.categoryId || "N/A" }}</span
>
<span class="badge badge-info"
>Status: {{ story.statusid || "N/A" }}</span
>Status: {{ story.statusId || "N/A" }}</span
>
</div>
<div
@@ -109,10 +109,10 @@
<p class="card-text">{{ story.content }}</p>
<div title="Badges">
<span class="badge badge-primary"
>Category: {{ story.categoryid || "N/A" }}</span
>Category: {{ story.categoryId || "N/A" }}</span
>
<span class="badge badge-info"
>Status: {{ story.statusid || "N/A" }}</span
>Status: {{ story.statusId || "N/A" }}</span
>
</div>
<div style="text-align: right;">

16
src/app/components/backlog/backlog.component.ts
View File

@@ -74,22 +74,22 @@ export class BacklogComponent {
/**
* Getter that returns an array with all userstories that are in the currently selected sprint.
* The relation to the sprint is determined by the userstory's sprintid.
* The relation to the sprint is determined by the userstory's sprintId.
* If no sprint is selected it just returns an empty array.
*/
public get choosen(): ScrumUserstory[] {
if (this.selectedSprint === undefined) {
return null;
}
return this.storys.filter((u) => u.sprintid == this.selectedSprint.id);
return this.storys.filter((u) => u.sprintId == this.selectedSprint.id);
}
/**
* Getter that returns an array with all userstories that aren't in any sprint.
* The relation to no sprint is determined by the userstory's sprintid being undefined.
* The relation to no sprint is determined by the userstory's sprintId being undefined.
*/
public get backlog(): ScrumUserstory[] {
return this.storys.filter((u) => u.sprintid === undefined);
return this.storys.filter((u) => u.sprintId === undefined);
}
/**
@@ -108,11 +108,11 @@ export class BacklogComponent {
//#region backlogFunctions
/**
* Adds a userstory to the currently selected sprint by changing it's sprintid to the current sprint's id
* Adds a userstory to the currently selected sprint by changing it's sprintId to the current sprint's id
* @param userstory userstory object that shall be added to the selected sprint's backlog
*/
public addToSprintBacklog(userstory: ScrumUserstory) {
userstory.sprintid = this.selectedSprint.id;
userstory.sprintId = this.selectedSprint.id;
this.backendService.putUserstory(userstory).subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
@@ -121,11 +121,11 @@ export class BacklogComponent {
}
/**
* Deletes a userstory from the currently selected sprint by changing it's sprintid to undefined
* Deletes a userstory from the currently selected sprint by changing it's sprintId to undefined
* @param userstory userstory object that shall be removed from the selected sprint's backlog
*/
public deleteFromSprintBacklog(userstory: ScrumUserstory) {
userstory.sprintid = undefined;
userstory.sprintId = undefined;
this.backendService.putUserstory(userstory).subscribe((response) => {
if (response.status > 399) {
alert('Fehler');

6
src/app/components/dashboard/dashboard.component.ts
View File

@@ -15,7 +15,7 @@ export class DashboardComponent {
public get usedStatus(): ScrumStatus[] {
return this.status.filter(
(s) =>
this.selectedSprintUserstories.find((us) => us.statusid === s.id) !==
this.selectedSprintUserstories.find((us) => us.statusId === s.id) !==
undefined
);
}
@@ -28,7 +28,7 @@ export class DashboardComponent {
return this.userstories;
}
return this.userstories.filter(
(us) => us.sprintid === this.selectedSprint.id
(us) => us.sprintId === this.selectedSprint.id
);
}
@@ -181,7 +181,7 @@ export class DashboardComponent {
*/
public getNumberOfUserstoriesByStatus(status: ScrumStatus): number {
return this.selectedSprintUserstories.filter(
(us) => us.statusid === status.id
(us) => us.statusId === status.id
).length;
}

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

@@ -13,7 +13,7 @@ import { BackendService, ScrumSprint } from '../../services/backend.service';
export class SprintFormComponent implements OnInit {
@Input() public sprint: ScrumSprint;
public editing: Boolean;
public sprintid: string;
public sprintId: string;
constructor(
private backendService: BackendService,

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

@@ -66,13 +66,13 @@
<th (click)="sortByStatus()" class="sortable">
<span>Status</span>
<span>
<span *ngIf="sortBy != 'statusid'"
<span *ngIf="sortBy != 'statusId'"
><i class="fa fa-sort fa-lg"></i
></span>
<span *ngIf="sortDescending && sortBy === 'statusid'"
<span *ngIf="sortDescending && sortBy === 'statusId'"
><i class="fa fa-sort-up fa-lg"></i
></span>
<span *ngIf="sortDescending === false && sortBy === 'statusid'"
<span *ngIf="sortDescending === false && sortBy === 'statusId'"
><i class="fa fa-sort-down fa-lg"></i
></span>
</span>
@@ -127,13 +127,13 @@
<th (click)="sortByCategory()" class="sortable">
<span>Category</span>
<span>
<span *ngIf="sortBy != 'categoryid'"
<span *ngIf="sortBy != 'categoryId'"
><i class="fa fa-sort fa-lg"></i
></span>
<span *ngIf="sortDescending && sortBy === 'categoryid'"
<span *ngIf="sortDescending && sortBy === 'categoryId'"
><i class="fa fa-sort-up fa-lg"></i
></span>
<span *ngIf="sortDescending === false && sortBy === 'categoryid'"
<span *ngIf="sortDescending === false && sortBy === 'categoryId'"
><i class="fa fa-sort-down fa-lg"></i
></span>
</span>
@@ -150,24 +150,24 @@
<td>{{ task.id }}</td>
<td>{{ task.title }}</td>
<td>
<a [routerLink]="['/userstories', { id: task.userstoryid }]">
US #{{ task.userstoryid }}
<a [routerLink]="['/userstories', { id: task.userstoryId }]">
US #{{ task.userstoryId }}
</a>
</td>
<td>
<a [routerLink]="['/status', { id: task.statusid }]">
{{ getStatusTitleById(task.statusid) }}
<a [routerLink]="['/status', { id: task.statusId }]">
{{ getStatusTitleById(task.statusId) }}
</a>
</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>
<a [routerLink]="['/categories', { id: task.categoryid }]">
{{ getCategoryTitleById(task.categoryid) }}
<a [routerLink]="['/categories', { id: task.categoryId }]">
{{ getCategoryTitleById(task.categoryId) }}
</a>
</td>
<td>

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

@@ -76,7 +76,7 @@ export class TaskTableComponent extends TableComponentBase<ScrumTask> {
return this.items.filter(
(task) =>
(this.filterUserstoryId === null ||
task.userstoryid === this.filterUserstoryId) &&
task.userstoryId === this.filterUserstoryId) &&
(this.filterPriority === null || task.priority === this.filterPriority)
);
}
@@ -148,31 +148,31 @@ export class TaskTableComponent extends TableComponentBase<ScrumTask> {
}
/**
* Sorts the tabel's items by userstoryid.
* Sorts the tabel's items by userstoryId.
*/
sortByTasks() {
this.doNumericSort('userstory', (task) => task.userstoryid);
this.doNumericSort('userstory', (task) => task.userstoryId);
}
/**
* Sorts the tabel's items by statusid
* Sorts the tabel's items by statusId
*/
sortByStatus() {
this.doNumericSort('statusid', (task) => task.statusid);
this.doNumericSort('statusId', (task) => task.statusId);
}
/**
* Sorts the tabel's items by assignedtoid
*/
sortByAssigned() {
this.doNumericSort('assignedtoid', (task) => task.assignedtoid);
this.doNumericSort('assignedtoid', (task) => task.assignedtoId);
}
/**
* Sorts the tabel's items by categoryid
* Sorts the tabel's items by categoryId
*/
sortByCategory() {
this.doNumericSort('categoryid', (task) => task.categoryid);
this.doNumericSort('categoryId', (task) => task.categoryId);
}
//#endregion sorters

20
src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.html
View File

@@ -48,13 +48,13 @@
<th (click)="sortByStatus()" class="sortable">
<span>Status</span>
<span>
<span *ngIf="sortBy != 'statusid'"
<span *ngIf="sortBy != 'statusId'"
><i class="fa fa-sort fa-lg"></i
></span>
<span *ngIf="sortDescending && sortBy === 'statusid'"
<span *ngIf="sortDescending && sortBy === 'statusId'"
><i class="fa fa-sort-up fa-lg"></i
></span>
<span *ngIf="sortDescending === false && sortBy === 'statusid'"
<span *ngIf="sortDescending === false && sortBy === 'statusId'"
><i class="fa fa-sort-down fa-lg"></i
></span>
</span>
@@ -94,13 +94,13 @@
<th (click)="sortByCategory()" class="sortable">
<span>Category</span>
<span>
<span *ngIf="sortBy != 'categoryid'"
<span *ngIf="sortBy != 'categoryId'"
><i class="fa fa-sort fa-lg"></i
></span>
<span *ngIf="sortDescending && sortBy === 'categoryid'"
<span *ngIf="sortDescending && sortBy === 'categoryId'"
><i class="fa fa-sort-up fa-lg"></i
></span>
<span *ngIf="sortDescending === false && sortBy === 'categoryid'"
<span *ngIf="sortDescending === false && sortBy === 'categoryId'"
><i class="fa fa-sort-down fa-lg"></i
></span>
</span>
@@ -122,14 +122,14 @@
</a>
</td>
<td>
<a [routerLink]="['/status', { id: userstory.statusid }]">
{{ getStatusTitleById(userstory.statusid) }}
<a [routerLink]="['/status', { id: userstory.statusId }]">
{{ getStatusTitleById(userstory.statusId) }}
</a>
</td>
<td>{{ userstory.priority }}</td>
<td>
<a [routerLink]="['/categories', { id: userstory.categoryid }]">
{{ getCategoryTitleById(userstory.categoryid) }}
<a [routerLink]="['/categories', { id: userstory.categoryId }]">
{{ getCategoryTitleById(userstory.categoryId) }}
</a>
</td>
<td>

36
src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.ts
View File

@@ -17,9 +17,7 @@ import { ActivatedRoute, ParamMap, Router } from '@angular/router';
templateUrl: './userstory-inner-table.component.html',
styleUrls: ['./userstory-inner-table.component.css'],
})
export class UserstoryInnerTableComponent extends TableComponentBase<
ScrumUserstory
> {
export class UserstoryInnerTableComponent extends TableComponentBase<ScrumUserstory> {
public tasks: ScrumTask[] = [];
public filterPriority: string | null = null;
public status: ScrumStatus[] = [];
@@ -40,14 +38,14 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
protected route: ActivatedRoute
) {
super(route);
backendService.getUserstories().subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
} else {
this.items.push(...response.body);
}
});
backendService.getUserstories().subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
} else {
this.items.push(...response.body);
}
});
backendService.getTasks().subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
@@ -86,11 +84,11 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
/**
* Returns the number of related tasks of a given userstory.
* The relation is defined by the userstoryid property of the task object and the id property of the userstory object.
* The relation is defined by the userstoryId property of the task object and the id property of the userstory object.
* @param userstory The userstory for which the number of related tasks gets calculated
*/
public getNumberOfTasks(userstory: ScrumUserstory) {
return this.tasks.filter((t) => t.userstoryid === userstory.id).length;
return this.tasks.filter((t) => t.userstoryId === userstory.id).length;
}
/**
@@ -116,6 +114,7 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
}
return category.title;
}
//#endregion getters
//#region userstoryTableFunctions
@@ -134,6 +133,7 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
this.items.splice(index, 1);
}
}
//#endregion userstoryTableFunctions
//#region sorters
@@ -152,18 +152,19 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
}
/**
* Sorts the tabel's items by statusid
* Sorts the tabel's items by statusId
*/
public sortByStatus() {
this.doNumericSort('statusid', (us) => us.statusid);
this.doNumericSort('statusId', (us) => us.statusId);
}
/**
* Sorts the tabel's items by categoryid
* Sorts the tabel's items by categoryId
*/
public sortByCategory() {
this.doNumericSort('categoryid', (us) => us.categoryid);
this.doNumericSort('categoryId', (us) => us.categoryId);
}
//#endregion sorters
//#region modals
@@ -184,5 +185,6 @@ export class UserstoryInnerTableComponent extends TableComponentBase<
}
modalRef.componentInstance.userstory = editUserstory;
}
//#endregion modals
}

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

@@ -19,7 +19,7 @@
aria-expanded="false"
>
Gehört zu Story:
{{ getUserstoryTitleById(task.userstoryid) || "Keine" }}
{{ getUserstoryTitleById(task.userstoryId) || "Keine" }}
<i class="fa fa-caret-down"></i>
</span>
<div
@@ -30,7 +30,7 @@
<option
ngbDropdownItem
*ngFor="let userstory of userstories"
(click)="task.userstoryid = userstory.id"
(click)="task.userstoryId = userstory.id"
>{{ userstory.title }}</option
>
</div>
@@ -104,7 +104,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Status: {{ getStatusTitleById(task.statusid) }}
Status: {{ getStatusTitleById(task.statusId) }}
</button>
<div
ngbDropdownMenu
@@ -116,7 +116,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let status of allStatus"
(click)="task.statusid = status.id"
(click)="task.statusId = status.id"
>{{ status.title }}</option
>
@@ -145,7 +145,7 @@
ngbDropdownItem
class="dropdown-item"
type="button"
(click)="deleteStatus(task.statusid)"
(click)="deleteStatus(task.statusId)"
>
Status löschen
</button>
@@ -157,7 +157,7 @@
id="status"
required
name="status"
[(ngModel)]="task.statusid"
[(ngModel)]="task.statusId"
>
<option
*ngFor="let status of allStatus"
@@ -178,7 +178,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Bearbeiter: {{ getAuthorById(task.assignedtoid) }}
Bearbeiter: {{ getAuthorById(task.assignedtoId) }}
</button>
<div
ngbDropdownMenu
@@ -190,7 +190,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let user of allUser"
(click)="task.assignedtoid = user.id"
(click)="task.assignedtoId = user.id"
>{{ user.name }}</option
>
</div>
@@ -201,7 +201,7 @@
id="assignedto"
required
name="assignedto"
[(ngModel)]="task.assignedtoid"
[(ngModel)]="task.assignedtoId"
>
<option *ngFor="let user of allUser" [value]="user.id">{{
user.name

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

@@ -48,7 +48,7 @@ export class TaskFormComponent implements OnInit {
this.task = { title: '' };
this.editing = false;
this.creating = false;
} else if (this.task.userstoryid) {
} else if (this.task.userstoryId) {
this.editing = true;
} else {
this.creating = true;
@@ -84,11 +84,11 @@ export class TaskFormComponent implements OnInit {
// Getting the userstory which is related to a task.
// The related story will be shown in popup window of a task.
getRelatedStory() {
if (!this.task.userstoryid) {
if (!this.task.userstoryId) {
return null;
}
this.backendService
.getUserstory(this.task.userstoryid)
.getUserstory(this.task.userstoryId)
.subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
@@ -145,7 +145,7 @@ export class TaskFormComponent implements OnInit {
this.allStatus.splice(index, 1);
}
}
this.task.statusid = null;
this.task.statusId = null;
});
}

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

@@ -78,7 +78,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Status: {{ getStatusTitleById(userstory.statusid) }}
Status: {{ getStatusTitleById(userstory.statusId) }}
</button>
<div
ngbDropdownMenu
@@ -90,7 +90,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let status of allStatus"
(click)="userstory.statusid = status.id"
(click)="userstory.statusId = status.id"
>{{ status.title }}</option
>
@@ -119,7 +119,7 @@
ngbDropdownItem
class="dropdown-item"
type="button"
(click)="deleteStatus(userstory.statusid)"
(click)="deleteStatus(userstory.statusId)"
>
Status löschen
</button>
@@ -131,7 +131,7 @@
id="prio"
required
name="prio"
[(ngModel)]="userstory.statusid"
[(ngModel)]="userstory.statusId"
>
<option
*ngFor="let status of allStatus"
@@ -152,7 +152,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Kategorie: {{ getCategoryById(userstory.categoryid) }}
Kategorie: {{ getCategoryById(userstory.categoryId) }}
</button>
<div
ngbDropdownMenu
@@ -164,7 +164,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let category of allCategories"
(click)="userstory.categoryid = category.id"
(click)="userstory.categoryId = category.id"
>{{ category.title }}</option
>
@@ -193,7 +193,7 @@
ngbDropdownItem
class="dropdown-item"
type="button"
(click)="deleteCategory(userstory.categoryid)"
(click)="deleteCategory(userstory.categoryId)"
>
Kategorie löschen
</button>
@@ -205,7 +205,7 @@
id="prio"
required
name="prio"
[(ngModel)]="userstory.categoryid"
[(ngModel)]="userstory.categoryId"
>
<option
*ngFor="let category of allCategories"
@@ -226,7 +226,7 @@
aria-haspopup="true"
aria-expanded="false"
>
Autor: {{ getAuthorById(userstory.createdbyid) }}
Autor: {{ getAuthorById(userstory.createdbyId) }}
</button>
<div
ngbDropdownMenu
@@ -238,7 +238,7 @@
disable-auto-close
ngbDropdownItem
*ngFor="let user of allUser"
(click)="userstory.createdbyid = user.id"
(click)="userstory.createdbyId = user.id"
>{{ user.name }}</option
>
</div>
@@ -249,7 +249,7 @@
id="prio"
required
name="prio"
[(ngModel)]="userstory.createdbyid"
[(ngModel)]="userstory.createdbyId"
>
<option *ngFor="let user of allUser" [value]="user.id">{{
user.name

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

@@ -115,7 +115,7 @@ export class UserstoryFormComponent implements OnInit {
this.allStatus.splice(index, 1);
}
}
this.userstory.statusid = null;
this.userstory.statusId = null;
});
}
@@ -195,7 +195,7 @@ export class UserstoryFormComponent implements OnInit {
this.allCategories.splice(index, 1);
}
}
this.userstory.categoryid = null;
this.userstory.categoryId = null;
});
}
// Shows the before choosen category in the category-field in the popup window.

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

@@ -348,12 +348,12 @@ export interface ScrumTask {
id?: number;
title: string;
content?: string;
statusid?: number;
categoryid?: number;
assignedtoid?: number;
sprintid?: number;
projectid?: number;
userstoryid?: number;
statusId?: number;
categoryId?: number;
assignedtoId?: number;
sprintId?: number;
projectId?: number;
userstoryId?: number;
priority?: Priority;
}
@@ -367,11 +367,11 @@ export interface ScrumUserstory {
title: string;
content?: string;
priority?: Priority;
statusid?: number;
categoryid?: number;
sprintid?: number;
createdbyid?: number;
projectid?: number;
statusId?: number;
categoryId?: number;
sprintId?: number;
createdbyId?: number;
projectId?: number;
}
/**
@@ -386,7 +386,7 @@ export interface ScrumSprint{
description?: string;
startDate: string;
endDate: string;
projectid?: number;
projectId?: number;
}
/**