MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

custom-icon class added in tags with uk-icon-external link class to fix line-height | custom-tab-content class added in tab contents of landing pages to fix min-height | Publication landing page: Funded By section: tooltip fixed (if no info for something do not show it) & special case: unidentified projects | Publication landing page: Related Organizations Tab added 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@46377 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2017-03-21 13:19:31 +00:00
parent e458388b66
commit edbe69bf51
20 changed files with 228 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
portal-2/src/app/claims/claim-utils/claimDataset.component.ts
View File

@ -33,7 +33,7 @@ import{DOI} from '../../utils/string-utils.class';
<ul *ngIf="dataciteResults.length > 0 " class="uk-list uk-list-line"> <ul *ngIf="dataciteResults.length > 0 " class="uk-list uk-list-line">
<li *ngFor=" let item of dataciteResults " [class]="(isSelected(item.doi))?'uk-block-muted':''" > <li *ngFor=" let item of dataciteResults " [class]="(isSelected(item.doi))?'uk-block-muted':''" >
<div > <div >
<a *ngIf="item.doi" target="_blank" href="{{'http://dx.doi.org/'+item.doi}}" ><span class="uk-icon-external-link" ></span> {{item.title}}</a> <a *ngIf="item.doi" target="_blank" href="{{'http://dx.doi.org/'+item.doi}}" ><span class="uk-icon-external-link custom-icon" ></span> {{item.title}}</a>
<span *ngIf="!item.doi" >{{item.title}}</span> <span *ngIf="!item.doi" >{{item.title}}</span>
<button class="uk-button uk-align-right" *ngIf="!isSelected(item.doi)" (click)="add(item, item.doi,'dataset','datacite',item.title,'http://dx.doi.org/'+item.doi, null,'OPEN')"><i aria-hidden="true" class= "uk-icon-plus clickable"></i></button> <button class="uk-button uk-align-right" *ngIf="!isSelected(item.doi)" (click)="add(item, item.doi,'dataset','datacite',item.title,'http://dx.doi.org/'+item.doi, null,'OPEN')"><i aria-hidden="true" class= "uk-icon-plus clickable"></i></button>

4
portal-2/src/app/claims/claim-utils/claimPublication.component.html
View File

@ -23,7 +23,7 @@
<ul *ngIf="crossrefResults.length > 0 " class="uk-list uk-list-line"> <ul *ngIf="crossrefResults.length > 0 " class="uk-list uk-list-line">
<li *ngFor=" let item of crossrefResults " [class]="(isSelected(item.DOI))?'uk-block-muted':''"> <li *ngFor=" let item of crossrefResults " [class]="(isSelected(item.DOI))?'uk-block-muted':''">
<div > <div >
<a *ngIf="item.URL" target="_blank" href="{{item.URL}}" ><span class="uk-icon-external-link" ></span> {{item.title}}</a> <a *ngIf="item.URL" target="_blank" href="{{item.URL}}" ><span class="uk-icon-external-link custom-icon" ></span> {{item.title}}</a>
<span *ngIf="!item.URL" >{{item.title}}</span> <span *ngIf="!item.URL" >{{item.title}}</span>
<button class="uk-button uk-align-right" *ngIf="!isSelected(item.DOI)" (click)="add(item, item.DOI, 'crossref', 'publication', item.URL, item.title, item.created['date-time'],'OPEN')"><i aria-hidden="true" class= "uk-icon-plus clickable"></i></button> <button class="uk-button uk-align-right" *ngIf="!isSelected(item.DOI)" (click)="add(item, item.DOI, 'crossref', 'publication', item.URL, item.title, item.created['date-time'],'OPEN')"><i aria-hidden="true" class= "uk-icon-plus clickable"></i></button>
</div> </div>
@ -91,7 +91,7 @@
</div> </div>
<span>Results for <span>Results for
<a target="_blank" href="http://orcid.org/{{authorId}}"><span class="uk-icon-external-link" ></span> {{authorGivenName}} {{authorFamilyName}} - {{authorId}} </a> : <a target="_blank" href="http://orcid.org/{{authorId}}"><span class="uk-icon-external-link custom-icon" ></span> {{authorGivenName}} {{authorFamilyName}} - {{authorId}} </a> :
</span> </span>
<div *ngIf=" ((orcidResultsNum >0) && (totalPages > 1) && ( 0 < page && page <= totalPages )) " class="uk-clearfix"> <div *ngIf=" ((orcidResultsNum >0) && (totalPages > 1) && ( 0 < page && page <= totalPages )) " class="uk-clearfix">

