From f641624b3277ac3be8cbbb38e84cebd57d90bd23 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Mon, 10 Apr 2023 11:51:18 +0300 Subject: [PATCH] search page: show the search term in the title, above results --- .../displayClaims.component.html | 2 +- .../displayClaims/displayClaims.component.ts | 4 +-- .../searchUtils/newSearchPage.component.html | 13 ++++++--- .../searchUtils/newSearchPage.component.ts | 10 +++++++ utils/resultsAndPagesNum.component.ts | 28 ++++++++++++++----- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index 8eba3930..2c5dd4eb 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -16,7 +16,7 @@
-
diff --git a/claims/claim-utils/displayClaims/displayClaims.component.ts b/claims/claim-utils/displayClaims/displayClaims.component.ts index 0f9b03ad..84e90ca7 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.ts +++ b/claims/claim-utils/displayClaims/displayClaims.component.ts @@ -240,7 +240,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy { handleErrors(err, message) { NotificationHandler.rise(message, "danger"); - console.error("Dispaly Claims (component): " + message + " " + (err && err.error ? err.error : '')); + console.error("Display Claims (component): " + message + " " + (err && err.error ? err.error : '')); } goTo(page: number = 1) { @@ -290,7 +290,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy { } changeKeyword() { - if (this.filterForm.get("keyword") && (this.filterForm.get("keyword").value.length >= 3 || this.filterForm.get("keyword").value.length == 0)) { + if (this.filterForm.get("keyword") && (this.filterForm.get("keyword").value?.length >= 3 || this.filterForm.get("keyword").value?.length == 0)) { this.searchTermStream.next(this.filterForm.get("keyword").value); } } diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 0f3bf4bf..d52614c8 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -255,12 +255,17 @@
-
+
{{searchUtils.totalResults|number}} - {{type}}, page - {{searchUtils.page | number}} - of {{(totalPages(searchUtils.totalResults)|number)}} + {{type}} + + for + {{searchTerm}} + + {{oldTotalResults|number}} diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 6f6e5c10..83aa9045 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -151,6 +151,8 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { showOffCanvas:boolean = false; isMobile: boolean = false; isServer: boolean; + searchTerm: string = null; + advancedSearchTerms: number = 0; constructor(private route: ActivatedRoute, private location: Location, @@ -1689,6 +1691,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { this.getRangeFiltersFromURL(params); this.getRefineFiltersFromURL(params); this.createAdvancedSearchSelectedFiltersFromURLParameters(params); + this.searchTerm = ''; + if(params && params['fv0'] && params['f0'] && params['f0'] == 'q'){ + let keyword = StringUtils.URIDecode(params['fv0']); + this.searchTerm = keyword; + } + if(params){ + this.advancedSearchTerms = Object.keys(params).filter(key => key.includes('fv')).length; + } } removeResultType(type) { diff --git a/utils/resultsAndPagesNum.component.ts b/utils/resultsAndPagesNum.component.ts index e4de31f1..b41896bc 100644 --- a/utils/resultsAndPagesNum.component.ts +++ b/utils/resultsAndPagesNum.component.ts @@ -3,13 +3,25 @@ import {Component, Input} from "@angular/core"; @Component({ selector: 'results-and-pages', template: ` -
- {{totalResults | number}} - {{type}}, page - {{currentPage}} - of - {{getTotalPages() | number}} -
+ +
+ {{totalResults | number}} + {{type}}, page + {{currentPage}} + of + {{getTotalPages() | number}} +
+
+ +
+ {{totalResults | number}} + {{type}} + + for + {{searchTerm}} + +
+
` }) @@ -19,6 +31,8 @@ export class ResultsAndPagesNumComponent { @Input() pageSize: number = 10; @Input() totalResults: number = 0; @Input() customClasses: string = ""; + @Input() hasSearch: boolean = false; + @Input() searchTerm: string; constructor() {}