diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 555ae4ef..6df0320b 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -390,7 +390,7 @@
-
+
@@ -406,7 +406,7 @@
-
+ @@ -424,14 +424,14 @@
- -
+
{{formatNumber(measure.value)}}
- -
+ +
{{measure.value}}
diff --git a/sharedComponents/search-input/search-input.component.ts b/sharedComponents/search-input/search-input.component.ts index 0b2a3e02..63fc7d03 100644 --- a/sharedComponents/search-input/search-input.component.ts +++ b/sharedComponents/search-input/search-input.component.ts @@ -90,7 +90,7 @@ export class SearchInputComponent implements OnInit, AfterViewInit { ngAfterViewInit() { if(typeof document !== 'undefined') { this.ratio = Number.parseFloat(getComputedStyle(this.searchInput.nativeElement).getPropertyValue('--search-input-icon-ratio')); - this.cdr.detectChanges() + this.cdr.detectChanges(); } } diff --git a/utils/fetchEntitiesClasses/fetchResearchResults.class.ts b/utils/fetchEntitiesClasses/fetchResearchResults.class.ts index 1090aeae..ce05a800 100644 --- a/utils/fetchEntitiesClasses/fetchResearchResults.class.ts +++ b/utils/fetchEntitiesClasses/fetchResearchResults.class.ts @@ -12,6 +12,7 @@ export class FetchResearchResults { private errorMessages: ErrorMessagesComponent; public results =[]; + public allResults =[]; // in case of paging public requestComplete: Subject; @@ -88,7 +89,8 @@ export class FetchResearchResults { this.subscriptions.push(this._searchResearchResultsService.advancedSearchResults(resultType, "", page, size, "resultdateofacceptance,descending", properties, "&type=results&fq=communityid=" + communityId +(contextId?'&fq=categoryid=' + encodeURIComponent(contextId):'')).subscribe( data => { this.searchUtils.totalResults = data[0]; - this.results = data[1]; + this.allResults = data[1]; + this.results = data[1].slice(0, 5) ; this.searchUtils.status = this.errorCodes.DONE; if(this.searchUtils.totalResults == 0 ){ diff --git a/utils/tabs/contents/search-tab.component.ts b/utils/tabs/contents/search-tab.component.ts index 7383f76e..e8656ed1 100644 --- a/utils/tabs/contents/search-tab.component.ts +++ b/utils/tabs/contents/search-tab.component.ts @@ -1,4 +1,4 @@ -import {Component, Input} from '@angular/core'; +import {Component, Input, SimpleChanges} from '@angular/core'; import {EnvProperties} from "../../properties/env-properties"; import {ErrorCodes} from "../../properties/errorCodes"; import {OpenaireEntities} from "../../properties/searchFields"; @@ -41,7 +41,7 @@ import {StringUtils} from "../../string-utils.class"; @@ -67,7 +67,6 @@ export class SearchTabComponent { @Input() properties: EnvProperties; @Input() customTitle; @Input() showEnermaps: boolean; - @Input() currentPage: number = null; public errorCodes: ErrorCodes = new ErrorCodes(); @@ -75,10 +74,6 @@ export class SearchTabComponent { return StringUtils.getEntityName(entityType, true); } - get results() { - return this.currentPage ? this.fetch.results.slice((this.currentPage - 1) * this.searchNumber, this.currentPage * this.searchNumber) : this.fetch.results; - } - get paramsForExternalUrl() { let parameters: string = ""; Object.keys(this.params).forEach(paramKey => {