add fadein animation | change search urls to query BETA
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45482 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki
parent
9b641ebf1e
commit
f035292eb3
|
|
@ -19,16 +19,16 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic
|
|||
Are you a grant recipient from the following: H2020; FP7 with SC39; or ERC?
|
||||
</i>
|
||||
Then you are required to publish in
|
||||
<a href="{{openAccess}}" target="_blank">open access ( <i class="uk-icon-external-link"></i> )</a>.
|
||||
<a href="{{openAccess}}" target="_blank">open access (<i class="uk-icon-external-link"></i>)</a>.
|
||||
One way to do this is to deposit your {{requestFor}} into an
|
||||
<a href="{{openAccessRepo}}" target="_blank">open access repository ( <i class="uk-icon-external-link"></i> )</a>.
|
||||
<a href="{{openAccessRepo}}" target="_blank">open access repository (<i class="uk-icon-external-link"></i>)</a>.
|
||||
</p>
|
||||
<p>
|
||||
Click the following to find more information:
|
||||
<a href="{{fp7Guidlines}}" target="_blank">FP7 guidelines ( <i class="uk-icon-external-link"></i> )</a>,
|
||||
<a href="{{h2020Guidlines}}" target="_blank">H2020 guidelines ( <i class="uk-icon-external-link"></i> )</a>,
|
||||
<a href="{{ercGuidlines}}" target="_blank">ERC guidelines ( <i class="uk-icon-external-link"></i> )</a> OR
|
||||
<a href="{{helpdesk}}" target="_blank">ask a question ( <i class="uk-icon-external-link"></i> )</a> to OpenAIRE’s national representative.
|
||||
<a href="{{fp7Guidlines}}" target="_blank">FP7 guidelines (<i class="uk-icon-external-link"></i>)</a>,
|
||||
<a href="{{h2020Guidlines}}" target="_blank">H2020 guidelines (<i class="uk-icon-external-link"></i>)</a>,
|
||||
<a href="{{ercGuidlines}}" target="_blank">ERC guidelines (<i class="uk-icon-external-link"></i>)</a> OR
|
||||
<a href="{{helpdesk}}" target="_blank">ask a question (<i class="uk-icon-external-link"></i>)</a> to OpenAIRE’s national representative.
|
||||
</p>
|
||||
|
||||
<h3>Locate data provider via your institution</h3>
|
||||
|
|
@ -41,7 +41,7 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic
|
|||
<button class="uk-button" type="submit" (click)="organizationSelected(selectedId)" >
|
||||
Locate
|
||||
</button>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">{{warningMessage}}</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import {OrganizationService} from '../services/organization.service';
|
|||
<h2 *ngIf="organization != undefined">
|
||||
<span>Data providers for institution: </span>
|
||||
<a *ngIf="organization['url']!=''" href="{{organization.url}}" target="_blank">
|
||||
<span>{{organization['name']}} ( <i class="uk-icon-external-link"></i> )</span>
|
||||
<span>{{organization['name']}} (<i class="uk-icon-external-link"></i>)</span>
|
||||
</a>
|
||||
<span *ngIf="organization['url']==''">{{organization['name']}}</span>
|
||||
</h2>
|
||||
|
|
@ -61,7 +61,7 @@ import {OrganizationService} from '../services/organization.service';
|
|||
</div>
|
||||
|
||||
You can still deposit your {{requestFor}} in
|
||||
<a href="{{zenodo}}" target="_blank">OpenAIRE's Zenodo catch-all repository ( <i class="uk-icon-external-link"></i> )</a>
|
||||
<a href="{{zenodo}}" target="_blank">OpenAIRE's Zenodo catch-all repository (<i class="uk-icon-external-link"></i>)</a>
|
||||
hosted by CERN.
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ import{TabsComponent} from './tabs.component';
|
|||
|
||||
export class DataProviderComponent {
|
||||
constructor (private _dataproviderService: DataProviderService, private route: ActivatedRoute) {
|
||||
|
||||
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.queryParams.subscribe(data => {
|
||||
this.datasourceId = data['datasourceId'];
|
||||
console.info("Datasource id is :"+this.datasourceId);
|
||||
// console.info("Datasource id is :"+this.datasourceId);
|
||||
if(this.datasourceId){
|
||||
this.getDataProviderInfo(this.datasourceId);
|
||||
}else{
|
||||
console.info("Datasource id not found");
|
||||
// console.info("Datasource id not found");
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -57,16 +57,16 @@ export class DataProviderComponent {
|
|||
this.errorMessage=""
|
||||
if(this.datasourceId==null || this.datasourceId==''){
|
||||
this.warningMessage="No valid datasource id";
|
||||
console.info("novalid");
|
||||
// console.info("novalid");
|
||||
}else{
|
||||
this._dataproviderService.getDataproviderInfo(this.datasourceId).subscribe(
|
||||
data => {
|
||||
this.dataProviderInfo = data;
|
||||
console.info(this.dataProviderInfo.resultsBy);
|
||||
// console.info(this.dataProviderInfo.resultsBy);
|
||||
},
|
||||
err => {
|
||||
console.log(err)
|
||||
console.info("error");
|
||||
// console.info("error");
|
||||
this.errorMessage = 'No dataProvider found';
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ export class DatasourcesTabComponent {
|
|||
|
||||
ngOnInit() {
|
||||
this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders()+this.paramsForSearchLink;
|
||||
console.info(this.linkToSearchDataproviders);
|
||||
// console.info(this.linkToSearchDataproviders);
|
||||
}
|
||||
|
||||
ngOnDestroy() {}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
|
|||
<div>
|
||||
<p class="uk-text-bold">Funders in Data Providers Publications</p>
|
||||
<i-frame [url]=pubsFunderUrl width="800" height="350"></i-frame>
|
||||
<p>Projects with most Publications</p>
|
||||
<p class="uk-text-bold">Projects with most Publications</p>
|
||||
<i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import {SearchFields} from '../../utils/properties/searchFields';
|
|||
</div>
|
||||
<div class=" uk-grid uk-margin-top uk-width-1-1">
|
||||
|
||||
<ul class="uk-tab uk-tab-left uk-width-large-1-5 uk-width-small-1-1 " data-uk-tab="{connect:'#searchtabs'}">
|
||||
<ul class="uk-tab uk-tab-left uk-width-large-1-5 uk-width-small-1-1 " data-uk-switcher="{connect:'#searchtabs'}">
|
||||
<li (click)="searchPublications()" >
|
||||
<a href="#pubsTab">
|
||||
Publications {{((keyword.length > 0)?'('+searchPublicationsComponent.searchUtils.totalResults+')':'')}}
|
||||
|
|
@ -73,57 +73,57 @@ import {SearchFields} from '../../utils/properties/searchFields';
|
|||
|
||||
<ul id="searchtabs" class="uk-switcher uk-margin-left uk-width-large-3-4 uk-width-small-1-1">
|
||||
<li id="pubsTab" class="uk-active">
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='publications'" >
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='publications'" class ="uk-animation-fade" >
|
||||
<browse-entities entityName="publication" baseUrl="/search/find/publications" [refineFields]=searchFields.RESULT_REFINE_FIELDS></browse-entities>
|
||||
</div>
|
||||
</li>
|
||||
<li id="dataTab">
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='datasets'" >
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='datasets'" class ="uk-animation-fade">
|
||||
<browse-entities entityName="dataset" baseUrl="/search/find/datasets" [refineFields]=searchFields.RESULT_REFINE_FIELDS></browse-entities>
|
||||
</div>
|
||||
</li>
|
||||
<li id="projectsTab" >
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-text-right" *ngIf = "searchProjectsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchProjects" >View all {{searchProjectsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchProjectsComponent.results" [(status)]= "searchProjectsComponent.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='projects'" >
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='projects'" class ="uk-animation-fade">
|
||||
<browse-entities entityName="project" baseUrl="/search/find/projects" [refineFields]=searchFields.PROJECT_REFINE_FIELDS></browse-entities>
|
||||
</div>
|
||||
</li>
|
||||
<li id="dataProviderTab">
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-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.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='dataproviders'" >
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='dataproviders'" class ="uk-animation-fade" >
|
||||
<browse-entities entityName="dataprovider" baseUrl="/search/find/dataproviders" [refineFields]=searchFields.DATASOURCE_REFINE_FIELDS></browse-entities>
|
||||
</div>
|
||||
</li>
|
||||
<li id="organizationsTab" >
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-text-right" *ngIf = "searchOrganizationsComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchOrganizations" >View all {{searchOrganizationsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchOrganizationsComponent.results" [(status)]= "searchOrganizationsComponent.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='organizations'" >
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='organizations'" class ="uk-animation-fade">
|
||||
<browse-entities entityName="organization" baseUrl="/search/find/organizations" [refineFields]=searchFields.ORGANIZATION_REFINE_FIELDS></browse-entities>
|
||||
</div>
|
||||
</li>
|
||||
<li id="peopleTab">
|
||||
<div *ngIf = "keyword.length > 0">
|
||||
<div *ngIf = "keyword.length > 0" class ="uk-animation-fade">
|
||||
<div class = "uk-text-right" *ngIf = "searchPeopleComponent.searchUtils.totalResults> 10" ><a [href] = "linkToSearchPeople" >View all {{searchPeopleComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchPeopleComponent.results" [(status)]= "searchPeopleComponent.status"></search-result>
|
||||
</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='people'" >
|
||||
<div class="uk-alert uk-alert-info" role="alert">No person statistics found</div>
|
||||
<div *ngIf = "keyword.length == 0 && activeTab=='people'" class ="uk-animation-fade">
|
||||
<div class="uk-alert uk-alert-info " role="alert">No person statistics found</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -284,11 +284,11 @@ public subPub;public subData;public subProjects;public subOrg;public subPeople;
|
|||
public keywordChanged($event){
|
||||
this.keyword = $event.value;
|
||||
console.info("Search Find: search with keyword \"" + this.keyword + "\"" );
|
||||
if(location.pathname.indexOf("search/find") ==-1){
|
||||
// if(location.pathname.indexOf("search/find") ==-1){
|
||||
this.location.go(location.pathname+"search/find","?keyword=" + this.keyword);
|
||||
}else{
|
||||
this.location.go(location.pathname,"?keyword=" + this.keyword);
|
||||
}
|
||||
// }else{
|
||||
// this.location.go(location.pathname,"?keyword=" + this.keyword);
|
||||
// }
|
||||
|
||||
//unsubscribeSearch();
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import {Dates} from '../../utils/string-utils.class';
|
|||
template: `
|
||||
<form class="uk-form">
|
||||
<table class="uk-text-center">
|
||||
<tr *ngFor="let selectedField of selectedFields; let i = index" class="uk-form-row ">
|
||||
<tr *ngFor="let selectedField of selectedFields; let i = index" class="uk-form-row uk-animation-fade">
|
||||
<td *ngIf ="i==0 ">Search for:</td>
|
||||
|
||||
<td *ngIf = "i != 0" ><select [(ngModel)]="selectedField.operatorId" name="selectOp_{{i}}" >
|
||||
|
|
@ -45,9 +45,14 @@ import {Dates} from '../../utils/string-utils.class';
|
|||
<input type="radio" [(ngModel)]="selectedField.value" [name]=selectedField.param value="false">No<br>
|
||||
</span>
|
||||
</td>
|
||||
<td *ngIf="selectedFields.length > 1"><button type="button" class="uk-button uk-button-danger" (click)="removeField(i)">
|
||||
<i class="uk-icon-minus"></i>
|
||||
</button></td>
|
||||
<td >
|
||||
<button *ngIf="selectedFields.length > 1" type="button" class="uk-button uk-button-danger" (click)="removeField(i)">
|
||||
<i class="uk-icon-minus"></i>
|
||||
</button>
|
||||
<button *ngIf="selectedFields.length == 1" type="button" class="uk-button uk-button-danger" disabled>
|
||||
<i class="uk-icon-minus" ></i>
|
||||
</button>
|
||||
</td>
|
||||
<td *ngIf="i == selectedFields.length-1 " ><button type="button" class="uk-button uk-button-success" (click)="addField()">
|
||||
<i class="uk-icon-plus"></i>
|
||||
</button></td>
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ import {SearchUtilsClass} from '../searchUtils/searchUtils.class';
|
|||
selector: 'browse-entities',
|
||||
template: `
|
||||
<div>
|
||||
<div *ngIf="status == errorCodes.LOADING" class="uk-alert uk-alert-primary" role="alert">Loading...</div>
|
||||
<div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
|
||||
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
|
||||
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
|
||||
<div *ngIf="status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div>
|
||||
<div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">No Results found</div>
|
||||
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
|
||||
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
|
||||
|
||||
<div class ="uk-grid">
|
||||
<div *ngFor= "let filter of filters" class = "uk-margin-top uk-width-large-1-5 uk-width-medium-1-4 uk-width-small-1-2">
|
||||
<browse-statistic [baseUrl]=baseUrl [filter]=filter ></browse-statistic>
|
||||
<browse-statistic [baseUrl]=baseUrl [filter]=filter ></browse-statistic>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,17 +7,17 @@ import { Filter, Value} from './searchHelperClasses.class';
|
|||
selector: 'search-filter',
|
||||
template: `
|
||||
|
||||
<div class = "uk-accordion " data-uk-accordion="{collapse: true, showfirst: true}">
|
||||
<div *ngIf= "filter.values.length >0" class = "uk-accordion uk-animation-fade" data-uk-accordion="{collapse: true, showfirst: true}">
|
||||
<h3 class="uk-accordion-title uk-margin-bottom-remove uk-margin-top">{{_formatTitle(filter.title,filter.values.length)}}
|
||||
</h3>
|
||||
<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;" aria-expanded="false">
|
||||
<div class="uk-accordion-content searchFilterBoxValues ">
|
||||
<div *ngFor = "let value of getSelectedValues(filter)" >
|
||||
<div *ngFor = "let value of getSelectedValues(filter)" class = "uk-animation-fade">
|
||||
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
|
||||
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
|
||||
</div>
|
||||
<div class="uk-grid-divider uk-margin-remove"></div>
|
||||
<div *ngFor = "let value of getNotSelectedValues(filter)" >
|
||||
<div *ngFor = "let value of getNotSelectedValues(filter)" class = "uk-animation-fade">
|
||||
<input [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
|
||||
<span title = "{{value.name}}"> {{_formatName(value)}}</span><span *ngIf = "showResultCount === true" > ({{value.number}})</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,18 +21,16 @@ import {ModalLoading} from '../../utils/modal/loading.component';
|
|||
<div class="uk-width-1-1 uk-margin uk-panel uk-panel-box uk-panel-box-default">
|
||||
<search-form [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"></search-form>
|
||||
<div *ngIf="isFiltered()" class = " uk-text-center ">
|
||||
<span *ngIf = "searchUtils.keyword.length > 0">Keywords:
|
||||
<span>{{searchUtils.keyword}}<a (click) = "clearKeywords() "> <span class=" clickable" aria-hidden="true"><i class="uk-icon-remove"></i></span></a></span>
|
||||
<span *ngIf = "searchUtils.keyword.length > 0">Keywords:<span>{{searchUtils.keyword}}<a (click) = "clearKeywords() "><span class=" clickable" aria-hidden="true">[<i class="uk-icon-remove"></i>]</span></a></span>
|
||||
</span>
|
||||
<span *ngFor="let filter of filters " >
|
||||
<span *ngIf = "filter.countSelectedValues > 0"> {{filter.title}}:
|
||||
<span *ngFor="let value of filter.values.slice(0,filter.countSelectedValues); let i = index; let end = last; " >
|
||||
{{value.name}} <a (click) = "removeFilter(value, filter) "> <span class=" e clickable" aria-hidden="true"><i class="uk-icon-remove"></i></span></a>
|
||||
<span *ngIf="!end">,</span>
|
||||
<span *ngFor="let value of filter.values.slice(0,filter.countSelectedValues); let i = index; let end = last; " >{{value.name}}<a (click) = "removeFilter(value, filter) "><span class=" e clickable" aria-hidden="true">[<i class="uk-icon-remove"></i>]</span></a>
|
||||
<span *ngIf="!end">, </span>
|
||||
</span>
|
||||
</span>
|
||||
</span>
|
||||
<a (click)="clearFilters()" class = "btn uk-text-right"> Clear Filters</a>
|
||||
<a (click)="clearFilters()" class = "btn uk-text-right"> Clear Filters[<i class="uk-icon-remove"></i>]</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-grid uk-width-1-1 uk-margin">
|
||||
|
|
@ -82,7 +80,7 @@ export class SearchPageComponent {
|
|||
private queryParameters: Map<string, string> = new Map<string,string>();
|
||||
private baseURLWithParameters:string = '';
|
||||
private sub: any;
|
||||
|
||||
public countFilters= 0;
|
||||
constructor (private location: Location ) {
|
||||
|
||||
}
|
||||
|
|
@ -126,7 +124,6 @@ export class SearchPageComponent {
|
|||
|
||||
}
|
||||
var keyword = params['keyword'];
|
||||
console.info("Type:" + this.type + "filters: "+allFqs);
|
||||
var doiQuery = "";
|
||||
var keywordQuery = "";
|
||||
if((keyword && keyword.length > 0)){
|
||||
|
|
@ -276,7 +273,6 @@ export class SearchPageComponent {
|
|||
}
|
||||
var doiQuery = "";
|
||||
var keywordQuery = "";
|
||||
console.info("keyyyyword::::"+ this.searchUtils.keyword )
|
||||
if((this.searchUtils.keyword && this.searchUtils.keyword.length > 0)){
|
||||
if((this.type == 'publications' ||this.type == 'datasets')){
|
||||
var DOIs:string[] = DOI.getDOIsFromString(this.searchUtils.keyword);
|
||||
|
|
@ -294,7 +290,6 @@ export class SearchPageComponent {
|
|||
keywordQuery += "q=("+this.quote(this.searchUtils.keyword) +")"
|
||||
}
|
||||
}
|
||||
console.info("keyyyyword:::: doi:"+ doiQuery+ " keyword:"+keywordQuery )
|
||||
|
||||
return (doiQuery.length > 0 ? doiQuery:keywordQuery) + allFqs;
|
||||
|
||||
|
|
@ -381,14 +376,13 @@ export class SearchPageComponent {
|
|||
// console.info("searchUtils.page goto = "+this.searchUtils.page);
|
||||
this.queryParameters = new Map<string,string>();
|
||||
var urlParameters = this.createUrlParameters(this.filters,true);
|
||||
console.info("urlParams : "+urlParameters);
|
||||
// console.info("urlParams : "+urlParameters);
|
||||
this.updateBaseUrlWithParameters(this.filters);
|
||||
var queryParameters = this.createSearchQueryParameters(this.filters);
|
||||
console.info("queryParams : "+queryParameters);
|
||||
// console.info("queryParams : "+queryParameters);
|
||||
var indexQuery = this.createIndexQueryParameters(this.filters);
|
||||
|
||||
this.location.go(location.pathname,urlParameters);
|
||||
// console.info("SearchPAGE::page "+this.searchUtils.page);
|
||||
|
||||
this.queryChange.emit({
|
||||
value: queryParameters,
|
||||
|
|
@ -477,10 +471,14 @@ export class SearchPageComponent {
|
|||
}
|
||||
// for loading
|
||||
public openLoading(){
|
||||
this.loading.open();
|
||||
if(this.loading){
|
||||
this.loading.open();
|
||||
}
|
||||
}
|
||||
public closeLoading(){
|
||||
if(this.loading){
|
||||
this.loading.close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {Observable} from 'rxjs/Observable';
|
|||
@Component({
|
||||
selector: 'search-paging',
|
||||
template: `
|
||||
<div class= "searchPaging uk-panel">
|
||||
<div class= "searchPaging uk-panel uk-margin-top">
|
||||
<div class="uk-float-right" *ngIf="results && searchUtils.totalResults > searchUtils.size">
|
||||
<paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [baseUrl]="baseUrl" [size]="searchUtils.size"> </paging>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ import { ErrorCodes} from '../../utils/properties/openaireProperties';
|
|||
selector: 'search-result',
|
||||
template: `
|
||||
<ul class="uk-list uk-list-line uk-margin">
|
||||
<div *ngIf="status == errorCodes.LOADING" class="uk-alert uk-alert-primary" role="alert">Loading...</div>
|
||||
<div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
|
||||
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
|
||||
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
|
||||
<!--div *ngIf="status == errorCodes.LOADING" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">Loading...</div-->
|
||||
<div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">No Results found</div>
|
||||
<div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
|
||||
<div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
|
||||
|
||||
<li *ngFor="let result of results">
|
||||
<li *ngFor="let result of results" class="uk-animation-fade">
|
||||
<h4 [class] = result.title.accessMode [title] = result.title.accessMode >
|
||||
<a href="{{result['title'].url}}">
|
||||
<p *ngIf="result['title'].name != undefined && result['title'].name != ''"
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ export class SearchDataprovidersComponent {
|
|||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.searchUtils.keyword = (params['keyword']?params['keyword']:'');
|
||||
this.searchUtils.page = (params['page']=== undefined)?1:+params['page'];
|
||||
console.info("PAGE init = "+this.searchUtils.page);
|
||||
|
||||
var queryParameters = this.searchPage.getQueryParametersFromUrl(params);
|
||||
this._getResults(queryParameters, true, this.searchUtils.page, this.searchUtils.size);
|
||||
|
|
@ -218,6 +217,7 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number)
|
|||
}
|
||||
var errorCodes:ErrorCodes = new ErrorCodes();
|
||||
this.searchUtils.status = errorCodes.LOADING;
|
||||
|
||||
this.searchPage.openLoading();
|
||||
|
||||
this.subResults = this._searchDataprovidersService.searchDataproviders(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, this.searchPage.getFields()).subscribe(
|
||||
|
|
@ -255,7 +255,6 @@ public getResultsForDeposit(id:string, type:string, page: number, size: number)
|
|||
|
||||
public queryChanged($event) {
|
||||
var parameters = $event.value;
|
||||
console.info("PAGE queryChanged = "+this.searchUtils.page);
|
||||
this._getResults(parameters, true, this.searchUtils.page, this.searchUtils.size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -122,37 +122,52 @@ import 'rxjs/Rx';
|
|||
</ul>
|
||||
</div-->
|
||||
|
||||
<a href="#offcanvas-mainmenu" class="uk-navbar-toggle uk-visible-small" data-uk-offcanvas=""></a>
|
||||
|
||||
<a href="#offcanvas-mainmenu" class="uk-navbar-toggle uk-visible-small" data-uk-offcanvas="{mode:'slide'}"></a>
|
||||
<div class="uk-navbar-brand uk-navbar-center uk-visible-small"><img src="assets/newlogo.png" class="uk-responsive-height" title="OpenAIRE" alt="OpenAIRE" ></div>
|
||||
|
||||
</nav>
|
||||
|
||||
<!--div id="offcanvas-mainmenu" class="uk-offcanvas uk-active" aria-hidden="false">
|
||||
|
||||
|
||||
|
||||
<div id="offcanvas-mainmenu" class="uk-offcanvas " aria-hidden="false">
|
||||
|
||||
<div class="uk-offcanvas-bar uk-offcanvas-bar-show" mode="push">
|
||||
<!--ul class="uk-navbar-nav uk-hidden-small"-->
|
||||
<ul class="uk-nav uk-nav-offcanvas uk-nav-parent-icon" data-uk-nav="{multiple:true}">
|
||||
<!--li class="uk-active"><a href="/" class="uk-logo uk-navbar-item">
|
||||
<img src="assets/newlogo.png" alt="OpenAIRE" class="uk-responsive-height"></a>
|
||||
</li-->
|
||||
<li class="uk-active"><a href="/search/find"><i class="uk-icon-home"></i></a></li>
|
||||
|
||||
<ul class="uk-nav uk-nav-offcanvas uk-nav-parent-icon" data-uk-nav="">
|
||||
<li class="uk-active"><a href=""><a href=""><i class="uk-icon-home"></i> Home</a></a></li>
|
||||
<li class="uk-parent" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="">Search</a>
|
||||
<li class="" aria-expanded="false" >
|
||||
<a href="#">Search</a>
|
||||
|
||||
<div style="overflow:hidden;height:0;position:relative;" class="uk-hidden">
|
||||
<ul class="uk-nav-sub" role="menu">
|
||||
<div ><ul class="uk-nav-sub" role="menu">
|
||||
<li><a href="/search/find/publications">Publications</a></li>
|
||||
<li><a href="/search/find/datasets">Datasets</a></li>
|
||||
<li><a href="/search/find/projects">Projects</a></li>
|
||||
<li><a href="/search/find/dataproviders">Data Providers</a></li>
|
||||
<li><a href="/search/find/organizations">Organizations</a></li>
|
||||
<li><a href="/search/find/people">People</a></li>
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
<li class="uk-parent" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="">Advanced Search</a>
|
||||
<li class="" aria-expanded="false" >
|
||||
<a href="#">Data Providers</a>
|
||||
|
||||
<div style="overflow:hidden;height:0;position:relative;" class="uk-hidden">
|
||||
<ul class="uk-nav-sub" role="menu">
|
||||
<div ><ul class="uk-nav-sub" role="menu">
|
||||
<li><a href="/search/data-providers">Compatible Data Providers</a></li>
|
||||
<li><a href="/search/entity-registries">Entity Registries</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
<li class="" aria-expanded="false" >
|
||||
<a href="#">Advanced Search</a>
|
||||
|
||||
<div ><ul class="uk-nav-sub" role="menu">
|
||||
<li><a href="/search/advanced/publications">Advanced Search Publications</a></li>
|
||||
<li><a href="/search/advanced/datasets">Advanced Search Research Data</a></li>
|
||||
<li><a href="/search/advanced/projects">Advanced Search Projects</a></li>
|
||||
|
|
@ -163,51 +178,26 @@ import 'rxjs/Rx';
|
|||
</div>
|
||||
|
||||
</li>
|
||||
<li class="uk-parent" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="">Deposit</a>
|
||||
|
||||
<div style="overflow:hidden;height:0;position:relative;" class="uk-hidden">
|
||||
<ul class="uk-nav-sub" role="menu">
|
||||
<li class="" aria-expanded="false" >
|
||||
<a href="#">Deposit</a>
|
||||
|
||||
<div ><ul class="uk-nav-sub" role="menu">
|
||||
<li><a href="/deposit-publications">Deposit Publications</a></li>
|
||||
<li><a href="/deposit-datasets">Deposit Research Data</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
<li class="uk-parent" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="">Linking</a>
|
||||
|
||||
<div style="overflow:hidden;height:0;position:relative;" class="uk-hidden">
|
||||
<ul class="uk-nav-sub" role="menu">
|
||||
<li><a href="/claims">Claims Admin</a></li>
|
||||
<li><a href="/myclaims">My Claims</a></li>
|
||||
<li><a href="/linking">Linking</a></li>
|
||||
<li><a href="/bulk-linking">Bulk Linking</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
<li class="uk-parent" data-uk-dropdown="" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="">Landing Pages</a>
|
||||
|
||||
<div style="overflow:hidden;height:0;position:relative;" class="uk-hidden">
|
||||
<ul class="uk-nav-sub" role="menu">
|
||||
<li><a href = "search/publication?articleId=od_______908::3a5b2885656a91307156325644e73b92" >Publication </a></li>
|
||||
<li><a href = "search/dataset?datasetId=datacite____::430ac1c41b7f99b7b543ef737dc41a74" >Dataset </a></li>
|
||||
<li><a href = "search/project?projectId=corda_______::2c37878a0cede85dbbd1081bb9b4a2f8" >Project </a></li>
|
||||
<li><a href = "search/person?personId=datacite____::9da3a037961b36a634fcd40ab0bf6535" >Person </a></li>
|
||||
<li><a href = "search/organization?organizationId=dedup_wf_001::f686277c34bf457bbdf19e03589b5e81" >Organization </a></li>
|
||||
<li><a href = "search/dataprovider?datasourceId=opendoar____::798ed7d4ee7138d49b8828958048130a" >Data Provider </a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
</div-->
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ export class OpenaireProperties {
|
|||
public static searchLinkToAdvancedOrganizations = "search/advanced/organizations";
|
||||
public static searchLinkToAdvancedPeople = "search/advanced/people";
|
||||
|
||||
|
||||
//http://beta.services.openaire.eu:8480/search/
|
||||
// Services - APIs
|
||||
|
||||
private static metricsAPIURL = "http://vatopedi.di.uoa.gr:8080/stats/";
|
||||
|
|
@ -37,21 +37,22 @@ export class OpenaireProperties {
|
|||
|
||||
// private static searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
// private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/";
|
||||
private static searchAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
private static searchAPIURL = "http://beta.services.openaire.eu:8480/search/rest/v2/api/";
|
||||
//"http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
|
||||
// private static searchAPIURLLAst = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
private static searchAPIURLLAst = "http://beta.services.openaire.eu:8480/search/rest/v2/api/";
|
||||
//private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
|
||||
// private static searchResourcesAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
|
||||
private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
|
||||
private static searchResourcesAPIURL = "http://beta.services.openaire.eu:8480/search/rest/v2/api/resources";
|
||||
|
||||
//private static searchServiveURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
|
||||
private static searchServiveURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
|
||||
private static searchServiveURL = "http://beta.services.openaire.eu:8480/search/";
|
||||
// private static searchServiveURL = "http://services.openaire.eu:8380/search/";
|
||||
//private static searchServiveURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
|
||||
|
||||
private static csvAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv
|
||||
private static csvAPIURL = "http://beta.services.openaire.eu:8480/search/rest/v2/api/";//publications?format=csv
|
||||
|
||||
private static searchCrossrefAPIURL = "http://api.crossref.org/works";
|
||||
private static searchDataciteAPIURL = "http://search.datacite.org/api";
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ export class SearchFields {
|
|||
["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 "}
|
||||
["collectedfromdatasourceid"]:{name:"Collected from Data 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 Data 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 Data Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -149,7 +149,7 @@ export class SearchFields {
|
|||
return this.PROJECT_FIELDS[fieldId].name;
|
||||
}else if(fieldType == "organization"){
|
||||
return this.ORGANIZATION_FIELDS[fieldId].name;
|
||||
}else if(fieldType == "datasource"){
|
||||
}else if(fieldType == "datasource" || fieldType == "dataprovider"){
|
||||
return this.DATASOURCE_FIELDS[fieldId].name;
|
||||
}else{
|
||||
return "UNDEFINED";
|
||||
|
|
|
|||
Loading…
Reference in New Issue