1. Columns changed from 4 to 3 for 'Search Projects' in community portals ('Acronym' and 'Name' merged to 'Project').

2. Links added to 'Search Projects' and 'Search Content Providers' in community portals.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51537 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2018-03-27 14:35:05 +00:00
parent 5139077569
commit 5dbf849a32
2 changed files with 23 additions and 1 deletions

View File

@ -128,13 +128,25 @@
</td> </td>
<!--Community Projects - name is also used for Community Content Providers--> <!--Community Projects - name is also used for Community Content Providers-->
<td *ngIf="result.hasOwnProperty('acronym')" [class]="'uk-text-center uk-width-1-'+columnNames.length"> <!-- <td *ngIf="result.hasOwnProperty('acronym')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<span *ngIf="result.acronym">{{result.acronym}}</span> <span *ngIf="result.acronym">{{result.acronym}}</span>
<span *ngIf="!result.acronym">-</span> <span *ngIf="!result.acronym">-</span>
</td> </td>
<td *ngIf="result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length"> <td *ngIf="result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<span *ngIf="result.name">{{result.name}}</span> <span *ngIf="result.name">{{result.name}}</span>
<span *ngIf="!result.name">-</span> <span *ngIf="!result.name">-</span>
</td> -->
<!--Community Projects-->
<td *ngIf="result.hasOwnProperty('acronym') && result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<a [queryParams]="(result.openaireId) ? {projectId: result.openaireId} : {grantId: encode(result.grantId), funder: encode(result.funder)}"
routerLinkActive="router-link-active" routerLink="/search/project">
<span *ngIf="result.name">{{result.name}}</span>
<span *ngIf="result.name && result.acronym">(</span>
<span *ngIf="result.acronym">{{result.acronym}}</span>
<span *ngIf="result.name && result.acronym">)</span>
<span *ngIf="!result.name && !result.acronym">[no title available]</span>
</a>
</td> </td>
<td *ngIf="result.hasOwnProperty('grantId')" [class]="'uk-text-center uk-width-1-'+columnNames.length"> <td *ngIf="result.hasOwnProperty('grantId')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<span *ngIf="result.grantId">{{result.grantId}}</span> <span *ngIf="result.grantId">{{result.grantId}}</span>
@ -146,6 +158,12 @@
</td> </td>
<!--Community Content Providers--> <!--Community Content Providers-->
<td *ngIf="!result.hasOwnProperty('acronym') && result.hasOwnProperty('name')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<a [queryParams]="{datasourceId: result.openaireId}" routerLinkActive="router-link-active" routerLink="/search/dataprovider">
<span *ngIf="result.name">{{result.name}}</span>
<span *ngIf="!result.name">[no name available]</span>
</a>
</td>
<td *ngIf="result.hasOwnProperty('officialname')" [class]="'uk-text-center uk-width-1-'+columnNames.length"> <td *ngIf="result.hasOwnProperty('officialname')" [class]="'uk-text-center uk-width-1-'+columnNames.length">
<span *ngIf="result.officialname">{{result.officialname}}</span> <span *ngIf="result.officialname">{{result.officialname}}</span>
<span *ngIf="!result.officialname">-</span> <span *ngIf="!result.officialname">-</span>

View File

@ -490,4 +490,8 @@ Transform initial - not filtered results to get the filtered number
return true; return true;
} }
public encode(param: string): string {
return StringUtils.URIEncode(param);
}
} }