= {};
- Object.keys(groups).forEach(group => {
- const groupTeams = groups[group];
- newGroupFilters[group] =
- groupTeams.length > 0 &&
- groupTeams.length === selectedSet.size &&
- groupTeams.every(t => selectedSet.has(t));
- });
- this.filtersTeamGroups.set(newGroupFilters);
-
- this.reColorHeatmap();
+ this.teamSelection.setTeams(selectedTeams);
}
getTeamProgressState(activityUuid: string, teamName: string): string {
@@ -874,12 +865,9 @@ export class CircularHeatmapComponent {
openAddEvidenceModal(activityUuid: string): void {
const ds = this.dataStore();
- const teams = ds?.meta?.teams || [];
const dialogData: AddEvidenceModalData = {
activityUuid,
- allTeams: teams,
- teamGroups: this.teamGroups(),
};
const dialogRef = this.dialog.open(AddEvidenceModalComponent, {
diff --git a/src/app/pages/report/report.component.html b/src/app/pages/report/report.component.html
index 5cc130e99..d44ed2c6d 100644
--- a/src/app/pages/report/report.component.html
+++ b/src/app/pages/report/report.component.html
@@ -13,8 +13,8 @@
@if (!isLoading()) {
{{ totalFilteredActivities() }} activities
- @if (reportConfig().selectedTeams.length > 0) {
- · {{ reportConfig().selectedTeams.length }} teams
+ @if (teamSelection.effectiveTeams().length > 0) {
+ · {{ teamSelection.effectiveTeams().length }} teams
}
}
@@ -22,9 +22,9 @@
@@ -101,7 +101,7 @@ {{ subDimension.name }}
}
@if (reportConfig().columnGrouping === 'byTeam') {
- @for (team of reportConfig().selectedTeams; track team) {
+ @for (team of teamSelection.effectiveTeams(); track team) {
{{ team }}
|
@@ -175,7 +175,7 @@ {{ subDimension.name }}
}
@if (reportConfig().columnGrouping === 'byTeam') {
- @for (team of reportConfig().selectedTeams; track team) {
+ @for (team of teamSelection.effectiveTeams(); track team) {
{{ getTeamProgressName(activity, team) }}
|
diff --git a/src/app/pages/report/report.component.ts b/src/app/pages/report/report.component.ts
index 9b37c18ba..18b20ef73 100644
--- a/src/app/pages/report/report.component.ts
+++ b/src/app/pages/report/report.component.ts
@@ -9,6 +9,7 @@ import {
import { MatDialog } from '@angular/material/dialog';
import { LoaderService } from '../../service/loader/data-loader.service';
import { SettingsService } from '../../service/settings/settings.service';
+import { TeamSelectionService } from '../../service/team-selection.service';
import {
Activity,
DifficultyOfImplementation,
@@ -22,6 +23,7 @@ import { ReportConfig, getReportConfig, saveReportConfig } from '../../model/rep
import {
ReportConfigModalComponent,
ReportConfigModalData,
+ ReportConfigModalResult,
} from '../../component/report-config-modal/report-config-modal.component';
import { ProgressTitle, TeamGroups } from '../../model/types';
import { EvidenceEntry } from '../../model/evidence-store';
@@ -77,6 +79,7 @@ export class ReportComponent implements OnInit {
private settings = inject(SettingsService);
private dialog = inject(MatDialog);
private datePipe = inject(DatePipe);
+ readonly teamSelection = inject(TeamSelectionService);
reportConfig = signal(getReportConfig());
allActivities = signal([]);
@@ -141,7 +144,7 @@ export class ReportComponent implements OnInit {
});
levelByLevelOverviewFromActivties = computed(() => {
- const config = this.reportConfig();
+ const selectedTeams = this.teamSelection.effectiveTeams();
const dims = this.filteredDimensions();
const activities: Activity[] = [];
@@ -160,8 +163,8 @@ export class ReportComponent implements OnInit {
const entry = levelMap.get(activity.level)!;
entry.total++;
- if (config.selectedTeams.length > 0) {
- const allCompleted = config.selectedTeams.every(team =>
+ if (selectedTeams.length > 0) {
+ const allCompleted = selectedTeams.every(team =>
this.isActivityCompletedByTeam(activity, team)
);
if (allCompleted) {
@@ -226,6 +229,7 @@ export class ReportComponent implements OnInit {
this.allSubdimensionNames = Array.from(subdimensionSet).sort();
this.allTeams = dataStore?.meta?.teams || [];
this.teamGroups = dataStore?.meta?.teamGroups || {};
+ this.teamSelection.init(this.allTeams, this.teamGroups);
if (dataStore.progressStore) {
const inProgress = dataStore.progressStore.getInProgressTitles();
@@ -233,11 +237,6 @@ export class ReportComponent implements OnInit {
this.allProgressTitles = [...inProgress, completed].filter(t => !!t);
}
- const currentConfig = this.reportConfig();
- if (currentConfig.selectedTeams.length === 0 && this.allTeams.length > 0) {
- this.reportConfig.set({ ...currentConfig, selectedTeams: [...this.allTeams] });
- }
-
this.allActivities.set(activities);
this.isLoading.set(false);
})
@@ -266,7 +265,7 @@ export class ReportComponent implements OnInit {
getTeamsForProgress(activity: Activity, progressTitle: ProgressTitle): string {
if (!this.progressStore || !activity.uuid) return '';
const teams: string[] = [];
- for (const team of this.reportConfig().selectedTeams) {
+ for (const team of this.teamSelection.effectiveTeams()) {
const teamTitle = this.progressStore.getTeamProgressTitle(activity.uuid, team);
if (teamTitle === progressTitle) {
teams.push(team);
@@ -329,12 +328,13 @@ export class ReportComponent implements OnInit {
openConfigModal(): void {
const modalData: ReportConfigModalData = {
config: this.reportConfig(),
+ allTeams: this.teamSelection.allTeams(),
+ teamGroups: this.teamSelection.teamGroups(),
+ selectedTeams: this.teamSelection.effectiveTeams(),
allActivities: this.allActivities(),
- allTeams: this.allTeams,
allDimensions: this.allDimensionNames,
allSubdimensions: this.allSubdimensionNames,
allProgressTitles: this.allProgressTitles,
- teamGroups: this.loader.datastore?.meta?.teamGroups || {},
};
const dialogRef = this.dialog.open(ReportConfigModalComponent, {
@@ -342,18 +342,17 @@ export class ReportComponent implements OnInit {
data: modalData,
});
- dialogRef.afterClosed().subscribe((result: ReportConfig | null) => {
+ dialogRef.afterClosed().subscribe((result: ReportConfigModalResult | null) => {
if (result) {
- this.reportConfig.set(result);
- saveReportConfig(result);
+ this.teamSelection.setTeams(result.selectedTeams);
+ this.reportConfig.set(result.config);
+ saveReportConfig(result.config);
}
});
}
onTeamsChanged(teams: string[]): void {
- const updated = { ...this.reportConfig(), selectedTeams: teams };
- this.reportConfig.set(updated);
- saveReportConfig(updated);
+ this.teamSelection.setTeams(teams);
}
printReport(): void {
@@ -449,7 +448,7 @@ export class ReportComponent implements OnInit {
const allEntries: EvidenceEntry[] = evidenceStore.getEvidence(activity.uuid);
const attrs = this.reportConfig().activityAttributes;
- const selectedTeams = this.reportConfig().selectedTeams;
+ const selectedTeams = this.teamSelection.effectiveTeams();
const entries = allEntries.filter(entry => entry.teams.some(t => selectedTeams.includes(t)));
@@ -486,7 +485,7 @@ export class ReportComponent implements OnInit {
}
// Show only the selected teams for this entry
- const matchingTeams = entry.teams.filter(t => selectedTeams.includes(t));
+ const matchingTeams = selectedTeams.filter(team => entry.teams.includes(team));
const teamsLabel =
matchingTeams.length > 0
? `[${matchingTeams.join(', ')}] `
diff --git a/src/app/pages/teams/teams.component.ts b/src/app/pages/teams/teams.component.ts
index be78aae6c..36889d148 100644
--- a/src/app/pages/teams/teams.component.ts
+++ b/src/app/pages/teams/teams.component.ts
@@ -27,6 +27,7 @@ import {
import { TeamGroups, TeamName, TeamNames, TeamProgress, Uuid } from 'src/app/model/types';
import { LoaderService } from 'src/app/service/loader/data-loader.service';
import { SettingsService } from 'src/app/service/settings/settings.service';
+import { TeamSelectionService } from 'src/app/service/team-selection.service';
import { downloadYamlFile } from 'src/app/util/download';
import { isEmptyObj, perfNow, dateStr, uniqueCount } from 'src/app/util/util';
import { MatIconModule } from '@angular/material/icon';
@@ -53,6 +54,7 @@ import { TopHeaderComponent } from '../../component/top-header/top-header.compon
})
export class TeamsComponent implements OnInit, AfterViewInit {
private loader = inject(LoaderService);
+ private teamSelection = inject(TeamSelectionService);
settings = inject(SettingsService);
modal = inject(ModalMessageComponent);
@@ -172,9 +174,17 @@ export class TeamsComponent implements OnInit, AfterViewInit {
console.log(`${perfNow()}: Saving groups: ${JSON.stringify(event.teamGroups)}`);
const ds = this.dataStore();
ds?.meta?.updateTeamsAndGroups(event.teams, event.teamGroups);
+ if (ds) {
+ const allTeamsGroupName = ds.getMetaString('allTeamsGroupName') || 'All';
+ this.teamSelection.init(event.teams, {
+ [allTeamsGroupName]: [],
+ ...event.teamGroups,
+ });
+ }
if (!isEmptyObj(event.teamsRenamed)) {
for (let oldName in event.teamsRenamed) {
ds?.progressStore?.renameTeam(oldName, event.teamsRenamed[oldName]);
+ ds?.evidenceStore?.renameTeam(oldName, event.teamsRenamed[oldName]);
}
ds?.progressStore?.saveToLocalStorage();
}
diff --git a/src/app/service/team-selection.service.ts b/src/app/service/team-selection.service.ts
new file mode 100644
index 000000000..0d1a49cf8
--- /dev/null
+++ b/src/app/service/team-selection.service.ts
@@ -0,0 +1,89 @@
+import { Injectable, signal, computed } from '@angular/core';
+import { TeamGroups, TeamNames } from '../model/types';
+
+@Injectable({ providedIn: 'root' })
+export class TeamSelectionService {
+ readonly allTeams = signal([]);
+ readonly teamGroups = signal({});
+ readonly selectedTeams = signal([]);
+ readonly initialised = signal(false);
+
+ readonly selectedGroupName = computed(() => {
+ const selected = new Set(this.selectedTeams());
+ if (selected.size === 0) return '';
+
+ const groups = this.teamGroups();
+ for (const [name, members] of Object.entries(groups)) {
+ if (
+ members.length > 0 &&
+ members.length === selected.size &&
+ members.every(t => selected.has(t))
+ ) {
+ return name;
+ }
+ }
+ return '';
+ });
+
+ readonly isAllSelected = computed(() => {
+ const selected = this.selectedTeams();
+ const allTeams = this.allTeams();
+ return (
+ selected.length === 0 ||
+ (allTeams.length > 0 &&
+ selected.length === allTeams.length &&
+ allTeams.every(team => selected.includes(team)))
+ );
+ });
+
+ readonly effectiveTeams = computed(() => {
+ const selected = this.selectedTeams();
+ const allTeams = this.allTeams();
+ if (selected.length === 0) return allTeams;
+ const selectedSet = new Set(selected);
+ return allTeams.filter(team => selectedSet.has(team));
+ });
+
+ init(teams: TeamNames, groups: TeamGroups): void {
+ this.allTeams.set([...teams]);
+ this.teamGroups.set({ ...groups });
+
+ this.initialised.set(true);
+
+ const validTeams = this.selectedTeams().filter(t => teams.includes(t));
+ if (validTeams.length !== this.selectedTeams().length) {
+ this.setTeams(validTeams);
+ }
+ }
+
+ setTeams(teams: string[]): void {
+ this.selectedTeams.set([...teams]);
+ }
+
+ toggleTeam(team: string): void {
+ const current = this.selectedTeams();
+ const idx = current.indexOf(team);
+ const next = [...current];
+ if (idx >= 0) {
+ next.splice(idx, 1);
+ } else {
+ next.push(team);
+ }
+ this.selectedTeams.set(next);
+ }
+
+ selectGroup(groupName: string): void {
+ const members = this.teamGroups()[groupName];
+ if (members) {
+ this.selectedTeams.set([...members]);
+ }
+ }
+
+ selectAll(): void {
+ this.selectedTeams.set([]);
+ }
+
+ deselectAll(): void {
+ this.selectedTeams.set([]);
+ }
+}