2
portal-2/src/app/claims/claim-utils/entityFormatter/publicationTitleFormatter.component.ts
View File

@ -6,7 +6,7 @@ import {Component, Input} from '@angular/core';
selector: 'publication-title', selector: 'publication-title',
template: ` template: `
<div class="publication-title"> <div class="publication-title">
<h5 *ngIf="url" ><a target="_blank" href="{{url}}" ><span class="uk-icon-external-link" ></span> {{title}}</a></h5> <h5 *ngIf="url" ><a target="_blank" href="{{url}}" ><span class="uk-icon-external-link custom-icon" ></span> {{title}}</a></h5>
<h5 *ngIf="!url" >{{title}}</h5> <h5 *ngIf="!url" >{{title}}</h5>
</div> </div>
` `

2
portal-2/src/app/claims/linking/selected/selectedDatasets.component.ts
View File

@ -18,7 +18,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
<div [ngClass]="showAccessRights?'uk-width-7-10':'uk-width-1-1'"> <div [ngClass]="showAccessRights?'uk-width-7-10':'uk-width-1-1'">
<div> <div>
<span *ngIf="showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="uk-button "><i class="uk-icon-remove"></i></span> <span *ngIf="showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="uk-button "><i class="uk-icon-remove"></i></span>
<a *ngIf="dataset.url" target="_blank" href="{{dataset.url}}" ><span class="uk-icon-external-link" ></span> {{dataset.title}}</a> <a *ngIf="dataset.url" target="_blank" href="{{dataset.url}}" ><span class="uk-icon-external-link custom-icon" ></span> {{dataset.title}}</a>
<span *ngIf="!dataset.url" >{{dataset.title}}</span> <span *ngIf="!dataset.url" >{{dataset.title}}</span>
<span *ngIf="!showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="uk-button"><i class="uk-icon-remove"></i></span> <span *ngIf="!showAccessRights" (click)="removeDataset(dataset)" aria-hidden="true" class="uk-button"><i class="uk-icon-remove"></i></span>
</div> </div>

2
portal-2/src/app/claims/linking/selected/selectedPublications.component.ts
View File

@ -17,7 +17,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
<div [ngClass]="showAccessRights?'uk-width-7-10':'uk-width-1-1'" > <div [ngClass]="showAccessRights?'uk-width-7-10':'uk-width-1-1'" >
<div> <div>
<span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-button"><i class="uk-icon-remove"></i></span> <span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-button"><i class="uk-icon-remove"></i></span>
<a *ngIf="pub.url" target="_blank" href="{{pub.url}}" ><span class="uk-icon-external-link" ></span> {{pub.title}}</a> <a *ngIf="pub.url" target="_blank" href="{{pub.url}}" ><span class="uk-icon-external-link custom-icon" ></span> {{pub.title}}</a>
<span *ngIf="!pub.url" >{{pub.title}}</span> <span *ngIf="!pub.url" >{{pub.title}}</span>
<span *ngIf="!showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-button "><i class="uk-icon-remove"></i></span> <span *ngIf="!showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-button "><i class="uk-icon-remove"></i></span>
</div> </div>

2
portal-2/src/app/landingPages/dataProvider/dataProvider.component.html
View File

@ -23,7 +23,7 @@
<dd *ngIf="dataProviderInfo.compatibility != undefined && dataProviderInfo.compatibility != ''">{{dataProviderInfo.compatibility}}</dd> <dd *ngIf="dataProviderInfo.compatibility != undefined && dataProviderInfo.compatibility != ''">{{dataProviderInfo.compatibility}}</dd>
<dt *ngIf="dataProviderInfo.oaiPmhURL != undefined && dataProviderInfo.oaiPmhURL != ''">OAI-PMH: </dt> <dt *ngIf="dataProviderInfo.oaiPmhURL != undefined && dataProviderInfo.oaiPmhURL != ''">OAI-PMH: </dt>
<dd *ngIf="dataProviderInfo.oaiPmhURL != undefined && dataProviderInfo.oaiPmhURL != ''"> <dd *ngIf="dataProviderInfo.oaiPmhURL != undefined && dataProviderInfo.oaiPmhURL != ''">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<a href="{{dataProviderInfo.oaiPmhURL}}" target="_blank"> <a href="{{dataProviderInfo.oaiPmhURL}}" target="_blank">
{{dataProviderInfo.oaiPmhURL}} {{dataProviderInfo.oaiPmhURL}}
</a> </a>

2
portal-2/src/app/landingPages/dataProvider/tabs.component.ts
View File

