Project

General

Profile

« Previous | Next » 

Revision 60895

Added by Konstantinos Triantafyllou about 3 years ago

[Library | Trunk]: Numbers: Add init function. Create numberSize interface

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/number-utils.class.ts
1 
export interface NumberSize {
2 
  number: number;
3 
  size: "M" | "K" | "";
4 
  count: number;
5 
}
1 6 

  		




  2
  7
  
    
export class NumberUtils{


  		




  3
  
  
    

  		




  4
  
  
    

  		




  5
  
  
    

  		




  
  8
  
    
  


  		




  6
  9
  
    
  public static roundNumber(num: number):any {


  		




  7
  10
  
    
      //console.log("Trying to round number: "+ num);


  		




  8
  
  
    
      var roundNum = null;


  		




  
  11
  
    
      var roundNum: NumberSize = null;


  		




  9
  12
  
    
      var initialNum = num;


  		




  10
  13
  
    
      if(num >= 1000000){


  		




  11
  14
  
    
        num=num/1000000;


  		




  12
  15
  
    
        num= Math.round(num);


  		




  13
  
  
    
        roundNum =  { "number": num, "size": "M", count: initialNum};


  		




  
  16
  
    
        roundNum =  { number: num, size: "M", count: initialNum};


  		




  14
  17
  
    
      }else if( num >= 1000){


  		




  15
  18
  
    
        num=num/1000;


  		




  16
  19
  
    
        num= Math.round(num);


  		




  17
  
  
    
        roundNum =  { "number": num, "size": "K", count: initialNum};


  		




  
  20
  
    
        roundNum =  { number: num, size: "K", count: initialNum};


  		




  18
  21
  
    
      }else if (num >= 100) {


  		




  19
  22
  
    
        num=num/100;


  		




  20
  23
  
    
        num= Math.round(num);


  		




  21
  24
  
    
        num=num*100;


  		




  22
  
  
    
        roundNum =  { "number": num, "size": "" , count: initialNum};


  		




  
  25
  
    
        roundNum =  { number: num, size: "" , count: initialNum};


  		




  23
  26
  
    
      }else{


  		




  24
  
  
    
        roundNum =  { "number": num, "size": "" , count: initialNum};


  		




  
  27
  
    
        roundNum =  { number: num, size: "" , count: initialNum};


  		




  25
  28
  
    
      }


  		




  26
  
  
    
      //console.log("Rounded number: "+ roundNum.number + " "+ roundNum.size);


  		




  27
  29
  
    
      return roundNum;


  		




  28
  30
  
    
  }


  		




  29
  31
  
    

  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/sharedComponents/numbers/numbers.component.ts
    
  





  1
  
  
    
import {Component, Input, OnDestroy, OnInit} from '@angular/core';


  		




  
  1
  
    
import {Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core';


  		




  2
  2
  
    
import {SearchResearchResultsService} from '../../services/searchResearchResults.service';


  		




  3
  3
  
    
import {SearchDataprovidersService} from '../../services/searchDataproviders.service';


  		




  4
  4
  
    
import {RefineFieldResultsService} from '../../services/refineFieldResults.service';


  		




  5
  5
  
    
import {EnvProperties} from '../../utils/properties/env-properties';


  		




  6
  6
  
    
import {properties} from '../../../../environments/environment';


  		




  7
  
  
    
import {NumberUtils} from '../../utils/number-utils.class';


  		




  8
  
  
    
import {Subscription, zip} from 'rxjs';


  		




  
  7
  
    
import {NumberSize, NumberUtils} from '../../utils/number-utils.class';


  		




  
  8
  
    
import {BehaviorSubject, Observable, Subscription, zip} from 'rxjs';


  		




  9
  9
  
    

  		




  
  10
  
    
export interface Numbers {


  		




  
  11
  
    
  publicationsSize?: NumberSize;


  		




  
  12
  
    
  datasetsSize?: NumberSize;


  		




  
  13
  
    
  datasetsLinkedSize?: NumberSize;


  		




  
  14
  
    
  softwareLinkedSize?: NumberSize;


  		




  
  15
  
    
  softwareSize?: NumberSize;


  		




  
  16
  
    
  otherSize?: NumberSize;


  		




  
  17
  
    
  fundersSize?: NumberSize;


  		




  
  18
  
    
  projectsSize?: NumberSize;


  		




  
  19
  
    
  datasourcesSize?: NumberSize;


  		




  
  20
  
    
}


  		




  
  21
  
    

  		




  10
  22
  
    
@Component({


  		




  11
  23
  
    
  selector: 'numbers',


  		




  12
  24
  
    
  template: `


  		




  13
  
  
    
    <div *ngIf="!loading">


  		




  
  25
  
    
    <div *ngIf="!loading && numbers">


  		




  14
  26
  
    
      <div class="uk-container uk-section uk-padding-remove-bottom uk-text-center">


  		




  15
  27
  
    
        <div class="uk-grid uk-grid-large uk-child-width-1-3@m" uk-grid>


  		




  16
  
  
    
          <div *ngIf="fundersSize">


  		




  
  28
  
    
          <div *ngIf="numbers.fundersSize">


  		




  17
  29
  
    
            <h3>


  		




  18
  30
  
    
              <a href="https://explore.openaire.eu/search/find/projects" target="_blank" class="uk-text-bold number">


  		




  19
  
  
    
                {{fundersSize.number|number}}<span class="number-size">{{fundersSize.size}}</span>


  		




  
  31
  
    
                {{numbers.fundersSize.number|number}}<span class="number-size">{{numbers.fundersSize.size}}</span>


  		




  20
  32
  
    
              </a>


  		




  21
  33
  
    
            </h3>


  		




  22
  34
  
    
            <span class="uk-text-uppercase uk-text-large">Funders</span>


  		




  23
  35
  
    
          </div>


  		




  24
  
  
    
          <div *ngIf="datasourcesSize">


  		




  
  36
  
    
          <div *ngIf="numbers.datasourcesSize">


  		




  25
  37
  
    
            <h3>


  		




  26
  38
  
    
              <a href="https://explore.openaire.eu/search/find/dataproviders" target="_blank"


  		




  27
  39
  
    
                 class="uk-text-bold number">


  		




  28
  
  
    
                {{datasourcesSize.number|number}}<span class="number-size">{{datasourcesSize.size}}</span>


  		




  
  40
  
    
                {{numbers.datasourcesSize.number|number}}<span class="number-size">{{numbers.datasourcesSize.size}}</span>


  		




  29
  41
  
    
              </a>


  		




  30
  42
  
    
            </h3>


  		




  31
  43
  
    
            <span class="uk-text-uppercase uk-text-large">Content providers</span>


  		




  32
  44
  
    
          </div>


  		




  33
  
  
    
          <div *ngIf="projectsSize">


  		




  
  45
  
    
          <div *ngIf="numbers.projectsSize">


  		




  34
  46
  
    
            <h3>


  		




  35
  47
  
    
              <a href="https://explore.openaire.eu/search/find/projects" target="_blank" class="uk-text-bold number">


  		




  36
  
  
    
                {{projectsSize.number|number}}<span class="number-size">{{projectsSize.size}}</span>


  		




  
  48
  
    
                {{numbers.projectsSize.number|number}}<span class="number-size">{{numbers.projectsSize.size}}</span>


  		




  37
  49
  
    
              </a>


  		




  38
  50
  
    
            </h3>


  		




  39
  51
  
    
            <span class="uk-text-uppercase uk-text-large">Projects</span>


  		




  40
  52
  
    
          </div>


  		




  41
  53
  
    
        </div>


  		




  42
  54
  
    
      </div>


  		




  43
  
  
    
      <div class="uk-section" [ngClass]="backgroundClass">


  		




  
  55
  
    
      <div class="uk-section uk-margin-top" [ngClass]="backgroundClass">


  		




  44
  56
  
    
        <div class="uk-container">


  		




  45
  57
  
    
          <div class="uk-grid uk-flex-center uk-margin-auto-left@m uk-margin-auto-right@m uk-grid-large" uk-grid>


  		




  46
  
  
    
            <div *ngIf="publicationsSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  47
  
  
    
              <div class="number-width uk-flex uk-flex-wrap uk-flex-center uk-flex-left@m">


  		




  
  58
  
    
            <div *ngIf="numbers.publicationsSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  
  59
  
    
              <div class="number-width uk-flex uk-flex-column">


  		




  48
  60
  
    
                <a href="https://explore.openaire.eu/search/find/research-outcomes?type=publications&qf=false"


  		




  49
  
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom">{{publicationsSize.count|number}} </a>


  		




  50
  
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle">


  		




  
  61
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom uk-text-center uk-text-left@m">{{numbers.publicationsSize.count|number}} </a>


  		




  
  62
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle uk-flex-center uk-flex-left@m">


  		




  51
  63
  
    
                  <icon name="book" ratio="1.5" [flex]="true" class="uk-margin-right" [customClass]="colorClass"></icon>


  		




  52
  64
  
    
                  <span>publications</span>


  		




  53
  65
  
    
                </div>


  		




  54
  66
  
    
              </div>


  		




  55
  67
  
    
            </div>


  		




  56
  
  
    
            <div *ngIf="datasetsSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  57
  
  
    
              <div class="number-width uk-flex uk-flex-wrap uk-flex-center uk-flex-left@m">


  		




  
  68
  
    
            <div *ngIf="numbers.datasetsSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  
  69
  
    
              <div class="number-width uk-flex uk-flex-column">


  		




  58
  70
  
    
                <a href="https://explore.openaire.eu/search/find/research-outcomes?type=datasets&qf=false"


  		




  59
  
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom">{{datasetsSize.count|number}} </a>


  		




  60
  
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle">


  		




  
  71
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom uk-text-center uk-text-left@m">{{numbers.datasetsSize.count|number}} </a>


  		




  
  72
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle uk-flex-center uk-flex-left@m">


  		




  61
  73
  
    
                  <icon name="database" ratio="1.5" [flex]="true" class="uk-margin-right" [customClass]="colorClass"></icon>


  		




  62
  74
  
    
                  <span>research data</span>


  		




  63
  75
  
    
                </div>


  		




  64
  76
  
    
              </div>


  		




  65
  77
  
    
            </div>


  		




  66
  
  
    
            <div *ngIf="softwareSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  67
  
  
    
              <div class="number-width uk-flex uk-flex-wrap uk-flex-center uk-flex-left@m">


  		




  
  78
  
    
            <div *ngIf="numbers.softwareSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  
  79
  
    
              <div class="number-width uk-flex uk-flex-column">


  		




  68
  80
  
    
                <a href="https://explore.openaire.eu/search/find/research-outcomes?type=software&qf=false"


  		




  69
  
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom">{{softwareSize.count|number}} </a>


  		




  70
  
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle">


  		




  
  81
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom uk-text-center uk-text-left@m">{{numbers.softwareSize.count|number}} </a>


  		




  
  82
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle uk-flex-center uk-flex-left@m">


  		




  71
  83
  
    
                  <icon name="cog" ratio="1.5" [flex]="true" class="uk-margin-right" [customClass]="colorClass"></icon>


  		




  72
  84
  
    
                  <span>software</span>


  		




  73
  85
  
    
                </div>


  		




  74
  86
  
    
              </div>


  		




  75
  87
  
    
            </div>


  		




  76
  
  
    
            <div *ngIf="otherSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  77
  
  
    
              <div class="number-width uk-flex uk-flex-wrap uk-flex-center uk-flex-left@m">


  		




  
  88
  
    
            <div *ngIf="numbers.otherSize" class="uk-width-1-2@m uk-flex uk-flex-center">


  		




  
  89
  
    
              <div class="number-width uk-flex uk-flex-column">


  		




  78
  90
  
    
                <a href="https://explore.openaire.eu/search/find/research-outcomes?type=other&qf=false"


  		




  79
  
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom">{{otherSize.count|number}} </a>


  		




  80
  
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle">


  		




  
  91
  
    
                   target="_blank" class="number uk-text-bold uk-margin-bottom uk-text-center uk-text-left@m">{{numbers.otherSize.count|number}} </a>


  		




  
  92
  
    
                <div class="uk-text-uppercase uk-flex uk-flex-middle uk-flex-center uk-flex-left@m">


  		




  81
  93
  
    
                  <icon name="earth" ratio="1.5" [flex]="true" class="uk-margin-right" [customClass]="colorClass"></icon>


  		




  82
  94
  
    
                  <span>other research products</span>


  		




  83
  95
  
    
                </div>


  		




  ......




  96
  108
  
    
  @Input() colorClass = 'portal-color';


  		




  97
  109
  
    
  @Input() backgroundClass = null;


  		




  98
  110
  
    
  @Input() refineQuery = null;


  		




  
  111
  
    
  @Input() defaultInit = true;


  		




  
  112
  
    
  @Output() results: EventEmitter<Numbers> = new EventEmitter<Numbers>();


  		




  
  113
  
    
  private emptySubject: BehaviorSubject<number> = new BehaviorSubject<number>(0);


  		




  99
  114
  
    
  public properties: EnvProperties = properties;


  		




  100
  
  
    
  public publicationsSize: any = null;


  		




  101
  
  
    
  public datasetsSize: any = null;


  		




  102
  
  
    
  public softwareSize: any = null;


  		




  103
  
  
    
  public otherSize: any = null;


  		




  104
  
  
    
  public fundersSize: any = null;


  		




  105
  
  
    
  public projectsSize: any = null;


  		




  106
  
  
    
  public datasourcesSize: any = null;


  		




  
  115
  
    
  public numbers: Numbers = {};


  		




  107
  116
  
    
  public loading: boolean = true;


  		




  108
  117
  
    
  private subs: any[] = [];


  		




  109
  118
  
    
  


  		




  ......




  113
  122
  
    
  }


  		




  114
  123
  
    
  


  		




  115
  124
  
    
  ngOnInit() {


  		




  
  125
  
    
    if(this.defaultInit) {


  		




  
  126
  
    
      this.init();


  		




  
  127
  
    
    }


  		




  
  128
  
    
  }


  		




  
  129
  
    
  


  		




  
  130
  
    
  init(getDatasetsLinked = false, getSoftwareLinked = false, getPublications = true, getDatasets = true,


  		




  
  131
  
    
       getSoftware = true, getOther = true, getProjects = true, getDataProviders = true) {


  		




  
  132
  
    
    this.loading = true;


  		




  116
  133
  
    
    this.subs.push(zip(


  		




  117
  
  
    
      this.searchResearchResultsService.numOfSearchResults('publication', '', this.properties, this.refineQuery),


  		




  118
  
  
    
      this.searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, this.refineQuery),


  		




  119
  
  
    
      this.searchResearchResultsService.numOfSearchResults('software', '', this.properties, this.refineQuery),


  		




  120
  
  
    
      this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, this.refineQuery),


  		




  121
  
  
    
      this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, this.refineQuery),


  		




  122
  
  
    
      this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, this.refineQuery)


  		




  
  134
  
    
      (getPublications)?this.searchResearchResultsService.numOfSearchResults('publication', '', this.properties, this.refineQuery):this.empty,


  		




  
  135
  
    
      (getDatasets)?this.searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, this.refineQuery):this.empty,


  		




  
  136
  
    
      (getDatasetsLinked)?this.searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties):this.empty,


  		




  
  137
  
    
      (getSoftware)?this.searchResearchResultsService.numOfSearchResults('software', '', this.properties, this.refineQuery):this.empty,


  		




  
  138
  
    
      (getSoftwareLinked)?this.searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties):this.empty,


  		




  
  139
  
    
      (getOther)?this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, this.refineQuery):this.empty,


  		




  
  140
  
    
      (getProjects)?this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, this.refineQuery):this.empty,


  		




  
  141
  
    
      (getDataProviders)?this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, this.refineQuery):this.empty


  		




  123
  142
  
    
    ).subscribe((data: any[]) => {


  		




  
  143
  
    
      console.log(data)


  		




  124
  144
  
    
      if (data[0] && data[0] > 0) {


  		




  125
  
  
    
        this.publicationsSize = NumberUtils.roundNumber(data[0]);


  		




  
  145
  
    
        this.numbers.publicationsSize = NumberUtils.roundNumber(data[0]);


  		




  126
  146
  
    
      }


  		




  127
  147
  
    
      if (data[1] && data[1] > 0) {


  		




  128
  
  
    
        this.datasetsSize = NumberUtils.roundNumber(data[1]);


  		




  
  148
  
    
        this.numbers.datasetsSize = NumberUtils.roundNumber(data[1]);


  		




  129
  149
  
    
      }


  		




  130
  150
  
    
      if (data[2] && data[2] > 0) {


  		




  131
  
  
    
        this.softwareSize = NumberUtils.roundNumber(data[2]);


  		




  
  151
  
    
        this.numbers.datasetsLinkedSize = NumberUtils.roundNumber(data[2]);


  		




  132
  152
  
    
      }


  		




  133
  153
  
    
      if (data[3] && data[3] > 0) {


  		




  134
  
  
    
        this.otherSize = NumberUtils.roundNumber(data[3]);


  		




  
  154
  
    
        this.numbers.softwareSize = NumberUtils.roundNumber(data[3]);


  		




  135
  155
  
    
      }


  		




  136
  
  
    
      if (data[4][0] && data[4][0] > 0) {


  		




  137
  
  
    
        this.projectsSize = NumberUtils.roundNumber(data[4][0]);


  		




  
  156
  
    
      if (data[4] && data[4] > 0) {


  		




  
  157
  
    
        this.numbers.softwareLinkedSize = NumberUtils.roundNumber(data[4]);


  		




  138
  158
  
    
      }


  		




  139
  
  
    
      if (data[4][1] && data[4][1].length > 0 && data[4][1][0].filterId == 'funder' && data[4][1][0].values) {


  		




  140
  
  
    
        this.fundersSize = NumberUtils.roundNumber(data[4][1][0].values.length);


  		




  141
  
  
    
      }


  		




  142
  159
  
    
      if (data[5] && data[5] > 0) {


  		




  143
  
  
    
        this.datasourcesSize = NumberUtils.roundNumber(data[5]);


  		




  
  160
  
    
        this.numbers.otherSize = NumberUtils.roundNumber(data[5]);


  		




  144
  161
  
    
      }


  		




  
  162
  
    
      if (data[6][0] && data[6][0] > 0) {


  		




  
  163
  
    
        this.numbers.projectsSize = NumberUtils.roundNumber(data[6][0]);


  		




  
  164
  
    
      }


  		




  
  165
  
    
      if (data[6][1] && data[6][1].length > 0 && data[6][1][0].filterId == 'funder' && data[6][1][0].values) {


  		




  
  166
  
    
        this.numbers.fundersSize = NumberUtils.roundNumber(data[6][1][0].values.length);


  		




  
  167
  
    
      }


  		




  
  168
  
    
      if (data[7] && data[7] > 0) {


  		




  
  169
  
    
        this.numbers.datasourcesSize = NumberUtils.roundNumber(data[7]);


  		




  
  170
  
    
      }


  		




  
  171
  
    
      this.results.emit(this.numbers);


  		




  145
  172
  
    
      this.loading = false;


  		




  146
  173
  
    
    }, err => {


  		




  147
  174
  
    
      this.handleError('Error getting numbers', err);


  		




  ......




  157
  184
  
    
    });


  		




  158
  185
  
    
  }


  		




  159
  186
  
    
  


  		




  
  187
  
    
  get empty(): Observable<number> {


  		




  
  188
  
    
    return this.emptySubject.asObservable();


  		




  
  189
  
    
  }


  		




  
  190
  
    
  


  		




  160
  191
  
    
  private handleError(message: string, error) {


  		




  161
  192
  
    
    console.error('Numbers: ' + message, error);


  		




  162
  193
  
    
  }


  		












Also available in:  Unified diff