Skip to content

Commit 8aa9236

Browse files
committed
Display genuine teams in mat-card (sorted as in yaml)
1 parent 49a95aa commit 8aa9236

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/app/component/circular-heatmap/circular-heatmap.component.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ <h2>Nothing to show</h2>
218218
</mat-chip>
219219
<mat-chip
220220
#c="matChip"
221-
*ngFor="let group of teamGroups | keyvalue"
221+
*ngFor="let group of teamGroups | keyvalue : unsorted"
222222
(click)="toggleTeamGroupSelection(c)">
223223
{{ group.key }}
224224
</mat-chip>
@@ -264,13 +264,12 @@ <h2>Nothing to show</h2>
264264
<ng-template matExpansionPanelContent>
265265
<ul class="team-list">
266266
<li
267-
*ngFor="let item of activity.teamsImplemented | keyvalue">
267+
*ngFor="let teamname of teamVisible">
268268
<mat-checkbox
269-
[checked]="item.value === true"
270-
*ngIf="teamVisible.includes(item.key | ToStringValue)"
269+
[checked]="activity.teamsImplemented[teamname]"
271270
color="primary"
272-
(click)="this.teamCheckbox(activityIndex, item.key)">
273-
{{ item.key }}
271+
(click)="this.teamCheckbox(activityIndex, teamname); $event.preventDefault()">
272+
{{ teamname }}
274273
</mat-checkbox>
275274
</li>
276275
</ul>

src/app/component/circular-heatmap/circular-heatmap.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,4 +828,8 @@ export class CircularHeatmapComponent implements OnInit {
828828
perfNow(): string {
829829
return (performance.now() / 1000).toFixed(3);
830830
}
831+
832+
unsorted() {
833+
return 0;
834+
}
831835
}

0 commit comments

Comments
 (0)