@ -68,7 +68,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
</li> </li>
</ul> </ul>
<ul *ngIf="tabs != undefined" id="tab-content" class="uk-switcher uk-margin"> <ul *ngIf="tabs != undefined" id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade" id="firstTab-content" *ngIf="tabs.length>0"> <li class="uk-animation-fade" id="firstTab-content" *ngIf="tabs.length>0">
<publicationsTab *ngIf="tabs[0].content=='publicationsTab'" <publicationsTab *ngIf="tabs[0].content=='publicationsTab'"
[paramsForSearchLink]="paramsForSearchLink" [paramsForSearchLink]="paramsForSearchLink"

4
portal-2/src/app/landingPages/dataset/dataset.component.html
View File

@ -65,7 +65,7 @@
</li> </li>
</ul> </ul>
<ul id="tab-content" class="uk-switcher uk-margin"> <ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<div *ngIf="datasetInfo.relatedResearchResults == undefined" class = "uk-alert" > <div *ngIf="datasetInfo.relatedResearchResults == undefined" class = "uk-alert" >
There are no related research results There are no related research results
@ -134,7 +134,7 @@
[title]="datasetInfo.downloadFrom.get(key)['accessMode']"> [title]="datasetInfo.downloadFrom.get(key)['accessMode']">
<div *ngIf="i<5 || showAllDownloadFrom" <div *ngIf="i<5 || showAllDownloadFrom"
class="{{datasetInfo.downloadFrom.get(key)['bestAccessMode']}}"> class="{{datasetInfo.downloadFrom.get(key)['bestAccessMode']}}">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<div *ngIf="datasetInfo.downloadFrom.get(key)['url'].length > 1"> <div *ngIf="datasetInfo.downloadFrom.get(key)['url'].length > 1">
{{key}} {{key}}
<span *ngFor="let url of datasetInfo.downloadFrom.get(key)['url']; let i=index;"> <span *ngFor="let url of datasetInfo.downloadFrom.get(key)['url']; let i=index;">

2
portal-2/src/app/landingPages/organization/organization.component.html
View File

@ -56,7 +56,7 @@
</li--> </li-->
</ul> </ul>
<ul id="tab-content" class="uk-switcher uk-margin"> <ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<searchingProjectsTab [organizationId]=organizationId ></searchingProjectsTab> <searchingProjectsTab [organizationId]=organizationId ></searchingProjectsTab>
<!--div *ngIf="organizationInfo.projects == undefined" class = "uk-alert"> <!--div *ngIf="organizationInfo.projects == undefined" class = "uk-alert">

2
portal-2/src/app/landingPages/person/person.component.html
View File

@ -34,7 +34,7 @@
</li> </li>
</ul> </ul>
<ul id="tab-content" class="uk-switcher uk-margin"> <ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<div *ngIf="fetchPublications.searchUtils.totalResults == 0" class = "uk-alert"> <div *ngIf="fetchPublications.searchUtils.totalResults == 0" class = "uk-alert">

4
portal-2/src/app/landingPages/project/project.component.html
View File

@ -47,7 +47,7 @@
</dd> </dd>
<dt *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''">More information:</dt> <dt *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''">More information:</dt>
<dd *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''"> <dd *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<a target="_blank" href="{{projectInfo.url}}"> <a target="_blank" href="{{projectInfo.url}}">
{{projectInfo.urlInfo}} {{projectInfo.urlInfo}}
</a> </a>
@ -87,7 +87,7 @@
</li> </li>
</ul> </ul>
<ul id="tab-content" class="uk-switcher uk-margin"> <ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<div *ngIf="fetchPublications.searchUtils.totalResults == 0" class = "uk-alert" > <div *ngIf="fetchPublications.searchUtils.totalResults == 0" class = "uk-alert" >
There are no publications There are no publications

133
portal-2/src/app/landingPages/publication/publication.component.html
View File

