diff --git a/portal-2/src/app/landingPages/organization/organization.component.ts b/portal-2/src/app/landingPages/organization/organization.component.ts index 86c4a585..62c82092 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.ts +++ b/portal-2/src/app/landingPages/organization/organization.component.ts @@ -84,30 +84,27 @@ export class OrganizationComponent { } private getOrganizationInfo () { - console.info("inside getOrganizationInfo of component"); this.warningMessage = ''; this.errorMessage="" - console.info("do request"); this._organizationService.getOrganizationInfo(this.organizationId).subscribe( data => { + this.organizationInfo = data; let projectsNum = 0; if(this.organizationInfo.projects != undefined) { - this.fundersSet = new Set(); + this.fundersSet = new Set(); this.organizationInfo.projects.forEach(function (value, key, map) { projectsNum += value.length; this.fundersSet.add(key); }.bind(this)); } - this.projectsNum = projectsNum; }, err => { console.error(err) - console.info("error"); this.errorMessage = 'No organization found'; } diff --git a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts index 6d97065b..66bbeb07 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts @@ -74,7 +74,7 @@ export class SearchFilterComponent { } private _formatTitle(title,length){ - return (((title+" ("+length+")").length >this._maxCharacters)?(title.substring(0,(this._maxCharacters - (" ("+length+")").length - ('...').length))+"..."):title) + return (((title+" ("+length+")").length >this._maxCharacters)?(title.substring(0,(this._maxCharacters - (" ("+length+")").length - ('...').length))+"..."):title+" ("+length+")") } private _formatName(value){ return (((value.name+" ("+value.number+")").length >this._maxCharacters)?(value.name.substring(0,(this._maxCharacters - (" ("+value.number+")").length - ('...').length))+"..."):value.name) diff --git a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts index 579f5ae6..bdc30320 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts @@ -4,7 +4,7 @@ import {Observable} from 'rxjs/Observable'; @Component({ selector: 'search-form', template: ` -
+
diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts index 0a1e7298..d87f1ccd 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts @@ -20,7 +20,7 @@ import {SearchUtilsClass} from './searchUtils.class';
-
+
Keywords: {{searchUtils.keyword}} @@ -31,7 +31,7 @@ import {SearchUtilsClass} from './searchUtils.class'; , - Clear Filters + Clear Filters
diff --git a/portal-2/src/app/services/person.service.ts b/portal-2/src/app/services/person.service.ts index 7df9d492..a851fa14 100644 --- a/portal-2/src/app/services/person.service.ts +++ b/portal-2/src/app/services/person.service.ts @@ -31,8 +31,6 @@ export class PersonService { getPersonInfo (id: string):any { - console.info("Cache: NOT in cache "); - console.info("getPersonInfo in service"); let url = OpenaireProperties.getSearchAPIURL()+'people/'+id; diff --git a/portal-2/src/app/services/searchOrganizations.service.ts b/portal-2/src/app/services/searchOrganizations.service.ts index f25a10b5..d2c6a45e 100644 --- a/portal-2/src/app/services/searchOrganizations.service.ts +++ b/portal-2/src/app/services/searchOrganizations.service.ts @@ -88,7 +88,6 @@ export class SearchOrganizationsService { url += "&page="+page+"&size="+size; let key = url; - console.log("Org: "+key); if (this._cache.has(key)) { return Observable.of(this._cache.get(key)); } @@ -107,7 +106,6 @@ export class SearchOrganizationsService { let length = Array.isArray(data) ? data.length : 1; for(let i=0; i .custom-hidden-dropdown-menu {position:static !important;} .searchFilterBox .values {overflow:auto; max-height:200px; } + .selected-filters-box {margin:5px; background-color:#F8F8F8; } + .search-form {margin:5px; } +