TSP/taurus-tv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'emakazi_dev' of TSP/taurus-tv into master

Browse Source
This commit is contained in:
Danyi Dávid 2017-08-24 17:33:01 +02:00 committed by Gogs
commit c07ef0efcb
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/kanban/kanban-entry-item/kanban-entry-item.component.html
View File

@ -9,7 +9,7 @@
<div class="ui jira-avatar floated image">
<img src="{{avatarUrl(kanbanEntry.assignee?.avatar)}}">
</div>
<span [innerHTML]="kanbanEntry.summary|shortenText|priorityColor:kanbanEntry.issuePriorityIcon" [title]="kanbanEntry.summary"></span>
<span [innerHTML]="kanbanEntry.summary|shortenText|priorityColor:kanbanEntry.issuePriorityIcon:kanbanEntry.worklog" [title]="kanbanEntry.summary"></span>
</div>
</div>
</div>

1
src/app/kanban/kanban-entry-item/kanban-entry-item.component.ts
View File

@ -10,6 +10,7 @@ const labelColors = {
MTAS: 'orange',
Internal: 'yellow',
Team: 'yellow',
BLOCKED: 'red',
};
@Component({

2
src/app/kanban/shared/kanban-entry.model.ts
View File

@ -23,5 +23,5 @@ export class KanbanEntry {
public team: string;
public answerCode: string;
public isLastOfPriority: boolean;
public worklog: string;
public worklog: number;
}

8
src/app/kanban/shared/priority-color.pipe.ts
View File

@ -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 `<span class="match-mhr">${mhrMatched}</span> `;
transform(value: any, prioIcon: string = "", worklog: number = 0): any {
let mhrMatch = /(\[(.*)mhr\])/ig;
value = value.replace(mhrMatch, (fullMatch: string, mhrMatched: string, hoursMatch: number) => {
return `<span class="match-mhr">[${worklog}/${hoursMatch} mhr] </span> `;
});
let sMatch = /(\[s\])/ig;
value = value.replace(sMatch, (fullMatch: string, mhrMatched: string) => {