From 2af5775104c2943c3624fd0ba768e9082cb9647d Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 29 Jan 2024 17:14:23 +0200 Subject: [PATCH] [master | DONE | CHANGED] Researcher dashboards change query - remove irish filter --- src/app/researcher/researcher.component.ts | 4 ++-- .../search-researcher/search-researcher.component.ts | 3 +-- src/app/shared/researcher-base.component.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/researcher/researcher.component.ts b/src/app/researcher/researcher.component.ts index 17fb42a..10855b5 100644 --- a/src/app/researcher/researcher.component.ts +++ b/src/app/researcher/researcher.component.ts @@ -121,9 +121,9 @@ export class ResearcherComponent extends ResearcherBaseComponent implements OnI this.orcid = { success: () => { - let name = this.author.authorGivenName + " " + this.author.authorFamilyName?this.author.authorFamilyName:""; + let name = this.author.authorGivenName + " " + (this.author.authorFamilyName?this.author.authorFamilyName:""); this._customFilterService.setCustomFilter( - [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), + [/*new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false),*/ new SearchCustomFilter("Orcid", "authorId", this.authorId, name) ]); this.title = name; diff --git a/src/app/researcher/search-researcher/search-researcher.component.ts b/src/app/researcher/search-researcher/search-researcher.component.ts index 5262a2d..18d1093 100644 --- a/src/app/researcher/search-researcher/search-researcher.component.ts +++ b/src/app/researcher/search-researcher/search-researcher.component.ts @@ -173,8 +173,7 @@ private getOpenaireResultsFor(start, end){ } } private getOpenaireResultsObs(author){ - let param = '(authorid="' + StringUtils.URIEncode(author.id) + '")' - +' and (country exact "IE")'; + let param = '(authorid="' + StringUtils.URIEncode(author.id) + '")'; return this._searchResearchResultsService.numOfResearchOutcomes(param, properties, null).pipe(map(res => { author.resultsCount = res; return author; diff --git a/src/app/shared/researcher-base.component.ts b/src/app/shared/researcher-base.component.ts index 540e097..4503e6b 100644 --- a/src/app/shared/researcher-base.component.ts +++ b/src/app/shared/researcher-base.component.ts @@ -38,7 +38,7 @@ export class ResearcherBaseComponent extends StakeholderBaseComponent { } getResultsForAuthor(){ - this.param = '(authorid="' + StringUtils.URIEncode(this.author.id) + '") and (country exact "IE")'; + this.param = '(authorid="' + StringUtils.URIEncode(this.author.id) + '")'; this.subscriptions.push(this._searchResearchResultsService.numOfResearchOutcomes(this.param, properties, null).subscribe(res => { if(this.results?.success) { this.results?.success(res);