From 604b1235be852505820efaac09fd8f5bc87c9636 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 23 Oct 2018 13:11:25 +0000
Subject: [PATCH] Project Entity (landing & search): Add 'Open Access Mandate'
 information for Research Data (field 'ecarticle29_3') & specify when 'Open
 Access Mandate' refers to Publications or Datasets.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53543 d315682c-612b-4755-9ff5-7f18f6832af3
---
 landingPages/project/project.component.html         | 13 +++++++++++--
 landingPages/project/project.service.ts             |  3 ++-
 searchPages/searchUtils/searchResult.component.html |  7 ++++++-
 searchPages/searchUtils/tabResult.component.html    |  7 ++++++-
 services/searchProjects.service.ts                  |  3 ++-
 utils/entities/projectInfo.ts                       |  3 ++-
 utils/entities/searchResult.ts                      | 10 +++++++++-
 7 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 9f3a0829..9b6dad73 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -22,14 +22,23 @@
             <div>
               <span class="uk-label custom-label label-blue label-project" title="Type">Project</span>
               <span class="uk-label custom-label label-funder " title="Funder">{{projectInfo.funder}}</span>
-              <span *ngIf="projectInfo.openAccessMandate != undefined && projectInfo.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
+
+              <span *ngIf="projectInfo.openAccessMandatePublications != undefined && projectInfo.openAccessMandatePublications && projectInfo.openAccessMandateDatasets != undefined && projectInfo.openAccessMandateDatasets"
+                    class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications and Research Data">
+                    Open Access mandate for Publications and Research Data
+              </span>
+              <span *ngIf="projectInfo.openAccessMandatePublications != undefined && projectInfo.openAccessMandatePublications && (projectInfo.openAccessMandateDatasets == undefined || !projectInfo.openAccessMandateDatasets)"
+                    class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications">Open Access mandate for Publications</span>
               <span *ngIf="projectInfo.specialClause39" class="uk-label custom-label label-sc39 " title="Special Clause 39">Special Clause 39</span>
+              <span *ngIf="projectInfo.openAccessMandateDatasets != undefined && projectInfo.openAccessMandateDatasets && (projectInfo.openAccessMandatePublications == undefined || !projectInfo.openAccessMandatePublications)"
+                    class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Research Data">Open Access mandate for Research Data</span>
             </div>
             <ul class="uk-list">
               <li  *ngIf="projectInfo.funding"><span class="uk-text-bold">Funding:</span> {{projectInfo.funding}}</li>
               <li  *ngIf="projectInfo.startDate"><span class="uk-text-bold">Start Date:</span> {{projectInfo.startDate}}</li>
               <li  *ngIf="projectInfo.endDate"><span class="uk-text-bold">End Date:</span> {{projectInfo.endDate}}</li>
-              <li  *ngIf="projectInfo.openAccessMandate != undefined && !projectInfo.openAccessMandate "><span class="uk-text-bold">Open Access mandate:</span> no</li>
+              <li  *ngIf="projectInfo.openAccessMandatePublications != undefined && !projectInfo.openAccessMandatePublications "><span class="uk-text-bold">Open Access mandate for Publications:</span> no</li>
+              <li  *ngIf="projectInfo.openAccessMandateDatasets != undefined && !projectInfo.openAccessMandateDatasets "><span class="uk-text-bold">Open Access mandate for Research Data:</span> no</li>
               <li *ngIf="projectInfo.organizations && projectInfo.organizations.length > 0"><span class="uk-text-bold">Organization:</span>
 
                 <span class="list-horizontal-line">
