Skip to content

Commit 5691fb3

Browse files
committed
✨ feat(results-center-table): add functionality to navigate to results by year
1 parent 650c94c commit 5691fb3

File tree

3 files changed

+39
-21
lines changed

3 files changed

+39
-21
lines changed

research-indicators/src/app/pages/platform/pages/result/components/version-selector/version-selector.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class VersionSelectorComponent {
7171
}
7272

7373
get hasLiveVersion() {
74-
return this.liveVersion() !== null && this.cache.currentMetadata().status_id !== 6;
74+
return this.liveVersion() !== null;
7575
}
7676

7777
get liveVersionData(): TransformResultCodeResponse {
@@ -95,6 +95,7 @@ export class VersionSelectorComponent {
9595
if (!response.successfulRequest) {
9696
this.actions.showToast({ severity: 'error', summary: 'Error', detail: response.errorDetail.errors });
9797
} else {
98+
this.router.navigate(['/result', this.cache.currentMetadata().status_id]);
9899
this.actions.showGlobalAlert({
99100
severity: 'success',
100101
hasNoButton: true,

research-indicators/src/app/pages/platform/pages/results-center/components/results-center-table/results-center-table.component.html

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,27 +116,38 @@
116116
@let visibleYears = versions.slice(0, showMoreCount > 0 ? 3 : maxVisible);
117117

118118
@if (count > 0) {
119-
@for (year of visibleYears; track year) {
120-
<span class="px-3 py-1 bg-[#F4F7F9] rounded-md text-[#1689CA] text-[10px] font-medium mr-1">
121-
{{ year }}
122-
</span>
123-
}
124-
@if (showMoreCount > 0) {
125-
<a #popoverTarget class="text-blue-600 cursor-pointer text-[10px] font-medium hover:underline" (click)="popover.toggle($event)">
126-
+{{ showMoreCount }} more
127-
</a>
119+
<div
120+
(click)="$event.stopPropagation()"
121+
(keydown.enter)="$event.stopPropagation()"
122+
class="w-max-[90px] flex flex-wrap items-center gap-2">
123+
@for (year of visibleYears; track year) {
124+
<span
125+
(keydown.enter)="openResultByYear(result.result_official_code, year)"
126+
(click)="openResultByYear(result.result_official_code, year)"
127+
class="px-3 py-1 bg-[#F4F7F9] rounded-md text-[#1689CA] text-[12px] font-medium cursor-pointer">
128+
{{ year }}
129+
</span>
130+
}
131+
@if (showMoreCount > 0) {
132+
<a #popoverTarget class="text-[#035BA9] cursor-pointer text-[13px] underline" (click)="popover.toggle($event)">
133+
+{{ showMoreCount }} more
134+
</a>
128135

129-
<p-popover #popover [baseZIndex]="10000" styleClass="rounded-lg p-4 shadow-lg">
130-
<div class="text-center mb-3 font-semibold text-lg">Approved Versions</div>
131-
<div class="grid grid-cols-2 gap-2">
132-
@for (year of versions; track year) {
133-
<span class="px-3 py-1 bg-[#F4F7F9] rounded-md text-[#1689CA] text-[10px] font-medium">
134-
{{ year }}
135-
</span>
136-
}
137-
</div>
138-
</p-popover>
139-
}
136+
<p-popover #popover [baseZIndex]="10000" styleClass="rounded-lg p-1 ">
137+
<div class="text-center mb-3 text-[14px] text-[#173F6F]">Approved Versions</div>
138+
<div class="grid grid-cols-2 gap-2">
139+
@for (year of versions; track year) {
140+
<span
141+
(keydown.enter)="openResultByYear(result.result_official_code, year)"
142+
(click)="openResultByYear(result.result_official_code, year)"
143+
class="px-3 py-1 bg-[#F4F7F9] rounded-md text-[#1689CA] text-[12px] font-medium cursor-pointer">
144+
{{ year }}
145+
</span>
146+
}
147+
</div>
148+
</p-popover>
149+
}
150+
</div>
140151
} @else {
141152
<span>None</span>
142153
}

research-indicators/src/app/pages/platform/pages/results-center/components/results-center-table/results-center-table.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@ export class ResultsCenterTableComponent implements AfterViewInit {
203203
this.router.navigate(['/result', result_official_code]);
204204
}
205205

206+
openResultByYear(result_official_code: string, year: string | number) {
207+
this.router.navigate(['/result', result_official_code], {
208+
queryParams: { version: year }
209+
});
210+
}
211+
206212
ngAfterViewInit() {
207213
this.tableRef.set(this.dt2);
208214
this.resultsCenterService.tableRef.set(this.dt2);

0 commit comments

Comments
 (0)