@ -87,6 +87,15 @@
</span> </span>
</a> </a>
</li> </li>
<li>
<a>
Related Organizations
<span *ngIf="publicationInfo.organizations == undefined" class="uk-badge uk-badge-notification">0</span>
<span *ngIf="publicationInfo.organizations != undefined" class="uk-badge uk-badge-notification">
{{publicationInfo.organizations.length}}
</span>
</a>
</li>
<li *ngIf="publicationInfo.bioentities != undefined"> <li *ngIf="publicationInfo.bioentities != undefined">
<a> <a>
Bioentities Bioentities
@ -107,7 +116,7 @@
</li> </li>
</ul> </ul>
<ul id="tab-content" class="uk-switcher uk-margin"> <ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
<li class="uk-animation-fade"> <li class="uk-animation-fade">
<div *ngIf="publicationInfo.references == undefined" class = "uk-alert" > <div *ngIf="publicationInfo.references == undefined" class = "uk-alert" >
There are no references There are no references
@ -122,7 +131,8 @@
<tabPaging [showAll]="showAllReferences" [length]="publicationInfo.references.length" (changeShowAll)="showChange($event)"></tabPaging> <tabPaging [showAll]="showAllReferences" [length]="publicationInfo.references.length" (changeShowAll)="showChange($event)"></tabPaging>
<div *ngFor="let item of publicationInfo.references.slice(0,10)"> <div *ngFor="let item of publicationInfo.references.slice(0,10)">
<p *ngIf=" item != undefined && item['url'] != undefined" class="uk-icon-external-link"> <p *ngIf=" item != undefined && item['url'] != undefined"
class="uk-icon-external-link custom-icon">
<a href="{{item['url']}}" target="_blank"> <a href="{{item['url']}}" target="_blank">
{{item['name']}} {{item['name']}}
</a> </a>
@ -134,7 +144,8 @@
<div *ngIf="showAllReferences"> <div *ngIf="showAllReferences">
<div *ngFor="let item of publicationInfo.references.slice(10)"> <div *ngFor="let item of publicationInfo.references.slice(10)">
<p *ngIf=" item != undefined && item['url'] != undefined" class="uk-icon-external-link"> <p *ngIf=" item != undefined && item['url'] != undefined"
class="uk-icon-external-link custom-icon">
<a href="{{item['url']}}" target="_blank"> <a href="{{item['url']}}" target="_blank">
{{item['name']}} {{item['name']}}
</a> </a>
@ -182,6 +193,72 @@
<tabTable from="publication" [info]="publicationInfo.similarResearchResults"></tabTable> <tabTable from="publication" [info]="publicationInfo.similarResearchResults"></tabTable>
</div> </div>
</li> </li>
<li class="uk-animation-fade">
<div *ngIf="publicationInfo.organizations == undefined" class = "uk-alert">
There are no related organizations
</div>
<div *ngIf="publicationInfo.organizations != undefined">
<p>
The results below are discovered through our pilot algorithms.
<a href="mailto:feedback@openaire.eu">Let us know how we are doing!</a>
</p>
<table class="uk-table uk-table-striped">
<thead>
<tr>
<th>Organization</th>
<th>Trust</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let organization of publicationInfo.organizations">
<td>
<a *ngIf="(organization['id'] != undefined && organization['id'] != '')
&& ((organization['name'] != undefined && organization['name'] != '')
|| (organization['shortname'] != undefined && organization['shortname'] != ''))"
[queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
{{organization['name']}}
<span *ngIf="organization.name != undefined && organization.name != ''
&& organization.shortname != undefined && organization.shortname != ''"> ( </span>
<span *ngIf="organization.shortname != undefined && organization.shortname != ''">{{organization.shortname}}</span>
<span *ngIf="organization.name != undefined && organization.name != ''
&& organization.shortname != undefined && organization.shortname != ''"> ) </span>
</a>
<p *ngIf="(organization['id'] == undefined || organization['id'] == '')
&& ((organization['name'] != undefined && organization['name'] != '')
|| (organization['shortname'] != undefined && organization['shortname'] != ''))">
{{organization['name']}}
<span *ngIf="organization.name != undefined && organization.name != ''
&& organization.shortname != undefined && organization.shortname != ''"> ( </span>
<span *ngIf="organization.shortname != undefined && organization.shortname != ''">{{organization.shortname}}</span>
<span *ngIf="organization.name != undefined && organization.name != ''
&& organization.shortname != undefined && organization.shortname != ''"> ) </span>
</p>
<div *ngIf="organization.websiteUrl != undefined && organization.websiteUrl != ''">Website url:
<a href="{{organization.websiteUrl}}" target="_blank">{{organization.websiteUrl}}</a>
</div>
<div *ngIf="organization.country != undefined && organization.country != ''">Country: {{organization.country}}</div>
</td>
<td>
<div *ngIf="organization['trust'] != undefined && organization['trust'] != ''"
class="uk-progress uk-progress-warning">
<div class="uk-progress-bar" role="progressbar" aria-valuenow="29" aria-valuemin="0" aria-valuemax="100" [style.width] = "organization['trust']">
{{organization['trust']}}
</div>
</div>
<div *ngIf="organization['trust'] == undefined || organization['trust'] == ''">
<p>no trust found</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</li>
<li *ngIf="publicationInfo.bioentities != undefined" class="uk-animation-fade"> <li *ngIf="publicationInfo.bioentities != undefined" class="uk-animation-fade">
<p> <p>
The results below are discovered through our pilot algorithms. The results below are discovered through our pilot algorithms.
@ -197,7 +274,7 @@
<tbody *ngFor="let key of publicationInfo.bioentities.keys()"> <tbody *ngFor="let key of publicationInfo.bioentities.keys()">
<tr *ngFor="let keyIn of publicationInfo.bioentities.get(key).keys()"> <tr *ngFor="let keyIn of publicationInfo.bioentities.get(key).keys()">
<td class="uk-text-center" *ngIf="keyIn != undefined"> <td class="uk-text-center" *ngIf="keyIn != undefined">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}" <a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}"
target="_blank"> target="_blank">
{{keyIn}} {{keyIn}}
@ -225,7 +302,7 @@
<tbody> <tbody>
<tr *ngFor="let item of publicationInfo.software" class="uk-text-center"> <tr *ngFor="let item of publicationInfo.software" class="uk-text-center">
<td> <td>
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<a href="{{item.url}}" target="_blank"> <a href="{{item.url}}" target="_blank">
{{item.name}} {{item.name}}
</a> </a>
@ -275,7 +352,7 @@
[title]="publicationInfo.downloadFrom.get(key)['accessMode']"> [title]="publicationInfo.downloadFrom.get(key)['accessMode']">
<div *ngIf="i<5 || showAllDownloadFrom" <div *ngIf="i<5 || showAllDownloadFrom"
class="{{publicationInfo.downloadFrom.get(key)['bestAccessMode']}}"> class="{{publicationInfo.downloadFrom.get(key)['bestAccessMode']}}">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<div *ngIf="publicationInfo.downloadFrom.get(key)['url'].length > 1"> <div *ngIf="publicationInfo.downloadFrom.get(key)['url'].length > 1">
{{key}} {{key}}
<span *ngFor="let url of publicationInfo.downloadFrom.get(key)['url']; let i=index;"> <span *ngFor="let url of publicationInfo.downloadFrom.get(key)['url']; let i=index;">
@ -312,7 +389,7 @@
data-uk-tooltip="{pos:'right', cls:'tooltip uk-text-center uk-contrast'}" data-uk-tooltip="{pos:'right', cls:'tooltip uk-text-center uk-contrast'}"
[title]="publicationInfo.publishedIn.get(key)['accessMode']"> [title]="publicationInfo.publishedIn.get(key)['accessMode']">
<div *ngIf="i<5 || showAllPublishedIn" class="{{publicationInfo.publishedIn.get(key)['bestAccessMode']}}"> <div *ngIf="i<5 || showAllPublishedIn" class="{{publicationInfo.publishedIn.get(key)['bestAccessMode']}}">
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<div *ngIf="publicationInfo.publishedIn.get(key)['url'].length > 1"> <div *ngIf="publicationInfo.publishedIn.get(key)['url'].length > 1">
{{key}} {{key}}
<span *ngFor="let url of publicationInfo.publishedIn.get(key)['url']; let i=index"> <span *ngFor="let url of publicationInfo.publishedIn.get(key)['url']; let i=index">
@ -351,34 +428,40 @@
*ngFor="let item of publicationInfo.fundedByProjects let i=index"> *ngFor="let item of publicationInfo.fundedByProjects let i=index">
<div *ngIf="i<5 || showAllFundedBy"> <div *ngIf="i<5 || showAllFundedBy">
<span data-uk-tooltip="{pos:'right', cls:'tooltip uk-text-center uk-contrast'}" <span data-uk-tooltip="{pos:'right', cls:'tooltip uk-text-center uk-contrast'}"
title=" title="{{buildTooltip(item)}}">
<div>
<h4>{{item['title']}}</h4>
Project Code: {{item['code']}}
<div>
Funder: {{item['funderName']}} ({{item['funderShortname']}})
</div>
<div>
Funding: {{item['funding']}}
</div>
</div>
">
<!--a *ngIf="!item['inline']" href="{{item['url']}}"--> <!--a *ngIf="!item['inline']" href="{{item['url']}}"-->
<a *ngIf="!item['inline']" <a *ngIf="!item['inline'] && item.id"
[queryParams]="{projectId: item.id}" routerLinkActive="router-link-active" routerLink="/search/project"> [queryParams]="{projectId: item.id}" routerLinkActive="router-link-active" routerLink="/search/project">
{{item['funderShortname']?item['funderShortname']:item['funderName']}} <span *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname']?item['funderShortname']:item['funderName']}}</span>
| {{ item['acronym']?item['acronym']:item['title']}} <span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
<span *ngIf="item['acronym'] || item['title']">| {{ item['acronym']?item['acronym']:item['title']}}</span>
</a> </a>
<!--a *ngIf="item['inline']" href="{{item['url']}}"--> <!--a *ngIf="item['inline']" href="{{item['url']}}"-->
<a *ngIf="item['inline']" <a *ngIf="item['inline'] && item.id"
[queryParams]="{projectId: item.id}" routerLinkActive="router-link-active" routerLink="/search/project"> [queryParams]="{projectId: item.id}" routerLinkActive="router-link-active" routerLink="/search/project">
<mark> <mark>
{{item['funderShortname']?item['funderShortname']:item['funderName']}} <span *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname']?item['funderShortname']:item['funderName']}}</span>
| {{ item['acronym']?item['acronym']:item['title']}} <span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
<span *ngIf="item['acronym'] || item['title']">| {{ item['acronym']?item['acronym']:item['title']}}</span>
</mark> </mark>
</a> </a>
<span class="clickable" *ngIf="!item['inline'] && !item.id">
<span *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname']?item['funderShortname']:item['funderName']}}</span>
<span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
<span *ngIf="item['acronym'] || item['title']">| {{ item['acronym']?item['acronym']:item['title']}}</span>
</span>
<span class="clickable" *ngIf="item['inline'] && !item.id">
<mark>
<span *ngIf="item['funderShortname'] || item['funderName']">{{item['funderShortname']?item['funderShortname']:item['funderName']}}</span>
<span *ngIf="!item['funderShortname'] && !item['funderName']">[no funder available]</span>
<span *ngIf="item['acronym'] || item['title']">| {{ item['acronym']?item['acronym']:item['title']}}</span>
</mark>
</span>
<!--i class="uk-icon-info-circle" <!--i class="uk-icon-info-circle"
data-uk-modal="{target:'#my-id'}"--> data-uk-modal="{target:'#my-id'}"-->
<i class="uk-icon-info-circle"> <i class="uk-icon-info-circle">

