diff --git a/src/app/app.component.ts b/src/app/app.component.ts index fd6cd192..c07882ec 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,6 +10,8 @@ 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 {DatasetComponent} from './landingPages/dataset/dataset.component'; +import {PersonComponent} from './landingPages/person/person.component'; import {MyClaimsDemoComponent} from './claimPages/myClaimsDemo.component'; import {SearchPublicationsComponent} from './searchPages/searchPublications.component'; import 'rxjs/Rx'; @@ -75,6 +77,8 @@ import 'rxjs/Rx'; { path: '/demo', component: MyClaimsDemoComponent, name: 'MyClaimsDemo' }, { path: '/project', component: ProjectComponent, name: 'Project' }, { path: '/publication', component: PublicationComponent, name: 'Publication' }, + { path: '/dataset', component: DatasetComponent, name: 'Dataset' }, + { path: '/person', component: PersonComponent, name: 'Person' }, { path: '/search-publications', component: SearchPublicationsComponent, name: 'SearchPublications' } ]) diff --git a/src/app/entities/projectInfo.ts b/src/app/entities/projectInfo.ts index 17ff7c69..e08e5043 100644 --- a/src/app/entities/projectInfo.ts +++ b/src/app/entities/projectInfo.ts @@ -9,7 +9,11 @@ export class ProjectInfo { endDate: string; openAccessMandate: string; specialClause39: string; - organizations: string[]; + organizations: Map; url: string; urlInfo: string; + + publications: any; + researchData: any; + statistics: any; } diff --git a/src/app/entities/publicationInfo.ts b/src/app/entities/publicationInfo.ts index 0ecc6ec8..598c5907 100644 --- a/src/app/entities/publicationInfo.ts +++ b/src/app/entities/publicationInfo.ts @@ -1,22 +1,30 @@ export class PublicationInfo { - title: string; - authors: { [key: string]: string }[]; + title: { "name": string, "url": string, "accessMode": string}; + authors: { "name": string, "url": string}[]; date: string; + embargoEndDate: string; types: string[]; - downloadFrom: Map; - bioentities: Map>; - identifiers: Map; + downloadFrom: Map; //key is name + publishedIn: Map; //key is name + bioentities: Map>; //> + identifiers: Map; //key is the classname publisher: string; - journal: string; + journal: {"journal": string, "issn": string, "lissn": string}; languages: string[]; subjects: string[]; - classifiedSubjects: Map; + classifiedSubjects: Map; // description: string; bestlicense: string; - collectedFrom: Map; - fundedByProjects: Map; - relatedResearchData: Map;//{ [key: string]: string }[]; - similarPublications: Map;//{ [key: string]: string }[]; - references: { [key: string]: string }[]; - contexts: { [key: string]: string }[]; + collectedFrom: { "name": string, "url": string}[]; + fundedByProjects: { "url": string, "acronym": string, "title": string, + "funderShortname": string, "funderName": string, + "funding": string, "new": boolean}[]; + //relatedPublications: { "name": string, "url": string, "date": string, "trust": string}[]; + //relatedResearchData: { "name": string, "url": string, "date": string, "trust": string}[]; + //similarPublications: {"name": string, "url": string, "date": string, "trust": string}[]; + //similarDatasets: {"name": string, "url": string, "date": string, "trust": string}[]; + relatedResearchResults: { "name": string, "url": string, "date": string, "trust": string, "class": string}[]; + similarResearchResults: {"name": string, "url": string, "date": string, "trust": string, "class": string}[]; + references: { "name": string, "url": string}[]; + contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string}[]; } diff --git a/src/app/landingPages/project/project.component.ts b/src/app/landingPages/project/project.component.ts index 0962cc25..06e4d1fa 100644 --- a/src/app/landingPages/project/project.component.ts +++ b/src/app/landingPages/project/project.component.ts @@ -8,212 +8,179 @@ import {ProjectInfo} from '../../entities/projectInfo'; @Component({ selector: 'project', template: ` - -
-
-
-
+
+
+
+

{{projectInfo.acronym}}

- - -
-
Title:
-
{{projectInfo.title}}
-
Funding:
-
{{projectInfo.funding}}
-
Call:
-
{{projectInfo.callIdentifier}}
-
Contract (GA) number:
-
{{projectInfo.contractNum}}
-
Start Date:
-
{{projectInfo.startDate}}
-
End Date:
-
{{projectInfo.endDate}}
-
Open Access mandate:
-
{{projectInfo.openAccessMandate}}
-
Special Clause 39:
-
{{projectInfo.specialClause39}}
-
Organizations:
-
{{projectInfo.organizations}}
-
More information:
-
- - {{projectInfo.urlInfo}} - -
-
- - + +
-