MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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().
This commit is contained in:
Konstantina Galouni 2022-06-15 13:54:49 +03:00
parent e9bbceebe0
commit 7dc4c5e664
11 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
landingPages/project/project.component.html
View File

@ -198,11 +198,11 @@
{{projectInfo.funding.funderName}} {{projectInfo.funding.funderName}}
</span>&#160; </span>&#160;
</ng-container> </ng-container>
<ng-container *ngIf="projectInfo.specialClause39"> <!-- <ng-container *ngIf="projectInfo.specialClause39">-->
<span class="uk-label custom-label label-sc39" title="Special Clause 39"> <!-- <span class="uk-label custom-label label-sc39" title="Special Clause 39">-->
Special Clause 39 <!-- Special Clause 39-->
</span>&#160; <!-- </span>&#160;-->
</ng-container> <!-- </ng-container>-->
</div> </div>
<div class="uk-text-small"> <div class="uk-text-small">
<div *ngIf="projectInfo.funding" class="uk-margin-bottom"> <div *ngIf="projectInfo.funding" class="uk-margin-bottom">

8
landingPages/project/project.service.ts
View File

@ -154,8 +154,12 @@ export class ProjectService {
if(this.projectInfo.funding) { if(this.projectInfo.funding) {
if(this.projectInfo.funding.funderShortName == "EC") { if(this.projectInfo.funding.funderShortName == "EC") {
this.projectInfo.openAccessMandatePublications = data[0].oamandatepublications; this.projectInfo.openAccessMandatePublications = data[0].oamandatepublications;
this.projectInfo.specialClause39 = data[0].ecsc39; // this.projectInfo.specialClause39 = data[0].ecsc39;
this.projectInfo.openAccessMandateDatasets = data[0].ecarticle29_3; 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.callIdentifier = data[0].callidentifier;
} }
this.projectInfo.funding.budget = data[0].totalcost;//"10000"; this.projectInfo.funding.budget = data[0].totalcost;//"10000";

2
services/searchDataproviders.service.ts
View File

@ -293,7 +293,7 @@ export class SearchDataprovidersService {
var result: SearchResult = new SearchResult(); var result: SearchResult = new SearchResult();
result['title'] = {"name": '', "accessMode": '', "sc39": ''}; result['title'] = {"name": '', "accessMode": ''};
result['title'].name = resData.officialname; result['title'].name = resData.officialname;
result['englishname'] = resData.englishname; result['englishname'] = resData.englishname;

2
services/searchOrganizations.service.ts
View File

@ -92,7 +92,7 @@ export class SearchOrganizationsService {
var result: SearchResult = new SearchResult(); var result: SearchResult = new SearchResult();
result['title'] = {"name": '', "accessMode": '', "sc39": ''}; result['title'] = {"name": '', "accessMode": ''};
result['title'].name = resData.legalshortname; result['title'].name = resData.legalshortname;
if(!result['title'].name || result['title'].name == '') { if(!result['title'].name || result['title'].name == '') {

14
services/searchProjects.service.ts
View File

@ -126,8 +126,12 @@ export class SearchProjectsService {
var result: SearchResult = new SearchResult(); var result: SearchResult = new SearchResult();
result.openAccessMandatePublications = (resData['oamandatepublications'])?true:false; result.openAccessMandatePublications = (resData['oamandatepublications'])?true:false;
result.openAccessMandateDatasets = (resData['ecarticle29_3'])?true:false; if(resData.hasOwnProperty("oamandatedata")) {
result['title'] = {"name": '', "accessMode": '', "sc39": ''}; result.openAccessMandateDatasets = (resData['oamandatedata'])?true:false;
} else {
result.openAccessMandateDatasets = (resData['ecarticle29_3'])?true:false;
}
result['title'] = {"name": '', "accessMode": ''};
// if(resData['acronym'] != undefined && resData['acronym'] != "") { // if(resData['acronym'] != undefined && resData['acronym'] != "") {
// result['title'].name = resData['acronym'] + " - "; // result['title'].name = resData['acronym'] + " - ";
// } // }
@ -141,9 +145,9 @@ export class SearchProjectsService {
// result['title'].name += " ("+resData['code']+")" // result['title'].name += " ("+resData['code']+")"
// } // }
if(resData['ecsc39'] == true) { // if(resData['ecsc39'] == true) {
result['title'].sc39 = "sc39"; // result['title'].sc39 = "sc39";
} // }
result.acronym = resData['acronym']; result.acronym = resData['acronym'];
result.code = resData['code']; result.code = resData['code'];

2
services/searchResearchResults.service.ts
View File

@ -267,7 +267,7 @@ export class SearchResearchResultsService {
} }
} }
result['title'] = {"name": '', "accessMode": '', "sc39": ''}; result['title'] = {"name": '', "accessMode": ''};
if (Array.isArray(resData['title'])) { if (Array.isArray(resData['title'])) {
for (let i = 0; i < resData['title'].length; i++) { for (let i = 0; i < resData['title'].length; i++) {

2
utils/entities/organizationInfo.ts
View File

@ -8,7 +8,7 @@ export interface OrganizationProject {
fundingStream: string; fundingStream: string;
fundingLevel1: string; fundingLevel1: string;
fundingLevel2: string; fundingLevel2: string;
sc39: string; // sc39: string;
startDate: string; startDate: string;
endDate: string; endDate: string;
} }

2
utils/entities/projectInfo.ts
View File

@ -11,7 +11,7 @@ export class ProjectInfo {
status: string; status: string;
openAccessMandatePublications: string; openAccessMandatePublications: string;
openAccessMandateDatasets: string; openAccessMandateDatasets: string;
specialClause39: string; // specialClause39: string;
organizations: { "acronym": string, "name": string, "id": string }[];//Map<string, string>; organizations: { "acronym": string, "name": string, "id": string }[];//Map<string, string>;
url: string; url: string;
urlInfo: string; urlInfo: string;

26
utils/properties/searchFields.ts
View File

@ -256,7 +256,7 @@ export class SearchFields {
["projectendyear", "projectstartyear"] ["projectendyear", "projectstartyear"]
]; ];
public PROJECT_REFINE_FIELDS: string[] = ["funder", "fundinglevel0_id", "fundinglevel1_id", 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", public PROJECT_ADVANCED_FIELDS: string[] = ["q", "projectacronym", "projecttitle", "projectkeywords",
"funder", "fundinglevel0_id", "fundinglevel1_id", "fundinglevel2_id", "funder", "fundinglevel0_id", "fundinglevel1_id", "fundinglevel2_id",
"projectstartdate", "projectenddate", "projectstartdate", "projectenddate",
@ -360,11 +360,27 @@ export class SearchFields {
equalityOperator: " within ", equalityOperator: " within ",
filterType: null filterType: null
}, },
["projectecsc39"]: { // ["projectecsc39"]: {
name: "Special Clause 39", // name: "Special Clause 39",
// type: "boolean",
// param: "sc39",
// operator: "sc",
// equalityOperator: " exact ",
// filterType: "radio"
// },
["projectoamandatepublications"]: {
name: "OA "+OpenaireEntities.PUBLICATIONS+" Mandate",
type: "boolean", type: "boolean",
param: "sc39", param: "oapubl",
operator: "sc", operator: "oap",
equalityOperator: " exact ",
filterType: "radio"
},
["projectoamandatedata"]: {
name: "OA "+OpenaireEntities.DATASETS+" Mandate",
type: "boolean",
param: "oadata",
operator: "oad",
equalityOperator: " exact ", equalityOperator: " exact ",
filterType: "radio" filterType: "radio"
}, },

8
utils/result-preview/result-preview.component.html
View File

@ -128,10 +128,10 @@
{{programmingLanguage}} {{programmingLanguage}}
</span>{{" "}} </span>{{" "}}
</span> </span>
<span <!-- <span -->
*ngIf="result.sc39" class="uk-label" title="Special Clause 39"> <!-- *ngIf="result.sc39" class="uk-label" title="Special Clause 39">-->
Special Clause 39 <!-- Special Clause 39-->
</span>{{' '}} <!-- </span>{{' '}}-->
<span <span
*ngIf="result.compatibility && result.compatibility != '' && result.compatibility != 'not available'" *ngIf="result.compatibility && result.compatibility != '' && result.compatibility != 'not available'"
class="uk-label" title="Compatibility"> class="uk-label" title="Compatibility">

6
utils/result-preview/result-preview.ts
View File

@ -59,7 +59,7 @@ export interface Author {
export interface ResultTitle { export interface ResultTitle {
name: string; name: string;
accessMode: string; accessMode: string;
sc39: string; // sc39: string;
} }
export interface Organization { export interface Organization {
@ -76,7 +76,7 @@ export class ResultPreview {
id: string; id: string;
title: string; title: string;
accessMode: string; accessMode: string;
sc39: string; // sc39: string;
countries: string[]; countries: string[];
//Impact factor //Impact factor
@ -147,7 +147,7 @@ export class ResultPreview {
resultPreview.relcanId = result.relcanId; resultPreview.relcanId = result.relcanId;
resultPreview.title = result.title.name; resultPreview.title = result.title.name;
resultPreview.accessMode = result.title.accessMode; resultPreview.accessMode = result.title.accessMode;
resultPreview.sc39 = result.title.sc39; // resultPreview.sc39 = result.title.sc39;
if(result.countriesForResults) { if(result.countriesForResults) {
resultPreview.countries = result.countriesForResults; resultPreview.countries = result.countriesForResults;
} else if(result.country) { } else if(result.country) {