diff --git a/landingPages/project/project.service.ts b/landingPages/project/project.service.ts
index a137762e..1523aa20 100644
--- a/landingPages/project/project.service.ts
+++ b/landingPages/project/project.service.ts
@@ -112,8 +112,9 @@ export class ProjectService {
             this.projectInfo.contractNum = data[0].code;
             this.projectInfo.startDate = data[0].startdate;
             this.projectInfo.endDate = data[0].enddate;
-            this.projectInfo.openAccessMandate = data[0].oamandatepublications;
+            this.projectInfo.openAccessMandatePublications = data[0].oamandatepublications;
             this.projectInfo.specialClause39 = data[0].ecsc39;
+            this.projectInfo.openAccessMandateDatasets = data[0].ecarticle29_3;
         }
         if(data[1] != null) {
           /*
diff --git a/searchPages/searchUtils/searchResult.component.html b/searchPages/searchUtils/searchResult.component.html
index 4192d631..a2b4244a 100644
--- a/searchPages/searchUtils/searchResult.component.html
+++ b/searchPages/searchUtils/searchResult.component.html
@@ -27,7 +27,12 @@
               *ngIf="i < result['funders'].length-1">, </span>
         </span></span> -->
         <span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}</span>
-        <span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
+        <span *ngIf="result.openAccessMandatePublications != undefined && result.openAccessMandatePublications && (result.openAccessMandateDatasets == undefined || !result.openAccessMandateDatasets)"
+               class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications">Open Access mandate for Publications</span>
+        <span *ngIf="result.openAccessMandateDatasets != undefined && result.openAccessMandateDatasets && (result.openAccessMandatePublications == undefined || !result.openAccessMandatePublications)"
+               class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Research Data">Open Access mandate for Research Data</span>
+        <span *ngIf="result.openAccessMandatePublications != undefined && result.openAccessMandatePublications && result.openAccessMandateDatasets != undefined && result.openAccessMandateDatasets"
+               class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications and Research Data">Open Access mandate for Publications and Research Data</span>
 
         <span *ngIf="result.title  && result.title.sc39" class="uk-label custom-label label-sc39 " title="Special Clause 39">Special Clause 39</span>
         <div class="uk-margin-small">
diff --git a/searchPages/searchUtils/tabResult.component.html b/searchPages/searchUtils/tabResult.component.html
index cd4d4ce5..cc8d3214 100644
--- a/searchPages/searchUtils/tabResult.component.html
+++ b/searchPages/searchUtils/tabResult.component.html
@@ -39,7 +39,12 @@
        <span *ngIf="result.countriesForResults && result.countriesForResults.length > 0" class="uk-label custom-label  label-country " title="Country">{{result.countriesForResults.join(", ")}}</span>
        <span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label  label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
        <span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}</span>
-       <span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
+       <span *ngIf="result.openAccessMandatePublications != undefined && result.openAccessMandatePublications && (result.openAccessMandateDatasets == undefined || !result.openAccessMandateDatasets)"
+              class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications">Open Access mandate for Publications</span>
+       <span *ngIf="result.openAccessMandateDatasets != undefined && result.openAccessMandateDatasets && (result.openAccessMandatePublications == undefined || !result.openAccessMandatePublications)"
+              class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Research Data">Open Access mandate for Research Data</span>
+       <span *ngIf="result.openAccessMandatePublications != undefined && result.openAccessMandatePublications && result.openAccessMandateDatasets != undefined && result.openAccessMandateDatasets"
+              class="uk-label custom-label label-openaccessmandate " title="Open Access mandate for Publications and Research Data">Open Access mandate for Publications and Research Data</span>
        <div *ngIf="result.publisher != undefined && result.publisher != ''"><span class="uk-text-bold">Publisher:</span> {{result.publisher}}</div>
        <span *ngIf="result['type'] != undefined && result['type'] != ''" class="uk-label custom-label label-blue label-dataprovider" title="Type"> {{result['type']}}</span>
        <span *ngIf="result['compatibility'] != undefined && result['compatibility'] != ''" class="uk-label custom-label  label-compatibility" title="Compatibility">{{result.compatibility}}</span>
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index 766638db..646ee9f5 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -121,7 +121,8 @@ export class SearchProjectsService {
             let resData = Array.isArray(data) ? data[i]['result']['metadata']['oaf:entity']['oaf:project'] : data['result']['metadata']['oaf:entity']['oaf:project'];
 
             var result: SearchResult = new SearchResult();
-            result.openAccessMandate = (resData['oamandatepublications'])?true:false;
+            result.openAccessMandatePublications = (resData['oamandatepublications'])?true:false;
+            result.openAccessMandateDatasets = (resData['ecarticle29_3'])?true:false;
             result['title'] = {"name": '', "accessMode": '', "sc39": ''};
             // if(resData['acronym'] != undefined && resData['acronym'] != "") {
             //     result['title'].name = resData['acronym'] + " - ";
diff --git a/utils/entities/projectInfo.ts b/utils/entities/projectInfo.ts
index d5c5b0c4..0b601f69 100644
--- a/utils/entities/projectInfo.ts
+++ b/utils/entities/projectInfo.ts
@@ -8,7 +8,8 @@ export class ProjectInfo {
     contractNum: string;
     startDate: string;
     endDate: string;
-    openAccessMandate: string;
+    openAccessMandatePublications: string;
+    openAccessMandateDatasets: string;
     specialClause39: string;
     organizations: { "acronym": string, "name": string, "id": string }[];//Map<string, string>;
     url: string;
diff --git a/utils/entities/searchResult.ts b/utils/entities/searchResult.ts
index 4f8a3fb0..eed34270 100644
--- a/utils/entities/searchResult.ts
+++ b/utils/entities/searchResult.ts
@@ -4,15 +4,19 @@ export class SearchResult {
     DOI:string;
     //publications & datasets & orp & organizations:
     projects: {"funderShortname": string, "funderName": string, "acronym": string, "title": string, "code": string, "id": string}[];
+
     //datasets & orp & publications
     description: string;
     year: string;
     embargoEndDate: string;
     authors: string[];
+
     //datasets & orp:
     publisher: string;
+
     //dataproviders & projects:
     organizations: { "name": string, "id": string}[];
+
     //projects:
     acronym: string;
     code: string;
@@ -20,8 +24,12 @@ export class SearchResult {
     funderShortname: string;
     startYear:number;
     endYear:number;
+    openAccessMandatePublications: boolean;
+    openAccessMandateDatasets: boolean;
+
     //organizations:
     country: string;
+
     //dataproviders:
     englishname: string;
     type: string;
@@ -40,7 +48,7 @@ export class SearchResult {
 
     entityType: string;
     types: string[];
-    openAccessMandate: boolean;
+
     constructor(){}
 
 }