Landing pages: remove bootstrap class - add uikit class (under construction, Dataproviders still in bootstrap) | Login do not store password
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45058 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni
parent
bb12a21fe3
commit
e2aee4cadb
|
|
@ -3,19 +3,19 @@
|
|||
<div *ngIf="datasetInfo != null" >
|
||||
<showTitle [title]="datasetInfo.title"></showTitle>
|
||||
</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="alert alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
</div>
|
||||
|
||||
<div class="row row-offcanvas row-offcanvas-right" >
|
||||
<div class="uk-grid" >
|
||||
|
||||
<div class="col-xs-6 col-sm-9 sidebar-offcanvas" *ngIf="datasetInfo != null">
|
||||
<div class="uk-width-2-3" *ngIf="datasetInfo != null">
|
||||
<div>
|
||||
<showAuthors [authors]="datasetInfo.authors"></showAuthors>
|
||||
<span *ngIf="datasetInfo.date != ''">({{datasetInfo.date}})</span>
|
||||
</div>
|
||||
|
||||
<dl class="dl-horizontal">
|
||||
<dl class="uk-description-list-horizontal">
|
||||
<dt *ngIf="datasetInfo.publisher != undefined && datasetInfo.publisher != ''">Publisher: </dt>
|
||||
<dd *ngIf="datasetInfo.publisher != undefined && datasetInfo.publisher != ''">{{datasetInfo.publisher}}</dd>
|
||||
<dt *ngIf="datasetInfo.type != undefined"> Type: </dt>
|
||||
|
|
@ -31,45 +31,45 @@
|
|||
</dl>
|
||||
|
||||
<blockquote *ngIf="datasetInfo.description != ''">
|
||||
<div class="text-justify" [innerHTML]="datasetInfo.description"></div>
|
||||
<div class="uk-text-justify" [innerHTML]="datasetInfo.description"></div>
|
||||
</blockquote>
|
||||
|
||||
<div class="uk-text-right">
|
||||
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
|
||||
<button (click)=" toggleClaimResult()" class = "uk-button uk-button-primary uk-button-mini" >Add Research Results</button>
|
||||
</div>
|
||||
<inline-claim-result inlineType ="dataset" [inlineEntity]="result" (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a data-toggle="tab" href="#relatedTab">
|
||||
<ul class="uk-tab" data-uk-tab="{connect:'#tab-content'}">
|
||||
<li class="uk-active">
|
||||
<a href="#relatedTab">
|
||||
Related Research Results
|
||||
<span *ngIf="datasetInfo.relatedResearchResults == undefined" class="badge">0</span>
|
||||
<span *ngIf="datasetInfo.relatedResearchResults != undefined" class="badge">
|
||||
<span *ngIf="datasetInfo.relatedResearchResults == undefined" class="uk-badge uk-badge-notification">0</span>
|
||||
<span *ngIf="datasetInfo.relatedResearchResults != undefined" class="uk-badge uk-badge-notification">
|
||||
{{datasetInfo.relatedResearchResults.length}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li role="presentation">
|
||||
<a data-toggle="tab" href="#similarTab">
|
||||
<li>
|
||||
<a href="#similarTab">
|
||||
Similar Research Results
|
||||
<span *ngIf="datasetInfo.similarResearchResults == undefined" class="badge">0</span>
|
||||
<span *ngIf="datasetInfo.similarResearchResults != undefined" class="badge">
|
||||
<span *ngIf="datasetInfo.similarResearchResults == undefined" class="uk-badge uk-badge-notification">0</span>
|
||||
<span *ngIf="datasetInfo.similarResearchResults != undefined" class="uk-badge uk-badge-notification">
|
||||
{{datasetInfo.similarResearchResults.length}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li role="presentation" (click)="getMetrics()">
|
||||
<a data-toggle="tab" href="#metricsTab">
|
||||
<li (click)="getMetrics()">
|
||||
<a href="#metricsTab">
|
||||
Metrics
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="relatedTab" class="tab-pane fade in active panel-body">
|
||||
<div *ngIf="datasetInfo.relatedResearchResults == undefined" class = "alert alert-info " >
|
||||
<ul id="tab-content" class="uk-switcher uk-margin">
|
||||
<li id="relatedTab">
|
||||
<div *ngIf="datasetInfo.relatedResearchResults == undefined" class = "uk-alert" >
|
||||
There are no related research results
|
||||
</div>
|
||||
<div *ngIf="datasetInfo.relatedResearchResults != undefined">
|
||||
|
|
@ -79,10 +79,10 @@
|
|||
</p>
|
||||
<tabTable [info]="datasetInfo.relatedResearchResults"></tabTable>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="similarTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="datasetInfo.similarResearchResults == undefined" class = "alert alert-info " >
|
||||
<li id="similarTab">
|
||||
<div *ngIf="datasetInfo.similarResearchResults == undefined" class = "uk-alert" >
|
||||
There are no similar research results
|
||||
</div>
|
||||
<div *ngIf="datasetInfo.similarResearchResults != undefined">
|
||||
|
|
@ -93,9 +93,12 @@
|
|||
|
||||
<tabTable [info]="datasetInfo.similarResearchResults"></tabTable>
|
||||
</div>
|
||||
</div>
|
||||
<div id="metricsTab" class="tab-pane fade panel-body">
|
||||
<dl *ngIf="metrics != undefined" class="dl-horizontal well">
|
||||
</li>
|
||||
<li id="metricsTab">
|
||||
<div *ngIf="metrics == undefined" class = "uk-alert uk-alert-warning">
|
||||
Metrics are currently unavailable
|
||||
</div>
|
||||
<dl *ngIf="metrics != undefined" class="uk-description-list-horizontal uk-block">
|
||||
<dt>TotalDownloads: </dt>
|
||||
<dd>{{metrics.totalDownloads}}</dd>
|
||||
<dt>TotalViews: </dt>
|
||||
|
|
@ -106,42 +109,43 @@
|
|||
class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">ID</th>
|
||||
<th class="text-center">Number Of Downloads</th>
|
||||
<th class="text-center">Number Of Views</th>
|
||||
<th class="uk-text-center">ID</th>
|
||||
<th class="uk-text-center">Number Of Downloads</th>
|
||||
<th class="uk-text-center">Number Of Views</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let key of metrics.infos.keys()">
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
<a href="{{metrics.infos.get(key).url}}" target="_blank">
|
||||
{{key}}
|
||||
</a>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
{{metrics.infos.get(key).numOfDownloads}}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
{{metrics.infos.get(key).numOfViews}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3" *ngIf="datasetInfo != null">
|
||||
<ul class="list-group mainFunctionsBlock">
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection">
|
||||
<div class="uk-width-1-3" *ngIf="datasetInfo != null">
|
||||
<ul class="uk-list uk-list-striped mainFunctionsBlock">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt >Share - Bookmark</dt>
|
||||
<dd>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
<li class="list-group-item" *ngIf="datasetInfo.collectedFrom != undefined">
|
||||
<dl class="functionsSection">
|
||||
<li></li>
|
||||
<li *ngIf="datasetInfo.collectedFrom != undefined">
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt>Collected from</dt>
|
||||
<dd *ngFor="let item of datasetInfo.collectedFrom">
|
||||
<a href="{{item['url']}}">
|
||||
|
|
@ -150,8 +154,8 @@
|
|||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
<li class="list-group-item" *ngIf="datasetInfo.downloadFrom != undefined && datasetInfo.downloadFrom.size > 0">
|
||||
<dl class="functionsSection">
|
||||
<li *ngIf="datasetInfo.downloadFrom != undefined && datasetInfo.downloadFrom.size > 0">
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt class="title">Download from</dt>
|
||||
<dd class="line" *ngFor="let key of datasetInfo.downloadFrom.keys()">
|
||||
<div *ngIf="datasetInfo.downloadFrom.get(key)['url'].length > 1">
|
||||
|
|
@ -170,11 +174,11 @@
|
|||
</li>
|
||||
|
||||
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection" *ngIf="datasetInfo.fundedByProjects != undefined">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="datasetInfo.fundedByProjects != undefined">
|
||||
<dt class="title">Funded By</dt>
|
||||
<dd
|
||||
title="{{item['title']}}
|
||||
data-uk-tooltip="{pos:'right'}" title="{{item['title']}}
|
||||
| Project Code: {{item['acronym']}}
|
||||
| Funder: {{item['funderName']}} ({{item['funderShortname']}})
|
||||
| Funding: {{item['funding']}}"
|
||||
|
|
@ -192,14 +196,14 @@
|
|||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="functionsSection" *ngIf="datasetInfo.fundedByProjects == undefined">
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="datasetInfo.fundedByProjects == undefined">
|
||||
<dt class="title">Funded By</dt>
|
||||
</dl>
|
||||
<button (click)="toggleClaimProject()" class = "btn btn-primary btn-xs" >Add Projects</button>
|
||||
<button (click)="toggleClaimProject()" class = "uk-button uk-button-primary uk-button-mini" >Add Projects</button>
|
||||
<inline-claim-project *ngIf="result " inlineType ="dataset" [inlineEntity]="result" (projectAdded)="projectAdded($event)" ></inline-claim-project>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection" *ngIf="datasetInfo.contexts != undefined">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="datasetInfo.contexts != undefined">
|
||||
<dt class="title">Related to </dt>
|
||||
<dd class="line" *ngFor="let item of datasetInfo.contexts">
|
||||
<span *ngIf = "!item['inline']" >
|
||||
|
|
@ -214,10 +218,10 @@
|
|||
</mark>
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="functionsSection" *ngIf="datasetInfo.contexts == undefined">
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="datasetInfo.contexts == undefined">
|
||||
<dt class="title">Related to </dt>
|
||||
</dl>
|
||||
<button (click)=" toggleClaimContext()" class = "btn btn-primary btn-xs" >Add Concepts</button>
|
||||
<button (click)=" toggleClaimContext()" class = "uk-button uk-button-primary uk-button-mini" >Add Concepts</button>
|
||||
<inline-claim-context inlineType ="dataset" [inlineEntity]="result" (contextAdded)="contextAdded($event)" ></inline-claim-context>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -82,9 +82,6 @@ export class DatasetComponent {
|
|||
},
|
||||
err => {
|
||||
console.log(err);
|
||||
console.info("error");
|
||||
|
||||
this.errorMessage = 'No dataset metrics found';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,50 +12,50 @@
|
|||
</p>
|
||||
</h3>
|
||||
</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="alert alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
</div>
|
||||
|
||||
<div class="row row-offcanvas row-offcanvas-right" >
|
||||
<div class="uk-grid">
|
||||
|
||||
<div class="col-xs-6 col-sm-9 sidebar-offcanvas" *ngIf="organizationInfo != null">
|
||||
<dl class="dl-horizontal">
|
||||
<div class="uk-width-2-3" *ngIf="organizationInfo != null">
|
||||
<dl class="uk-description-list-horizontal">
|
||||
<dt *ngIf="organizationInfo.name != undefined && organizationInfo.name != ''">Name: </dt>
|
||||
<dd *ngIf="organizationInfo.name != undefined && organizationInfo.name != ''">{{organizationInfo.name}}</dd>
|
||||
<dt *ngIf="organizationInfo.country != undefined && organizationInfo.country != ''">Country: </dt>
|
||||
<dd *ngIf="organizationInfo.country != undefined && organizationInfo.country != ''">{{organizationInfo.country}}</dd>
|
||||
</dl>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a data-toggle="tab" href="#projectsTab">
|
||||
<ul class="uk-tab" data-uk-tab="{connect:'#tab-content'}">
|
||||
<li class="uk-active">
|
||||
<a href="#projectsTab">
|
||||
Projects
|
||||
<span class="badge">{{projectsNum}}</span>
|
||||
<span class="uk-badge uk-badge-notification">{{projectsNum}}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchDataprovidersInit()" role="presentation">
|
||||
<a data-toggle="tab" href="#dataProvidersTab">
|
||||
<li (click)="searchDataprovidersInit()">
|
||||
<a href="#dataProvidersTab">
|
||||
Data Providers
|
||||
<!--span *ngIf="organizationInfo.dataProviders == undefined" class="badge">0</span>
|
||||
<span *ngIf="organizationInfo.dataProviders != undefined" class="badge">
|
||||
{{organizationInfo.dataProviders.length}}
|
||||
</span-->
|
||||
<span class="badge">
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{searchDataprovidersComponent.searchUtils.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" (click)="getMetrics()">
|
||||
<a data-toggle="tab" href="#metricsTab">
|
||||
<li (click)="getMetrics()">
|
||||
<a href="#metricsTab">
|
||||
Metrics
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="projectsTab" class="tab-pane fade in active panel-body">
|
||||
<ul id="tab-content" class="uk-switcher uk-margin">
|
||||
<li id="projectsTab">
|
||||
|
||||
<div *ngIf="organizationInfo.projects == undefined" class = "alert alert-info " >
|
||||
<div *ngIf="organizationInfo.projects == undefined" class = "uk-alert">
|
||||
There are no projects
|
||||
</div>
|
||||
|
||||
|
|
@ -74,22 +74,20 @@
|
|||
<div *ngIf="organizationInfo.projects.size > 1">
|
||||
<strong>Filter by Funder</strong>
|
||||
|
||||
<ul class="list-inline">
|
||||
<li *ngFor="let key of organizationInfo.projects.keys()" class="checkbox">
|
||||
<span *ngFor="let key of organizationInfo.projects.keys()" class="checkbox">
|
||||
<label>
|
||||
<!--input type="checkbox" (ngModelChange)="changeType(key)"-->
|
||||
<input type="checkbox" (click)='handleClick(key)'>
|
||||
{{key}}
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<table class="uk-table uk-table-striped" *ngIf="organizationInfo.projects.size > 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">Funder</th>
|
||||
<th class="text-center">Project Name</th>
|
||||
<th class="uk-text-center">Funder</th>
|
||||
<th class="uk-text-center">Project Name</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody *ngFor="let key of organizationInfo.projects.keys()">
|
||||
|
|
@ -109,11 +107,11 @@
|
|||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="dataProvidersTab" class="tab-pane fade panel-body">
|
||||
<li id="dataProvidersTab">
|
||||
<!--showDataProviders [dataProviders]="organizationInfo.dataProviders"></showDataProviders-->
|
||||
<div *ngIf="searchDataprovidersComponent.searchUtils.totalResults == 0" class = "alert alert-info " >
|
||||
<div *ngIf="searchDataprovidersComponent.searchUtils.totalResults == 0" class = "uk-alert">
|
||||
There are no dataproviders
|
||||
</div>
|
||||
|
||||
|
|
@ -126,27 +124,30 @@
|
|||
<div class = "uk-text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.status"></search-result>
|
||||
</div>
|
||||
</div>
|
||||
<div id="metricsTab" class="tab-pane fade panel-body">
|
||||
<div class="well">
|
||||
</li>
|
||||
<li id="metricsTab">
|
||||
<div *ngIf="metrics == undefined" class = "uk-alert uk-alert-warning">
|
||||
Metrics are currently unavailable
|
||||
</div>
|
||||
<div class="uk-block">
|
||||
<b>Views: </b>{{metrics}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3" *ngIf="organizationInfo != null">
|
||||
<ul class="uk-list">
|
||||
<li class="list-group-item">
|
||||
<div class="uk-width-1-3" *ngIf="organizationInfo != null">
|
||||
<ul class="uk-list uk-list-striped">
|
||||
<li>
|
||||
Share - Bookmark
|
||||
</li>
|
||||
<li role="separator" class="list-group-item divider"></li>
|
||||
<li></li>
|
||||
<div *ngIf="organizationInfo.projects != undefined">
|
||||
<li *ngFor="let key of organizationInfo.projects.keys()" class="list-group-item">
|
||||
<li *ngFor="let key of organizationInfo.projects.keys()">
|
||||
<a (click)="exportProjects(key)">Download projects report (CSV) for {{key}}</a>
|
||||
</li>
|
||||
|
||||
<li *ngFor="let key of organizationInfo.projects.keys()" class="list-group-item">
|
||||
<li *ngFor="let key of organizationInfo.projects.keys()">
|
||||
<a (click)="exportPublications(key)">Download publications report (CSV) for {{key}}</a>
|
||||
</li>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -119,9 +119,6 @@ export class OrganizationComponent {
|
|||
},
|
||||
err => {
|
||||
console.log(err);
|
||||
console.info("error");
|
||||
|
||||
this.errorMessage = 'No organization metrics found';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
<div *ngIf="personInfo != null">
|
||||
<h3>{{personInfo.fullname}}</h3>
|
||||
</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="alert alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
</div>
|
||||
|
||||
<div class="row row-offcanvas row-offcanvas-right" >
|
||||
<div class="uk-grid">
|
||||
|
||||
<div class="col-xs-6 col-sm-9 sidebar-offcanvas" *ngIf="personInfo != null">
|
||||
<dl class="dl-horizontal">
|
||||
<div class="uk-width-2-3" *ngIf="personInfo != null">
|
||||
<dl class="uk-description-list-horizontal">
|
||||
<dt *ngIf="personInfo.secondnames != undefined && personInfo.secondnames != ''">Last name: </dt>
|
||||
<dd *ngIf="personInfo.secondnames != undefined && personInfo.secondnames != ''">{{personInfo.secondnames}}</dd>
|
||||
<dt *ngIf="personInfo.firstname != undefined && personInfo.firstname != ''">First name: </dt>
|
||||
|
|
@ -20,29 +20,29 @@
|
|||
<dd *ngIf="personInfo.country != undefined && personInfo.country != ''">{{personInfo.country}}</dd>
|
||||
</dl>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a data-toggle="tab" href="#publicationsTab">
|
||||
<ul class="uk-tab" data-uk-tab="{connect:'#tab-content'}">
|
||||
<li class="uk-active">
|
||||
<a href="#publicationsTab">
|
||||
Publications
|
||||
<span class="badge">
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{searchPublicationsComponent.searchUtils.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" (click)="searchDatasetsInit()">
|
||||
<a data-toggle="tab" href="#researchDataTab">
|
||||
<li (click)="searchDatasetsInit()">
|
||||
<a href="#researchDataTab">
|
||||
Research Data
|
||||
<span class="badge">
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{searchDatasetsComponent.searchUtils.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="publicationsTab" class="tab-pane fade in active panel-body">
|
||||
<ul id="tab-content" class="uk-switcher uk-margin">
|
||||
<li id="publicationsTab">
|
||||
|
||||
<div *ngIf="searchPublicationsComponent.searchUtils.totalResults == 0" class = "alert alert-info " >
|
||||
<div *ngIf="searchPublicationsComponent.searchUtils.totalResults == 0" class = "uk-alert">
|
||||
There are no publications
|
||||
</div>
|
||||
|
||||
|
|
@ -55,10 +55,10 @@
|
|||
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="researchDataTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="searchDatasetsComponent.searchUtils.totalResults == 0" class = "alert alert-info " >
|
||||
<li id="researchDataTab">
|
||||
<div *ngIf="searchDatasetsComponent.searchUtils.totalResults == 0" class = "uk-alert">
|
||||
There are no research data
|
||||
</div>
|
||||
|
||||
|
|
@ -71,13 +71,13 @@
|
|||
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3" *ngIf="personInfo != null">
|
||||
<ul class="uk-list">
|
||||
<li class="list-group-item">
|
||||
<div class="uk-width-1-3" *ngIf="personInfo != null">
|
||||
<ul class="uk-list uk-list-striped">
|
||||
<li>
|
||||
Share - Bookmark
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<h3 *ngIf="projectInfo.acronym != undefined && projectInfo.acronym != ''">{{projectInfo.acronym}}</h3>
|
||||
<h3 *ngIf="projectInfo.acronym == undefined || projectInfo.acronym == ''">{{projectInfo.title}}</h3>
|
||||
</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="alert alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
</div>
|
||||
|
||||
<div class="row row-offcanvas row-offcanvas-right" >
|
||||
<div class="uk-grid" >
|
||||
|
||||
<div class="col-xs-6 col-sm-9 sidebar-offcanvas" *ngIf="projectInfo != null">
|
||||
<div class="uk-width-2-3" *ngIf="projectInfo != null">
|
||||
|
||||
<dl class="dl-horizontal">
|
||||
<dl class="uk-description-list-horizontal">
|
||||
<dt *ngIf="projectInfo.title != undefined && projectInfo.title != ''">Title: </dt>
|
||||
<dd *ngIf="projectInfo.title != undefined && projectInfo.title != ''">{{projectInfo.title}}</dd>
|
||||
<dt *ngIf="projectInfo.funding != undefined && projectInfo.funding != ''">Funding: </dt>
|
||||
|
|
@ -32,20 +32,18 @@
|
|||
<dd *ngIf="projectInfo.specialClause39 != undefined && projectInfo.specialClause39 != ''">{{projectInfo.specialClause39}}</dd>
|
||||
<dt *ngIf="projectInfo.organizations != undefined">Organizations: </dt>
|
||||
<dd *ngIf="projectInfo.organizations != undefined">
|
||||
<ul class="list-inline">
|
||||
<li *ngFor="let key of projectInfo.organizations.keys()">
|
||||
<a *ngIf="projectInfo.organizations.get(key) != null &&
|
||||
projectInfo.organizations.get(key) != ''"
|
||||
href="{{(projectInfo.organizations.get(key))}}" target="_blank">
|
||||
{{key}}
|
||||
</a>
|
||||
<span *ngIf="projectInfo.organizations.get(key) == null ||
|
||||
projectInfo.organizations.get(key) == ''">
|
||||
{{key}}
|
||||
<span *ngFor="let key of projectInfo.organizations.keys() let i=index">
|
||||
<a *ngIf="projectInfo.organizations.get(key) != null &&
|
||||
projectInfo.organizations.get(key) != ''"
|
||||
href="{{(projectInfo.organizations.get(key))}}" target="_blank">
|
||||
{{key}}
|
||||
</a>
|
||||
<span *ngIf="projectInfo.organizations.get(key) == null ||
|
||||
projectInfo.organizations.get(key) == ''">
|
||||
{{key}}
|
||||
</span>
|
||||
<span *ngIf="i<projectInfo.organizations.size-1">,</span>
|
||||
</span>
|
||||
<span>;</span>
|
||||
</li>
|
||||
</ul>
|
||||
</dd>
|
||||
<dt *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''">More information:</dt>
|
||||
<dd *ngIf="projectInfo.urlInfo != undefined && projectInfo.urlInfo != ''">
|
||||
|
|
@ -55,43 +53,43 @@
|
|||
</dd>
|
||||
</dl>
|
||||
<div class="uk-text-right">
|
||||
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
|
||||
<button (click)=" toggleClaimResult()" class = "uk-button uk-button-primary uk-button-mini" >Add Research Results</button>
|
||||
</div>
|
||||
<inline-claim-result inlineType ="'project'" [inlineEntity]=project (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a data-toggle="tab" href="#publicationsTab">
|
||||
<ul class="uk-tab" data-uk-tab="{connect:'#tab-content'}">
|
||||
<li class="uk-active">
|
||||
<a href="#publicationsTab">
|
||||
Publications
|
||||
<span class="badge">
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{searchPublicationsComponent.searchUtils.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="searchDatasetsInit()">
|
||||
<a data-toggle="tab" href="#researchDataTab">
|
||||
<a href="#researchDataTab">
|
||||
Research Data
|
||||
<span class="badge">
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{searchDatasetsComponent.searchUtils.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a data-toggle="tab" href="#statisticsTab">
|
||||
<a href="#statisticsTab">
|
||||
Statistics
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" (click)="getMetrics()">
|
||||
<a data-toggle="tab" href="#metricsTab">
|
||||
<li (click)="getMetrics()">
|
||||
<a href="#metricsTab">
|
||||
Metrics
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="publicationsTab" class="tab-pane fade in active panel-body">
|
||||
<ul id="tab-content" class="uk-switcher uk-margin">
|
||||
<li id="publicationsTab">
|
||||
|
||||
<div *ngIf="searchPublicationsComponent.searchUtils.totalResults == 0" class = "alert alert-info " >
|
||||
<div *ngIf="searchPublicationsComponent.searchUtils.totalResults == 0" class = "uk-alert" >
|
||||
There are no publications
|
||||
</div>
|
||||
|
||||
|
|
@ -104,10 +102,10 @@
|
|||
<div class = "uk-text-right" *ngIf = "searchPublicationsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchPublications" >View all {{searchPublicationsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchPublicationsComponent.results" [(status)]= "searchPublicationsComponent.status"></search-result>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="researchDataTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="searchDatasetsComponent.searchUtils.totalResults == 0" class = "alert alert-info " >
|
||||
<li id="researchDataTab">
|
||||
<div *ngIf="searchDatasetsComponent.searchUtils.totalResults == 0" class = "uk-alert">
|
||||
There are no research data
|
||||
</div>
|
||||
|
||||
|
|
@ -120,10 +118,10 @@
|
|||
<div class = "uk-text-right" *ngIf = "searchDatasetsComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDatasets" >View all {{searchDatasetsComponent.searchUtils.totalResults}} results</a></div>
|
||||
<search-result [(results)]="searchDatasetsComponent.results" [(status)]= "searchDatasetsComponent.status"></search-result>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="statisticsTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="projectInfo.statistics == undefined" class = "alert alert-info ">
|
||||
<li id="statisticsTab">
|
||||
<div *ngIf="projectInfo.statistics == undefined" class = "uk-alert">
|
||||
There are no statistics
|
||||
</div>
|
||||
<div *ngIf="projectInfo.statistics != undefined">
|
||||
|
|
@ -132,39 +130,42 @@
|
|||
<a href="mailto:">Let us know how we are doing!</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div id="metricsTab" class="tab-pane fade panel-body">
|
||||
<div class="well">
|
||||
<b>Views: </b>{{metrics}}
|
||||
</li>
|
||||
<li id="metricsTab">
|
||||
<div *ngIf="metrics == undefined" class = "uk-alert uk-alert-warning">
|
||||
Metrics are currently unavailable
|
||||
</div>
|
||||
<div class="uk-block">
|
||||
<b>Views: </b>{{metrics}}
|
||||
</div>
|
||||
<i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="100%" height="350"></i-frame>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3" *ngIf="projectInfo != null">
|
||||
<ul class="uk-list">
|
||||
<li class="list-group-item">
|
||||
<div class="uk-width-1-3" *ngIf="projectInfo != null">
|
||||
<ul class="uk-list uk-list-striped">
|
||||
<li>
|
||||
Share - Bookmark
|
||||
</li>
|
||||
<li role="separator" class="list-group-item divider"></li>
|
||||
<li class="list-group-item">
|
||||
<a data-toggle="tab" href="{{linkToSearchPublications}}">
|
||||
<li></li>
|
||||
<li>
|
||||
<a href="{{linkToSearchPublications}}">
|
||||
View all Project Publications
|
||||
</a>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<a data-toggle="tab" href="">
|
||||
<li>
|
||||
<a href="">
|
||||
Dynamically incorporate publications in your site (HTML)
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="list-group-item">
|
||||
<a data-toggle="tab" href="">
|
||||
<li>
|
||||
<a href="">
|
||||
View {{projectInfo.funder}} progress report (HTML)
|
||||
</a>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<li>
|
||||
<export
|
||||
[linkname]="'Download '+ projectInfo.funder +' progress report (CSV)'"
|
||||
[filename]="'publications.csv'">
|
||||
|
|
@ -177,9 +178,9 @@
|
|||
</a>
|
||||
</div>
|
||||
</li-->
|
||||
<li class="list-group-item">
|
||||
<div class="text-center">
|
||||
<a class="btn btn-primary" href="/deposit-publications">
|
||||
<li>
|
||||
<div class="uk-text-center">
|
||||
<a class="uk-button uk-button-primary uk-button-mini" href="/deposit-publications">
|
||||
Deposit Publications
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -141,9 +141,6 @@ export class ProjectComponent{
|
|||
},
|
||||
err => {
|
||||
console.log(err);
|
||||
console.info("error");
|
||||
|
||||
this.errorMessage = 'No project metrics found';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
<div>
|
||||
<div class="container publication">
|
||||
<div class="container-header" >
|
||||
<div *ngIf="publicationInfo != null">
|
||||
<showTitle [title]="publicationInfo.title"></showTitle>
|
||||
</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="alert alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">{{errorMessage}}</div>
|
||||
<div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
|
||||
<div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger" role="alert">{{errorMessage}}</div>
|
||||
</div>
|
||||
|
||||
<div class="row row-offcanvas row-offcanvas-right" >
|
||||
<div class="uk-grid">
|
||||
|
||||
<div class="col-xs-6 col-sm-9 sidebar-offcanvas" *ngIf="publicationInfo != null">
|
||||
<div class="uk-width-2-3" *ngIf="publicationInfo != null">
|
||||
<div>
|
||||
<showAuthors [authors]="publicationInfo.authors"></showAuthors>
|
||||
<span *ngIf="publicationInfo.date != ''">({{publicationInfo.date}})</span>
|
||||
</div>
|
||||
|
||||
<dl class="dl-horizontal">
|
||||
<dl class="uk-description-list-horizontal">
|
||||
<dt *ngIf="publicationInfo.publisher != undefined && publicationInfo.publisher != ''">Publisher: </dt>
|
||||
<dd *ngIf="publicationInfo.publisher != undefined && publicationInfo.publisher != ''">{{publicationInfo.publisher}}</dd>
|
||||
<dt *ngIf="publicationInfo.journal != undefined && publicationInfo.journal['journal'] != ''">Journal: </dt>
|
||||
|
|
@ -50,64 +49,64 @@
|
|||
</dl>
|
||||
|
||||
<blockquote *ngIf="publicationInfo.description != ''">
|
||||
<div class="text-justify" [innerHTML]="publicationInfo.description"></div>
|
||||
<div class="uk-text-justify" [innerHTML]="publicationInfo.description"></div>
|
||||
</blockquote>
|
||||
<div class="uk-text-right">
|
||||
<button (click)=" toggleClaimResult()" class = "btn btn-primary btn-xs" >Add Research Results</button>
|
||||
<button (click)=" toggleClaimResult()" class = "uk-button uk-button-primary uk-button-mini" >Add Research Results</button>
|
||||
</div>
|
||||
<inline-claim-result inlineType ="publication" [inlineEntity]="result" (datasetAdded)="resultsAdded($event,false)" (publicationAdded)="resultsAdded($event,true)" ></inline-claim-result>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a data-toggle="tab" href="#citationsTab">
|
||||
<ul class="uk-tab" data-uk-tab="{connect:'#tab-content'}" (click)="myfunct()">
|
||||
<li class="uk-active">
|
||||
<a href="#citationsTab">
|
||||
References
|
||||
<span *ngIf="publicationInfo.references == undefined" class="badge">0</span>
|
||||
<span *ngIf="publicationInfo.references != undefined" class="badge">
|
||||
<span *ngIf="publicationInfo.references == undefined" class="uk-badge uk-badge-notification">0</span>
|
||||
<span *ngIf="publicationInfo.references != undefined" class="uk-badge uk-badge-notification">
|
||||
{{publicationInfo.references.length}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<a data-toggle="tab" href="#relatedTab">
|
||||
<li>
|
||||
<a href="#relatedTab">
|
||||
Related Research Results
|
||||
<span *ngIf="publicationInfo.relatedResearchResults == undefined" class="badge">0</span>
|
||||
<span *ngIf="publicationInfo.relatedResearchResults != undefined" class="badge">
|
||||
<span *ngIf="publicationInfo.relatedResearchResults == undefined" class="uk-badge uk-badge-notification">0</span>
|
||||
<span *ngIf="publicationInfo.relatedResearchResults != undefined" class="uk-badge uk-badge-notification">
|
||||
{{publicationInfo.relatedResearchResults.length}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<a data-toggle="tab" href="#similarTab">
|
||||
<li>
|
||||
<a href="#similarTab">
|
||||
Similar Research Results
|
||||
<span *ngIf="publicationInfo.similarResearchResults == undefined" class="badge">0</span>
|
||||
<span *ngIf="publicationInfo.similarResearchResults != undefined" class="badge">
|
||||
<span *ngIf="publicationInfo.similarResearchResults == undefined" class="uk-badge uk-badge-notification">0</span>
|
||||
<span *ngIf="publicationInfo.similarResearchResults != undefined" class="uk-badge uk-badge-notification">
|
||||
{{publicationInfo.similarResearchResults.length}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" *ngIf="publicationInfo.bioentities != undefined">
|
||||
<a data-toggle="tab" href="#bioentitiesTab">
|
||||
<li *ngIf="publicationInfo.bioentities != undefined">
|
||||
<a href="#bioentitiesTab">
|
||||
Bioentities
|
||||
<span class="badge">{{bioentitiesNum}}</span>
|
||||
<span class="uk-badge uk-badge-notification">{{bioentitiesNum}}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" *ngIf="publicationInfo.software != undefined">
|
||||
<a data-toggle="tab" href="#softwareTab">
|
||||
<li *ngIf="publicationInfo.software != undefined">
|
||||
<a href="#softwareTab">
|
||||
Software
|
||||
<span class="badge">{{publicationInfo.software.length}}</span>
|
||||
<span class="uk-badge uk-badge-notification">{{publicationInfo.software.length}}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li role="presentation" (click)="getMetrics()">
|
||||
<a data-toggle="tab" href="#metricsTab">
|
||||
<li>
|
||||
<a id="metrtab" href="#metricsTab" (click)="getMetrics('bla')">
|
||||
Metrics
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div id="citationsTab" class="tab-pane fade in active panel-body">
|
||||
<ul id="tab-content" class="uk-switcher uk-margin">
|
||||
<li id="citationsTab">
|
||||
|
||||
<div *ngIf="publicationInfo.references == undefined" class = "alert alert-info " >
|
||||
<div *ngIf="publicationInfo.references == undefined" class = "uk-alert" >
|
||||
There are no references
|
||||
</div>
|
||||
|
||||
|
|
@ -146,10 +145,10 @@
|
|||
<tabPaging [showAll]="showAllReferences" [length]="publicationInfo.references.length" (changeShowAll)="showChange($event)"></tabPaging>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<div id="relatedTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="publicationInfo.relatedResearchResults == undefined" class = "alert alert-info ">
|
||||
<li id="relatedTab">
|
||||
<div *ngIf="publicationInfo.relatedResearchResults == undefined" class = "uk-alert">
|
||||
There are no related research results
|
||||
</div>
|
||||
<div *ngIf="publicationInfo.relatedResearchResults != undefined">
|
||||
|
|
@ -160,11 +159,11 @@
|
|||
|
||||
<tabTable [info]="publicationInfo.relatedResearchResults"></tabTable>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<div id="similarTab" class="tab-pane fade panel-body">
|
||||
<div *ngIf="publicationInfo.similarResearchResults == undefined" class = "alert alert-info ">
|
||||
<li id="similarTab">
|
||||
<div *ngIf="publicationInfo.similarResearchResults == undefined" class = "uk-alert">
|
||||
There are no similar research results
|
||||
</div>
|
||||
<div *ngIf="publicationInfo.similarResearchResults != undefined">
|
||||
|
|
@ -175,8 +174,8 @@
|
|||
|
||||
<tabTable [info]="publicationInfo.similarResearchResults"></tabTable>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="publicationInfo.bioentities != undefined" id="bioentitiesTab" class="tab-pane fade panel-body">
|
||||
</li>
|
||||
<li *ngIf="publicationInfo.bioentities != undefined" id="bioentitiesTab">
|
||||
<p>
|
||||
The results below are discovered through our pilot algorithms.
|
||||
<a href="mailto:">Let us know how we are doing!</a>
|
||||
|
|
@ -184,25 +183,25 @@
|
|||
<table id="bioentitiesTable" class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">Bio Entity</th>
|
||||
<th class="text-center">Site Name</th>
|
||||
<th class="uk-text-center">Bio Entity</th>
|
||||
<th class="uk-text-center">Site Name</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody *ngFor="let key of publicationInfo.bioentities.keys()">
|
||||
<tr *ngFor="let keyIn of publicationInfo.bioentities.get(key).keys()">
|
||||
<td class="text-center" *ngIf="keyIn != undefined">
|
||||
<td class="uk-text-center" *ngIf="keyIn != undefined">
|
||||
<a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}" target="_blank">
|
||||
{{keyIn}}
|
||||
</a>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
{{key}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div *ngIf="publicationInfo.software != undefined" id="softwareTab" class="tab-pane fade panel-body">
|
||||
</li>
|
||||
<li *ngIf="publicationInfo.software != undefined" id="softwareTab">
|
||||
<p>
|
||||
The results below are discovered through our pilot algorithms.
|
||||
<a href="mailto:">Let us know how we are doing!</a>
|
||||
|
|
@ -210,12 +209,12 @@
|
|||
<table id="softwareTable" class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">Site Name</th>
|
||||
<th class="uk-text-center">Site Name</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let item of publicationInfo.software">
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
<a href="{{item.url}}" target="_blank">
|
||||
{{item.name}}
|
||||
</a>
|
||||
|
|
@ -223,9 +222,12 @@
|
|||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div id="metricsTab" class="tab-pane fade panel-body">
|
||||
<dl *ngIf="metrics != undefined" class="dl-horizontal well">
|
||||
</li>
|
||||
<li id="metricsTab">
|
||||
<div *ngIf="metrics == undefined" class = "uk-alert uk-alert-warning">
|
||||
Metrics are currently unavailable
|
||||
</div>
|
||||
<dl *ngIf="metrics != undefined" class="uk-description-list-horizontal uk-block">
|
||||
<dt>TotalDownloads: </dt>
|
||||
<dd>{{metrics.totalDownloads}}</dd>
|
||||
<dt>TotalViews: </dt>
|
||||
|
|
@ -236,22 +238,22 @@
|
|||
class="uk-table uk-table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">ID</th>
|
||||
<th class="text-center">Number Of Downloads</th>
|
||||
<th class="text-center">Number Of Views</th>
|
||||
<th class="uk-text-center">ID</th>
|
||||
<th class="uk-text-center">Number Of Downloads</th>
|
||||
<th class="uk-text-center">Number Of Views</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let key of metrics.infos.keys()">
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
<a href="{{metrics.infos.get(key).url}}" target="_blank">
|
||||
{{key}}
|
||||
</a>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
{{metrics.infos.get(key).numOfDownloads}}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="uk-text-center">
|
||||
{{metrics.infos.get(key).numOfViews}}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -259,24 +261,25 @@
|
|||
</table>
|
||||
<!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="100%" height="250"></i-frame-->
|
||||
<i-frame *ngIf="metricsClicked" [url]=openaireViewsFrameUrl width="100%" height="250"></i-frame>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3" *ngIf="publicationInfo != null">
|
||||
<div class="uk-width-1-3" *ngIf="publicationInfo != null">
|
||||
|
||||
<ul class="list-group mainFunctionsBlock">
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection">
|
||||
<ul class="uk-list uk-list-striped mainFunctionsBlock">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt >Share - Bookmark</dt>
|
||||
<dd>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
<li class="list-group-item" *ngIf="publicationInfo.collectedFrom != undefined">
|
||||
<dl class="functionsSection">
|
||||
<li></li>
|
||||
<li *ngIf="publicationInfo.collectedFrom != undefined">
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt>Collected from</dt>
|
||||
<dd *ngIf="showAllCollectedFrom" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
|
|
@ -286,22 +289,22 @@
|
|||
</a>
|
||||
</dd>
|
||||
<dd *ngIf="showAllCollectedFrom" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
<dd *ngIf="!showAllCollectedFrom && publicationInfo.collectedFrom.length > 5" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllCollectedFrom = !showAllCollectedFrom;">
|
||||
View more
|
||||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
<li class="list-group-item" *ngIf="publicationInfo.downloadFrom != undefined && publicationInfo.downloadFrom.size > 0">
|
||||
<dl class="functionsSection">
|
||||
<li *ngIf="publicationInfo.downloadFrom != undefined && publicationInfo.downloadFrom.size > 0">
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt class="title">Download from</dt>
|
||||
<dd *ngIf="showAllDownloadFrom" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
|
|
@ -311,32 +314,32 @@
|
|||
{{key}}
|
||||
<span *ngFor="let url of publicationInfo.downloadFrom.get(key)['url']; let i=index;">
|
||||
<a href="{{url}}">
|
||||
[{{i+1}}]
|
||||
[{{i+1}}] -- accessMode={{publicationInfo.downloadFrom.get(key)['accessMode']}}
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
<a *ngIf="publicationInfo.downloadFrom.get(key)['url'].length == 1" href="{{publicationInfo.downloadFrom.get(key)['url']}}">
|
||||
{{key}}
|
||||
{{key}} -- accessMode={{publicationInfo.downloadFrom.get(key)['accessMode']}}
|
||||
</a>
|
||||
</div>
|
||||
</dd>
|
||||
<dd *ngIf="showAllDownloadFrom" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
<dd *ngIf="!showAllDownloadFrom && publicationInfo.downloadFrom.length > 5" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
<a class="uk-text-muted" (click)="showAllDownloadFrom = !showAllDownloadFrom;">
|
||||
View more
|
||||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
<li class="list-group-item" *ngIf="publicationInfo.publishedIn != undefined && publicationInfo.publishedIn.size > 0">
|
||||
<dl class="functionsSection">
|
||||
<li *ngIf="publicationInfo.publishedIn != undefined && publicationInfo.publishedIn.size > 0">
|
||||
<dl class="uk-description-list-line functionsSection">
|
||||
<dt class="title">Published in</dt>
|
||||
<dd *ngIf="showAllPublishedIn" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
<a class="uk-text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
|
|
@ -356,28 +359,28 @@
|
|||
</div>
|
||||
</dd>
|
||||
<dd *ngIf="showAllPublishedIn" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
<a class="uk-text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
<dd *ngIf="!showAllPublishedIn && publicationInfo.publishedIn.length > 5" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
<a class="uk-text-muted" (click)="showAllPublishedIn = !showAllPublishedIn;">
|
||||
View more
|
||||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
</li>
|
||||
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection" *ngIf="publicationInfo.fundedByProjects != undefined">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="publicationInfo.fundedByProjects != undefined">
|
||||
<dt class="title">Funded By</dt>
|
||||
<dd *ngIf="showAllFundedBy" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
<a class="uk-text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
<dd
|
||||
title="{{item['title']}}
|
||||
data-uk-tooltip="{pos:'right'}" title="{{item['title']}}
|
||||
| Project Code: {{item['code']}}
|
||||
| Funder: {{item['funderName']}} ({{item['funderShortname']}})
|
||||
| Funding: {{item['funding']}}"
|
||||
|
|
@ -397,22 +400,22 @@
|
|||
</div>
|
||||
</dd>
|
||||
<dd *ngIf="showAllFundedBy" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
<a class="uk-text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
View less
|
||||
</a>
|
||||
</dd>
|
||||
<dd *ngIf="!showAllFundedBy && publicationInfo.fundedByProjects.length > 5" class="uk-text-right">
|
||||
<a class="text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
<a class="uk-text-muted" (click)="showAllFundedBy = !showAllFundedBy;">
|
||||
View more
|
||||
</a>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<button (click)="toggleClaimProject()" class = "btn btn-primary btn-xs" >Add Projects</button>
|
||||
<button (click)="toggleClaimProject()" class = "uk-button uk-button-primary uk-button-mini" >Add Projects</button>
|
||||
<inline-claim-project *ngIf="result " inlineType ="publication" [inlineEntity]="result" (projectAdded)="projectAdded($event)" ></inline-claim-project>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<dl class="functionsSection" *ngIf="publicationInfo.contexts != undefined">
|
||||
<li>
|
||||
<dl class="uk-description-list-line functionsSection" *ngIf="publicationInfo.contexts != undefined">
|
||||
<dt class="title">Related to</dt>
|
||||
<dd class="line" *ngFor="let item of publicationInfo.contexts">
|
||||
<span *ngIf = "!item['inline']" >
|
||||
|
|
@ -431,11 +434,16 @@
|
|||
<dt class="title">Related to </dt>
|
||||
|
||||
</dl>
|
||||
<button (click)=" toggleClaimContext()" class = "btn btn-primary btn-xs" >Add Concepts</button>
|
||||
<button (click)=" toggleClaimContext()" class = "uk-button uk-button-primary uk-button-mini" >Add Concepts</button>
|
||||
<inline-claim-context inlineType ="publication" [inlineEntity]="result" (contextAdded)="contextAdded($event)" ></inline-claim-context>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--script>
|
||||
$("#tabs").on('change.uk.tab', function(event, area, previous){
|
||||
console.info("Switcher switched to ", area);
|
||||
});
|
||||
</script-->
|
||||
|
|
|
|||
|
|
@ -73,9 +73,16 @@ ngAfterContentInit() {
|
|||
|
||||
public activeTab: string = '';
|
||||
|
||||
public myfunct(tab: string) {
|
||||
this.activeTab = tab;
|
||||
}
|
||||
public myfunct() {
|
||||
//this.activeTab = tab;
|
||||
/*UIkit.ul($('[data-uk-tab]').on('show.uk.tab', function(event, area){
|
||||
console.info("Switcher switched to ", area);
|
||||
}));*/
|
||||
|
||||
//var elem = document.activeElement;
|
||||
//console.info("id="+elem.id);
|
||||
console.info("hi");
|
||||
}
|
||||
|
||||
getPublicationInfo(id:string) {
|
||||
this.warningMessage = '';
|
||||
|
|
@ -110,7 +117,8 @@ ngAfterContentInit() {
|
|||
}
|
||||
}
|
||||
|
||||
getMetrics() {
|
||||
getMetrics(id: any) {
|
||||
console.info(id);
|
||||
this.metricsClicked = true;
|
||||
//this.viewsFrameUrl = 'http://vaggelas.athenarc.gr/stats/merge.php?com=query&data=[{"table":"result_stats_monthly","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":0,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Number of views for '+this.publicationInfo.title.name+'","yaxisheaders":["sum of views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"result_stats_monthly(id)-(id)result-id","values":["'+this.articleId+'"],"to":"-1"}]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
|
||||
this.openaireViewsFrameUrl = 'http://vaggelas.athenarc.gr/stats/merge.php?com=query&data=[{"table":"result_stats_monthly_charts","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"result_stats_monthly_charts(id)-(id)result-id","values":["'+this.articleId+'"],"to":"-1"}]},{"table":"repo_view_stats_monthly_charts","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"repo_view_stats_monthly_charts(source)-(piwik_id)datasource_piwik(openaire_id)-(id)datasource-name","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":0,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"repo_view_stats_monthly_charts(id)-(orid)result_oids(id)-(id)result-id","values":["'+this.articleId+'"],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
|
||||
|
|
@ -122,9 +130,6 @@ ngAfterContentInit() {
|
|||
},
|
||||
err => {
|
||||
console.log(err);
|
||||
console.info("error");
|
||||
|
||||
this.errorMessage = 'No publication metrics found';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {Component, Input} from '@angular/core';
|
|||
template: `
|
||||
<span *ngIf="authors != undefined">
|
||||
<div *ngIf="showAll">
|
||||
<a class="text-muted" (click)="showAll = !showAll;">View less authors</a>
|
||||
<a class="uk-text-muted" (click)="showAll = !showAll;">View less authors</a>
|
||||
</div>
|
||||
<span *ngFor="let item of authors.slice(0,30)">
|
||||
<a class="custom-external" href="{{item['url']}}" target="_blank">
|
||||
|
|
@ -21,12 +21,12 @@ import {Component, Input} from '@angular/core';
|
|||
</span>
|
||||
</span>
|
||||
<span *ngIf="!showAll && authors.length > 30">
|
||||
<a class="text-muted" (click)="showAll = !showAll;">
|
||||
<a class="uk-text-muted" (click)="showAll = !showAll;">
|
||||
view all {{authors.length}} authors
|
||||
</a>
|
||||
</span>
|
||||
<span *ngIf="showAll">
|
||||
<a class="text-muted" (click)="showAll = !showAll;">View less authors</a>
|
||||
<a class="uk-text-muted" (click)="showAll = !showAll;">View less authors</a>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
|
|||
@Component({
|
||||
selector: 'showIdentifiers',
|
||||
template: `
|
||||
<div *ngIf="identifiers != undefined && identifiers.size > 0">
|
||||
<span class="uk-description-list-horizontal" *ngIf="identifiers != undefined && identifiers.size > 0">
|
||||
<dt>Identifiers:</dt>
|
||||
<dd>
|
||||
<span *ngFor="let key of identifiers.keys() let i=index">
|
||||
|
|
@ -19,7 +19,7 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
|
|||
</span>
|
||||
</span>
|
||||
</dd>
|
||||
</div>
|
||||
</span>
|
||||
|
||||
`
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'showSubjects',
|
||||
template: `
|
||||
<div *ngIf="subjects != undefined">
|
||||
<span class="uk-description-list-horizontal" *ngIf="subjects != undefined">
|
||||
|
||||
<dt *ngIf="(subjects != undefined && subjects.length > 0) ||
|
||||
(otherSubjects != undefined && otherSubjects.size > 0)">
|
||||
|
|
@ -29,8 +29,9 @@ import {Component, Input} from '@angular/core';
|
|||
</div>
|
||||
</dd>
|
||||
|
||||
<dd class="col-md-offset-1"
|
||||
<dd class="uk-grid"
|
||||
*ngIf="classifiedSubjects != undefined && classifiedSubjects.size > 0">
|
||||
<div uk-push-4-5>
|
||||
<a (click)="showClassifiedSbj = !showClassifiedSbj;">
|
||||
<div *ngIf="!showClassifiedSbj">
|
||||
Show additional classifications
|
||||
|
|
@ -38,11 +39,11 @@ import {Component, Input} from '@angular/core';
|
|||
</div>
|
||||
<div *ngIf="showClassifiedSbj">
|
||||
Hide additional classifications
|
||||
<i class="uk-icon-plus"></i>
|
||||
<i class="uk-icon-minus"></i>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<div class="well" *ngIf="showClassifiedSbj">
|
||||
<div class="uk-block" *ngIf="showClassifiedSbj">
|
||||
<div *ngFor="let key of classifiedSubjects.keys()">
|
||||
Classified by OpenAIRE into
|
||||
<div>
|
||||
|
|
@ -50,8 +51,9 @@ import {Component, Input} from '@angular/core';
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</dd>
|
||||
</div>
|
||||
</span>
|
||||
`
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {Component, Input} from '@angular/core';
|
|||
@Component({
|
||||
selector: 'showTitle',
|
||||
template: `
|
||||
<h2 *ngIf="title != undefined" [class] = "title['accessMode']" [title] = "title['accessMode']" >
|
||||
<h2 *ngIf="title != undefined" [class] = "title['accessMode']" data-uk-tooltip [title]="title['accessMode']" >
|
||||
<div *ngIf="title['url'] != undefined">
|
||||
<a class="custom-external" href="{{title['url']}}" target="_blank">
|
||||
<div [innerHTML]="title['name']"></div>
|
||||
|
|
|
|||
|
|
@ -26,10 +26,11 @@ import {Component, Input} from '@angular/core';
|
|||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<div *ngIf="item['trust'] != ''" class="progress">
|
||||
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="29" aria-valuemin="0" aria-valuemax="100" [style.width] = "item['trust']">
|
||||
<div *ngIf="item['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] = "item['trust']">
|
||||
{{item['trust']}}
|
||||
</div>
|
||||
<!--div class="uk-progress-bar" style="width: 40%;">40%</div-->
|
||||
</div>
|
||||
<div *ngIf="item['trust'] == ''">
|
||||
<p>no trust found</p>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {Injectable} from '@angular/core';
|
||||
import {Http, Response} from '@angular/http';
|
||||
import {Http, Response, Headers, RequestOptions} from '@angular/http';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import 'rxjs/add/observable/of';
|
||||
import 'rxjs/add/operator/do';
|
||||
|
|
@ -15,22 +15,33 @@ export class LoginService {
|
|||
|
||||
constructor(private http: Http, public _cache: CacheService) {}
|
||||
|
||||
authenticate (user: User):any {
|
||||
authenticate (/*user: User*/username: string, password: string):any {
|
||||
/*
|
||||
let headers = new Headers({ 'Content-Type': 'application/json' });
|
||||
let options = new RequestOptions({ headers: headers });
|
||||
|
||||
let url = OpenaireProperties.getLoginAPIURL()+user.username+"&password="+user.password;
|
||||
return this.http.post(this.heroesUrl, { name }, options)
|
||||
.map(this.extractData)
|
||||
.catch(this.handleError);
|
||||
*/
|
||||
let url = OpenaireProperties.getLoginAPIURL()+username+"&password="+password;
|
||||
let key = url;
|
||||
if (this._cache.has(key)) {
|
||||
return Observable.of(this._cache.get(key));
|
||||
}
|
||||
return this.http.get(url)
|
||||
.map(res => <any> res.json())
|
||||
.map(res => this.parseUserInfo(res['data'], user))
|
||||
.map(res => this.parseUserInfo(res['data']))
|
||||
.do(res => {
|
||||
this._cache.set(key, res);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private parseUserInfo(data: any, user: User): User {
|
||||
private parseUserInfo(data: any/*, user: User*/): User {
|
||||
var user: User = new User();
|
||||
|
||||
user.username = data.username;
|
||||
user.email = data.email;
|
||||
user.id = data.id;
|
||||
user.fullname = data.fullname;
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ export class PublicationService {
|
|||
this.publicationInfo.title = {"name": "", "url": "", "accessMode": ""};
|
||||
if(data[0]['bestlicense'].hasOwnProperty("classid")) {
|
||||
this.publicationInfo.title.accessMode = data[0]['bestlicense'].classid;
|
||||
console.info("accessmode by bestlicense = "+this.publicationInfo.title.accessMode);
|
||||
}
|
||||
if(data[1] != null) {
|
||||
|
||||
|
|
@ -191,24 +192,24 @@ export class PublicationService {
|
|||
}
|
||||
|
||||
if(fundingData.hasOwnProperty("funding_level_2")) {
|
||||
funding = fundingData['funding_level_2'].content;
|
||||
funding = fundingData['funding_level_2'].name;//.content;
|
||||
} else if(fundingData.hasOwnProperty("funding_level_1")) {
|
||||
funding = fundingData['funding_level_1'].content;
|
||||
funding = fundingData['funding_level_1'].name;//.content;
|
||||
} else if(fundingData.hasOwnProperty("funding_level_0")) {
|
||||
funding = fundingData['funding_level_0'].content;
|
||||
funding = fundingData['funding_level_0'].name;//.content;
|
||||
}
|
||||
|
||||
if(funding != undefined) {
|
||||
funding = funding.split("::");
|
||||
// funding = funding.split("::");
|
||||
|
||||
if(this.publicationInfo.fundedByProjects[counter]['funding'] != "") {
|
||||
this.publicationInfo.fundedByProjects[counter]['funding'] += ", "+funding[1];
|
||||
this.publicationInfo.fundedByProjects[counter]['funding'] += ", "+funding;//[1];
|
||||
} else {
|
||||
this.publicationInfo.fundedByProjects[counter]['funding'] = funding[1];
|
||||
}
|
||||
for(let i=2; i<funding.length; i++) {
|
||||
this.publicationInfo.fundedByProjects[counter]['funding'] += " | " + funding[i];
|
||||
this.publicationInfo.fundedByProjects[counter]['funding'] = funding;//[1];
|
||||
}
|
||||
// for(let i=2; i<funding.length; i++) {
|
||||
// this.publicationInfo.fundedByProjects[counter]['funding'] += " | " + funding[i];
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -313,32 +314,31 @@ export class PublicationService {
|
|||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['url'] = new Array<string>();
|
||||
}
|
||||
|
||||
counter2 = this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['url'].length;
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['url'][counter2] = url;
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['url'].push(url);
|
||||
|
||||
if(this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'] == null) {
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'] = new Array<string>();
|
||||
}
|
||||
|
||||
if(instance.hasOwnProperty("licence")) {
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'][counter2] = instance['licence'].classid;
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'].push(instance['licence'].classid);
|
||||
} else {
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'][counter2] = "";
|
||||
this.publicationInfo.downloadFrom.get(instance['hostedby'].name)['accessMode'].push("");
|
||||
}
|
||||
} else {
|
||||
if(data[0] != null && data[0].hasOwnProperty("source")) {
|
||||
let key: string;
|
||||
if(Array.isArray(data[0].source)) {
|
||||
if(!this.publicationInfo.publishedIn.has(data[0]['source'][counter1])) {
|
||||
key = data[0]['source'][counter1];
|
||||
if(counter1==data[0].source.length) {
|
||||
counter1--;
|
||||
}
|
||||
key = data[0]['source'][counter1];
|
||||
} else {
|
||||
if(!this.publicationInfo.publishedIn.has(data[0]['source'])) {
|
||||
key = data[0]['source'];
|
||||
}
|
||||
key = data[0]['source'];
|
||||
}
|
||||
if(!this.publicationInfo.publishedIn.has(key)) {
|
||||
this.publicationInfo.publishedIn.set(key, {"url": null, "accessMode": null});
|
||||
}
|
||||
|
||||
this.publicationInfo.publishedIn.set(key, {"url": null, "accessMode": null});
|
||||
|
||||
if(this.publicationInfo.publishedIn.get(key)['url'] == null) {
|
||||
this.publicationInfo.publishedIn.get(key)['url'] = new Array<string>();
|
||||
|
|
@ -351,22 +351,19 @@ export class PublicationService {
|
|||
}
|
||||
|
||||
if(instance.hasOwnProperty("licence")) {
|
||||
this.publicationInfo.publishedIn.get(key)['accessMode'][counter2] = instance['licence'].classid;
|
||||
this.publicationInfo.publishedIn.get(key)['accessMode'].push(instance['licence'].classid);
|
||||
} else {
|
||||
this.publicationInfo.publishedIn.get(key)['accessMode'][counter2] = "";
|
||||
this.publicationInfo.publishedIn.get(key)['accessMode'].push("");
|
||||
}
|
||||
counter1++;
|
||||
}
|
||||
}
|
||||
if(this.publicationInfo.title != undefined) {
|
||||
if(this.publicationInfo.title['url'] == "") {
|
||||
this.publicationInfo.title['url'] = url;
|
||||
}
|
||||
|
||||
switch (this.publicationInfo.title['accessMode']) {
|
||||
case undefined:
|
||||
this.publicationInfo.title['accessMode'] = instance['accessMode'].classid;
|
||||
this.publicationInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("accessmode by undefined = "+this.publicationInfo.title.accessMode);
|
||||
break;
|
||||
case "CLOSED":
|
||||
if(instance['licence'].classid == "OPEN" ||
|
||||
|
|
@ -374,6 +371,7 @@ export class PublicationService {
|
|||
instance['licence'].classid == "RESTRICTED") {
|
||||
this.publicationInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("accessmode by closed = "+this.publicationInfo.title.accessMode);
|
||||
}
|
||||
break;
|
||||
case "RESTRICTED":
|
||||
|
|
@ -381,12 +379,20 @@ export class PublicationService {
|
|||
instance['licence'].classid == "EMBARGO") {
|
||||
this.publicationInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("accessmode by restricted = "+this.publicationInfo.title.accessMode);
|
||||
}
|
||||
break;
|
||||
case "EMBARGO":
|
||||
if(instance['licence'].classid == "OPEN") {
|
||||
this.publicationInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("accessmode by embargo= "+this.publicationInfo.title.accessMode);
|
||||
}
|
||||
break;
|
||||
case "OPEN":
|
||||
if(this.publicationInfo.title['url'] == "") {
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("title url by empty = "+this.publicationInfo.title.url);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -554,6 +560,7 @@ export class PublicationService {
|
|||
|
||||
if(this.publicationInfo.title != undefined && this.publicationInfo.title['url'] == "") {
|
||||
this.publicationInfo.title['url'] = url;
|
||||
console.info("title url by doi = "+this.publicationInfo.title.url);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,25 +8,28 @@ import {User} from '../utils/entities/user';
|
|||
template: `
|
||||
|
||||
|
||||
<form class="uk-form uk-width-medium-1-3">
|
||||
<form *ngIf="!loggedIn" class="uk-form uk-width-medium-1-3">
|
||||
<fieldset>
|
||||
<legend>Legend</legend>
|
||||
<legend>Login Form</legend>
|
||||
<div class="uk-form-row">
|
||||
<input placeholder="Text input" type="text">
|
||||
<input placeholder="Text input" type="text" name="username" [(ngModel)]="username">
|
||||
</div>
|
||||
<div class="uk-form-row">
|
||||
<input placeholder="Password input" type="password">
|
||||
<input placeholder="Password input" type="password" name="password" [(ngModel)]="password">
|
||||
</div>
|
||||
<div class="uk-form-row">
|
||||
<button class="uk-button">Login</button>
|
||||
<button (click)="login()" class="uk-button">Login</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
<div class="uk-alert uk-alert-success"> ... </div>
|
||||
<div class="uk-alert uk-alert-warning">...</div>
|
||||
<div class="uk-alert uk-alert-danger">...</div>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div *ngIf="!loggedIn && errorMessage.length > 0" class="uk-alert uk-alert-danger">{{errorMessage}}</div>
|
||||
|
||||
<div *ngIf="loggedIn" class="uk-alert uk-alert-success">
|
||||
Hello {{user.fullname}}!
|
||||
</div>
|
||||
|
||||
<!--div class="container-fluid">
|
||||
<div *ngIf="!loggedIn">
|
||||
<div *ngIf="errorMessage.length > 0" class="alert alert-danger" role="alert">
|
||||
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
|
||||
|
|
@ -54,18 +57,22 @@ import {User} from '../utils/entities/user';
|
|||
<div *ngIf="loggedIn">
|
||||
Hello {{user.fullname}}!
|
||||
</div>
|
||||
</div>
|
||||
</div-->
|
||||
`
|
||||
})
|
||||
|
||||
export class LoginComponent {
|
||||
public user: User;
|
||||
private user: User;
|
||||
private loggedIn: boolean;
|
||||
private errorMessage: string;
|
||||
private username: string = "";
|
||||
private password: string = "";
|
||||
|
||||
constructor( private _loginService: LoginService ) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.loggedIn = false;
|
||||
|
||||
if( typeof localStorage !== 'undefined') {
|
||||
if(localStorage.getItem("user")) {
|
||||
this.user = JSON.parse(localStorage.getItem("user"));
|
||||
|
|
@ -73,16 +80,17 @@ export class LoginComponent {
|
|||
}
|
||||
}
|
||||
|
||||
if(this.loggedIn == undefined) {
|
||||
/*if(this.loggedIn == undefined) {
|
||||
this.user = new User();
|
||||
this.loggedIn = false;
|
||||
}
|
||||
}*/
|
||||
this.errorMessage = "";
|
||||
}
|
||||
|
||||
login() {
|
||||
this._loginService.authenticate(this.user).subscribe(
|
||||
this._loginService.authenticate(/*this.user*/this.username, this.password).subscribe(
|
||||
data => {
|
||||
this.user = data;
|
||||
this.loggedIn = true;
|
||||
},
|
||||
err => {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
export class User {
|
||||
password:string;
|
||||
email:string;
|
||||
username: string;
|
||||
id: string;
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ export class OpenaireProperties {
|
|||
|
||||
|
||||
// private static searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
// private static searchAPIURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
private static searchAPIURLLAst = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
// private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/";
|
||||
// private static searchAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
|
||||
// private static searchAPIURLLAst = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
|
||||
|
||||
private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT-new/rest/v2/api/";
|
||||
//private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT-new/rest/v2/api/";
|
||||
|
||||
// private static searchResourcesAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
|
||||
private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT-new/rest/v2/api/resources";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<link href="http://scoobydoo.di.uoa.gr:8083/joomlaNew/templates/yootheme_test/css/uikit.css" rel="stylesheet" type="text/css" id="theme-style-css" /-->
|
||||
|
||||
|
||||
<script src="http://scoobydoo.di.uoa.gr:8083/joomlaNew/media/jui/js/jquery.min.js" type="text/javascript"></script>
|
||||
<script src="http://beta.openaire.eu/media/jui/js/jquery.min.js" type="text/javascript"></script>
|
||||
<!--uikit-->
|
||||
<script src="assets/uikit-2.27.2/js/uikit.min.js" type="text/javascript"></script>
|
||||
<link href="assets/uikit-2.27.2/css/uikit.almost-flat.min.css" rel="stylesheet" type="text/css" />
|
||||
|
|
@ -44,6 +44,13 @@
|
|||
<script src="assets/uikit-2.27.2/js/core/tab.min.js" type="text/javascript"></script>
|
||||
<script src="assets/uikit-2.27.2/js/core/switcher.min.js" type="text/javascript"></script>
|
||||
<!--script src="assets/uikit-2.27.2/js/core/dropdown.min.js" type="text/javascript"></script-->
|
||||
<link href="assets/uikit-2.27.2/css/components/progress.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
<link href="assets/uikit-2.27.2/css/components/tooltip.css" rel="stylesheet" type="text/css" />
|
||||
<script src="assets/uikit-2.27.2/js/components/tooltip.min.js" type="text/javascript"></script>
|
||||
<script src="assets/uikit-2.27.2/js/core/button.min.js" type="text/javascript"></script>
|
||||
<script src="assets/uikit-2.27.2/js/core/alert.min.js" type="text/javascript"></script>
|
||||
<script src="assets/uikit-2.27.2/js/components/grid.min.js" type="text/javascript"></script>
|
||||
|
||||
<!--script src="http://scoobydoo.di.uoa.gr:8083/joomlaNew/templates/yootheme/vendor/assets/uikit/src/js/core/dropdown.js" type="text/javascript"></script-->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue