Project

General

Profile

« Previous | Next » 

Revision 58996

Added by Stefania Martziou almost 4 years ago

Small corrections in some numbers

View differences:

modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html
27 27 
                  </div>
28 28 
                </div>
29 29 

  		




  30
  
  
    
                // TODO uncomment when implemented


  		




  
  30
  
    
                <!-- TODO uncomment when implemented -->


  		




  31
  31
  
    
                <!--<div class="actionButtonsCountryPage uk-text-right">-->


  		




  32
  32
  
    
                  <!--<a class=""><i class="fas fa-code uk-margin-small-right"></i>Embed</a>-->


  		




  33
  33
  
    
                  <!--&lt;!&ndash;<a class="uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download CSV</a>&ndash;&gt;-->


  		




  ......




  169
  169
  
    
                            <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">


  		




  170
  170
  
    
                          </div>


  		




  171
  171
  
    
                          <h3 class="uk-margin-remove">


  		




  172
  
  
    
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.oa" class="number">--</span>


  		




  173
  
  
    
                            <span *ngIf="countryPageOverviewData?.repositories?.oa" class="number">{{countryPageOverviewData.repositories.oa | number}}</span>


  		




  
  172
  
    
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.repositories || !countryPageOverviewData.repositories.total" class="number">--</span>


  		




  
  173
  
    
                            <span *ngIf="countryPageOverviewData?.repositories?.total" class="number">{{countryPageOverviewData.repositories.total | number}}</span>


  		




  174
  174
  
    
                          </h3>


  		




  175
  175
  
    
                        </div>


  		




  176
  176
  
    
                        <div class="uk-margin-top">


  		




  ......




  192
  192
  
    
                            <img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">


  		




  193
  193
  
    
                          </div>


  		




  194
  194
  
    
                          <h3 class="uk-margin-remove">


  		




  195
  
  
    
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.journals || !countryPageOverviewData.journals.oa" class="number">--</span>


  		




  196
  
  
    
                            <span *ngIf="countryPageOverviewData?.journals?.oa" class="number">{{countryPageOverviewData.journals.oa | number}}</span>


  		




  
  195
  
    
                            <span *ngIf="!countryPageOverviewData || !countryPageOverviewData.journals || !countryPageOverviewData.journals.total" class="number">--</span>


  		




  
  196
  
    
                            <span *ngIf="countryPageOverviewData?.journals?.total" class="number">{{countryPageOverviewData.journals.total | number}}</span>


  		




  197
  197
  
    
                            <!--<span *ngIf="overviewData.overview.journals?.oa" class="number">{{overviewData.overview.journals.oa | number}}</span>-->


  		




  198
  198
  
    
                            <!--<span *ngIf="!overviewData.overview.journals || !overviewData.overview.journals.oa" class="number">--</span>-->


  		




  199
  199
  
    
                          </h3>


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.html
    
  





  755
  755
  
    

  		




  756
  756
  
    
                      <div class="uk-margin-top uk-margin-bottom">


  		




  757
  757
  
    
                        <label class="uk-margin-right">Show: </label>


  		




  758
  
  
    
                        <select class="md-input" #selectContent (change)="getContent('publication', selectContent.value)" style="width: 230px; display: inline-block">


  		




  
  758
  
    
                        <select class="md-input" #selectPublicationsContent (change)="getContent('publication', selectPublicationsContent.value)" style="width: 230px; display: inline-block">


  		




  759
  759
  
    
                          <option value="affiliated">affiliated</option>


  		




  760
  760
  
    
                          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>


  		




  761
  761
  
    
                          <option value="deposited">deposited</option>


  		




  ......




  784
  784
  
    

  		




  785
  785
  
    
                              <ul id="pubs-indicators-content-a-fade" class="uk-switcher uk-margin" >


  		




  786
  786
  
    
                                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">


  		




  787
  
  
    
                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  787
  
    
                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  788
  788
  
    
                                  <app-countries-table *ngIf="publicationsAbsoluteTableData" [isPercentage]="false" [countries]="publicationsAbsoluteTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table>


  		




  789
  789
  
    
                                </li>


  		




  790
  790
  
    
                                <li aria-hidden="true" style="animation-duration: 200ms;" class="">


  		




  791
  
  
    
                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  791
  
    
                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  792
  792
  
    
                                  <app-countries-table *ngIf="publicationsPercentageTableData" [isPercentage]="true" [countries]="publicationsPercentageTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table>


  		




  793
  793
  
    
                                </li>


  		




  794
  794
  
    
                              </ul>


  		




  ......




  912
  912
  
    

  		




  913
  913
  
    
                      <div class="uk-margin-top uk-margin-bottom">


  		




  914
  914
  
    
                        <label class="uk-margin-right">Show: </label>


  		




  915
  
  
    
                        <select class="md-input" #selectContent (change)="getContent('dataset', selectContent.value)" style="width: 230px; display: inline-block">


  		




  
  915
  
    
                        <select class="md-input" #selectDatasetsContent (change)="getContent('dataset', selectDatasetsContent.value)" style="width: 230px; display: inline-block">


  		




  916
  916
  
    
                          <option value="affiliated">affiliated</option>


  		




  917
  917
  
    
                          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>


  		




  918
  918
  
    
                          <option value="deposited">deposited</option>


  		




  ......




  941
  941
  
    

  		




  942
  942
  
    
                              <ul id="data-indicators-content-a-fade" class="uk-switcher uk-margin" >


  		




  943
  943
  
    
                                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">


  		




  944
  
  
    
                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  944
  
    
                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  945
  945
  
    
                                  <app-countries-table *ngIf="datasetsAbsoluteTableData" [isPercentage]="false" [countries]="datasetsAbsoluteTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>


  		




  946
  946
  
    
                                </li>


  		




  947
  947
  
    
                                <li aria-hidden="true" style="animation-duration: 200ms;" class="">


  		




  948
  
  
    
                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  948
  
    
                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  949
  949
  
    
                                  <app-countries-table *ngIf="datasetsPercentageTableData" [isPercentage]="true" [countries]="datasetsPercentageTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>


  		




  950
  950
  
    
                                </li>


  		




  951
  951
  
    
                              </ul>


  		




  ......




  1069
  1069
  
    

  		




  1070
  1070
  
    
                      <div class="uk-margin-top uk-margin-bottom">


  		




  1071
  1071
  
    
                        <label class="uk-margin-right">Show: </label>


  		




  1072
  
  
    
                        <select class="md-input" #selectContent (change)="getContent('software', selectContent.value)" style="width: 230px; display: inline-block">


  		




  
  1072
  
    
                        <select class="md-input" #selectSoftwareContent (change)="getContent('software', selectSoftwareContent.value)" style="width: 230px; display: inline-block">


  		




  1073
  1073
  
    
                          <option value="affiliated">affiliated</option>


  		




  1074
  1074
  
    
                          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>


  		




  1075
  1075
  
    
                          <option value="deposited">deposited</option>


  		




  ......




  1098
  1098
  
    

  		




  1099
  1099
  
    
                              <ul id="software-indicators-content-a-fade" class="uk-switcher uk-margin" >


  		




  1100
  1100
  
    
                                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">


  		




  1101
  
  
    
                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  1101
  
    
                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  1102
  1102
  
    
                                  <app-countries-table *ngIf="softwareAbsoluteTableData" [isPercentage]="false" [countries]="softwareAbsoluteTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table>


  		




  1103
  1103
  
    
                                </li>


  		




  1104
  1104
  
    
                                <li aria-hidden="true" style="animation-duration: 200ms;" class="">


  		




  1105
  
  
    
                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  1105
  
    
                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  1106
  1106
  
    
                                  <app-countries-table *ngIf="softwarePercentageTableData" [isPercentage]="true" [countries]="softwarePercentageTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table>


  		




  1107
  1107
  
    
                                </li>


  		




  1108
  1108
  
    
                              </ul>


  		




  ......




  1226
  1226
  
    

  		




  1227
  1227
  
    
                      <div class="uk-margin-top uk-margin-bottom">


  		




  1228
  1228
  
    
                        <label class="uk-margin-right">Show: </label>


  		




  1229
  
  
    
                        <select class="md-input" #selectContent (change)="getContent('other', selectContent.value)" style="width: 230px; display: inline-block">


  		




  
  1229
  
    
                        <select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">


  		




  1230
  1230
  
    
                          <option value="affiliated">affiliated</option>


  		




  1231
  1231
  
    
                          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>


  		




  1232
  1232
  
    
                          <option value="deposited">deposited</option>


  		




  ......




  1255
  1255
  
    

  		




  1256
  1256
  
    
                              <ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" >


  		




  1257
  1257
  
    
                                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">


  		




  1258
  
  
    
                                  <!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  1258
  
    
                                  <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  1259
  1259
  
    
                                  <app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>


  		




  1260
  1260
  
    
                                </li>


  		




  1261
  1261
  
    
                                <li aria-hidden="true" style="animation-duration: 200ms;" class="">


  		




  1262
  
  
    
                                  <!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>-->


  		




  
  1262
  
    
                                  <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>


  		




  1263
  1263
  
    
                                  <app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>


  		




  1264
  1264
  
    
                                </li>


  		




  1265
  1265
  
    
                              </ul>


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.ts
    
  





  531
  531
  
    
  }


  		




  532
  532
  
    

  		




  533
  533
  
    
  getPublicationsTableData(contentSelection: string) {


  		




  
  534
  
    

  		




  534
  535
  
    
    this.loadingPublicationsAbsoluteTable = true;


  		




  535
  536
  
    
    this.loadingPublicationsPercentageTable = true;


  		




  536
  537
  
    
    this.dataService.getIndicatorsTableData('publication', contentSelection).subscribe(


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.html
    
  





  205
  205
  
    
                      <img src="../../../assets/img/icons/repositories-icon.svg" width="43" height="40">


  		




  206
  206
  
    
                    </div>


  		




  207
  207
  
    
                    <h3 class="uk-margin-remove">


  		




  208
  
  
    
                      <span *ngIf="europeOverviewData.repositories?.oa" class="number">{{europeOverviewData.repositories.oa | number}}</span>


  		




  209
  
  
    
                      <span *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.oa" class="number">--</span>


  		




  
  208
  
    
                      <span *ngIf="europeOverviewData.repositories?.total" class="number">{{europeOverviewData.repositories.total | number}}</span>


  		




  
  209
  
    
                      <span *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.total" class="number">--</span>


  		




  210
  210
  
    
                    </h3>


  		




  211
  211
  
    
                  </div>


  		




  212
  212
  
    
                  <div class="uk-margin-top">


  		




  ......




  229
  229
  
    
                      <img src="../../../assets/img/icons/journals-icon.svg" width="43" height="40">


  		




  230
  230
  
    
                    </div>


  		




  231
  231
  
    
                    <h3 class="uk-margin-remove">


  		




  232
  
  
    
                      <span *ngIf="europeOverviewData.journals?.oa" class="number">{{europeOverviewData.journals.oa | number}}</span>


  		




  233
  
  
    
                      <span *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.oa" class="number">--</span>


  		




  
  232
  
    
                      <span *ngIf="europeOverviewData.journals?.total" class="number">{{europeOverviewData.journals.total | number}}</span>


  		




  
  233
  
    
                      <span *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.total" class="number">--</span>


  		




  234
  234
  
    
                    </h3>


  		




  235
  235
  
    
                  </div>


  		




  236
  236
  
    
                  <div class="uk-margin-top">


  		




  ......




  397
  397
  
    
              <img src="../../../assets/img/icons/repositories-icon.svg" width="30" height="30">


  		




  398
  398
  
    
            </div>


  		




  399
  399
  
    
            <div class="uk-width-2-5">


  		




  400
  
  
    
              <div *ngIf="europeOverviewData.repositories?.oa" class="number big">{{europeOverviewData.repositories.oa | number}}</div>


  		




  401
  
  
    
              <div *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.oa" class="number big">--</div>


  		




  402
  
  
    
              <div class="uk-margin-small-top">VALIDATED REPOSITORIES</div>


  		




  
  400
  
    
              <div *ngIf="europeOverviewData.repositories?.total" class="number big">{{europeOverviewData.repositories.total | number}}</div>


  		




  
  401
  
    
              <div *ngIf="!europeOverviewData.repositories || !europeOverviewData.repositories.total" class="number big">--</div>


  		




  
  402
  
    
              <div class="uk-margin-small-top">REPOSITORIES FROM OPENDOAR & RE3DATA</div>


  		




  403
  403
  
    
            </div>


  		




  404
  404
  
    
            <div *ngIf="europeOverviewData.repositories?.percentage" class="uk-width-2-5">


  		




  405
  405
  
    
              <div class="progress">


  		




  ......




  416
  416
  
    
              <img src="../../../assets/img/icons/journals-icon.svg" width="30" height="30">


  		




  417
  417
  
    
            </div>


  		




  418
  418
  
    
            <div class="uk-width-2-5">


  		




  419
  
  
    
              <div *ngIf="europeOverviewData.journals?.oa" class="number big">{{europeOverviewData.journals.oa | number}}</div>


  		




  420
  
  
    
              <div *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.oa" class="number big">--</div>


  		




  421
  
  
    
              <div class="uk-margin-small-top">VALIDATED JOURNALS</div>


  		




  
  419
  
    
              <div *ngIf="europeOverviewData.journals?.total" class="number big">{{europeOverviewData.journals.total | number}}</div>


  		




  
  420
  
    
              <div *ngIf="!europeOverviewData.journals || !europeOverviewData.journals.total" class="number big">--</div>


  		




  
  421
  
    
              <div class="uk-margin-small-top">JOURNALS FROM DOAJ</div>


  		




  422
  422
  
    
            </div>


  		




  423
  423
  
    
            <div *ngIf="europeOverviewData.journals?.percentage" class="uk-width-2-5">


  		




  424
  424
  
    
              <div class="progress">


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/services/data.service.ts
    
  





  129
  129
  
    
  }


  		




  130
  130
  
    

  		




  131
  131
  
    
  public getIndicatorsTableData(type: string, content: string): Observable<RawData> {


  		




  
  132
  
    

  		




  132
  133
  
    
    let indicatorsTableDataQuery = '';


  		




  133
  134
  
    
    if (content === 'affiliated') {


  		




  134
  135
  
    
      indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		












Also available in:  Unified diff