48
portal-2/src/app/landingPages/publication/publication.component.ts
View File

@ -16,6 +16,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
}) })
export class PublicationComponent { export class PublicationComponent {
public showAllCollectedFrom: boolean = false; public showAllCollectedFrom: boolean = false;
public showAllDownloadFrom: boolean = false; public showAllDownloadFrom: boolean = false;
public showAllFundedBy: boolean = false; public showAllFundedBy: boolean = false;
@ -84,6 +85,8 @@ export class PublicationComponent {
this._publicationService.getPublicationInfo(this.articleId).subscribe( this._publicationService.getPublicationInfo(this.articleId).subscribe(
data => { data => {
this.publicationInfo = data; this.publicationInfo = data;
// this.result = [] // this.result = []
// this.result = {id: id, type :"dataset", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''}; // this.result = {id: id, type :"dataset", source : "openaire", title: this.publicationInfo.title,url: '', result: '', accessRights: this.publicationInfo.bestlicense, embargoEndDate: ''};
@ -132,4 +135,49 @@ export class PublicationComponent {
this.totalViews = $event.totalViews; this.totalViews = $event.totalViews;
this.totalDownloads = $event.totalDownloads; this.totalDownloads = $event.totalDownloads;
} }
public buildTooltip(item: { "id": string, "acronym": string, "title": string,
"funderShortname": string, "funderName": string,
"funding": string, "code": string, inline: boolean}) {
let tooltipContent: string = "";
if(item.title) {
tooltipContent += "<h4>"+item.title+"</h4>";
}
if(item.code && item.code != "unidentified") {
tooltipContent += "Project Code: "+item.code;
}
if(item.funderName || item.funderShortname) {
tooltipContent += "<div>Funder: ";
if(item.funderName && item.funderShortname) {
tooltipContent += item.funderName + " ("+ item.funderShortname +")";
} else if(item.funderName) {
tooltipContent += item.funderName;
} else {
tooltipContent += item.funderShortname;
}
tooltipContent += "</div>";
}
if(item.funding) {
tooltipContent += "<div>Funding: "+ item.funding + "</div>";
}
if(tooltipContent != "") {
tooltipContent = "<div>" + tooltipContent + "</div>";
}
return tooltipContent;
/*<div>
<h4>{{item['title']}}</h4>
Project Code: {{item['code']}}
<div>
Funder: {{item['funderName']}} ({{item['funderShortname']}})
</div>
<div>
Funding: {{item['funding']}}
</div>
</div>*/
}
} }

35
portal-2/src/app/landingPages/publication/publication.service.ts
View File

@ -112,11 +112,18 @@ export class PublicationService {
"funding": "", "code": "", "inline": false "funding": "", "code": "", "inline": false
} }
if(relation.title != 'unidentified') {
this.publicationInfo.fundedByProjects[counter]['id'] = this.publicationInfo.fundedByProjects[counter]['id'] =
/*OpenaireProperties.getsearchLinkToProject() + */relation['to'].content; /*OpenaireProperties.getsearchLinkToProject() + */relation['to'].content;
this.publicationInfo.fundedByProjects[counter]['acronym'] = relation.acronym; this.publicationInfo.fundedByProjects[counter]['acronym'] = relation.acronym;
this.publicationInfo.fundedByProjects[counter]['title'] = relation.title; this.publicationInfo.fundedByProjects[counter]['title'] = relation.title;
this.publicationInfo.fundedByProjects[counter]['code'] = relation.code; this.publicationInfo.fundedByProjects[counter]['code'] = relation.code;
} else {
this.publicationInfo.fundedByProjects[counter]['id'] = "";
this.publicationInfo.fundedByProjects[counter]['acronym'] = "";
this.publicationInfo.fundedByProjects[counter]['title'] = "";
this.publicationInfo.fundedByProjects[counter]['code'] = "";
}
if(relation.hasOwnProperty("funding")) { if(relation.hasOwnProperty("funding")) {
let length1 = Array.isArray(relation['funding']) ? relation['funding'].length : 1; let length1 = Array.isArray(relation['funding']) ? relation['funding'].length : 1;
@ -223,6 +230,34 @@ export class PublicationService {
this.publicationInfo.similarResearchResults[counter]['name'] = titleName; this.publicationInfo.similarResearchResults[counter]['name'] = titleName;
this.publicationInfo.similarResearchResults[counter]['date'] = relation.dateofacceptance.substring(0,4);; this.publicationInfo.similarResearchResults[counter]['date'] = relation.dateofacceptance.substring(0,4);;
this.publicationInfo.similarResearchResults[counter]['trust'] = Math.round(relation.trust*100)+"%"; this.publicationInfo.similarResearchResults[counter]['trust'] = Math.round(relation.trust*100)+"%";
} else if(relation['to'].class == "hasAuthorInstitution") {
if(this.publicationInfo.organizations == undefined) {
this.publicationInfo.organizations = new Array<{
"name": string, "shortname": string,
"id": string, "websiteUrl": string,
"country": string, "trust": string}>();
}
let organization: {
"name": string, "shortname": string,
"id": string, "websiteUrl": string,
"country": string, "trust": string
} = {
"name": "", "shortname": "",
"id": "", "websiteUrl": "",
"country": "", "trust": ""
};
organization.id = relation['to'].content;
organization.name = relation.legalname;
organization.shortname = relation.legalshortname;
organization.websiteUrl = relation.websiteurl;
if(relation.country) {
organization.country = relation.country.classname;
}
organization.trust = Math.round(relation.trust*100)+"%";
this.publicationInfo.organizations.push(organization);
} }
} }
} }

