diff --git a/portal-2/src/app/deposit/deposit.component.ts b/portal-2/src/app/deposit/deposit.component.ts index ce41d792..96a8e3eb 100644 --- a/portal-2/src/app/deposit/deposit.component.ts +++ b/portal-2/src/app/deposit/deposit.component.ts @@ -38,7 +38,9 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic [placeHolderMessage] = "'Search for Organizations'" [title] = "'Organizations'" [multipleSelections]=false (selectedValueChanged)="valueChanged($event)"> - + @@ -47,14 +49,13 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic }) export class DepositComponent { - public keyword: string=''; + @Input() keyword: string=''; public openAccess: string; public openAccessRepo: string; public fp7Guidlines: string; public h2020Guidlines: string; public ercGuidlines: string; public helpdesk: string; - public organizations: {"name": string, "id": string}[] = []; @Input() compatibility: string = ''; @Input() requestFor: string = "Publications"; diff --git a/portal-2/src/app/deposit/depositResult.component.ts b/portal-2/src/app/deposit/depositResult.component.ts index 0d8c6240..41f2e7d7 100644 --- a/portal-2/src/app/deposit/depositResult.component.ts +++ b/portal-2/src/app/deposit/depositResult.component.ts @@ -1,7 +1,7 @@ import {Component, Input} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import {OpenaireProperties, ErrorCodes} from '../utils/properties/openaireProperties'; - +import { Router } from '@angular/router'; import { ActivatedRoute } from '@angular/router'; import { SearchDataprovidersComponent } from '../searchPages/simple/searchDataproviders.component'; import { SearchDataprovidersService } from '../services/searchDataproviders.service'; @@ -25,8 +25,8 @@ import {OrganizationService} from '../services/organization.service';

Data providers for institution: - - {{organization['name']}} + + {{organization['name']}} ( ) {{organization['name']}}

@@ -61,9 +61,13 @@ import {OrganizationService} from '../services/organization.service';
You can still deposit your {{requestFor}} in - OpenAIRE's Zenodo catch-all repository + OpenAIRE's Zenodo catch-all repository ( ) hosted by CERN. + + ` }) @@ -84,7 +88,8 @@ export class DepositResultComponent { @Input() compatibility: string = ''; @Input() requestFor: string = "Publications"; - constructor (private route: ActivatedRoute, + constructor (private _router: Router, + private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService, private _organizationService: OrganizationService) { console.info("depositResult constructor"); @@ -138,7 +143,6 @@ export class DepositResultComponent { data => { this.organization = data.title; this.status = this.errorCodes.DONE; - console.info("done"); this.subDataproviders = this.route.queryParams.subscribe(params => { this.searchDataproviders(); }); @@ -156,4 +160,12 @@ export class DepositResultComponent { } ); } + + goToDeposit() { + if(this.requestFor == "Publications") { + this._router.navigate( ['deposit-publications'] ); + } else if(this.requestFor == "Research Data") { + this._router.navigate( ['deposit-datasets'] ); + } + } }