@@ -66,7 +72,8 @@ export class EntitiesAutocompleteComponent {
@Input() public funderId:string;
@Input() public entityType:string ;
@Input() public depositType:string ;
-
+ public results = 0;
+ public focus:boolean = false;
constructor (private _search:EntitiesSearchService, private myElement: ElementRef) {
@@ -81,7 +88,7 @@ export class EntitiesAutocompleteComponent {
.switchMap((term: string) => {
var results = this._search.searchProjectsByFunder(term, (this.funderId == "0"?"":this.funderId));
this.showLoading = false;
- // this.numFilteredResults = results.length;
+ this.results = results.length;
return results;
});
}else if(this.entityType == "organization" && this.depositType ){
@@ -90,7 +97,7 @@ export class EntitiesAutocompleteComponent {
.switchMap((term: string) => {
var results = this._search.searchByDepositType(term, this.depositType);
this.showLoading = false;
- // this.numFilteredResults = results.length;
+ this.results = results.length;
return results;
});
@@ -102,7 +109,7 @@ export class EntitiesAutocompleteComponent {
.switchMap((term: string) => {
var results = this._search.searchByType(term, this.entityType);
this.showLoading = false;
- // this.numFilteredResults = results.length;
+ this.results = results.length;
return results;
});
@@ -134,6 +141,7 @@ export class EntitiesAutocompleteComponent {
this.searchTermStream.next(this.keyword);
// if(this.numFilteredResults ==0){
this.showLoading = true;
+ this.focus = true;
// }
}
@@ -216,6 +224,10 @@ export class EntitiesAutocompleteComponent {
}
}
+ truncate(str:string, size:number):string{
+ if(str == null){return "";}
+ return (str.length > size)?str.substr(0,size)+'...':str;
+ }
private getSelectedNameFromGivenId(){
if(this.selectedValue && this.selectedValue.length > 0 ){
@@ -242,6 +254,7 @@ export class EntitiesAutocompleteComponent {
this.keyword = "";
// this.numFilteredResults = 0;
this.searchTermStream.next(this.keyword);
+ this.focus=false;
}
}
diff --git a/portal-2/src/app/utils/modal/loading.component.ts b/portal-2/src/app/utils/modal/loading.component.ts
index 95d9ff75..da824f3c 100644
--- a/portal-2/src/app/utils/modal/loading.component.ts
+++ b/portal-2/src/app/utils/modal/loading.component.ts
@@ -3,19 +3,25 @@ import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmit
@Component({
selector: 'modal-loading',
template: `
-
-
+
+
`,
encapsulation: ViewEncapsulation.None,
})
diff --git a/portal-2/src/app/utils/staticAutoComplete.component.ts b/portal-2/src/app/utils/staticAutoComplete.component.ts
index 4de93e58..ad8669ab 100644
--- a/portal-2/src/app/utils/staticAutoComplete.component.ts
+++ b/portal-2/src/app/utils/staticAutoComplete.component.ts
@@ -12,19 +12,24 @@ import {RefineFieldResultsService} from '../services/refineFieldResults.service'
'(document:click)': 'handleClick($event)',
},
template: `
-
+
- {{showItem(item)}}
+ {{truncate(showItem(item),14)}}
- Loading...
- {{warningMessage}}
-
+
+
@@ -59,6 +64,8 @@ export class StaticAutoCompleteComponent {
public showInput = true;
public sub;
public done = false;
+ public results = 0;
+ public focus:boolean = false;
constructor ( private _vocabulariesService: ISVocabulariesService,private _refineService: RefineFieldResultsService, private myElement: ElementRef) {
}
ngOnDestroy(){
@@ -70,6 +77,7 @@ export class StaticAutoCompleteComponent {
if(this.list == undefined || this.list.length == 0){
this.showLoading = true;
+ console.log("getVocabulary id: "+ this.vocabularyId + " for entity: "+ this.entityName);
if(this.vocabularyId){
// this.list = this._vocabulariesService.getVocabularyByType(this.vocabularyId, this.entityName);
// this.afterListFetchedActions();
@@ -127,15 +135,17 @@ export class StaticAutoCompleteComponent {
}
filter() {
+ this.focus = true;
if(this.done){
this.infoMessage = "";
this.filtered = [];
if(this.keyword == ""){
- var cut = 5;
+ var cut = 10;
if(this.list.length < 5){
cut = this.list.length;
}
- this.filtered =this.list.slice(0, cut);
+ this.results = this.list.length;
+ this.filtered =this.list.slice(0, cut);
this.tries = 0;
this.warningMessage = "";
// } else if(this.keyword && this.keyword.length < this.keywordlimit){
@@ -150,7 +160,12 @@ export class StaticAutoCompleteComponent {
this.filtered = this.list.filter(function(el){
return el.label.toLowerCase().indexOf(this.keyword.toLowerCase()) > -1;
}.bind(this));
-
+ var cut = 10;
+ if(this.filtered .length < 5){
+ cut = this.list.length;
+ }
+ this.results = this.filtered.length;
+ this.filtered =this.filtered.slice(0, cut);
}
}
}
@@ -238,6 +253,10 @@ export class StaticAutoCompleteComponent {
}
}
+ truncate(str:string, size:number):string{
+ if(str == null){return "";}
+ return (str.length > size)?str.substr(0,size)+'...':str;
+ }
private getSelectedNameFromGivenId(){
if(this.list == null ){
return;
@@ -261,7 +280,8 @@ export class StaticAutoCompleteComponent {
clickedComponent = clickedComponent.parentNode;
} while (clickedComponent);
if(!inside){
- this.filtered.splice(0, this.filtered.length);;
+ this.focus =false;
+ this.filtered.splice(0, this.filtered.length);
}
}