diff --git a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html index 23209af..567d347 100644 --- a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html +++ b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.html @@ -9,7 +9,7 @@
- + diff --git a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.ts b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.ts index 969b3f5..fcc55e5 100644 --- a/src/app/kanban/kanban-entry-item/kanban-entry-item.component.ts +++ b/src/app/kanban/kanban-entry-item/kanban-entry-item.component.ts @@ -10,6 +10,7 @@ const labelColors = { MTAS: 'orange', Internal: 'yellow', Team: 'yellow', + BLOCKED: 'red', }; @Component({ diff --git a/src/app/kanban/shared/kanban-entry.model.ts b/src/app/kanban/shared/kanban-entry.model.ts index 6574c73..b5d5eb4 100644 --- a/src/app/kanban/shared/kanban-entry.model.ts +++ b/src/app/kanban/shared/kanban-entry.model.ts @@ -23,5 +23,5 @@ export class KanbanEntry { public team: string; public answerCode: string; public isLastOfPriority: boolean; - public worklog: string; + public worklog: number; } diff --git a/src/app/kanban/shared/priority-color.pipe.ts b/src/app/kanban/shared/priority-color.pipe.ts index 729dabe..e365cb6 100644 --- a/src/app/kanban/shared/priority-color.pipe.ts +++ b/src/app/kanban/shared/priority-color.pipe.ts @@ -5,10 +5,10 @@ import {Pipe, PipeTransform} from '@angular/core'; }) export class PriorityColorPipe implements PipeTransform { - transform(value: any, prioIcon: string = ""): any { - let mhrMatch = /(\[.*mhr\])/ig; - value = value.replace(mhrMatch, (fullMatch: string, mhrMatched: string) => { - return `${mhrMatched} `; + transform(value: any, prioIcon: string = "", worklog: number = 0): any { + let mhrMatch = /(\[(.*)mhr\])/ig; + value = value.replace(mhrMatch, (fullMatch: string, mhrMatched: string, hoursMatch: number) => { + return `[${worklog}/${hoursMatch} mhr] `; }); let sMatch = /(\[s\])/ig; value = value.replace(sMatch, (fullMatch: string, mhrMatched: string) => {