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 @@
0" class="uk-label custom-label label-country " title="Country">{{result.countriesForResults.join(", ")}}
{{result.title.accessMode}}
{{result['funderShortname']}}
-
Open Access mandate
+
Open Access mandate for Publications
+
Open Access mandate for Research Data
+
Open Access mandate for Publications and Research Data
Publisher: {{result.publisher}}
{{result['type']}}
{{result.compatibility}}
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
;
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(){}
}