MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

Deposit Pages: Show proper messages (Publications or Research Data) | Landing pages' tabs: redirect results to search pages 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@44893 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2016-12-09 16:12:30 +00:00
parent b933586b83
commit c9e915c0ae
17 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
portal-2/src/app/deposit/deposit.component.ts
View File

@ -20,7 +20,7 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic
</i>
Then you are required to publish in
<a href="{{openAccess}}">open access</a>.
One way to do this is to deposit your publications into an
One way to do this is to deposit your {{requestFor}} into an
<a href="{{openAccessRepo}}">open access repository</a>.
</p>
<p>
@ -82,8 +82,7 @@ export class DepositComponent {
if(this.requestFor == "Publications") {
this._router.navigate( ['deposit-publications-result'], { queryParams: { "organizationId": id } } );
} else if(this.requestFor == "Datasets") {
console.info("call deposit result for datasets")
} else if(this.requestFor == "Research Data") {
this._router.navigate( ['deposit-datasets-result'], { queryParams: { "organizationId": id } } );
}
}

2
portal-2/src/app/deposit/depositDatasets.component.ts
View File

@ -3,7 +3,7 @@ import {Component} from '@angular/core';
@Component({
selector: 'deposit-datasets',
template: `
<deposit [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit>
<deposit [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Research Data'"></deposit>
`
})

2
portal-2/src/app/deposit/depositDatasetsResult.component.ts
View File

@ -3,7 +3,7 @@ import {Component} from '@angular/core';
@Component({
selector: 'deposit-datasets-result',
template: `
<deposit-result [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit-result>
<deposit-result [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Research Data'"></deposit-result>
`
})

4
portal-2/src/app/deposit/depositResult.component.ts
View File

@ -34,7 +34,7 @@ import {OrganizationService} from '../services/organization.service';
</div>
<div *ngIf="searchDataprovidersComponent.searchUtils.totalResults > 0">
<p>Please use the information/contacts shown below to deposit your publications.</p>
<p>Please use the information/contacts shown below to deposit your {{requestFor}}.</p>
<!--showDataProviders [dataProviders]=dataProviders></showDataProviders-->
<div class = "text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
<search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.searchUtils.status"></search-result>
@ -60,7 +60,7 @@ import {OrganizationService} from '../services/organization.service';
No ID for organization.
</div>
You can still deposit your publications and/or research data in
You can still deposit your {{requestFor}} in
<a href="{{zenodo}}">OpenAIRE's Zenodo catch-all repository </a>
hosted by CERN.
</div>

2
portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts
View File