2
portal-2/src/app/landingPages/showIdentifiers.component.ts
View File

@ -10,7 +10,7 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
<span *ngFor="let key of identifiers.keys() let i=index"> <span *ngFor="let key of identifiers.keys() let i=index">
<span *ngFor="let item of identifiers.get(key) let j=index"> <span *ngFor="let item of identifiers.get(key) let j=index">
<span *ngIf="i>0 || j>0">, </span> <span *ngIf="i>0 || j>0">, </span>
<span class="uk-icon-external-link"> <span class="uk-icon-external-link custom-icon">
<a *ngIf="key=='doi'" href="{{doiURL}}{{item}}" target="_blank"> <a *ngIf="key=='doi'" href="{{doiURL}}{{item}}" target="_blank">
{{key}}: {{item}} {{key}}: {{item}}
</a> </a>

2
portal-2/src/app/landingPages/showTitle.component.ts
View File

@ -6,7 +6,7 @@ import {Component, Input} from '@angular/core';
template: ` template: `
<h2 *ngIf="title != undefined"> <h2 *ngIf="title != undefined">
<span *ngIf="title['url'] != undefined && title['url'] != null && title['url'] != ''" <span *ngIf="title['url'] != undefined && title['url'] != null && title['url'] != ''"
class="uk-icon-external-link {{title['accessMode']}}" class="uk-icon-external-link custom-icon {{title['accessMode']}}"
data-uk-tooltip="{cls:'tooltip uk-text-center uk-contrast'}" data-uk-tooltip="{cls:'tooltip uk-text-center uk-contrast'}"
[title]="title['accessMode']"> [title]="title['accessMode']">
<a *ngIf="title['name'] != undefined && title['name'] != ''" <a *ngIf="title['name'] != undefined && title['name'] != ''"

