Project

General

Profile

« Previous | Next » 

Revision 60826

[Library|Trunk]

Metrics:
add back the Openaire views

SEO:
- Landing: encode pid in canonical url
- result preview: single encoding in pid url

Enermaps Integration:
- update landing tab
- update look for tool url

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/dataProvider/dataProvider.component.ts
526 526
  }
527 527
  
528 528
  public get hasMetrics(): boolean {
529
    return !(this.totalViews && this.totalDownloads/* && this.pageViews*/) || this.totalViews > 0 || this.totalDownloads > 0 /*|| this.pageViews > 0*/;
529
    return !(this.totalViews && this.totalDownloads && this.pageViews) || this.totalViews > 0 || this.totalDownloads > 0 || this.pageViews > 0;
530 530
  }
531 531
  
532 532
  public openStatistics() {
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/project/project.component.ts
467 467
  }
468 468
  
469 469
  public get hasMetrics(): boolean {
470
    return !(this.totalViews && this.totalDownloads/* && this.pageViews*/) || this.totalViews > 0 || this.totalDownloads > 0/*||this.pageViews > 0*/;
470
    return !(this.totalViews && this.totalDownloads && this.pageViews) || this.totalViews > 0 || this.totalDownloads > 0||this.pageViews > 0;
471 471
  }
472 472

  
473 473
  public openStatistics() {
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/landing-utils/metrics/metrics.component.ts
26 26
                are derived from aggregating individual research results metrics.
27 27
              </i>
28 28
            </div>
29
            <div class="uk-child-width-1-2@m uk-grid-small uk-grid-divider uk-grid-match" uk-grid>
29
            <div class="uk-child-width-1-3@m uk-grid-small uk-grid-divider uk-grid-match" uk-grid>
30 30
              <div class="uk-text-center uk-first-column">
31 31
                <div class="number">{{metrics.totalDownloads | number}}</div>
32 32
                <div>Downloads</div>
33 33
              </div>
34
              <!--<div class="uk-text-center">
34
              <div class="uk-text-center">
35 35
                <div class="number">{{pageViews | number}}</div>
36 36
                <div>OpenAIRE views</div>
37
              </div>-->
37
              </div>
38 38
              <div class="uk-text-center">
39 39
                <div class="number">{{metrics.totalViews | number}}</div>
40 40
                <div>Total views</div>
......
224 224
  }
225 225
  
226 226
  public get total(): number {
227
    return /*+this.pageViews +*/ +this.metrics.totalViews + +this.metrics.totalDownloads;
227
    return +this.pageViews + +this.metrics.totalViews + +this.metrics.totalDownloads;
228 228
  }
229 229
  
230 230
  private getMetrics() {
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/result/resultLanding.component.html
425 425
                </div>
426 426
              </ng-template>
427 427
              <ng-template #enermaps_tab>
428

  
429
                  <div   class="uk-width-expand  uk-text-center uk-padding">
428
                <div class="uk-padding">
429
                  <div   class=" uk-inline uk-width-expand  uk-text-center ">
430 430
                    <img  class="uk-width-auto" [src]="properties.enermapsURL +'/images/' + enermapsId + '.png'" alt="Enermaps tool preview">
431
                    <br>
432
                    <span class=" uk-text-baseline uk-text-muted"> Visit <a
433
                      class=" uk-margin-right uk-margin-small-top"
434
                      [href]="properties.enermapsURL" target="_blank" >
435
                      Enermaps Tool
436
                    </a></span>
431
                    <div class="uk-overlay uk-overlay-default uk-position-bottom">
432
                      <p>Visit <a
433
                        class=" uk-margin-right uk-margin-small-top"
434
                        [href]="properties.enermapsURL" target="_blank" >
435
                        Enermaps tool <span class="custom-external custom-icon space"></span>
436
                      </a></p>
437
                    </div>
438
                </div>
439
              </div>
437 440

  
438
                </div>
439 441
              </ng-template>
440 442
              <my-tabs>
441 443
<!--                *ngIf="hasPrimaryInfo || hasSecondaryInfo"-->
modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/result/resultLanding.component.ts
353 353
        if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType
354 354
          this.updateUrlWithType(pid);
355 355
        }
356
        this.seoService.createLinkForCanonicalURL(this.properties.domain+ properties.baseLink  + ( pid ? (this.linkToLandingPage.split("?")[0] + "?pid=" + pid.id):
356
        this.seoService.createLinkForCanonicalURL(this.properties.domain+ properties.baseLink  + ( pid ? (this.linkToLandingPage.split("?")[0] + "?pid=" + encodeURIComponent(pid.id)):
357 357
          (this.linkToLandingPage + this.resultLandingInfo.relcanId)));
358 358
        if ((this.type == "publication") && (this.properties.environment == "beta" || this.properties.environment == "development") && (typeof document !== 'undefined')) {
359 359
          this.getOpenCitations();
......
433 433
  }
434 434
  
435 435
  public get hasMetrics(): boolean {
436
    return !(this.totalViews && this.totalDownloads /*&& this.pageViews*/) || this.totalViews > 0 || this.totalDownloads > 0 /*|| this.pageViews > 0*/;
436
    return !(this.totalViews && this.totalDownloads && this.pageViews) || this.totalViews > 0 || this.totalDownloads > 0 || this.pageViews > 0;
437 437
  }
438 438
  
439 439
  private updateDescription(description: string) {
modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/result-preview/result-preview.component.html
1 1
<div *ngIf="result">
2 2
  <!-- Before title -->
3 3
  <div class="uk-grid uk-flex uk-flex-middle">
4
    <div *ngIf="properties.enermapsURL && showEnermaps" class="uk-width-auto">
5
      <a [href]="properties.enermapsURL" target="_blank" ><img *ngIf="result.enermapsId"
6
                                                               class="uk-width-medium" [src]="properties.enermapsURL + '/images/' + result.enermapsId + '.png'" alt="Enermaps tool preview">
7
      </a>
4
    <div   *ngIf="properties.enermapsURL && showEnermaps && result.enermapsId"  class=" uk-inline uk-width-auto  uk-text-center uk-visible-toggle">
5
      <img  class="uk-width-medium" [src]="properties.enermapsURL +'/images/' + result.enermapsId + '.png'" alt="Enermaps tool preview">
6
      <div class="uk-overlay uk-margin-medium-left uk-overlay-default uk-position-bottom uk-hidden-hover uk-padding-small">
7
        <p>Visit <a
8
          class=" uk-margin-right uk-margin-small-top"
9
          [href]="properties.enermapsURL" target="_blank" >
10
          Enermaps tool <span class="custom-external custom-icon space"></span>
11
        </a></p>
12
      </div>
13

  
8 14
    </div>
9 15
    <div class="uk-width-expand">
10 16
  <div>
modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/result-preview/result-preview.component.ts
83 83
    let pid:Identifier =this.getPID();
84 84
    if(pid){
85 85
      this.urlParam = "pid";
86
      this.result.id = encodeURIComponent(pid.id);
86
      this.result.id = pid.id;
87 87
    
88 88
    }
89 89
  }

Also available in: Unified diff