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

Datasets renamed to Research Data and Data Providers / Datasources renamed to Content Providers | Publication Landing: small bug fix in 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48657 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2017-07-21 10:58:27 +00:00
parent 6fe2929e9e
commit 29ee64a77f
50 changed files with 142 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html
View File

@ -18,7 +18,7 @@
<div *ngIf="showSearchResults" class="uk-margin-top uk-animation">
<ul class="uk-tab" uk-tab="animation: uk-animation-fade">
<li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openairePub')" ><a>Publications <span class="uk-badge uk-badge-notification">{{ (openairePubsNum)?openairePubsNum:0 }}</span></a></li>
<li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireData')" ><a>Datasets <span class="uk-badge uk-badge-notification">{{(openaireDataNum==null)?'0':openaireDataNum}}</span></a></li>
<li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireData')" ><a>Research Data <span class="uk-badge uk-badge-notification">{{(openaireDataNum==null)?'0':openaireDataNum}}</span></a></li>
<li *ngIf="searchSource == 'all' || searchSource == 'crossref'" (click)="clickTab('crossref')" ><a>Crossref <span class="uk-badge uk-badge-notification">{{(crossrefResultsNum)?crossrefResultsNum:0}}</span></a></li>
<li *ngIf="searchSource == 'all' || searchSource == 'datacite'" (click)="clickTab('datacite')"><a>Datacite <span class="uk-badge uk-badge-notification">{{(dataciteResultsNum==null)?'0':dataciteResultsNum}}</span></a></li>
<li *ngIf="searchSource == 'all' || searchSource == 'orcid'" (click)="clickTab('orcid')"><a>Orcid <span class="uk-badge uk-badge-notification">{{(orcidResultsNum)?orcidResultsNum:0}}</span></a></li>

2
portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.ts
View File

@ -551,7 +551,7 @@ openaireDataPageChange($event) {
// value: this.selectedResults
// });
}else{
this.warningMessage = "Dataset already in selected list";
this.warningMessage = "Research Data already in selected list";
}
}

2
portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html
View File

@ -8,7 +8,7 @@
<div class="-row">
<label> <input [(ngModel)]="projectCB" type="checkbox" (ngModelChange)="changeType()" name="project" /> Project </label>
<label> <input [(ngModel)]="publicationCB" type="checkbox" (ngModelChange)="changeType()" name="publication" /> Publication </label>
<label> <input [(ngModel)]="datasetCB" type="checkbox" (ngModelChange)="changeType()" name="dataset" /> Dataset </label>
<label> <input [(ngModel)]="datasetCB" type="checkbox" (ngModelChange)="changeType()" name="dataset" /> Research Data </label>
<label> <input [(ngModel)]="contextCB" type="checkbox" (ngModelChange)="changeType()" name="context" /> Context </label>
</div>

2
portal-2/src/app/claims/directLinking/directLinking.component.ts
View File

@ -36,7 +36,7 @@ import { Meta} from '../../../angular2-meta';
<p *ngIf="linkTo=='project'"><span class="uk-text-bold">Projects:</span> Search and add projects using keyword search. Limit the search space by specifying project Funder. </p>
<p *ngIf="linkTo=='context'"><span class="uk-text-bold">Communities:</span> Search and add communities/ concepts by selecting community, category and using keyword search for . Or browse through the categories and add communities. </p>
<p *ngIf="linkTo=='result'"><span class="uk-text-bold">Research Results:</span> You can search for reasearch results (publication and/ or datasets) to link, in openaire, crossref, and/ or Datacite. Use search mode, to search and add results through keyword search. Use upload mode, to upload a list of DOIs of results. </p>
<p *ngIf="linkTo=='result'"><span class="uk-text-bold">Research Results:</span> You can search for reasearch results (publication and/ or research data) to link, in openaire, crossref, and/ or Datacite. Use search mode, to search and add results through keyword search. Use upload mode, to upload a list of DOIs of results. </p>
<p *ngIf="show=='claim' && linkTo=='result'"><span class="uk-text-bold">Review Metadata:</span> For selected research results that came from 3rd party repositories (Datacite, Crossreff), you need to set access mode, and type before they are included in openaire information space.
Please have in mind that if you ignore this step they will have the default values.
</p>

4
portal-2/src/app/claims/linking/linkingGeneric.component.ts
View File