4
portal-2/src/app/searchPages/searchUtils/searchResult.component.ts
View File

@ -114,7 +114,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
<div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''"> <div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''">
<span>Website URL: </span> <span>Website URL: </span>
<span> <span>
<a href="{{result['websiteURL']}}" target="_blank" class="uk-icon-external-link"> <a href="{{result['websiteURL']}}" target="_blank" class="uk-icon-external-link custom-icon">
{{result['websiteURL']}} {{result['websiteURL']}}
</a> </a>
</span> </span>
@ -122,7 +122,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
<div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''"> <div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''">
<span>OAI-PMH URL: </span> <span>OAI-PMH URL: </span>
<span> <span>
<a href="{{result['OAIPMHURL']}}" target="_blank" class="uk-icon-external-link"> <a href="{{result['OAIPMHURL']}}" target="_blank" class="uk-icon-external-link custom-icon">
{{result['OAIPMHURL']}} {{result['OAIPMHURL']}}
</a> </a>
</span> </span>

1
portal-2/src/app/utils/entities/publicationInfo.ts
View File

@ -31,4 +31,5 @@ export class PublicationInfo {
similarResearchResults: { "name": string, "id": string, "date": string, "trust": string, "class": string}[]; similarResearchResults: { "name": string, "id": string, "date": string, "trust": string, "class": string}[];
references: { "name": string, "url": string}[]; references: { "name": string, "url": string}[];
contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string, "inline": boolean}[]; contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string, "inline": boolean}[];
organizations: {"name": string, "shortname":string, "id": string, "websiteUrl": string, "country": string, "trust": string}[];
} }

