diff --git a/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts b/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
index 2c7ea0e9..afeacc40 100644
--- a/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
@@ -1,6 +1,6 @@
import {Component, Input,Output, ElementRef, EventEmitter, ViewChild} from '@angular/core';
import {Observable} from 'rxjs/Observable';
-import {OpenaireProjectsService} from '../../services/openaireProjects.service';
+import {SearchProjectsService} from '../../services/searchProjects.service';
import {ProjectService} from '../../services/project.service';
import {ModalLoading} from '../../utils/modal/loading.component';
import { Subject } from 'rxjs/Subject';
@@ -17,20 +17,21 @@ import {ClaimProject} from '../../utils/entities/claimEntities.class';
-->
-
@@ -110,13 +111,13 @@ export class ClaimProjectsComponent {
public infoMessage = "";
private searchTermStream = new Subject
();
- filtered: Observable<{}> = this.searchTermStream
+ filtered: Observable<{}> = this.searchTermStream
.debounceTime(300).distinctUntilChanged()
.switchMap((term: string) => this._projectService.searchForProjectsObs(term, this.selectedFunderId));
private tries:number = 0 ;
private keywordlimit = 3;
-constructor(private _service: ProjectService, private _projectService: OpenaireProjectsService,myElement: ElementRef) {
+constructor(private _service: ProjectService, private _projectService: SearchProjectsService, myElement: ElementRef) {
this.elementRef = myElement;
}
@@ -144,46 +145,19 @@ search() {
}
}
-// filter() {
-// console.info("Search projects");
-// if (this.selectedFunderId == '0' ){
-// this.warningMessage = "Please select a funder first";
-// this.infoMessage = "";
-// }else if ( this.query == "" || this.query.length < 3){
-// this.warningMessage = "Please type a keyword, containing at least 3 characters"
-// this.infoMessage = "";
-// }else{
-// this.warningMessage = "";
-// this.infoMessage = "";
-// this.loading.open();
-// this._projectService.searchForProjects(this.query, this.selectedFunderId).subscribe(
-// data => {
-// this.filteredList =(data == null)?[]:data;
-// this.infoMessage = (data == null)?"No Results found":"";
-// this.loading.close();
-// },
-// err => {
-// console.error(err);
-// this.loading.close();
-// this.warningMessage = "An error occured";
-//
-// }
-// );
-// }
-// }
-
select(item){
this.query = "";
this.searchTermStream.next(this.query); //clear
-
- var project: ClaimProject = { funderId: this.selectedFunderId,funderName: this.selectedFunderName, projectId: item.field[0]['@value'], projectName: item.field[3]['@value'] , projectAcronym: item.field[1]['@value'], startDate: null, endDate: null };
- this._service.getProjectDates(project.projectId).subscribe(
- data => {
- project.startDate = data.startDate;
- project.endDate = data.endDate;
- },
- err => console.error(err)
- );
+ item = item.value;
+ var project: ClaimProject = { funderId: this.selectedFunderId,funderName: this.selectedFunderName, projectId: item.id, projectName: item.projectName , projectAcronym: item.projectAcronym, startDate: item.startDate, endDate: item.endDate };
+ console.log(item);
+ // this._service.getProjectDates(project.projectId).subscribe(
+ // data => {
+ // project.startDate = data.startDate;
+ // project.endDate = data.endDate;
+ // },
+ // err => console.error(err)
+ // );
var index:number =this.selectedProjects.indexOf(project);
var found:boolean = false;
this.warningMessage = "";
@@ -220,19 +194,13 @@ handleClick(event){
}
clickedComponent = clickedComponent.parentNode;
} while (clickedComponent);
- // if(!inside){
- // this.query = "";
- // this.filteredList = this.searchTermStream
- // .debounceTime(300).
- // distinctUntilChanged()
- // .switchMap((term: string) => this._projectService.searchForProjectsObs(term, this.selectedFunderId));
- // }
+
}
getFunders () {
console.info("Getting Funders....");
this._projectService.getFunders().subscribe(
data => {
- this.funders = data;
+ this.funders = data[1];
},
err => console.error(err)
);
diff --git a/portal-2/src/app/services/entitySearch.service.ts b/portal-2/src/app/services/entitySearch.service.ts
new file mode 100644
index 00000000..30775eb0
--- /dev/null
+++ b/portal-2/src/app/services/entitySearch.service.ts
@@ -0,0 +1,100 @@
+import {Injectable} from '@angular/core';
+import {Http, Response} from '@angular/http';
+import {Observable} from 'rxjs/Observable';
+import {AutoCompleteValue} from '../searchPages/searchUtils/searchHelperClasses.class';
+import {OpenaireProperties} from '../utils/properties/openaireProperties';
+
+@Injectable()
+export class EntitiesSearchService {
+ private api ="https://beta.services.openaire.eu/provision/mvc/vocabularies/";
+ constructor(private http: Http) {}
+
+ searchByType(keyword:string,type:string,funderId:string){
+ if( type = "project"){
+ return this.searchProjectsByFunder(keyword,funderId);
+ }
+ // else if ( type == "hostedBy" || type == "collectedFrom"){
+ // return this.searchDataproviders(keyword);
+ // }
+ }
+ searchProjectsByFunder(keyword:string, funderId:string):any {
+ let url = OpenaireProperties.getSearchAPIURL()+"projects?"+((keyword && keyword.length > 0)?("q=" +keyword+"&op=and"):"")+"&funder="+funderId+"&fn=and&size=10&page=1";
+ return this.http.get(url).toPromise()
+ .then(request =>
+ {
+ request = request.json().results;
+ return this.parse(request,"oaf:project","project");
+ });
+ }
+ // searchDataproviders (keyword: string):any {
+ //
+ // let link = OpenaireProperties.getSearchAPIURL()+"projects";
+ // this.search(link,keyword,"oaf:datasource")
+ //
+ // }
+ // searchProjects (keyword: string):any {
+ //
+ // console.info("In searchProjects");
+ //
+ // let link = OpenaireProperties.getSearchAPIURL()+"datasources";
+ // this.search(link,keyword,"oaf:project")
+ //
+ // }
+ // search (link,keyword,type){
+ // let url = link+"?";
+ // if(keyword!= null && keyword != '' ) {
+ // url += "q="+ keyword+"&op=and";
+ // }
+ //
+ // url += "&page="+1+"&size="+10;
+ //
+ //
+ // return this.http.get(url)
+ // .map(res => res.json())
+ // //.do(res => console.info(res))
+ // .map(res => this.parse(res['results'],type));
+ // }
+ parse(data: any,oafEntityType:string, type:string){
+ var array:any =[]
+ let length = Array.isArray(data) ? data.length : 1;
+
+ for(let i=0; i 1 ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
+ if(type=="project"){
+ value.projectAcronym = resData['acronym'];
+ value.projectName = value.label;
+ value.endDate = null;
+ value.startDate = null;
+ if(resData.hasOwnProperty("startdate")) {
+ value.startDate = resData.startdate.split('-')[0];
+ }
+ if(resData.hasOwnProperty("enddate")) {
+ value.endDate = resData.enddate.split('-')[0];
+ }
+
+ }
+ console.log("value:"+value);
+ array.push(value);
+ }
+
+ return array;
+ }
+
+// http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/projects?refine=true&fields=funderid&page=1&size=0
+
+ private handleError (error: Response) {
+ // in a real world app, we may send the error to some remote logging infrastructure
+ // instead of just logging it to the console
+ console.error(error);
+ return Observable.throw(error || 'Server error');
+ }
+}
diff --git a/portal-2/src/app/services/searchProjects.service.ts b/portal-2/src/app/services/searchProjects.service.ts
index 4a5e99f0..2ed0d51a 100644
--- a/portal-2/src/app/services/searchProjects.service.ts
+++ b/portal-2/src/app/services/searchProjects.service.ts
@@ -33,7 +33,29 @@ export class SearchProjectsService {
.map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields)]);
}
+ getFunders():any {
+ let url = OpenaireProperties.getSearchAPIURL()+"projects?refine=true&fields=funderid&size=0";
+ return this.http.get(url)
+ .map(res => res.json())
+ .map(res => [res['meta'].total, res['refineResults']['funderid']]);
+
+ }
+
+ searchForProjectsObs(keyword:string, funderId:string):any {
+ let url = 'search?action=search&sTransformer=projects_openaire&query='+
+ '%28oaftype+exact+project%29+and+%28%28projecttitle+%3D+%22'+keyword+'%22%29+or+%28projectacronym+%3D+%22'+keyword+'%22%29+or+%28projectcode+%3D+%22'+keyword+'%22%29%29+and+%28funderid+exact+'+funderId+'%29&size=10&locale=en_GB&format=json';
+ return this.http.get(url).toPromise()
+ .then(request =>{
+
+ // var valid:boolean= this.isJsonString(request);
+ // if(valid==true){
+ return (request.json().response.results)?request.json().response.results.result:request.json().response.result;
+ // }else{
+ // return [];
+ // }
+ })
+ }
parseResults(data: any): SearchResult[] {
let results: SearchResult[] = [];
diff --git a/portal-2/src/app/services/services.module.ts b/portal-2/src/app/services/services.module.ts
index 5961da90..a85379ec 100644
--- a/portal-2/src/app/services/services.module.ts
+++ b/portal-2/src/app/services/services.module.ts
@@ -22,6 +22,7 @@ import {SearchDatasetsService} from './searchDatasets.service';
import {SearchOrganizationsService} from './searchOrganizations.service';
import {SearchPeopleService} from './searchPeople.service';
import {SearchProjectsService} from './searchProjects.service';
+import {EntitiesSearchService} from './entitySearch.service';
import {ISVocabulariesService} from './ISVocabularies.service';
import {RefineFieldResultsService} from './refineFieldResults.service'
@@ -40,7 +41,8 @@ import {RefineFieldResultsService} from './refineFieldResults.service'
SearchPublicationsService, SearchDataprovidersService, DataProviderService,
SearchProjectsService, SearchDatasetsService, SearchOrganizationsService,
SearchPeopleService, ISVocabulariesService,
- RefineFieldResultsService
+ RefineFieldResultsService,
+ EntitiesSearchService
],
exports: [
]
diff --git a/portal-2/src/app/utils/entitiesAutoComplete.component.ts b/portal-2/src/app/utils/entitiesAutoComplete.component.ts
new file mode 100644
index 00000000..4da4fef7
--- /dev/null
+++ b/portal-2/src/app/utils/entitiesAutoComplete.component.ts
@@ -0,0 +1,225 @@
+import {Component, ElementRef, Input, Output, EventEmitter} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+import {Value} from '../searchPages/searchUtils/searchHelperClasses.class';
+import {EntitiesSearchService} from '../services/entitySearch.service';
+
+//Usage example
+//
+
+@Component({
+ selector: 'entities-autocomplete',
+ styleUrls: ['autoComplete.component.css'],
+ host: {
+ '(document:click)': 'handleClick($event)',
+ },
+ template: `
+
+
+
+ {{showItem(item)}}
+
+
+
+
+
+
+
{{warningMessage}}
+
No results found
+
+