Publication Landing page: case of number or string for journal's volumn, start page, end page | remove spaces near parenthesis (html code).

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52740 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2018-07-13 10:18:03 +00:00
parent c762941623
commit 97318a5e33
2 changed files with 28 additions and 22 deletions

View File

@ -39,25 +39,31 @@
<span class="uk-text-bold">Journal:</span>
<span *ngIf="publicationInfo.journal['journal']">{{publicationInfo.journal['journal']}}</span>
<span *ngIf="publicationInfo.journal['issn'] || publicationInfo.journal['lissn'] || publicationInfo.journal['volume']
|| publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">
(
</span>
<span *ngIf="publicationInfo.journal['issn']">
issn: {{publicationInfo.journal['issn']}}<span *ngIf="publicationInfo.journal['lissn'] || publicationInfo.journal['volume'] || publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">,</span>
</span>
<span *ngIf="publicationInfo.journal['lissn']">
lissn: {{publicationInfo.journal['lissn']}}<span *ngIf="publicationInfo.journal['volume'] || publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">,</span>
</span>
<span *ngIf="publicationInfo.journal['volume']">
vol: {{publicationInfo.journal['volume']}}<span *ngIf="publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">,</span>
</span>
<span *ngIf="publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">
pp: <span *ngIf="publicationInfo.journal['start_page']">{{publicationInfo.journal['start_page'] | number}}</span><span *ngIf="publicationInfo.journal['start_page'] && publicationInfo.journal['end_page']">-</span><span *ngIf="publicationInfo.journal['end_page']">{{publicationInfo.journal['end_page'] | number}}</span>
</span>
<span *ngIf="publicationInfo.journal['issn'] || publicationInfo.journal['lissn'] || publicationInfo.journal['volume']
|| publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">
)
</span>
|| publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">(</span
><span *ngIf="publicationInfo.journal['issn']">issn: {{publicationInfo.journal['issn']}}<span *ngIf="publicationInfo.journal['lissn'] || publicationInfo.journal['volume'] || publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">, </span
></span
><span *ngIf="publicationInfo.journal['lissn']">lissn: {{publicationInfo.journal['lissn']}}<span *ngIf="publicationInfo.journal['volume'] || publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">, </span
></span
><span *ngIf="publicationInfo.journal['volume']"
>vol:
<span *ngIf="publicationInfo.journal['volume'] > 0">{{publicationInfo.journal['volume'] | number}}</span
><span *ngIf="!(publicationInfo.journal['volume'] > 0)">{{publicationInfo.journal['volume']}}</span
><span *ngIf="publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">, </span
></span
><span *ngIf="publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']"
>pp:
<span *ngIf="publicationInfo.journal['start_page']"
><span *ngIf="publicationInfo.journal['start_page'] > 0">{{publicationInfo.journal['start_page'] | number}}</span
><span *ngIf="!(publicationInfo.journal['start_page'] > 0)">{{publicationInfo.journal['start_page']}}</span
></span
><span *ngIf="publicationInfo.journal['start_page'] && publicationInfo.journal['end_page']">-</span
><span *ngIf="publicationInfo.journal['end_page']"
><span *ngIf="publicationInfo.journal['end_page'] > 0">{{publicationInfo.journal['end_page'] | number}}</span
><span *ngIf="!(publicationInfo.journal['end_page'] > 0)">{{publicationInfo.journal['end_page']}}</span
></span
></span
><span *ngIf="publicationInfo.journal['issn'] || publicationInfo.journal['lissn'] || publicationInfo.journal['volume']
|| publicationInfo.journal['start_page'] || publicationInfo.journal['end_page']">)</span>
</li>
<li *ngIf="publicationInfo.embargoEndDate"><span class="uk-text-bold">Embargo end date:</span> {{publicationInfo.embargoEndDate}}</li>

View File

@ -182,9 +182,9 @@ export class PublicationService {
this.publicationInfo.journal['journal'] = data[5].content;
this.publicationInfo.journal['issn'] = data[5].issn;
this.publicationInfo.journal['lissn'] = data[5].lissn;
this.publicationInfo.journal['volume'] = (data[5].vol>0)?data[5].vol:0;
this.publicationInfo.journal['start_page'] = (data[5].sp > 0)?data[5].sp:null;
this.publicationInfo.journal['end_page'] = (data[5].ep > 0)?data[5].ep:null;
this.publicationInfo.journal['volume'] = data[5].vol;
this.publicationInfo.journal['start_page'] = data[5].sp;
this.publicationInfo.journal['end_page'] = data[5].ep;
}
if(data[6] != null) {