Skip to content

Commit 3c7ef7f

Browse files
committed
fix(evidence-panel,report): use configured team order
1 parent 4656d45 commit 3c7ef7f

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎src/app/component/evidence-panel/evidence-panel.component.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export class EvidencePanelComponent implements OnChanges {
6868
}
6969
}
7070

71-
this.teamsWithEvidence = Array.from(this.evidenceByTeam.keys());
71+
// Evidence entries can be entered in any order. Display the teams using the
72+
// configured order, while omitting teams without evidence for this activity.
73+
this.teamsWithEvidence = this.teamSelection
74+
.effectiveTeams()
75+
.filter(teamName => this.evidenceByTeam.has(teamName));
7276
}
7377
}

‎src/app/pages/report/report.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ export class ReportComponent implements OnInit {
485485
}
486486

487487
// Show only the selected teams for this entry
488-
const matchingTeams = entry.teams.filter(t => selectedTeams.includes(t));
488+
const matchingTeams = selectedTeams.filter(team => entry.teams.includes(team));
489489
const teamsLabel =
490490
matchingTeams.length > 0
491491
? `<span class="evidence-teams">[${matchingTeams.join(', ')}]</span> `

0 commit comments

Comments
 (0)