From a4a54ccdb8d3510980b4a331e03ec4318e2812bd Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 15 Jul 2016 13:17:14 +0000 Subject: [PATCH] Updating landing page of publication : parse context field (shown as related to) | linkify authors | linkify identifiers | change downloadFrom type | show additional classifications in subjects | add badges in tabs | view all in References tab git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@43244 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/entities/publicationInfo.ts | 3 +- .../publication/publication.component.ts | 261 +++++++++++++++--- src/app/services/publication.service.ts | 116 +++++--- 3 files changed, 304 insertions(+), 76 deletions(-) diff --git a/src/app/entities/publicationInfo.ts b/src/app/entities/publicationInfo.ts index a1cfd63e..0ecc6ec8 100644 --- a/src/app/entities/publicationInfo.ts +++ b/src/app/entities/publicationInfo.ts @@ -1,6 +1,6 @@ export class PublicationInfo { title: string; - authors: string[]; + authors: { [key: string]: string }[]; date: string; types: string[]; downloadFrom: Map; @@ -18,4 +18,5 @@ export class PublicationInfo { relatedResearchData: Map;//{ [key: string]: string }[]; similarPublications: Map;//{ [key: string]: string }[]; references: { [key: string]: string }[]; + contexts: { [key: string]: string }[]; } diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index c02ea0be..17a3e69e 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/src/app/landingPages/publication/publication.component.ts @@ -6,9 +6,10 @@ import {PublicationInfo} from '../../entities/publicationInfo'; import { RouteParams} from '@angular/router-deprecated'; import { InlineClaimContextComponent} from '../../claimPages/inlineClaimContext/inlineClaimContext.component'; import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/inlineClaimProject.component'; +//import {NgSwitch, ngSwitchCase, NgSwitchDefault} from '@angular/common'; + @Component({ selector: 'publication', - //directives: [...ROUTER_DIRECTIVES], template: `
@@ -23,9 +24,36 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/
-

- {{publicationInfo.authors}} ({{publicationInfo.date}}) -

+
Publisher:
@@ -34,41 +62,141 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/
{{publicationInfo.journal}}
Languages:
{{publicationInfo.languages}}
-
Types:
-
{{publicationInfo.types}}
+
Types:
+
{{publicationInfo.types}}
+ + +
+
Identifiers:
+
+
    +
  • + + +
    + + + +
    +
    • +
+
+
+ +
+
+ Subjects: +
+
+
{{publicationInfo.subjects}}
+
-
+
+ +
+ +
+ Show additional classifications + +
+
+ Hide additional classifications + +
+ + +
+
+ Classified by OpenAIRE into +
+ {{key}}: {{publicationInfo.classifiedSubjects.get(key)}} +
+
+
+
+
+ -
Subjects:
-
{{publicationInfo.subjects}}
-
Identifiers:
-
-
    -
  • - {{key}}: {{publicationInfo.identifiers.get(key)}}
    • -
-
-
- {{publicationInfo.description}} -
+ +
+ {{publicationInfo.description}} +
+
There are no references
-
-
-

+

+ +
+
+ +
view all {{publicationInfo.references.length}}
+ +
+
+ +
+
+

{{item['text']}} @@ -77,9 +205,31 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/ {{item['text']}}

-
+
+
+
+

+ + {{item['text']}} + +

+

+ {{item['text']}} +

+
+
+ +
+
+ +
view all {{publicationInfo.references.length}}
+ +
+
+
+
There are no related research data @@ -94,10 +244,12 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/ - - {{publicationInfo.relatedResearchData.get(key)[0]}} - - ({{publicationInfo.relatedResearchData.get(key)[1]}}) + + {{publicationInfo.relatedResearchData.get(key)[0]}} + + + ({{publicationInfo.relatedResearchData.get(key)[1]}}) +
@@ -127,10 +279,12 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/ - - {{publicationInfo.similarPublications.get(key)[0]}} - - ({{publicationInfo.similarPublications.get(key)[1]}}) + + {{publicationInfo.similarPublications.get(key)[0]}} + + + ({{publicationInfo.similarPublications.get(key)[1]}}) +
@@ -189,11 +343,11 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/
  • -
    +
    Download from
    -
    - - {{key}} +
    + + {{publicationInfo.downloadFrom.get(key)[1]}}
    @@ -223,8 +377,10 @@ import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/
  • Related to
    -
    - +
    + {{item['labelContext']}} + -> {{item['labelCategory']}} + : {{item['labelConcept']}}
    @@ -259,9 +415,17 @@ export class PublicationComponent { this.getPublicationInfo(); } + private publicationInfo: PublicationInfo; + private params: RouteParams; - publicationInfo: PublicationInfo; - params: RouteParams; + private showAllAuthors: boolean = false; + private showStyle: boolean = false; + private showAllReferences: boolean = false; + private showAllRelResData: boolean = false; + private showAllSimilPubl: boolean = false; + private showAllBioentities: boolean = false; + + private bioentitiesNum: number = 0; private result ; private claimInline:string = "none" ; @@ -283,7 +447,16 @@ console.info("do request"); this._publicationService.getPublicationInfo(this.params.get("articleId")).subscribe( data => { this.publicationInfo = data; - this.result = [] + + let bioentitiesNum = 0; + if(this.publicationInfo.bioentities != undefined) { + this.publicationInfo.bioentities.forEach(function (value, key, map) { + bioentitiesNum += value.size; + }); + } + this.bioentitiesNum = bioentitiesNum; + + this.result = [] let result_ ={id: this.params.get("articleId"), type :"publication", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''}; this.result.push(result_); }, @@ -328,7 +501,7 @@ console.info("do request"); var contexts =$event.value; if(contexts){ for(var i=0; i < contexts.length; i++){ - + } } } diff --git a/src/app/services/publication.service.ts b/src/app/services/publication.service.ts index 197e758b..ff8d3cfd 100644 --- a/src/app/services/publication.service.ts +++ b/src/app/services/publication.service.ts @@ -30,7 +30,8 @@ export class PublicationService { res['result']['metadata']['oaf:entity']['oaf:result']['subject'], res['result']['metadata']['oaf:entity']['oaf:result']['bestlicense'], res['result']['metadata']['oaf:entity']['oaf:result']['collectedfrom'], - (res['result']['metadata']['oaf:entity']['extraInfo']!= undefined && res['result']['metadata']['oaf:entity']['extraInfo']['citations']!= undefined)? res['result']['metadata']['oaf:entity']['extraInfo']['citations']['citation']:null + (res['result']['metadata']['oaf:entity']['extraInfo']!= undefined && res['result']['metadata']['oaf:entity']['extraInfo']['citations']!= undefined)? res['result']['metadata']['oaf:entity']['extraInfo']['citations']['citation']:null, + res['result']['metadata']['oaf:entity']['oaf:result']['context'] ]) .map(res => this.parsePublicationInfo(res)); @@ -67,9 +68,12 @@ export class PublicationService { if(mydata.hasOwnProperty("to")) { if(mydata['to'].class == "hasAuthor") { if(this.publicationInfo.authors == undefined) { - this.publicationInfo.authors = new Array(); + this.publicationInfo.authors = new Array<{[key: string]: string}>(); } - this.publicationInfo.authors[mydata.ranking-1] = mydata.fullname; + + this.publicationInfo.authors[mydata.ranking-1] = {}; + this.publicationInfo.authors[mydata.ranking-1]['name'] = mydata.fullname; + this.publicationInfo.authors[mydata.ranking-1]['url'] = "https://beta.openaire.eu/search/person?personId="+mydata['to'].content; } else if(mydata['to'].class == "isProducedBy") { if(this.publicationInfo.fundedByProjects == undefined) { this.publicationInfo.fundedByProjects = new Map(); @@ -106,7 +110,7 @@ export class PublicationService { } } } - } else if(mydata['to'].class == "isRelatedTo") { + } else if(mydata['to'].class == "iscontexts") { if(this.publicationInfo.relatedResearchData == undefined) { this.publicationInfo.relatedResearchData = new Map();//Array<{}>(); } @@ -130,6 +134,10 @@ export class PublicationService { } } } + + this.publicationInfo.authors = this.publicationInfo.authors.filter(function (item) { + return (item != undefined); + }); } if(data[3] != null) { @@ -152,18 +160,25 @@ export class PublicationService { counter++; } } - if(!this.publicationInfo.downloadFrom.has(mydata.id)) { - this.publicationInfo.downloadFrom.set(mydata.id, new Array()); - } - if(mydata.hasOwnProperty("licence")) { - this.publicationInfo.downloadFrom.get(mydata.id)[0] = mydata['licence'].classid; - } - if(mydata.hasOwnProperty("hostedby")) { - this.publicationInfo.downloadFrom.get(mydata.id)[1] = mydata['hostedby'].name; - } if(mydata.hasOwnProperty("webresource")) { - this.publicationInfo.downloadFrom.get(mydata.id)[2] = mydata['webresource'].url; + let url; + if(mydata['webresource'].length == undefined) { + url = mydata['webresource'].url; + } else{ + url = mydata['webresource'][0].url; + } + + if(!this.publicationInfo.downloadFrom.has(url)) { + this.publicationInfo.downloadFrom.set(url, new Array()); + } + + if(mydata.hasOwnProperty("licence")) { + this.publicationInfo.downloadFrom.get(url)[0] = mydata['licence'].classid; + } + if(mydata.hasOwnProperty("hostedby")) { + this.publicationInfo.downloadFrom.get(url)[1] = mydata['hostedby'].name; + } } } } @@ -188,7 +203,7 @@ export class PublicationService { if(data[4] != null) { this.publicationInfo.identifiers = new Map(); - if(data[4].hasOwnProperty("classname")) { + if(data[4].hasOwnProperty("classname") && data[4]['classname'] != "") { this.publicationInfo.identifiers.set(data[4].classname, data[4].content); } else { for(let i=0; i 1 ? data[7][i] : data[7]; - if(mydata.inferred == true) { - if(!this.publicationInfo.classifiedSubjects.has(mydata.classid)) { - this.publicationInfo.classifiedSubjects.set(mydata.classid, new Array()); + if(mydata.classid != "") { + if(mydata.inferred == true) { + if(!this.publicationInfo.classifiedSubjects.has(mydata.classid)) { + this.publicationInfo.classifiedSubjects.set(mydata.classid, new Array()); + } + + let counter = this.publicationInfo.classifiedSubjects.get(mydata.classid).length; + this.publicationInfo.classifiedSubjects.get(mydata.classid)[counter] = mydata.content; + } else { + let counter = this.publicationInfo.subjects.length; + this.publicationInfo.subjects[counter] = mydata.content; } - - let counter = this.publicationInfo.classifiedSubjects.get(mydata.classid).length; - this.publicationInfo.classifiedSubjects.get(mydata.classid)[counter] = mydata.content; - } else { - let counter = this.publicationInfo.subjects.length; - this.publicationInfo.subjects[counter] = mydata.content; } - } } @@ -262,14 +278,13 @@ export class PublicationService { this.publicationInfo.downloadFrom = new Map(); } - let doi = this.publicationInfo.identifiers.get("doi"); - if(!this.publicationInfo.downloadFrom.has(doi)) { - this.publicationInfo.downloadFrom.set(doi, new Array()); + let url = "http://dx.doi.org/"+this.publicationInfo.identifiers.get("doi"); + if(!this.publicationInfo.downloadFrom.has(url)) { + this.publicationInfo.downloadFrom.set(url, new Array()); } - this.publicationInfo.downloadFrom.get(doi)[0] = ""; - this.publicationInfo.downloadFrom.get(doi)[1] = this.publicationInfo.publisher+"/ "+this.publicationInfo.journal; - this.publicationInfo.downloadFrom.get(doi)[2] = "http://dx.doi.org/"+doi; + this.publicationInfo.downloadFrom.get(url)[0] = ""; + this.publicationInfo.downloadFrom.get(url)[1] = this.publicationInfo.publisher+"/ "+this.publicationInfo.journal; } if(data[10] != null) { @@ -299,6 +314,45 @@ export class PublicationService { } } + if(data[11] != null) { + this.publicationInfo.contexts = new Array<{ [key: string]: string }>(); + + let position = 0; + let labels = ""; + let mydata; + let length = data[11].length!=undefined ? data[11].length : 1; + for(let i=0; i 1 ? data[11][i] : data[11]; + + if(mydata.hasOwnProperty("category")) { + if(mydata['category'].hasOwnProperty("concept")) { + let mydata1; + let length1 = mydata['category']['concept'].length!=undefined ? mydata['category']['concept'].length : 1; + for(let j=0; j 1 ? mydata['category']['concept'][j] : mydata['category']['concept']; + + this.publicationInfo.contexts[position] = {}; + this.publicationInfo.contexts[position]['labelContext'] = mydata.label; + this.publicationInfo.contexts[position]['labelCategory'] = mydata['category'].label;; + this.publicationInfo.contexts[position]['labelConcept'] = mydata1.label; + + position++; + } + } else { + this.publicationInfo.contexts[position] = {}; + this.publicationInfo.contexts[position]['labelContext'] = mydata.label; + this.publicationInfo.contexts[position]['labelCategory'] = mydata['category'].label;; + this.publicationInfo.contexts[position]['labelConcept'] = null; + } + } else { + this.publicationInfo.contexts[position] = {}; + this.publicationInfo.contexts[position]['labelContext'] = mydata.label; + this.publicationInfo.contexts[position]['labelCategory'] = null; + this.publicationInfo.contexts[position]['labelConcept'] = null; + } + } + } + //this.printPublicationInfo(); return this.publicationInfo;