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

Bug fixes in metrics (correct messages and correct variable binding) 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48788 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2017-07-28 10:21:11 +00:00
parent 74dc21a1a9
commit 2249d06eaf
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,10 @@ import { Subscription } from 'rxjs/Subscription';
<div *ngIf="entityType=='results'" class="uk-text-center">Page views</div> <div *ngIf="entityType=='results'" class="uk-text-center">Page views</div>
<div *ngIf="entityType!='results'" class="uk-text-center">Research results page views</div> <div *ngIf="entityType!='results'" class="uk-text-center">Research results page views</div>
<div class="uk-text-center">{{pageViews}}</div> <div class="uk-text-center">{{pageViews}}</div>
<p class="uk-article-meta uk-margin-top">Research results page views in OpenAIRE</p> <div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType != 'results'">Research results page views in OpenAIRE</div>
<div *ngIf="entityType == 'results'">{{entity}} page views in OpenAIRE</div>
</div>
</div> </div>
</div> </div>
@ -70,20 +73,14 @@ import { Subscription } from 'rxjs/Subscription';
</span></div> </span></div>
<div class="uk-margin-top uk-article-meta"> <div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType == 'projects'"> <div *ngIf="entityType == 'projects'">Research results page views in Repositories</div>
Research results page views in Repositories <div *ngIf="entityType == 'datasources'">Research results page views in Repository</div>
</div> <div *ngIf="entityType == 'results'">{{entity}} page views in Repositories</div>
<div *ngIf="entityType == 'datasources'">
Research results page views in Repository
</div>
<div *ngIf="entityType == 'results'">
Publication page views in Repositories
</div>
<div *ngIf="entityType!='datasources' && metrics.totalOpenaireViews > 0"> <div *ngIf="entityType!='datasources' && metrics.totalOpenaireViews > 0">
Of the {{metrics.totalViews}} views, repositories accessed {{metrics.totalOpenaireViews}} times from OpenAIRE Of the {{metrics.totalViews}} views, repositories accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE
</div> </div>
<div *ngIf="entityType=='datasources' && metrics.totalOpenaireViews > 0"> <div *ngIf="entityType=='datasources' && metrics.totalOpenaireViews > 0">
Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} times from OpenAIRE Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE
</div> </div>
</div> </div>
</div> </div>
@ -109,20 +106,14 @@ import { Subscription } from 'rxjs/Subscription';
</span></div> </span></div>
<div class="uk-margin-top uk-article-meta"> <div class="uk-margin-top uk-article-meta">
<div *ngIf="entityType == 'projects'"> <div *ngIf="entityType == 'projects'">Research results page downloads in Repositories</div>
Research results page downloads in Repositories <div *ngIf="entityType == 'datasources'">Research results page downloads in Repository</div>
</div> <div *ngIf="entityType == 'results'">{{entity}} page downloads in Repositories</div>
<div *ngIf="entityType == 'datasources'">
Research results page downloads in Repository
</div>
<div *ngIf="entityType == 'results'">
Publication page downloads in Repositories
</div>
<div *ngIf="entityType!='datasources' && metrics.totalOpenaireDownloads > 0"> <div *ngIf="entityType!='datasources' && metrics.totalOpenaireDownloads > 0">
Of the {{metrics.totalDownloads}} downloads, repositories accessed {{metrics.totalOpenaireDownloads}} times from OpenAIRE Of the {{metrics.totalDownloads}} downloads, repositories accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE
</div> </div>
<div *ngIf="entityType=='datasources' && metrics.totalOpenaireDownloads > 0"> <div *ngIf="entityType=='datasources' && metrics.totalOpenaireDownloads > 0">
Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} times from OpenAIRE Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE
</div> </div>
</div> </div>

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

@ -218,7 +218,7 @@
<!--[name]="projectName"--> <!--[name]="projectName"-->
<metrics [pageViews]="pageViews" <metrics [pageViews]="pageViews"
[id]="projectId" [enitityType]="'projects'" [entity]="'Project'" [id]="projectId" [entityType]="'projects'" [entity]="'Project'"
(metricsResults)="metricsResults($event)"> (metricsResults)="metricsResults($event)">
</metrics> </metrics>
<!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="800" height="350"></i-frame--> <!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="800" height="350"></i-frame-->