MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Advanced Search 

limit query for organizations & datasources similar to simple search & landing
Organization Autocomplete:
	show legalname (legal short name)
Css: change dashboard buttons focus & active 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54461 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-12-19 14:07:02 +00:00
parent 91c27dcfb8
commit c6922230c3
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/searchDataproviders.service.ts
View File

@ -35,7 +35,8 @@ export class SearchDataprovidersService {
//((oaftype exact datasource) and(collectedfromdatasourceid exact "openaire____::47ce9e9f4fad46e732cff06419ecaabb"))
advancedSearchDataproviders (params: string, page: number, size: number, properties: EnvProperties ):any {
let url = properties.searchResourcesAPIURL;
var basicQuery = "(oaftype exact datasource) "
var basicQuery = "(oaftype exact datasource) " +
'and (datasourcecompatibilityid <> "UNKNOWN")';
url += "?query=";
if(params!= null && params != '' ) {
url +=" ( "+basicQuery+ " ) " +" and (" + params + ")";

6
services/searchOrganizations.service.ts
View File

@ -60,7 +60,11 @@ export class SearchOrganizationsService {
}
advancedSearchOrganizations (params: string, page: number, size: number, properties:EnvProperties ):any {
let url = properties.searchResourcesAPIURL;
var basicQuery = "(oaftype exact organization) "
var basicQuery = "oaftype exact organization and "
+"(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or " +
"reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or " +
"reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)";
url += "?query=";
if(params!= null && params != '' ) {
url +=" ( "+basicQuery+ " ) " +" and (" + params + ")";

8
utils/entitiesAutoComplete/entitySearch.service.ts
View File

@ -178,6 +178,14 @@ private fetch (link,id,oafEntityType,type, properties:EnvProperties ){
} else {
value.label = resData["legalname"];
}
if(resData["legalshortname"]){
if(Array.isArray(resData["legalshortname"])) {
value.label += " (" + resData["legalshortname"][0] +")";
} else {
value.label += " (" + resData["legalshortname"] +")";
}
}
}else if(resData["officialname"]){

3
utils/properties/environment-specific.service.ts
View File

@ -22,6 +22,9 @@ export class EnvironmentSpecificService {
// private serverUrl = "https://beta.explore.openaire.eu";
// private serverUrl = "https://beta.connect.openaire.eu";
// private serverUrl = "https://beta.admin.connect.openaire.eu";
// private serverUrl = "https://explore.openaire.eu";
// private serverUrl = "https://connect.openaire.eu";
// private serverUrl = "https://test.explore.openaire.eu";
constructor(private http: Http, @Inject(PLATFORM_ID) private platformId: string) {
this.testBrowser = isPlatformBrowser(platformId);
if (this.testBrowser) {