8
portal-2/src/app/utils/showDataProviders.component.ts
View File

@ -15,7 +15,7 @@ import {Component, Input} from '@angular/core';
<div role="separator" class="divider" *ngFor="let item of dataProviders"> <div role="separator" class="divider" *ngFor="let item of dataProviders">
<p *ngIf="item['url'] != undefined && item['url']"> <p *ngIf="item['url'] != undefined && item['url']">
<a href="{{item['url']}}" target="_blank" class="uk-icon-external-link"> <a href="{{item['url']}}" target="_blank" class="uk-icon-external-link custom-icon">
{{item['name']}} {{item['name']}}
</a> </a>
</p> </p>
@ -25,7 +25,8 @@ import {Component, Input} from '@angular/core';
<p> <p>
<span *ngFor="let item of dataProviders.organizations"> <span *ngFor="let item of dataProviders.organizations">
<a *ngIf="item['url']!=''" href="{{item['url']}}" target="_blank" class="uk-icon-external-link"> <a *ngIf="item['url']!=''" href="{{item['url']}}" target="_blank"
class="uk-icon-external-link custom-icon">
{{item['name']}} {{item['name']}}
</a> </a>
<p *ngIf="item['url']==''"> <p *ngIf="item['url']==''">
@ -41,7 +42,8 @@ import {Component, Input} from '@angular/core';
<p *ngIf="item['websiteUrl'] != null && item['websiteUrl'] != ''"> <p *ngIf="item['websiteUrl'] != null && item['websiteUrl'] != ''">
Website URL: Website URL:
<a href="{{item['websiteUrl']}}" target="_blank" class="uk-icon-external-link" > <a href="{{item['websiteUrl']}}" target="_blank"
class="uk-icon-external-link custom-icon">
{{item['websiteUrl']}} {{item['websiteUrl']}}
</a> </a>
</p> </p>

8
portal-2/src/index.html
View File

@ -133,6 +133,14 @@
background: rgba(100, 100, 100, 1); background: rgba(100, 100, 100, 1);
} }
.custom-icon {
line-height: unset;
}
.custom-tab-content {
min-height: 250px;
}
.filterItem span { .filterItem span {
display: inline-flex; display: inline-flex;
} }