Project

General

Profile

« Previous | Next » 

Revision 58923

Finished the charts for the overview tab of the country page

View differences:

continent-overview.component.html
15 15
          <img src="../../../assets/img/flags/{{continentName}}-flag.jpg" class="flag-image" width="132" height="132">
16 16
          <div class="uk-inline uk-margin-left">
17 17
            <h1>{{continentName | titlecase}}</h1>
18
            <span class="lastUpdateInfo">Info Last Updated: 21 May 2020</span>
18
            <span class="lastUpdateInfo">Info Last Updated: </span>
19
            <span *ngIf="lastUpdateDate" class="lastUpdateInfo">{{lastUpdateDate}}</span>
19 20
          </div>
20 21
        </div>
21 22
      </div>
......
133 134
          <div class="entityLegendContent">
134 135
            <div class="publicationsDot uk-inline"></div>
135 136
            <div class="uk-inline uk-margin-left">
136
              <span>Lorem Ipsum Lorem Ipsum Lorem Ipsum</span>
137
              <span>
138
                <ng-container *ngIf="europeOverviewData.publications?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.publications?.oa | number}}</span> OA</ng-container><br>
139
                <ng-container *ngIf="europeOverviewData.publications?.total"><span class="number uk-margin-small-right">{{europeOverviewData.publications?.total | number}}</span> total</ng-container>
140
              </span>
137 141
            </div>
138 142
          </div>
139 143
          <div class="entityLegendContent">
140 144
            <div class="datasetsDot"></div>
141 145
            <div class="uk-inline uk-margin-left">
142
              <span>Lorem Ipsum Lorem Ipsum Lorem Ipsum</span>
146
              <span>
147
                <ng-container *ngIf="europeOverviewData.datasets?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.datasets?.oa | number}}</span> OA</ng-container><br>
148
                <ng-container *ngIf="europeOverviewData.datasets?.total"><span class="number uk-margin-small-right">{{europeOverviewData.datasets?.total | number}}</span> total</ng-container>
149
              </span>
143 150
            </div>
144 151
          </div>
145 152
          <div class="entityLegendContent">
146 153
            <div class="softwareDot"></div>
147 154
            <div class="uk-inline uk-margin-left">
148
              <span>Lorem Ipsum Lorem Ipsum Lorem Ipsum</span>
155
              <span>
156
                <ng-container *ngIf="europeOverviewData.software?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.software?.oa | number}}</span> OA</ng-container><br>
157
                <ng-container *ngIf="europeOverviewData.software?.total"><span class="number uk-margin-small-right">{{europeOverviewData.software?.total | number}}</span> total</ng-container>
158
              </span>
149 159
            </div>
150 160
          </div>
151 161
          <div class="entityLegendContent">
152 162
            <div class="otherDot"></div>
153 163
            <div class="uk-inline uk-margin-left">
154
              <span>Lorem Ipsum Lorem Ipsum Lorem Ipsum</span>
164
              <span>
165
                <ng-container *ngIf="europeOverviewData.other?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.other?.oa | number}}</span> OA</ng-container><br>
166
                <ng-container *ngIf="europeOverviewData.other?.total"><span class="number uk-margin-small-right">{{europeOverviewData.other?.total | number}}</span> total</ng-container>
167
              </span>
155 168
            </div>
156 169
          </div>
157 170

  
......
336 349
          <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
337 350
            <div class="uk-margin tabContent">
338 351

  
339
              <!--<div class="uk-grid uk-child-width-1-4 uk-grid-match">-->
340

  
341
                <!--<div>-->
342
                  <!--<div class="md-card">-->
343
                    <!--<div class="md-card-content">-->
344

  
345
                      <!--<svg viewBox="0 0 36 36" class="circular-chart publications">-->
346
                        <!--<path class="circle-bg" d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"></path>-->
347
                        <!--<path class="circle" stroke-dasharray="30, 100" d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"></path>-->
348
                        <!--<text x="18" y="20.35" class="percentage">30%</text>-->
349
                      <!--</svg>-->
350
                      <!--<div class="uk-margin-small-top uk-text-center">OA publications</div>-->
351
                    <!--</div>-->
352
                  <!--</div>-->
353
                <!--</div>-->
354

  
355
                <!--<div>-->
356
                  <!--<div class="md-card">-->
357
                    <!--<div class="md-card-content">-->
358
                      <!--30% open access-->
359
                    <!--</div>-->
360
                  <!--</div>-->
361
                <!--</div>-->
362

  
363
                <!--<div>-->
364
                  <!--<div class="md-card">-->
365
                    <!--<div class="md-card-content">-->
366
                      <!--18.165 closed access-->
367
                    <!--</div>-->
368
                  <!--</div>-->
369
                <!--</div>-->
370

  
371
                <!--<div>-->
372
                  <!--<div class="md-card">-->
373
                    <!--<div class="md-card-content">-->
374
                      <!--22.888-->
375
                    <!--</div>-->
376
                  <!--</div>-->
377
                <!--</div>-->
378

  
379
              <!--</div>-->
380

  
381 352
              <div class="uk-grid uk-child-width-1-1">
382 353

  
383 354
                <div>
......
495 466
                <div class="uk-grid-margin">
496 467
                  <div class="md-card chartCard">
497 468
                    <div class="md-card-content">
498
                      <app-treemap-highchart *ngIf="publicationsByFunderData" [chartTitle]="'Publications by funder'"
469
                      <app-treemap-highchart *ngIf="publicationsByFunderData" [chartTitle]="'OA Publications by funder'"
499 470
                                             [chartData]="publicationsByFunderData" [color]="'#F181AE'"></app-treemap-highchart>
500 471
                    </div>
501 472
                  </div>
......
504 475
                <div class="uk-grid-margin">
505 476
                  <div class="md-card chartCard">
506 477
                    <div class="md-card-content">
507
                      <app-treemap-highchart *ngIf="datasetsByFunderData" [chartTitle]="'Datasets by funder'"
478
                      <app-treemap-highchart *ngIf="datasetsByFunderData" [chartTitle]="'OA Datasets by funder'"
508 479
                                             [chartData]="datasetsByFunderData" [color]="'#BB9CE6'"></app-treemap-highchart>
509 480
                    </div>
510 481
                  </div>
......
513 484
                <div class="uk-grid-margin">
514 485
                  <div class="md-card chartCard">
515 486
                    <div class="md-card-content">
516
                      <app-treemap-highchart *ngIf="softwareByFunderData" [chartTitle]="'Software by funder'"
487
                      <app-treemap-highchart *ngIf="softwareByFunderData" [chartTitle]="'OS Software by funder'"
517 488
                                             [chartData]="softwareByFunderData" [color]="'#C2155A'"></app-treemap-highchart>
518 489
                    </div>
519 490
                  </div>
......
522 493
                <div class="uk-grid-margin">
523 494
                  <div class="md-card chartCard">
524 495
                    <div class="md-card-content">
525
                      <app-treemap-highchart *ngIf="otherByFunderData" [chartTitle]="'Other research products by funder'"
496
                      <app-treemap-highchart *ngIf="otherByFunderData" [chartTitle]="'OA Other research products by funder'"
526 497
                                             [chartData]="otherByFunderData" [color]="'#00CCCC'"></app-treemap-highchart>
527 498
                    </div>
528 499
                  </div>

Also available in: Unified diff