@ -32,7 +32,7 @@ export class DatasetsTabComponent {
constructor () {}
ngOnInit() {
this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets()+this.paramsForSearchLink;
this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets()+this.paramsForSearchLink;
}
ngOnDestroy() {}

3
portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts
View File

@ -32,7 +32,8 @@ export class DatasourcesTabComponent {
constructor () {}
ngOnInit() {
this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders()+this.paramsForSearchLink;
this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders()+this.paramsForSearchLink;
console.info(this.linkToSearchDataproviders);
}
ngOnDestroy() {}

2
portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts
View File

@ -33,7 +33,7 @@ export class ProjectsTabComponent {
constructor () {}
ngOnInit() {
this.linkToSearchProjects = OpenaireProperties.getLinkToSearchProjects()+this.paramsForSearchLink;
this.linkToSearchProjects = OpenaireProperties.getLinkToAdvancedSearchProjects()+this.paramsForSearchLink;
}
ngOnDestroy() {}

2
portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts
View File

@ -32,7 +32,7 @@ export class PublicationsTabComponent {
constructor () {}
ngOnInit() {
this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink;
this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+this.paramsForSearchLink;
}
ngOnDestroy() {}

12
portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts
View File

@ -22,8 +22,8 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
<table class="table table-striped">
<thead>
<tr>
<th class="text-center">Name</th>
<th class="text-center">Aggregation Number</th>
<th class="text-center">Data Provider Name</th>
<th class="text-center">Number of publications/ datasets</th>
</tr>
</thead>
<tbody>
@ -34,7 +34,9 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
</a>
</td>
<td class="text-center">
{{item.count}}
<a href="{{linkToSearchPublications}}{{item.id}}&ho=and&collectedFrom={{dataproviderId}}&co=and" target="_blank">
{{item.count}}
</a>
</td>
</tr>
</tbody>
@ -44,14 +46,14 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
})
export class RelatedDatasourcesTabComponent {
@Input() paramsForSearchLink: string = "";
@Input() dataproviderId: string;
@Input() searchPublicationsComponent : SearchPublicationsComponent;
private linkToSearchPublications = "";
constructor () {}
ngOnInit() {
//this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink;
this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+"?&hostedBy=";//+ +"&ho=and&collectedFrom="+ +"&co=and";
}
ngOnDestroy() {}

5
portal-2/src/app/landingPages/dataProvider/tabs.component.ts
View File

@ -112,6 +112,7 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s
[organizations]="organizations">
</organizationsTab>
<relatedDatasourcesTab *ngIf="i>0 && tab.content=='relatedDatasourcesTab'"
[dataproviderId]="id"
[searchPublicationsComponent]="searchPublicationsComponentAggregators">
</relatedDatasourcesTab>
<div *ngIf="i>0 && tab.content=='metricsTab'" class="well">
@ -171,9 +172,9 @@ export class TabsComponent {
}
if(this.resultsBy == "collectedFrom") {
this.paramsForSearchLink = "?collectedfromdatasourceid="+this.id;
this.paramsForSearchLink = "?collectedFrom="+this.id+"&co=and";
} else if (this.resultsBy == "hostedBy") {
this.paramsForSearchLink = "?resulthostingdatasourceid="+this.id;
this.paramsForSearchLink = "?hostedBy="+this.id+"&ho=and";
}
}

2
portal-2/src/app/landingPages/organization/organization.component.ts
View File

@ -222,7 +222,7 @@ export class OrganizationComponent {
private searchDataproviders() {
this.searchDataprovidersComponent.getResultsForEntity("organization", this.organizationId, 1, 10);
this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders();
this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders() + "?organization=" + this.organizationId + "&or=and";;
}
private searchDataprovidersInit() {

4
portal-2/src/app/landingPages/person/person.component.ts
View File

@ -112,11 +112,11 @@ export class PersonComponent {
private searchPublications() {
this.searchPublicationsComponent.getResultsForEntity("person", this.personId, 1, 10);
this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications();
this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?person=" + this.personId + "&pe=and";
}
private searchDatasets() {
this.searchDatasetsComponent.getResultsForEntity("person", this.personId, 1, 10);
this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets();
this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?person=" + this.personId + "&pe=and";
}
}

4
portal-2/src/app/landingPages/project/project.component.html
View File

@ -147,8 +147,8 @@
</li>
<li role="separator" class="list-group-item divider"></li>
<li class="list-group-item">
<a data-toggle="tab" href="">
Publication details
<a data-toggle="tab" href="{{linkToSearchPublications}}">
View all Project Publications
</a>
</li>
<li class="list-group-item">

4
portal-2/src/app/landingPages/project/project.component.ts
View File

@ -91,12 +91,12 @@ export class ProjectComponent{
private searchPublications() {
this.searchPublicationsComponent.getResultsForEntity("project", this.projectId, 1, 10);
this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications() + "?relprojectid=" + this.projectId;
this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?project=" + this.projectId+"&pr=and";
}
private searchDatasets() {
this.searchDatasetsComponent.getResultsForEntity("project", this.projectId, 1, 10);
this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets() + "?relprojectid=" + this.projectId;;
this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?project=" + this.projectId+"&pr=and";
}
private searchDatasetsInit() {

2
portal-2/src/app/sharedComponents/navigationBar.component.ts
View File

@ -56,7 +56,7 @@ import 'rxjs/Rx';
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Deposit <span class=""></span></a>
<ul class="dropdown-menu">
<li><a href="/deposit-publications">Deposit Publications</a></li>
<li><a href="/deposit-datasets">Deposit Datasets</a></li>
<li><a href="/deposit-datasets">Deposit Research Data</a></li>
</ul>
</li>

1
portal-2/src/app/utils/entities/dataProviderInfo.ts
View File

@ -79,6 +79,7 @@ export class DataProviderInfo {
"aggregator::pubsrepository::unknown",
"aggregator::pubsrepository::journals",
"entityregistry::projects",
"entityregistry::repositories",
"infospace",
"scholarcomminfra",
"pubscatalogue::unknown"

20
portal-2/src/app/utils/properties/openaireProperties.ts
View File

@ -117,6 +117,26 @@ export class OpenaireProperties {
return this.baseSearchLink + this.searchLinkToPeople;
}
//Advanced searchPages
public static getLinkToAdvancedSearchPublications():string{
return this.baseSearchLink + this.searchLinkToAdvancedPublications;
}
public static getLinkToAdvancedSearchProjects():string{
return this.baseSearchLink + this.searchLinkToAdvancedProjects;
}
public static getLinkToAdvancedSearchDataProviders():string{
return this.baseSearchLink + this.searchLinkToAdvancedDataProviders;
}
public static getLinkToAdvancedSearchDatasets():string{
return this.baseSearchLink + this.searchLinkToAdvancedDatasets;
}
public static getLinkToAdvancedSearchOrganizations():string{
return this.baseSearchLink + this.searchLinkToAdvancedOrganizations;
}
public static getLinkToAdvancedSearchPeople():string{
return this.baseSearchLink + this.searchLinkToAdvancedPeople;
}
// Services - APIs' getters
// public static getSearchAPIURL():string{
// return this.searchAPIURL;