@ -32,7 +32,7 @@ declare var UIkit:any;
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" icon="info" ratio="1"><path d="M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z"></path><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle></svg>
</span> Linking Functionality:</div>
<p>Through linking functioanilty you are able to create links from research results to projects and/ or communities. You have to select at least one research result and one project or community in order to be able to proceed.</p>
<p>You can search for reasearch results (publication and/ or datasets) to link, in openaire, crossref, and/ or Datacite. </p>
<p>You can search for reasearch results (publication and/ or research data) to link, in openaire, crossref, and/ or Datacite. </p>
<p *ngIf="show=='project'"><span class="uk-text-bold">Projects:</span> Search and add projects using keyword search. Limit the search space by specifying project Funder. </p>
<p *ngIf="show=='context'"><span class="uk-text-bold">Communities:</span> Search and add communities/ concepts by selecting community, category and using keyword search for . Or browse through the categories and add communities. </p>
@ -134,7 +134,7 @@ export class LinkingGenericComponent {
linkType:string ="project"; // link type (selected in home page) : project, context, software, etc
/* url Parameters for inline linking */
id:string = null; //entity id
type:string = null; // entity type (publication or dataset)
type:string = null; // entity type (publication or research data)
linkTo:string = null; // entity type (project or context or result)
entityTypes=["dataset", "publication", "project","context"];

2
portal-2/src/app/claims/linking/selected/selectedResults.component.ts
View File

@ -69,7 +69,7 @@ import {Dates} from '../../../utils/string-utils.class';
<div class="uk-width-1-3 uk-padding-remove-left">
<select [(ngModel)]="pub.type" name="{{'select_type_'+pub.id}}" >
<option [value]="'publication'" (click)="onTypeChanged('publication',pub)" >Publication</option>
<option [value]="'dataset'" (click)="onTypeChanged('dataset',pub)" >Dataset</option>
<option [value]="'research data'" (click)="onTypeChanged('dataset',pub)" >Research Data</option>
</select>
</div>
<div class="uk-width-1-3 uk-padding-remove-left">

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

@ -10,7 +10,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
template: `
<div class="uk-margin-top">
<h3>Or search for Data providers via Classifications</h3>
<h3>Or search for content providers via Classifications</h3>
<form class= "uk-grid">
<input type="text" [(ngModel)]="subjectKeyword" class="uk-margin-medium-left uk-input uk-width-1-2" name="subject" placeholder="Search for classifications..." />

8
portal-2/src/app/deposit/datasets/depositBySubjectResult.component.ts
View File

@ -53,7 +53,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<paging-no-load [currentPage]="page" [totalResults]="fetchDataproviders.searchUtils.totalResults" size=10 (pageChange)="pageChange($event)"> </paging-no-load>
</div>
<div class="" *ngIf="fetchDataproviders.results && fetchDataproviders.searchUtils.totalResults > 0">
{{fetchDataproviders.searchUtils.totalResults}} data providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}}
{{fetchDataproviders.searchUtils.totalResults}} content providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}}
</div>
<search-result [(results)]="fetchDataproviders.results"
@ -63,7 +63,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE && subject != ''" class = "uk-alert uk-alert-primary">
No Data providers found with classification "{{subject}}".
No content providers found with classification "{{subject}}".
</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.ERROR && subject != ''" class = "uk-alert uk-alert-danger">
An error occured.
@ -116,7 +116,7 @@ export class DepositBySubjectResultComponent {
this.status = this.errorCodes.LOADING;
this.updateTitle("Deposit "+this.requestFor);
this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor);
this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor);
this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
@ -146,7 +146,7 @@ export class DepositBySubjectResultComponent {
this.searchDataproviders();
});
}
totalPages(): number {
let totalPages:any = this.fetchDataproviders.searchUtils.totalResults/(this.fetchDataproviders.searchUtils.size);
if(!(Number.isInteger(totalPages))) {

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

@ -32,7 +32,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';
<a href="{{helpdesk}}" target="_blank">ask a question (<i class="custom-external"></i>)</a> to OpenAIRE’s national representative.
</p>
<h3>Locate data provider via your institution</h3>
<h3>Locate content provider via your institution</h3>
<form class= "uk-grid">
<div class="uk-width-1-2 ">
@ -77,7 +77,7 @@ export class DepositComponent {
this.ercGuidlines = OpenaireProperties.getERCGuidlines();
this.helpdesk = OpenaireProperties.getHelpdesk();
this.updateTitle("Deposit "+this.requestFor);
this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor);
this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor);
this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
}

2
portal-2/src/app/deposit/deposit.module.ts
View File

@ -1,4 +1,4 @@
/* Common Component of deposit for both datasets & ppublications*/
/* Common Component of deposit for both research data & ppublications*/
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

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

@ -32,7 +32,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';
<div *ngIf="status != errorCodes.LOADING" class="uk-margin-bottom">
<h3>Locate data provider via your institution</h3>
<h3>Locate content provider via your institution</h3>
<form class= "uk-grid">
<div class="uk-width-1-2 ">
@ -51,7 +51,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
<h2 *ngIf="organization != undefined">
<span>Data providers for institution: </span>
<span>content providers for institution: </span>
<a *ngIf="organization['url']!=''" href="{{organization.url}}" target="_blank">
<span>{{organization['name']}} (<i class="custom-external"></i>)</span>
</a>
@ -92,7 +92,7 @@ import {PiwikService} from '../utils/piwik/piwik.service';
<span *ngIf="fetchDataproviders.searchUtils.status == errorCodes.ERROR">
An error occured.
</span>
No data providers found for institution:
No content providers found for institution:
<a *ngIf="organization['url']!=''" target="_blank" href="{{organization.url}}">
<span>{{organization['name']}} (<i class="custom-external"></i>)</span>
</a>
@ -153,7 +153,7 @@ export class DepositResultComponent {
this.status = this.errorCodes.LOADING;
this.updateTitle("Deposit "+this.requestFor);
this.updateDescription("Openaire, repositories, open access, data provider, compatibility, organization, deposit "+ this.requestFor);
this.updateDescription("Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor);
this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url);
this.piwiksub = this._piwikService.trackView("Deposit "+this.requestFor).subscribe();
}

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

@ -9,7 +9,7 @@ import {Component} from '@angular/core';
<div class="uk-container">
<deposit [compatibility]="'openaire____::47ce9e9f4fad46e732cff06419ecaabb||OpenDOAR'" [requestFor]="'Publications'"></deposit>
<h3>Or locate data provider in map</h3>
<h3>Or locate content provider in map</h3>
<div class="uk-margin-top">
<i-frame [url]="mapUrl"width="100%" height="900"></i-frame>
</div>

8
portal-2/src/app/landingPages/dataProvider/dataProvider.component.html
View File

@ -39,7 +39,7 @@
<li *ngIf="dataProviderInfo.openDoarURL">
<span class="uk-button-text">
<a target="_blank" href="{{dataProviderInfo.openDoarURL}}">
Detailed data provider information (OpenDOAR)
Detailed content provider information (OpenDOAR)
</a>
</span>
@ -47,7 +47,7 @@
<li *ngIf="dataProviderInfo.r3DataURL">
<span class="uk-button-text">
<a target="_blank" href="{{dataProviderInfo.r3DataURL}}">
Detailed data provider information (Re3data)
Detailed content provider information (Re3data)
</a>
</span>
@ -163,7 +163,7 @@
[organizations]="dataProviderInfo.organizations">
</organizationsTab>
<!--*ngIf=" tab.content=='relatedDatasourcesTab'"-->
<relatedDatasourcesTab *ngIf="activeTab=='Related Data Providers'"
<relatedDatasourcesTab *ngIf="activeTab=='Related Content Providers'"
[dataproviderId]="id"
[fetchResults]="fetchResultsAggregators"
[type]="relatedDataprovidersResultsType">
@ -193,7 +193,7 @@
<div *ngIf="(fetchPublications.searchUtils.totalResults > 0)">
<div>
<p class="uk-text-bold">Funders in Data Providers Publications</p>
<p class="uk-text-bold">Funders in content providers Publications</p>
<i-frame [url]=pubsFunderUrl width="800" height="350"></i-frame>
<p class="uk-text-bold">Projects with most Publications</p>
<i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>

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

@ -98,13 +98,13 @@ export class DataProviderComponent {
ngOnInit() {
this.sub = this.route.queryParams.subscribe(data => {
this.updateTitle("Data provider");
this.updateDescription("Data provider, search, repositories, open access");
this.updateTitle("Content provider");
this.updateDescription("Content provider, search, repositories, open access");
this.datasourceId = data['datasourceId'];
if(this.datasourceId){
this.getDataProviderInfo(this.datasourceId);
}else{
// console.info("Datasource id not found");
// console.info("Content Provider id not found");
}
if (typeof document !== 'undefined') {
@ -136,7 +136,7 @@ export class DataProviderComponent {
this.initTabs();
this.showTabs = true ;
this.updateTitle(this.dataProviderInfo.title.name);
this.updateDescription("Data provider, search, repositories, open access,"+this.dataProviderInfo.title.name);
this.updateDescription("Content provider, search, repositories, open access,"+this.dataProviderInfo.title.name);
if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView(this.dataProviderInfo.title.name).subscribe();
}
@ -197,7 +197,7 @@ export class DataProviderComponent {
this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Data"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
this.pubsProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
//if({"name": "Publications", "content": "publicationsTab"} in this.dataProviderInfo.tabs) {

4
portal-2/src/app/landingPages/dataProvider/dataProvider.service.ts
View File

@ -86,12 +86,12 @@ export class DataProviderService {
this.dataProviderInfo.tabs.push({"name": "Projects", "content": "projectsTab"});
}
if(this.dataProviderInfo.tabsInTypes.datasourcesTab.has(data[1].classid)) {
this.dataProviderInfo.tabs.push({"name": "Datasources", "content": "datasourcesTab"});
this.dataProviderInfo.tabs.push({"name": "Content Providers", "content": "datasourcesTab"});
}
this.dataProviderInfo.tabs.push({"name": "Organizations", "content": "organizationsTab"});
if(this.dataProviderInfo.tabsInTypes.relatedDatasourcesTab.has(data[1].classid)) {
this.dataProviderInfo.tabs.push({"name": "Related Data Providers", "content": "relatedDatasourcesTab"});
this.dataProviderInfo.tabs.push({"name": "Related Content Providers", "content": "relatedDatasourcesTab"});
}
if(this.dataProviderInfo.tabsInTypes.statisticsTab.has(data[1].classid)) {

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

@ -12,7 +12,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
<div *ngIf="fetchDatasets.searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>
<!--div *ngIf="fetchDatasets.searchUtils.totalResults == 0" class = "uk-alert">
There are no datasets
There are no research data
</div-->
<div *ngIf="fetchDatasets.searchUtils.totalResults > 0">
@ -24,7 +24,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
</div>
<tab-result [(results)]="fetchDatasets.results"
[(status)]= "fetchDatasets.searchUtils.status"
type="dataset" urlParam="datasetId">
type="research data" urlParam="datasetId">
</tab-result>
</div>
`

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

@ -6,13 +6,13 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
@Component({
selector: 'datasourcesTab',
template: `
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no data providers</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no content providers</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>
<!--div *ngIf="fetchDataproviders.searchUtils.totalResults == 0" class = "uk-alert">
There are no datasources
There are no content providers
</div-->
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">

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

@ -9,20 +9,20 @@ import {RouterHelper} from '../../utils/routerHelper.class';
@Component({
selector: 'relatedDatasourcesTab',
template: `
<div *ngIf="fetchResults.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no related data providers</div>
<div *ngIf="fetchResults.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no related content providers</div>
<div *ngIf="fetchResults.searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
<div *ngIf="fetchResults.searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
<div *ngIf="fetchResults.searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>
<!--div *ngIf="fetchResults.results.length == 0" class = "uk-alert">
There are no related dataproviders
There are no related content providers
</div-->
<div *ngIf="fetchResults.results.length > 0">
<table class="uk-table uk-table-striped">
<thead>
<tr>
<th class="uk-text-center">Data Provider Name</th>
<th class="uk-text-center">Content Provider Name</th>
<th class="uk-text-center">Number of {{type}}</th>
</tr>
</thead>

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

@ -29,7 +29,7 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro
<div *ngIf="(searchPublicationsComponent.searchUtils.totalResults > 0)">
<div>
<p class="uk-text-bold">Funders in Data Providers Publications</p>
<p class="uk-text-bold">Funders in content providers Publications</p>
<i-frame [url]=pubsFunderUrl width="800" height="350"></i-frame>
<p class="uk-text-bold">Projects with most Publications</p>
<i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>

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

@ -93,7 +93,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
<div *ngIf="(fetchPublications.searchUtils.totalResults > 0)">
<div>
<p class="uk-text-bold">Funders in Data Providers Publications</p>
<p class="uk-text-bold">Funders in content providers Publications</p>
<i-frame [url]=pubsFunderUrl width="800" height="350"></i-frame>
<p class="uk-text-bold">Projects with most Publications</p>
<i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>

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

@ -385,7 +385,7 @@
</span></a>
<div class="uk-float-left " uk-tooltip="pos:right; delay:5"
title='<div id="linkinginfo" class= "uk-margin uk-padding-small">
<p>Do you think that information is missing about a project, a community or other research results related to this dataset?</p>
<p>Do you think that information is missing about a project, a community or other research results related to this research data?</p>
<p>You are able to enhance it! Please follow the links and create the missing relations.</p>
</div>'><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="question" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="10" cy="10" r="9"></circle><circle cx="10.44" cy="14.42" r="1.05"></circle><path fill="none" stroke="#000" stroke-width="1.2" d="M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75"></path></svg></span>
</div>

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

@ -68,7 +68,7 @@ export class DatasetComponent {
this.getDatasetInfo(this.datasetId);
}else{
this.showLoading = false;
this.warningMessage="No valid dataset id";
this.warningMessage="No valid research data id";
}
this.metricsClicked = false;
@ -125,7 +125,7 @@ export class DatasetComponent {
console.log(err)
console.info("error");
this.errorMessage = 'No dataset found';
this.errorMessage = 'No research data found';
this.showLoading = false;
}
);

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

@ -78,13 +78,13 @@ export class HtmlProjectReportComponent{
this.warningMessage="Requested size is not an integer";
}
if(params['type'] && (params['type'] == "dataset" || params['type'] == "publication")){
if(params['type'] && (params['type'] == "research data" || params['type'] == "publication")){
this.resultsType = params['type'];
this.updateTitle("Project's "+this.resultsType+" report");
this.updateDescription("project, project "+ this.resultsType +" report, funding, open access, publications, datasets, ");
this.updateDescription("project, project "+ this.resultsType +" report, funding, open access, publications, research data");
} else {
this.showLoading = false;
this.warningMessage="Requested type should be publication or dataset";
this.warningMessage="Requested type should be publication or research data";
}
//showLoading is true if no warnings
@ -124,7 +124,7 @@ export class HtmlProjectReportComponent{
}
);
this.header2 = this.totalResults+((this.resultsType == "publication")?" publications":" datasets");
this.header2 = this.totalResults+((this.resultsType == "publication")?" publications":" research data");
}
createClipboard() {
@ -164,7 +164,7 @@ export class HtmlProjectReportComponent{
}
createHeader1(data: {"title": string, "acronym": string, "callIdentifier": string}) {
this.header1 = ((this.resultsType == "publication")?"Publications":"Datasets") + " of Project ";
this.header1 = ((this.resultsType == "publication")?"Publications":"Research Data") + " of Project ";
if(data != undefined) {
if(data.title != undefined && data.title != "") {

2
portal-2/src/app/landingPages/landing-utils/parsingFunctions.class.ts
View File

@ -69,7 +69,7 @@ export class ParsingFunctions {
return fundedByProjects;
}
// publication & dataset : for fundedByProjects | project landing : for funding
// publication & research data : for fundedByProjects | project landing : for funding
public parseFundingTrees(fundingTree: any): {"funderName": string, "funderShortname": string, "stream": string} {
let funding: {"funderName": string, "funderShortname": string, "stream": string} = {"funderName": "", "funderShortname": "", "stream": ""};
let length = Array.isArray(fundingTree) ? fundingTree.length : 1;

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

@ -33,10 +33,10 @@
</span>
</a>
</li>
<li (click)="activeTab='Data Providers'; searchDataprovidersInit()"
[class]="activeTab == 'Data Providers'?'uk-active':''">
<li (click)="activeTab='Content Providers'; searchDataprovidersInit()"
[class]="activeTab == 'Content Providers'?'uk-active':''">
<a>
Data Providers
Content Providers
<!--span *ngIf="organizationInfo.dataProviders == undefined" class="badge">0</span>
<span *ngIf="organizationInfo.dataProviders != undefined" class="badge">
{{organizationInfo.dataProviders.length}}
@ -70,10 +70,10 @@
</span>
</a>
</li>
<li (click)="activeTab='Data Providers'; searchDataprovidersInit()"
[class]="activeTab == 'Data Providers'?'uk-active':''">
<li (click)="activeTab='Content Providers'; searchDataprovidersInit()"
[class]="activeTab == 'Content Providers'?'uk-active':''">
<a>
Data Providers
Content Providers
<span class="uk-badge uk-badge-notification">
{{fetchDataproviders.searchUtils.totalResults}}
</span>
@ -107,13 +107,13 @@
<searchingProjectsTab *ngIf="projectsClicked" [(fetchProjects)]="fetchProjects" [organizationId]="organizationId"></searchingProjectsTab>
</div>
<div *ngIf="activeTab=='Data Providers'" class="uk-animation-fade">
<div *ngIf="activeTab=='Content Providers'" class="uk-animation-fade">
<!--showDataProviders [dataProviders]="organizationInfo.dataProviders"></showDataProviders-->
<!--div *ngIf="fetchDataproviders.searchUtils.totalResults == 0" class = "uk-alert uk-alert-primary">
There are no dataproviders
There are no content providers
</div-->
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no data providers</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no content providers</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
<div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>

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

@ -228,7 +228,7 @@ export class OrganizationComponent {
if(this.fetchDataproviders.searchUtils.totalResults > 0) {
this.reloadDataproviders = false;
//this.activeTab = "Data Providers";
//this.activeTab = "Content Providers";
} else {
}

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

@ -178,7 +178,7 @@
</div>
<tab-result [(results)]="fetchDatasets.results"
[(status)]= "fetchDatasets.searchUtils.status"
type="dataset" urlParam="datasetId">
type="research data" urlParam="datasetId">
</tab-result>
</div>
</div>
@ -289,7 +289,7 @@
</li>
<li>
<a target="_blank"
href="/project-report?projectId={{projectId}}&size={{fetchDatasets.searchUtils.totalResults}}&type=dataset">
href="/project-report?projectId={{projectId}}&size={{fetchDatasets.searchUtils.totalResults}}&type=research data">
<span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span> Get {{projectInfo.funder}} report (HTML)
</a>
</li>

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

@ -84,7 +84,7 @@ export class ProjectComponent{
this.fetchDatasets = new FetchDatasets(this._searchDatasetsService);
this.updateTitle("Project");
this.updateDescription("project, funding, open access, publications, datasets, ");
this.updateDescription("project, funding, open access, publications, research data");
this.projectId = params['projectId'];
if(this.projectId){
@ -189,7 +189,7 @@ console.info(this.projectInfo.title);
this.projectName = this.projectInfo.title;
}
this.updateTitle(this.projectName);
this.updateDescription("project, funding, open access, publications, datasets, "+this.projectName+ ","+this.projectInfo.funder);
this.updateDescription("project, funding, open access, publications, research data, "+this.projectName+ ","+this.projectInfo.funder);
if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView(this.projectName).subscribe();
}

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

@ -276,7 +276,7 @@
</div>
</div>
<div *ngIf="activeTab == 'Organizations'" class="uk-animation-fade">
<div *ngIf="activeTab == 'Related Organizations'" class="uk-animation-fade">
<div *ngIf="!publicationInfo.organizations" class = "uk-alert uk-alert-primary">
There are no related organizations
</div>

6
portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -14,8 +14,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({
selector: 'advanced-search-dataprovider',
template: `
<advanced-search-page pageTitle="Advanced Search Data Providers" entityType="dataprovider"
type = "data providers"
<advanced-search-page pageTitle="Advanced Search Content Providers" entityType="dataprovider"
type = "content providers"
[(results)] = "results"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
[(searchUtils)] = "searchUtils"
@ -86,7 +86,7 @@ export class AdvancedSearchDataProvidersComponent {
this._searchDataProvidersService.advancedSearchDataproviders(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("Adv Search Data providers total="+this.searchUtils.totalResults);
console.info("Adv Search Content Providers total="+this.searchUtils.totalResults);
this.results = data[1];
this.searchPage.updateBaseUrlWithParameters();
var errorCodes:ErrorCodes = new ErrorCodes();

8
portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
View File

@ -13,8 +13,8 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
@Component({
selector: 'advanced-search-datasets',
template: `
<advanced-search-page pageTitle="Advanced Search Datasets" entityType="dataset"
type = "datasets"
<advanced-search-page pageTitle="Advanced Search Research Data" entityType="dataset"
type = "research data"
[(results)] = "results"
[(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
@ -87,11 +87,11 @@ export class AdvancedSearchDatasetsComponent {
this.results = [];
this.searchUtils.totalResults = 0;
console.info("Advanced Search Datasets: Execute search query "+parameters);
console.info("Advanced Search Research Data: Execute search query "+parameters);
this._searchDatasetsService.advancedSearchDatasets(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets total="+this.searchUtils.totalResults);
console.info("search Research Data total="+this.searchUtils.totalResults);
this.results = data[1];
this.searchPage.updateBaseUrlWithParameters();
var errorCodes:ErrorCodes = new ErrorCodes();

4
portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
View File

@ -17,7 +17,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
<search-page pageTitle="OpenAIRE Content Providers"
formPlaceholderText = "Search for OpenAIRE Content Providers"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false
(queryChange)="queryChanged($event)"
@ -103,7 +103,7 @@ export class SearchCompatibleDataprovidersComponent {
this.subResults = this._searchDataprovidersService.searchCompatibleDataproviders(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, []).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Data Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Content Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
this.searchPage.checkSelectedFilters(this.filters);
this.searchPage.updateBaseUrlWithParameters(this.filters);

4
portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
View File

@ -16,7 +16,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
template: `
<search-page-table pageTitle="OpenAIRE Content Providers Table"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[showResultCount]=false
[disableForms]="disableForms"
@ -91,7 +91,7 @@ export class SearchCompatibleDataprovidersTableComponent {
this.subResults = this._searchDataprovidersService.searchCompatibleDataproviders("", null, 1, size, []).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Data Providers [total results:"+this.searchUtils.totalResults+"]");
console.info("search Content Providers [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
this.searchPage.checkSelectedFilters(this.filters);

2
portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts
View File

@ -17,7 +17,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
<search-page pageTitle="Entity Registries"
formPlaceholderText = "Search for Entity Registries"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false
(queryChange)="queryChanged($event)"

2
portal-2/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
View File

@ -16,7 +16,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
template: `
<search-page-table pageTitle="Entity Registries"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[showResultCount]=false
[disableForms]="disableForms"

2
portal-2/src/app/searchPages/dataProviders/journals.component.ts
View File

@ -17,7 +17,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
<search-page pageTitle="OpenAIRE Journals"
formPlaceholderText = "Search for OpenAIRE Journals"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false
(queryChange)="queryChanged($event)"

2
portal-2/src/app/searchPages/dataProviders/journalsTable.component.ts
View File

@ -16,7 +16,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
template: `
<search-page-table pageTitle="OpenAIRE Journals Table"
type="datasources" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[showResultCount]=false
[disableForms]="disableForms"

46
portal-2/src/app/searchPages/find/search.component.ts
View File

@ -63,7 +63,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<div>
<div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
<h2 class="el-title uk-margin uk-h2">
<span *ngIf="datasetsSize" class="uk-text-background">{{datasetsSize.number}} {{datasetsSize.size}} datasets</span>
<span *ngIf="datasetsSize" class="uk-text-background">{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
</h2>
</div>
</div>
@ -114,9 +114,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
</a>
</li>
<li (click)="searchDatasets()" [class]="activeTab == 'datasets'?'uk-active':''">
<li (click)="searchDatasets()" [class]="activeTab == 'research data'?'uk-active':''">
<a>
Datasets
Research Data
<span [class]="(fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}}</span>
</a>
@ -128,9 +128,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
</a>
</li>
<li (click)="searchDataProviders()" [class]="activeTab == 'dataproviders'?'uk-active':''">
<li (click)="searchDataProviders()" [class]="activeTab == 'content providers'?'uk-active':''">
<a>
Data Providers
Content Providers
<span [class]="(fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}}</span>
</a>
@ -155,9 +155,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<span *ngIf = "fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification">{{((keyword.length > 0)? fetchPublications.searchUtils.totalResults :'')}}</span>
</a>
</li>
<li (click)="searchDatasets()" [class]="activeTab == 'datasets'?'uk-active':''">
<li (click)="searchDatasets()" [class]="activeTab == 'research data'?'uk-active':''">
<a>
Datasets
Research Data
<span *ngIf = "fetchDatasets.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
<span *ngIf = "fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}}</span>
</a>
@ -169,9 +169,9 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<span *ngIf = "fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchProjects.searchUtils.totalResults :'')}}</span>
</a>
</li>
<li (click)="searchDataProviders()" [class]="activeTab == 'dataproviders'?'uk-active':''">
<li (click)="searchDataProviders()" [class]="activeTab == 'content providers'?'uk-active':''">
<a>
Data Providers
Content Providers
<span *ngIf = "fetchDataproviders.searchUtils.status == errorCodes.LOADING && keyword.length > 0" class="uk-icon-spinner uk-icon-spin"></span>
<span *ngIf = "fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0" class="uk-badge uk-badge-notification"> {{((keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}}</span>
</a>
@ -211,8 +211,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<!--/li>
<li-->
</div>
<div *ngIf = "activeTab=='datasets'" >
<div *ngIf = "keyword.length > 0 && activeTab=='datasets'" class ="uk-animation-fade">
<div *ngIf = "activeTab=='research data'" >
<div *ngIf = "keyword.length > 0 && activeTab=='research data'" class ="uk-animation-fade">
<div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults> 10">
<!--a [href] = "linkToSearchDatasets"-->
<a [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
@ -227,7 +227,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
type="dataset" urlParam="datasetId">
</search-result>
</div>
<div *ngIf = "keyword.length == 0 && activeTab=='datasets'" class ="uk-animation-fade">
<div *ngIf = "keyword.length == 0 && activeTab=='research data'" class ="uk-animation-fade">
<browse-entities entityName="dataset" baseUrl="/search/find/datasets" [refineFields]=searchFields.RESULT_REFINE_FIELDS></browse-entities>
</div>
<!--/li>
@ -255,8 +255,8 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<!--/li>
<li-->
</div>
<div *ngIf = "activeTab=='dataproviders'">
<div *ngIf = "keyword.length > 0 && activeTab=='dataproviders'" class ="uk-animation-fade">
<div *ngIf = "activeTab=='content providers'">
<div *ngIf = "keyword.length > 0 && activeTab=='content providers'" class ="uk-animation-fade">
<div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults> 10">
<!--a [href] = "linkToSearchDataproviders"-->
<a [queryParams]="routerHelper.createQueryParam('keyword', keyword)"
@ -271,7 +271,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
type="dataprovider" urlParam="datasourceId">
</search-result>
</div>
<div *ngIf = "keyword.length == 0 && activeTab=='dataproviders'" class ="uk-animation-fade" >
<div *ngIf = "keyword.length == 0 && activeTab=='content providers'" class ="uk-animation-fade" >
<browse-entities entityName="dataprovider" baseUrl="/search/find/dataproviders" [refineFields]=searchFields.DATASOURCE_REFINE_FIELDS></browse-entities>
</div>
<!--/li>
@ -367,7 +367,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
this.fetchOrganizations = new FetchOrganizations( this._searchOrganizationsService);
var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
var title = "Search publications, datasets, projects... | OpenAIRE";
var title = "Search publications, research data, projects... | OpenAIRE";
var url = OpenaireProperties.getBaseLink()+this._router.url;
this._meta.setTitle(title);
this._meta.updateMeta("description", description);
@ -376,7 +376,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
this._meta.updateProperty("og:url", url);
this.getNumbers();
if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView("Search publications, datasets, projects... | OpenAIRE").subscribe();
this.piwiksub = this._piwikService.trackView("Search publications, research data, projects... | OpenAIRE").subscribe();
}
}
@ -429,7 +429,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
}
public searchDatasets() {
this.activeTab = "datasets";
this.activeTab = "research data";
if(this.reloadDatasets &&
this.fetchDatasets.searchUtils.status != this.errorCodes.NONE &&
this.fetchDatasets.searchUtils.status != this.errorCodes.ERROR) {
@ -452,7 +452,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
}
public searchDataProviders() {
this.activeTab = "dataproviders";
this.activeTab = "content providers";
if( this.reloadDataproviders &&
this.fetchDataproviders.searchUtils.status != this.errorCodes.NONE &&
this.fetchDataproviders.searchUtils.status != this.errorCodes.ERROR) {
@ -485,10 +485,10 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
if(this.activeTab == "projects") {
this.searchProjects();
}
if(this.activeTab == "dataproviders") {
if(this.activeTab == "content providers") {
this.searchDataProviders();
}
if(this.activeTab == "datasets") {
if(this.activeTab == "research data") {
this.searchDatasets();
}
if(this.activeTab == "organizations") {
@ -517,7 +517,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
);
}
if(this.activeTab != "datasets"){
if(this.activeTab != "research data"){
this.fetchDatasets.searchUtils.status = this.errorCodes.LOADING;
this.fetchDatasets.results = [];
this.subData = this._searchDatasetsService.numOfSearchDatasets(this.keyword).subscribe(
@ -551,7 +551,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
);
}
if(this.activeTab != "dataproviders"){
if(this.activeTab != "content providers"){
this.fetchDataproviders.results = [];
this.fetchDataproviders.getNumForSearch(this.keyword);
}

2
portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
View File

@ -82,7 +82,7 @@ export class AdvancedSearchPageComponent {
ngOnInit() {
this.updateTitle("Advanced search "+this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, data provider, funder, project, "+ this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, "+ this.pageTitle);
if(typeof window !== 'undefined') {
this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
}

10
portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
View File

@ -163,7 +163,7 @@ export class SearchPageComponent {
this.updateBaseUrlWithParameters(this.filters);
this.defineUrlParam();
this.updateTitle(this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, data provider, funder, project, " + this.type + "," +this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle);
if(typeof window !== 'undefined') {
this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
}
@ -245,7 +245,7 @@ export class SearchPageComponent {
var doiQuery = "";
var keywordQuery = "";
if((keyword && keyword.length > 0)){
if((this.type == 'publications' ||this.type == 'datasets')){
if((this.type == 'publications' ||this.type == 'research data')){
var DOIs:string[] = DOI.getDOIsFromString(keyword);
var doisParams = "";
@ -295,7 +295,7 @@ export class SearchPageComponent {
var doiQuery = "";
var keywordQuery = "";
if((keyword && keyword.length > 0)){
if((this.type == 'publications' ||this.type == 'datasets')){
if((this.type == 'publications' ||this.type == 'research data')){
var DOIs:string[] = DOI.getDOIsFromString(keyword);
var doisParams = "";
@ -405,7 +405,7 @@ export class SearchPageComponent {
var doiQuery = "";
var keywordQuery = "";
if((this.searchUtils.keyword && this.searchUtils.keyword.length > 0)){
if((this.type == 'publications' ||this.type == 'datasets')){
if((this.type == 'publications' ||this.type == 'research data')){
var DOIs:string[] = DOI.getDOIsFromString(this.searchUtils.keyword);
var doisParams = "";
@ -446,7 +446,7 @@ export class SearchPageComponent {
var doiQuery = "";
var keywordQuery = "";
if((this.searchUtils.keyword && this.searchUtils.keyword.length > 0)){
if((this.type == 'publications' ||this.type == 'datasets')){
if((this.type == 'publications' ||this.type == 'research data')){
var DOIs:string[] = DOI.getDOIsFromString(this.searchUtils.keyword);
var doisParams = "";
for(var i =0 ;i < DOIs.length; i++){

4
portal-2/src/app/searchPages/searchUtils/searchPageTableView.component.ts
View File

@ -72,7 +72,7 @@ import {PiwikService} from '../../utils/piwik/piwik.service';
<thead *ngIf="searchUtils.totalResults > 0">
<tr><td colspan="5" class="uk-padding-remove-bottom uk-padding-remove-right">
<span>
{{searchUtils.totalResults}} datasources, page {{searchUtils.page}} of {{(totalPages())}}
{{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}}
</span>
<paging-no-load class="uk-float-right" [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [size]="rowsOnPage" (pageChange)="goTo($event.value, false)"></paging-no-load>
</td></tr>
@ -185,7 +185,7 @@ export class SearchPageTableViewComponent {
ngOnInit() {
this.updateTitle(this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, data provider, funder, project, " + this.type + "," +this.pageTitle);
this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle);
if(typeof window !== 'undefined') {
this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
}

6
portal-2/src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -16,7 +16,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
<search-page pageTitle="Search Content Providers"
formPlaceholderText = "Search for Content Providers"
type="data providers" entityType="dataprovider" [(filters)] = "filters"
type="content providers" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils" [baseUrl] = "baseUrl"
(queryChange)="queryChanged($event)" (downloadClick)="downloadClicked($event)"
[csvParams]="csvParams" csvPath="datasources" advancedSearchLink="/search/advanced/dataproviders"
@ -251,7 +251,7 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number)
this.subResults = this._searchDataprovidersService.searchDataproviders(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, this.searchPage.getFields()).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Data Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Content Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
if(refine){
this.filters = data[2];
@ -313,7 +313,7 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number)
this._searchDataprovidersService.searchDataprovidersCSV(parameters, this.searchPage.getRefineFieldsQuery(), 1, 1000).subscribe(
data => {
this.CSV.export = data;
ExportCSVComponent.downloadCSV(this.CSV, "dataproviders.csv");
ExportCSVComponent.downloadCSV(this.CSV, "content_providers.csv");
var errorCodes:ErrorCodes = new ErrorCodes();
this.searchUtils.status = errorCodes.DONE;

10
portal-2/src/app/searchPages/simple/searchDatasets.component.ts
View File

@ -17,7 +17,7 @@ import {DOI} from '../../utils/string-utils.class';
<search-page pageTitle="Search Research Data"
formPlaceholderText = "Search for Research Data"
type="datasets" entityType="dataset" [(filters)] = "filters"
type="research data" entityType="dataset" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" (queryChange)="queryChanged($event)"
[csvParams]="csvParams" csvPath="datasets" advancedSearchLink="/search/advanced/datasets"
@ -57,7 +57,7 @@ export class SearchDatasetsComponent {
public ngOnInit() {
this.searchPage.refineFields = this.refineFields;
this.searchPage.fieldIdsMap = this.fieldIdsMap;
this.searchPage.type = "datasets";
this.searchPage.type = "research data";
var firstLoad =true;
this.sub = this.route.queryParams.subscribe(params => {
this.searchUtils.keyword = (params['keyword']?params['keyword']:'');
@ -96,7 +96,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number)
this._searchDatasetsService.searchDatasetsForEntity(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets for "+entity+": [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data for "+entity+": [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();
@ -131,7 +131,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s
this._searchDatasetsService.searchDatasetsForDataproviders(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets for Dataproviders: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data for Dataproviders: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();
@ -185,7 +185,7 @@ private _getResults(parameters:string,refine:boolean, page: number, size: number
this.subResults = this._searchDatasetsService.searchDatasets(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, this.searchPage.getFields()).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
if(refine){
this.filters = data[2];

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

@ -36,9 +36,9 @@ import {Session} from '../login/utils/helper.class';
Search
<ul class="uk-nav-sub">
<li><a routerLinkActive="uk-link" routerLink="/search/find/publications" class="uk-offcanvas-close custom-offcanvas-close">Publications</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/datasets" class="uk-offcanvas-close custom-offcanvas-close">Datasets</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/datasets" class="uk-offcanvas-close custom-offcanvas-close">Research Data</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/projects" class="uk-offcanvas-close custom-offcanvas-close">Projects</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders" class="uk-offcanvas-close custom-offcanvas-close">Data Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders" class="uk-offcanvas-close custom-offcanvas-close">Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li>
</ul>
</li>
@ -130,9 +130,9 @@ import {Session} from '../login/utils/helper.class';
<div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="uk-link" routerLink="/search/find/publications">Publications</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/datasets">Datasets</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/datasets">Research Data</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/projects">Projects</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders">Data Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders">Content Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/find/organizations">Organizations</a></li>
</ul>
</div>

4
portal-2/src/app/utils/fetchEntitiesClasses/fetchDataproviders.class.ts
View File

@ -42,7 +42,7 @@ export class FetchDataproviders {
this.subResults = this._searchDataprovidersService.searchDataproviders(parameters,null, page, size,[]).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Data Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Content Providers: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();
@ -252,7 +252,7 @@ public getResultsBySubjectsForDeposit(subject:string, type:string, page: number,
this._searchDataprovidersService.searchDataprovidersCSV(parameters, "", 1, 1000).subscribe(
data => {
this.CSV.export = data;
ExportCSVComponent.downloadCSV(this.CSV, "dataproviders.csv");
ExportCSVComponent.downloadCSV(this.CSV, "content_providers.csv");
var errorCodes:ErrorCodes = new ErrorCodes();
this.searchUtils.status = errorCodes.DONE;

6
portal-2/src/app/utils/fetchEntitiesClasses/fetchDatasets.class.ts
View File

@ -53,7 +53,7 @@ export class FetchDatasets{
this.subResults = this._searchDatasetsService.searchDatasets(parameters,null, page, size, []).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();
@ -118,7 +118,7 @@ public getResultsForEntity(entity:string, id:string, page: number, size: number)
this._searchDatasetsService.searchDatasetsForEntity(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets for "+entity+": [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data for "+entity+": [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();
@ -156,7 +156,7 @@ public getResultsForDataproviders(id:string, resultsFrom:string, page: number, s
this._searchDatasetsService.searchDatasetsForDataproviders(parameters, page, size).subscribe(
data => {
this.searchUtils.totalResults = data[0];
console.info("search Datasets for Dataproviders: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
console.info("search Research Data for Dataproviders: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]");
this.results = data[1];
var errorCodes:ErrorCodes = new ErrorCodes();

12
portal-2/src/app/utils/properties/searchFields.ts
View File

@ -19,8 +19,8 @@ export class SearchFields {
["relperson"]:{name:"Author", type:"keyword", param:"author", equalityOperator: "="},
["resultpublisher"]:{name:"Publisher", type:"keyword", param:"publisher", equalityOperator: "="},
["pid"]:{name:"PID", type:"keyword", param:"pid", equalityOperator: " = "},
["resulthostingdatasourceid"]:{name:"Hosting Data Provider", type:"entity", param:"hostedBy", equalityOperator: " exact "},
["resulthostingdatasource"]:{name:"Datasource", type:"refine", param:"hostedBy", equalityOperator: " exact "},
["resulthostingdatasourceid"]:{name:"Hosting Content Provider", type:"entity", param:"hostedBy", equalityOperator: " exact "},
["resulthostingdatasource"]:{name:"Content Provider", type:"refine", param:"hostedBy", equalityOperator: " exact "},
["instancetypename"]:{name:"Type", type:"vocabulary", param:"type", equalityOperator: " exact "},
// ["instancetypenameid"]:{name:"Type", type:"vocabulary", param:"type", equalityOperator: " exact "},
["resultlanguagename"]:{name:"Language", type:"vocabulary", param:"lang", equalityOperator: " exact "},
@ -36,9 +36,9 @@ export class SearchFields {
["resultdateofacceptance"]:{name:"Publication Date", type:"date", param:"date", equalityOperator: " within "},
["resultbestlicense"]:{name:"Access Mode", type:"vocabulary", param:"access", equalityOperator: " exact "},
// ["resultbestlicenseid"]:{name:"Access Mode", type:"refine", param:"access", equalityOperator: " exact "},
["collectedfrom"]:{name:"Datasource", type:"refine", param:"datasource", equalityOperator: " exact "},
["collectedfrom"]:{name:"Content Provider", type:"refine", param:"datasource", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Data Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
//PROJECT
@ -66,7 +66,7 @@ export class SearchFields {
["projectecsc39"]:{name:"Special Clause 39", type:"boolean", param:"sc39", equalityOperator: " exact "},
["projectcode_nt"]:{name:"Project Code", type:"keyword", param:"code", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Data Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
@ -91,7 +91,7 @@ export class SearchFields {
["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"refine", param:"compatibility", equalityOperator: " exact "},
["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Data Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
public COMPATIBLE_DATAPROVIDER_FIELDS:string[] = ["datasourcetypeuiid","datasourcecompatibilityname"];

8
portal-2/src/app/utils/properties/searchFields_new.ts
View File

@ -33,8 +33,8 @@ export class SearchFields {
["resultacceptanceyear"]:{name:"Year", type:"year", param:"year", equalityOperator: " exact "},
["resultbestlicense"]:{name:"Access Mode", type:"refine", param:"access", equalityOperator: " exact "},
["resultbestlicenseid"]:{name:"Access Mode", type:"vocabulary", param:"access", equalityOperator: " exact "},
["collectedfrom"]:{name:"Datasource", type:"refine", param:"datasource", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfrom"]:{name:"Content Provider", type:"refine", param:"datasource", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
//PROJECT
@ -61,7 +61,7 @@ export class SearchFields {
["projectecsc39"]:{name:"Special Clause 39", type:"boolean", param:"sc39", equalityOperator: " exact "},
["projectcode"]:{name:"Project Code", type:"keyword", param:"code", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
@ -86,7 +86,7 @@ export class SearchFields {
["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", equalityOperator: " exact "},
["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"refine", param:"compatibility", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};

8
portal-2/src/app/utils/properties/searchFields_old.ts
View File

@ -33,8 +33,8 @@ export class SearchFields {
["resultacceptanceyear"]:{name:"Year", type:"year", param:"year", equalityOperator: " exact "},
["resultbestlicense"]:{name:"Access Mode", type:"refine", param:"access", equalityOperator: " exact "},
["resultbestlicenseid"]:{name:"Access Mode", type:"vocabulary", param:"access", equalityOperator: " exact "},
["collectedfrom"]:{name:"Datasource", type:"refine", param:"datasource", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfrom"]:{name:"Content Provider", type:"refine", param:"datasource", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
//PROJECT
@ -61,7 +61,7 @@ export class SearchFields {
["projectecsc39"]:{name:"Special Clause 39", type:"boolean", param:"sc39", equalityOperator: " exact "},
["projectcode"]:{name:"Project Code", type:"keyword", param:"code", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};
@ -86,7 +86,7 @@ export class SearchFields {
["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", equalityOperator: " exact "},
["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"refine", param:"compatibility", equalityOperator: " exact "},
["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
["collectedfromdatasourceid"]:{name:"Collected from Datasource", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
};

2
portal-2/src/app/utils/showDataProviders.component.ts
View File

@ -5,7 +5,7 @@ import {Component, Input} from '@angular/core';
template: `
<div *ngIf="dataProviders == undefined" class = "alert alert-info ">
There are no data providers
There are no content providers
</div>
<div *ngIf="dataProviders != undefined">