diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index eed4892b..ce41d792 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -8,7 +8,7 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic @Component({ selector: 'deposit', template: ` -
+

Deposit {{requestFor}}

@@ -19,26 +19,27 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic Are you a grant recipient from the following: H2020; FP7 with SC39; or ERC? Then you are required to publish in - open access. + open access ( ). One way to do this is to deposit your {{requestFor}} into an - open access repository. + open access repository ( ).

Click the following to find more information: - FP7 guidelines, - H2020 guidelines, - ERC guidelines OR - ask a question to OpenAIRE’s national representative. + FP7 guidelines ( ), + H2020 guidelines ( ), + ERC guidelines ( ) OR + ask a question ( ) to OpenAIRE’s national representative.

Locate data provider via your institution

- - - + (selectedValueChanged)="valueChanged($event)"> + + +
@@ -59,7 +60,8 @@ export class DepositComponent { public status: number; public errorCodes:ErrorCodes = new ErrorCodes(); - public selectedId = ""; + public selectedId: string = ""; + private warningMessage: string = ""; constructor (private _router: Router, private _searchOrganizationsService: SearchOrganizationsService) { @@ -74,13 +76,15 @@ export class DepositComponent { organizationSelected(id: string) { - if(id && id.length > 0){ - - if(this.requestFor == "Publications") { - this._router.navigate( ['deposit-publications-result'], { queryParams: { "organizationId": id } } ); - } else if(this.requestFor == "Research Data") { - this._router.navigate( ['deposit-datasets-result'], { queryParams: { "organizationId": id } } ); - } + console.info("organization selected"); + if(id && id.length > 0){ + if(this.requestFor == "Publications") { + this._router.navigate( ['deposit-publications-result'], { queryParams: { "organizationId": id } } ); + } else if(this.requestFor == "Research Data") { + this._router.navigate( ['deposit-datasets-result'], { queryParams: { "organizationId": id } } ); + } + } else { + this.warningMessage = "No organization selected"; } } diff --git a/portal-2/src/app/deposit/depositResult.component.ts b/portal-2/src/app/deposit/depositResult.component.ts index 7886b5fb..0d8c6240 100644 --- a/portal-2/src/app/deposit/depositResult.component.ts +++ b/portal-2/src/app/deposit/depositResult.component.ts @@ -12,7 +12,7 @@ import {OrganizationService} from '../services/organization.service'; @Component({ selector: 'deposit-result', template: ` -
+

Deposit {{requestFor}}

diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html index b28e68df..f0165940 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts index 00217ff3..b1970c75 100644 --- a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts @@ -17,6 +17,9 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s
  • {{tabs[0].name}} + + + {{searchPublicationsComponent.searchUtils.totalResults}} @@ -39,6 +42,9 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s {{tab.name}} + + + {{searchPublicationsComponent.searchUtils.totalResults}} diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.html b/portal-2/src/app/landingPages/dataset/dataset.component.html index a0275913..710bbcc1 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.html +++ b/portal-2/src/app/landingPages/dataset/dataset.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/portal-2/src/app/landingPages/organization/organization.component.html b/portal-2/src/app/landingPages/organization/organization.component.html index 0b41836c..b6815439 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.html +++ b/portal-2/src/app/landingPages/organization/organization.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/portal-2/src/app/landingPages/person/person.component.html b/portal-2/src/app/landingPages/person/person.component.html index dbd4d1f4..888e847d 100644 --- a/portal-2/src/app/landingPages/person/person.component.html +++ b/portal-2/src/app/landingPages/person/person.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index afd8cd16..a630a3d6 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -1,4 +1,4 @@ -
    +
    @@ -6,7 +6,7 @@
    -

    {{projectName}}

    +

    {{projectName}}

    Title:
    @@ -75,11 +75,13 @@
  • Statistics +
  • Metrics +
    • diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index 93d8fd53..22d1e5ee 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -1,4 +1,4 @@ -
    +
    @@ -102,6 +102,7 @@
  • Metrics +
    • @@ -242,6 +243,10 @@
    Share - Bookmark
    +
    • diff --git a/portal-2/src/app/landingPages/publication/publication.component.ts b/portal-2/src/app/landingPages/publication/publication.component.ts index 32083ca4..364719f5 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.ts +++ b/portal-2/src/app/landingPages/publication/publication.component.ts @@ -58,6 +58,8 @@ export class PublicationComponent { public bioentitiesNum: number = 0; + private doi: string; + public result ; /* @ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ; @@ -79,16 +81,20 @@ export class PublicationComponent { // this.result = [] // this.result = {id: id, type :"dataset", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''}; - let bioentitiesNum = 0; - if(this.publicationInfo.bioentities != undefined) { - this.publicationInfo.bioentities.forEach(function (value, key, map) { - bioentitiesNum += value.size; - }); - } - this.bioentitiesNum = bioentitiesNum; + let bioentitiesNum = 0; + if(this.publicationInfo.bioentities != undefined) { + this.publicationInfo.bioentities.forEach(function (value, key, map) { + bioentitiesNum += value.size; + }); + } + this.bioentitiesNum = bioentitiesNum; - this.result = {id: this.articleId, type :"publication", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''}; - // this.result.push(result_); + this.result = {id: this.articleId, type :"publication", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''}; + // this.result.push(result_); + + if(this.publicationInfo.identifiers != undefined && this.publicationInfo.identifiers.has('doi')) { + this.doi = this.publicationInfo.identifiers.get('doi')[0]; + } }, err => { console.log(err); diff --git a/portal-2/src/app/services/dataProvider.service.ts b/portal-2/src/app/services/dataProvider.service.ts index 4c5366de..b31c8052 100644 --- a/portal-2/src/app/services/dataProvider.service.ts +++ b/portal-2/src/app/services/dataProvider.service.ts @@ -72,9 +72,7 @@ export class DataProviderService { if(this.dataProviderInfo.tabsInTypes.datasetsTab.has(data[1].classid)) { this.dataProviderInfo.tabs.push({"name": "Datasets", "content": "datasetsTab"}); } - if(this.dataProviderInfo.tabsInTypes.statisticsTab.has(data[1].classid)) { - this.dataProviderInfo.tabs.push({"name": "Statistics", "content": "statisticsTab"}); - } + if(this.dataProviderInfo.tabsInTypes.projectsTab.has(data[1].classid)) { this.dataProviderInfo.tabs.push({"name": "Projects", "content": "projectsTab"}); } @@ -87,6 +85,10 @@ export class DataProviderService { this.dataProviderInfo.tabs.push({"name": "Related Data Providers", "content": "relatedDatasourcesTab"}); } + if(this.dataProviderInfo.tabsInTypes.statisticsTab.has(data[1].classid)) { + this.dataProviderInfo.tabs.push({"name": "Statistics", "content": "statisticsTab"}); + } + this.dataProviderInfo.tabs.push({"name": "Metrics", "content": "metricsTab"}); if(this.dataProviderInfo.resultTypes.collectedFrom.has(data[1].classid)) { diff --git a/portal-2/src/app/services/dataset.service.ts b/portal-2/src/app/services/dataset.service.ts index 9425b32a..b49c4101 100644 --- a/portal-2/src/app/services/dataset.service.ts +++ b/portal-2/src/app/services/dataset.service.ts @@ -42,9 +42,8 @@ export class DatasetService { this._cache.set(key, res); }) .map(res => this.parseDatasetInfo(res)); + } - -} private handleError (error: Response) { // in a real world app, we may send the error to some remote logging infrastructure // instead of just logging it to the console diff --git a/portal-2/src/index.html b/portal-2/src/index.html index dc0303a6..5de35d81 100644 --- a/portal-2/src/index.html +++ b/portal-2/src/index.html @@ -66,6 +66,9 @@ } } + + +