Project

General

Profile

« Previous | Next » 

Revision 48788

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

View differences:

modules/uoa-services-portal/trunk/portal-2/src/app/landingPages/metrics.component.ts
45 45
              <div *ngIf="entityType=='results'" class="uk-text-center">Page views</div>
46 46
              <div  *ngIf="entityType!='results'" class="uk-text-center">Research results page views</div>
47 47
              <div class="uk-text-center">{{pageViews}}</div>
48
              <p class="uk-article-meta uk-margin-top">Research results page views in OpenAIRE</p>
48
              <div class="uk-margin-top uk-article-meta">
49
                <div *ngIf="entityType != 'results'">Research results page views in OpenAIRE</div>
50
                <div *ngIf="entityType == 'results'">{{entity}} page views in OpenAIRE</div>
51
              </div>
49 52

  
50 53
          </div>
51 54
      </div>
......
70 73
                </span></div>
71 74

  
72 75
                <div class="uk-margin-top uk-article-meta">
73
                  <div *ngIf="entityType == 'projects'">
74
                    Research results page views in Repositories
75
                  </div>
76
                  <div *ngIf="entityType == 'datasources'">
77
                    Research results page views in Repository
78
                  </div>
79
                  <div *ngIf="entityType == 'results'">
80
                    Publication page views in Repositories
81
                  </div>
76
                  <div *ngIf="entityType == 'projects'">Research results page views in Repositories</div>
77
                  <div *ngIf="entityType == 'datasources'">Research results page views in Repository</div>
78
                  <div *ngIf="entityType == 'results'">{{entity}} page views in Repositories</div>
82 79
                  <div *ngIf="entityType!='datasources' && metrics.totalOpenaireViews > 0">
83
                    Of the {{metrics.totalViews}} views, repositories accessed {{metrics.totalOpenaireViews}} times from OpenAIRE
80
                    Of the {{metrics.totalViews}} views, repositories accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE
84 81
                  </div>
85 82
                  <div *ngIf="entityType=='datasources' && metrics.totalOpenaireViews > 0">
86
                    Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} times from OpenAIRE
83
                    Of the {{metrics.totalViews}} views, repository accessed {{metrics.totalOpenaireViews}} time(s) from OpenAIRE
87 84
                  </div>
88 85
                </div>
89 86
          </div>
......
109 106
                </span></div>
110 107

  
111 108
                <div class="uk-margin-top uk-article-meta">
112
                  <div *ngIf="entityType == 'projects'">
113
                    Research results page downloads in Repositories
114
                  </div>
115
                  <div *ngIf="entityType == 'datasources'">
116
                    Research results page downloads in Repository
117
                  </div>
118
                  <div *ngIf="entityType == 'results'">
119
                    Publication page downloads in Repositories
120
                  </div>
109
                  <div *ngIf="entityType == 'projects'">Research results page downloads in Repositories</div>
110
                  <div *ngIf="entityType == 'datasources'">Research results page downloads in Repository</div>
111
                  <div *ngIf="entityType == 'results'">{{entity}} page downloads in Repositories</div>
121 112
                  <div *ngIf="entityType!='datasources' && metrics.totalOpenaireDownloads > 0">
122
                    Of the {{metrics.totalDownloads}} downloads, repositories accessed {{metrics.totalOpenaireDownloads}} times from OpenAIRE
113
                    Of the {{metrics.totalDownloads}} downloads, repositories accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE
123 114
                  </div>
124 115
                  <div *ngIf="entityType=='datasources' && metrics.totalOpenaireDownloads > 0">
125
                    Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} times from OpenAIRE
116
                    Of the {{metrics.totalDownloads}} downloads, repository accessed {{metrics.totalOpenaireDownloads}} time(s) from OpenAIRE
126 117
                  </div>
127 118
                </div>
128 119

  
modules/uoa-services-portal/trunk/portal-2/src/app/landingPages/project/project.component.html
218 218

  
219 219
                    <!--[name]="projectName"-->
220 220
                    <metrics [pageViews]="pageViews"
221
                        [id]="projectId" [enitityType]="'projects'" [entity]="'Project'"
221
                        [id]="projectId" [entityType]="'projects'" [entity]="'Project'"
222 222
                        (metricsResults)="metricsResults($event)">
223 223
                    </metrics>
224 224
                    <!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="800" height="350"></i-frame-->

Also available in: Unified diff