From 7dc4c5e6643267e36aec984362b8e0d3fbcdf466 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 15 Jun 2022 13:54:49 +0300 Subject: [PATCH] [Library | new-theme]: Removed parsing and display of special clause 39 (esc39) | In parsing for open access mandate for datasets, added check if field is "projectoamandatedata" (ecarticle29_3 to be renamed to projectoamandatedata). 1. project.component.html & result-preview.component.html: Do not display label for "Special Clause 39". 2. project.service.ts: a. Removed parsing of ecsc39. b. For parsing of openAccessMandateDatasets, use projectoamandatedata or ecarticle29_3. 3. searchDataproviders.service.ts & searchOrganizations.service.ts & searchResearchResults.service.ts: Removed sc39 from "title" of SearchResult. 4. searchProjects.service.ts: a. Removed sc39 from "title" of SearchResult. b. Removed parsing of ecsc39. c. For parsing of openAccessMandateDatasets, use oamandatedata or ecarticle29_3. 5. organizationInfo.ts: Removed "sc39: string;" from OrganizationProject. 6. projectInfo.ts: Removed "specialClause39: string;" from ProjectInfo. 7. searchFields.ts: Removed "projectecsc39" and added "projectoamandatepublications" in PROJECT_REFINE_FIELDS. 8. result-preview.ts: Removed "sc39: string;" from ResultTitle and ResultPreview | Do not set sc39 in searchResultConvert(). --- landingPages/project/project.component.html | 10 +++---- landingPages/project/project.service.ts | 8 ++++-- services/searchDataproviders.service.ts | 2 +- services/searchOrganizations.service.ts | 2 +- services/searchProjects.service.ts | 14 ++++++---- services/searchResearchResults.service.ts | 2 +- utils/entities/organizationInfo.ts | 2 +- utils/entities/projectInfo.ts | 2 +- utils/properties/searchFields.ts | 26 +++++++++++++++---- .../result-preview.component.html | 8 +++--- utils/result-preview/result-preview.ts | 6 ++--- 11 files changed, 53 insertions(+), 29 deletions(-) diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 74c6c458..f8576cd6 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -198,11 +198,11 @@ {{projectInfo.funding.funderName}}   - - - Special Clause 39 -   - + + + + +
diff --git a/landingPages/project/project.service.ts b/landingPages/project/project.service.ts index e72d922f..dbafa780 100644 --- a/landingPages/project/project.service.ts +++ b/landingPages/project/project.service.ts @@ -154,8 +154,12 @@ export class ProjectService { if(this.projectInfo.funding) { if(this.projectInfo.funding.funderShortName == "EC") { this.projectInfo.openAccessMandatePublications = data[0].oamandatepublications; - this.projectInfo.specialClause39 = data[0].ecsc39; - this.projectInfo.openAccessMandateDatasets = data[0].ecarticle29_3; + // this.projectInfo.specialClause39 = data[0].ecsc39; + if(data[0].hasOwnProperty("projectoamandatedata")) { + this.projectInfo.openAccessMandateDatasets = data[0].projectoamandatedata; + } else if(data[0].hasOwnProperty("ecarticle29_3")) { + this.projectInfo.openAccessMandateDatasets = data[0].ecarticle29_3; + } this.projectInfo.funding.callIdentifier = data[0].callidentifier; } this.projectInfo.funding.budget = data[0].totalcost;//"10000"; diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts index 49b49462..150d47e8 100644 --- a/services/searchDataproviders.service.ts +++ b/services/searchDataproviders.service.ts @@ -293,7 +293,7 @@ export class SearchDataprovidersService { var result: SearchResult = new SearchResult(); - result['title'] = {"name": '', "accessMode": '', "sc39": ''}; + result['title'] = {"name": '', "accessMode": ''}; result['title'].name = resData.officialname; result['englishname'] = resData.englishname; diff --git a/services/searchOrganizations.service.ts b/services/searchOrganizations.service.ts index 978a5496..65f286fb 100644 --- a/services/searchOrganizations.service.ts +++ b/services/searchOrganizations.service.ts @@ -92,7 +92,7 @@ export class SearchOrganizationsService { var result: SearchResult = new SearchResult(); - result['title'] = {"name": '', "accessMode": '', "sc39": ''}; + result['title'] = {"name": '', "accessMode": ''}; result['title'].name = resData.legalshortname; if(!result['title'].name || result['title'].name == '') { diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts index 6992ec36..19113242 100644 --- a/services/searchProjects.service.ts +++ b/services/searchProjects.service.ts @@ -126,8 +126,12 @@ export class SearchProjectsService { var result: SearchResult = new SearchResult(); result.openAccessMandatePublications = (resData['oamandatepublications'])?true:false; - result.openAccessMandateDatasets = (resData['ecarticle29_3'])?true:false; - result['title'] = {"name": '', "accessMode": '', "sc39": ''}; + if(resData.hasOwnProperty("oamandatedata")) { + result.openAccessMandateDatasets = (resData['oamandatedata'])?true:false; + } else { + result.openAccessMandateDatasets = (resData['ecarticle29_3'])?true:false; + } + result['title'] = {"name": '', "accessMode": ''}; // if(resData['acronym'] != undefined && resData['acronym'] != "") { // result['title'].name = resData['acronym'] + " - "; // } @@ -141,9 +145,9 @@ export class SearchProjectsService { // result['title'].name += " ("+resData['code']+")" // } - if(resData['ecsc39'] == true) { - result['title'].sc39 = "sc39"; - } + // if(resData['ecsc39'] == true) { + // result['title'].sc39 = "sc39"; + // } result.acronym = resData['acronym']; result.code = resData['code']; diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts index 5246c1b1..cf1647c2 100644 --- a/services/searchResearchResults.service.ts +++ b/services/searchResearchResults.service.ts @@ -267,7 +267,7 @@ export class SearchResearchResultsService { } } - result['title'] = {"name": '', "accessMode": '', "sc39": ''}; + result['title'] = {"name": '', "accessMode": ''}; if (Array.isArray(resData['title'])) { for (let i = 0; i < resData['title'].length; i++) { diff --git a/utils/entities/organizationInfo.ts b/utils/entities/organizationInfo.ts index b203e12f..6bd9b68f 100644 --- a/utils/entities/organizationInfo.ts +++ b/utils/entities/organizationInfo.ts @@ -8,7 +8,7 @@ export interface OrganizationProject { fundingStream: string; fundingLevel1: string; fundingLevel2: string; - sc39: string; + // sc39: string; startDate: string; endDate: string; } diff --git a/utils/entities/projectInfo.ts b/utils/entities/projectInfo.ts index 086583a3..28f080df 100644 --- a/utils/entities/projectInfo.ts +++ b/utils/entities/projectInfo.ts @@ -11,7 +11,7 @@ export class ProjectInfo { status: string; openAccessMandatePublications: string; openAccessMandateDatasets: string; - specialClause39: string; + // specialClause39: string; organizations: { "acronym": string, "name": string, "id": string }[];//Map; url: string; urlInfo: string; diff --git a/utils/properties/searchFields.ts b/utils/properties/searchFields.ts index 55b105b3..fcd79467 100644 --- a/utils/properties/searchFields.ts +++ b/utils/properties/searchFields.ts @@ -256,7 +256,7 @@ export class SearchFields { ["projectendyear", "projectstartyear"] ]; public PROJECT_REFINE_FIELDS: string[] = ["funder", "fundinglevel0_id", "fundinglevel1_id", - "fundinglevel2_id", "projectstartyear", "projectendyear", "projectecsc39"]; + "fundinglevel2_id", "projectstartyear", "projectendyear", "projectoamandatepublications"]; public PROJECT_ADVANCED_FIELDS: string[] = ["q", "projectacronym", "projecttitle", "projectkeywords", "funder", "fundinglevel0_id", "fundinglevel1_id", "fundinglevel2_id", "projectstartdate", "projectenddate", @@ -360,11 +360,27 @@ export class SearchFields { equalityOperator: " within ", filterType: null }, - ["projectecsc39"]: { - name: "Special Clause 39", + // ["projectecsc39"]: { + // name: "Special Clause 39", + // type: "boolean", + // param: "sc39", + // operator: "sc", + // equalityOperator: " exact ", + // filterType: "radio" + // }, + ["projectoamandatepublications"]: { + name: "OA "+OpenaireEntities.PUBLICATIONS+" Mandate", type: "boolean", - param: "sc39", - operator: "sc", + param: "oapubl", + operator: "oap", + equalityOperator: " exact ", + filterType: "radio" + }, + ["projectoamandatedata"]: { + name: "OA "+OpenaireEntities.DATASETS+" Mandate", + type: "boolean", + param: "oadata", + operator: "oad", equalityOperator: " exact ", filterType: "radio" }, diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index 269461a7..a2cd2693 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -128,10 +128,10 @@ {{programmingLanguage}} {{" "}} - - Special Clause 39 - {{' '}} + + + + diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts index 68763e87..73211623 100644 --- a/utils/result-preview/result-preview.ts +++ b/utils/result-preview/result-preview.ts @@ -59,7 +59,7 @@ export interface Author { export interface ResultTitle { name: string; accessMode: string; - sc39: string; + // sc39: string; } export interface Organization { @@ -76,7 +76,7 @@ export class ResultPreview { id: string; title: string; accessMode: string; - sc39: string; + // sc39: string; countries: string[]; //Impact factor @@ -147,7 +147,7 @@ export class ResultPreview { resultPreview.relcanId = result.relcanId; resultPreview.title = result.title.name; resultPreview.accessMode = result.title.accessMode; - resultPreview.sc39 = result.title.sc39; + // resultPreview.sc39 = result.title.sc39; if(result.countriesForResults) { resultPreview.countries = result.countriesForResults; } else if(result.country) {