From 9de98a9f6f44e07dc01d8c3481c463e5e5771405 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 30 Jun 2016 13:31:06 +0000 Subject: [PATCH] more checks and changes in publication landing page git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@43089 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 7 +- .../publication/publication.component.ts | 283 ++++++++++-------- src/app/services/publication.service.ts | 27 -- 3 files changed, 165 insertions(+), 152 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e7335e6b..063adce6 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -9,6 +9,9 @@ import {LinkingComponent} from './claimPages/linking/linking.component'; import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component'; import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component'; +import {ProjectComponent} from './landingPages/project/project.component'; +import {PublicationComponent} from './landingPages/publication/publication.component'; + import 'rxjs/Rx'; @@ -69,7 +72,9 @@ import 'rxjs/Rx'; { path: '/search', component: SearchComponent, name: 'Search' }, // { path: '/upload', component: BasicProgressbar, name: 'Upload' }, { path: '/linking', component: LinkingComponent, name: 'Linking' }, - { path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' } + { path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' }, + { path: '/project', component: ProjectComponent, name: 'Project' }, + { path: '/publication', component: PublicationComponent, name: 'Publication' } ]) export class App { diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index ea917d5c..9888e1ec 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/src/app/landingPages/publication/publication.component.ts @@ -13,142 +13,177 @@ import { RouteParams} from '@angular/router-deprecated';
-

{{publicationInfo.title}}

+
+

{{publicationInfo.title}}

-

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

-
- -
Publisher:
- {{publicationInfo.publisher}} - -
-
- -
Journal:
- {{publicationInfo.journal}} - -
-
- -
Languages:
- {{publicationInfo.languages}} - -
-
-
Types:
- {{publicationInfo.types}} -
-
- -
Subjects:
- {{publicationInfo.subjects}} -
-
-
Identifiers:
- - {{key}}: {{publicationInfo.identifiers.get(key)}} - -
-
- - {{publicationInfo.description}} - -
+

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

+
+
Publisher:
+ {{publicationInfo.publisher}} +
+
+
Journal:
+ {{publicationInfo.journal}} +
+
+
Languages:
+ {{publicationInfo.languages}} +
+
+
Types:
+ {{publicationInfo.types}} +
+
+
Subjects:
+ {{publicationInfo.subjects}} +
+
+
Identifiers:
+ + {{key}}: {{publicationInfo.identifiers.get(key)}} + +
+
+
+ {{publicationInfo.description}} +
+
- + -
-
-

REFERENCES

+
-
-

- - {{item['text']}} - -

-

- {{item['text']}} -

+
+

REFERENCES

+ +
+
+
+

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

+

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

+
+
+
+ +
+
+

RELATED RESEARCH DATA

+ + + + + + + + + + + + + + + +
TitleTrust
+ + {{publicationInfo.relatedResearchData.get(key)[0]}} + + ({{publicationInfo.relatedResearchData.get(key)[1]}}) + +
+
+ {{publicationInfo.relatedResearchData.get(key)[2]}} +
+
+
+
+ +
+

SIMILAR PUBLICATIONS

+ + + + + + + + + + + + + + +
TitleTrust
+ + {{publicationInfo.similarPublications.get(key)[0]}} + + ({{publicationInfo.similarPublications.get(key)[1]}}) + +
+ {{publicationInfo.similarPublications.get(key)[2]}} +
+
+
+
+

BIOENTITIES

+ + + + + + + +
+
+
+
+ + + + + + + +
Bio EntitySite Name
+ + {{keyIn}} + + + {{key}} +
-
-

dataTab

- - - - - - - - - - - - - - - - - - + +
- -
-

similarTab

-

Some content in similarTab.

-
-
-

YO men

-
- - - - - - +
diff --git a/src/app/services/publication.service.ts b/src/app/services/publication.service.ts index 7a1f5ff3..5c71879b 100644 --- a/src/app/services/publication.service.ts +++ b/src/app/services/publication.service.ts @@ -85,13 +85,10 @@ export class PublicationService { } if(mydata['funding'].hasOwnProperty("funding_level_2")) { funding = mydata['funding']['funding_level_2'].content; - //this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_2'].content; } else if(mydata['funding'].hasOwnProperty("funding_level_1")) { funding = mydata['funding']['funding_level_1'].content; - //this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_1'].content; } else if(mydata['funding'].hasOwnProperty("funding_level_0")) { funding = mydata['funding']['funding_level_0'].content; - //this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_0'].content; } if(funding != undefined) { @@ -107,16 +104,6 @@ export class PublicationService { if(this.publicationInfo.relatedResearchData == undefined) { this.publicationInfo.relatedResearchData = new Map();//Array<{}>(); } - /* - this.publicationInfo.relatedResearchData[counter] = {}; - this.publicationInfo.relatedResearchData[counter]['title'] = mydata['title'].content; - this.publicationInfo.relatedResearchData[counter]['year'] = mydata.dateofacceptance.substring(0,4); - this.publicationInfo.relatedResearchData[counter]['trust'] = Math.round(mydata.trust*100)+"%"; - let link = "https://beta.openaire.eu/search/publication?articleId="; - this.publicationInfo.relatedResearchData[counter]['link'] = link+mydata['to'].content; - - counter++; - */ let url = "https://beta.openaire.eu/search/publication?articleId="+mydata['to'].content; this.publicationInfo.relatedResearchData.set(url, new Array()); @@ -137,14 +124,6 @@ export class PublicationService { } } } - - - //for(let i in this.publicationInfo.relatedResearchData) { - // for(let key in this.publicationInfo.relatedResearchData[i]) { - // console.info(key+" : "+this.publicationInfo.relatedResearchData[i][key]); - // } - //} - } if(data[3] != null) { @@ -214,7 +193,6 @@ export class PublicationService { if(data[5] != null) { this.publicationInfo.journal = data[5].content; - //console.info(this.publicationInfo.journal); } if(data[6] != null) { @@ -338,11 +316,6 @@ export class PublicationService { } console.info("\n"); - /*for(let i in this.publicationInfo.relatedResearchData) { - for(let key in this.publicationInfo.relatedResearchData[i]) { - console.info(key+" : "+this.publicationInfo.relatedResearchData[i][key]); - } - }*/ console.info("\nRELATED RESEARCH DATA:"); if(this.publicationInfo.relatedResearchData != undefined) { this.publicationInfo.relatedResearchData.forEach(function (value, key, map) {