Add approvalDate based filtering without aggregations to funding sear…

…ch. Edit links in funding-call and funding document views.
CSCfi · May 28, 2024 · 237e577 · 237e577
1 parent 128e17c
commit 237e577
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/app/portal/components/single/single-funding-call/single-funding-call.component.html b/src/app/portal/components/single/single-funding-call/single-funding-call.component.html
@@ -393,7 +393,7 @@ <h2 i18n>Rahoitushaun vaihe</h2>
                       <div style='display: flex; border-bottom: 1rem'>
                         <div style='min-width: 100px'>{{ row.phase }}</div>
                         <div style='min-width: 100px'>{{ row.approvalDate | date }}</div>
-                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "LT", callId: call.id}' i18n>Näytä myönnöt</a>
+                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "LT", callId: call.id, approvalDate: row.approvalDate}' i18n>Näytä myönnöt</a>
                       </div>
                     </div>
 
@@ -410,7 +410,7 @@ <h2 i18n>Rahoitushaun vaihe</h2>
                       <div style='display: flex; border-bottom: 1rem'>
                         <div style='min-width: 100px'>{{ row.phase }}</div>
                         <div style='min-width: 100px'>{{ row.approvalDate | date }}</div>
-                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "BTY", callId: call.id}' i18n>Näytä myönnöt</a>
+                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "BTY", callId: call.id, approvalDate: row.approvalDate}' i18n>Näytä myönnöt</a>
                       </div>
                     </div>
 
@@ -425,7 +425,7 @@ <h2 i18n>Rahoitushaun vaihe</h2>
                       <div style='display: flex; border-bottom: 1rem'>
                         <div style='min-width: 100px'>{{ row.phase }}</div>
                         <div style='min-width: 100px'>{{ row.approvalDate | date }}</div>
-                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "KY", callId: call.id}' i18n>Näytä myönnöt</a>
+                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "KY", callId: call.id, approvalDate: row.approvalDate}' i18n>Näytä myönnöt</a>
                       </div>
                     </div>
 
@@ -440,7 +440,7 @@ <h2 i18n>Rahoitushaun vaihe</h2>
                       <div style='display: flex; border-bottom: 1rem'>
                         <div style='min-width: 100px'>{{ row.phase }}</div>
                         <div style='min-width: 100px'>{{ row.approvalDate | date }}</div>
-                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "TIK", callId: call.id}' i18n>Näytä myönnöt</a>
+                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "TIK", callId: call.id, approvalDate: row.approvalDate}' i18n>Näytä myönnöt</a>
                       </div>
                     </div>
 
@@ -455,7 +455,7 @@ <h2 i18n>Rahoitushaun vaihe</h2>
                       <div style='display: flex; border-bottom: 1rem'>
                         <div style='min-width: 100px'>{{ row.phase }}</div>
                         <div style='min-width: 100px'>{{ row.approvalDate | date }}</div>
-                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "STN", callId: call.id}' i18n>Näytä myönnöt</a>
+                        <a [routerLink]='["/results/fundings"]' [queryParams]='{decisionMaker: "STN", callId: call.id, approvalDate: row.approvalDate}' i18n>Näytä myönnöt</a>
                       </div>
                     </div>
 

diff --git a/src/app/portal/components/single/single-funding/single-funding.component.html b/src/app/portal/components/single/single-funding/single-funding.component.html
@@ -427,7 +427,7 @@ <h2 class="col-12 col-sm-4 col-lg-3 th">
               <!-- Normal funding -->
               <ng-container *ngIf="!item.euFunding; else euCallProgramme">
                 <div class="col-12 col-sm-8 col-lg-9 td">
-                  {{ item.funder.callProgrammeName }}
+                  <a [routerLink]="'/results/funding-calls/' + item.funder.callProgrammeName">{{ item.funder.callProgrammeName }}</a>
                 </div>
               </ng-container>
 

diff --git a/src/app/portal/services/filters/filter.service.spec.ts b/src/app/portal/services/filters/filter.service.spec.ts
@@ -54,6 +54,7 @@ describe('FilterService', () => {
     approvalYear: [],
     decisionMaker: [],
     callId: [],
+    approvalDate: [],
   };
   let tabChangeService: TabChangeService;
 

diff --git a/src/app/portal/services/filters/filter.service.ts b/src/app/portal/services/filters/filter.service.ts
@@ -54,6 +54,7 @@ export type Filters = {
   approvalYear: string[];
   decisionMaker: string[];
   callId: string[];
+  approvalDate: string[];
 };
 
 @Injectable({
@@ -98,6 +99,7 @@ export class FilterService {
   approvalYearFilter: string[];
   decisionMakerFilter: string[];
   callIdFilter: string[];
+  approvalDateFilter: string[];
 
   private filterSource = new BehaviorSubject({
     toYear: [],
@@ -200,6 +202,7 @@ export class FilterService {
       topic: mapFilter(source.topic),
 
       callId: mapFilter(source.callId),
+      approvalDate: mapFilter(source.approvalDate),
 
       // Datasets
       dataSource: mapFilter(source.dataSource),
@@ -335,6 +338,11 @@ export class FilterService {
       filter.callId,
       'callProgrammeId'
     );
+
+    this.approvalDateFilter = this.basicFilter(
+      filter.approvalDate,
+      'council.approvalDate'
+    );
   }
 
   // Regular terms filter
@@ -958,6 +966,7 @@ export class FilterService {
       ...basicFilter('funding', this.approvalYearFilter),
       ...basicFilter('funding', this.decisionMakerFilter),
       ...basicFilter('funding', this.callIdFilter),
+      ...basicFilter('funding', this.approvalDateFilter),
 
       // Datasets
       ...basicFilter('dataset', this.dataSourceFilter),