Project

General

Profile

« Previous | Next » 

Revision 58923

Finished the charts for the overview tab of the country page

View differences:

modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html
22 22
                  <img src="../../../assets/img/flags/{{countryCode | lowercase}}-flag-round.png" class="flag-image" width="132" height="132">
23 23
                  <div class="uk-inline uk-margin-left">
24 24
                    <h1>{{countryPageOverviewData.name}}</h1>
25
                    <span class="lastUpdateInfo">Info Last Updated: 21 May 2020</span>
25
                    <span class="lastUpdateInfo">Info Last Updated: </span>
26
                    <span *ngIf="lastUpdateDate" class="lastUpdateInfo">{{lastUpdateDate}}</span>
26 27
                  </div>
27 28
                </div>
28 29

  
......
513 514

  
514 515
        <!--LAPTOP & PAD LANDSCAPE-->
515 516
        <ul class="uk-visible@m uk-tab uk-tab-large uk-flex-center" data-uk-tab="{connect:'#team_tabbed',animation: 'slide-bottom'}">
516
          <li class="uk-active" aria-expanded="true"><a href="#">Overview</a></li>
517
          <li aria-expanded="false"><a href="#">Open Science</a></li>
517
          <li class="uk-active" aria-expanded="true"><a (click)="changeTopView('overview')">Overview</a></li>
518
          <li aria-expanded="false"><a (click)="changeTopView('openScience')">Open Science</a></li>
518 519
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
519 520
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
520 521
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
......
523 524

  
524 525
        <!--MOBILE & PAD PORTRAIT-->
525 526
        <ul class="uk-hidden@m uk-tab" data-uk-tab="{connect:'#team_tabbed',animation: 'slide-bottom'}">
526
          <li class="uk-active" aria-expanded="true"><a href="#">Overview</a></li>
527
          <li aria-expanded="false"><a href="#">Open Science</a></li>
527
          <li class="uk-active" aria-expanded="true"><a (click)="changeTopView('overview')">Overview</a></li>
528
          <li aria-expanded="false"><a (click)="changeTopView('openScience')">Open Science</a></li>
528 529
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
529 530
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
530 531
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
......
537 538
          <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
538 539
            <div class="uk-margin tabContent">
539 540

  
540
              <!--<div class="uk-grid uk-child-width-1-4 uk-grid-match">-->
541
              <!--<div class="md-card">-->
542
              <!--<div class="md-card-content">-->
543
              <!--22.888-->
544
              <!--</div>-->
545
              <!--</div>-->
546
              <!--<div class="md-card">-->
547
              <!--<div class="md-card-content">-->
548
              <!--30% open access-->
549
              <!--</div>-->
550
              <!--</div>-->
551
              <!--<div class="md-card">-->
552
              <!--<div class="md-card-content">-->
553
              <!--18.165 closed access-->
554
              <!--</div>-->
555
              <!--</div>-->
556
              <!--<div class="md-card">-->
557
              <!--<div class="md-card-content">-->
558
              <!--22.888-->
559
              <!--</div>-->
560
              <!--</div>-->
561
              <!--</div>-->
541
              <div *ngIf="countryPageOAData" class="uk-grid uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-2@s uk-grid-match">
562 542

  
563
              <!--<div class="uk-grid uk-child-width-1-1">-->
543
                <div>
544
                  <div class="md-card">
545
                    <div class="md-card-content">
546
                      <svg *ngIf="countryPageOAData.publicationsAffiliated?.percentage" viewBox="0 0 36 36" class="circular-chart publications">
547
                        <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>
548
                        <path class="circle" attr.stroke-dasharray="{{countryPageOAData.publicationsAffiliated.percentage}}, 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>
549
                        <text x="18" y="20.35" class="percentage">{{countryPageOAData.publicationsAffiliated.percentage | number : '1.0-1'}}%</text>
550
                      </svg>
551
                      <div class="uk-margin-small-top uk-text-center">OA publications</div>
552
                    </div>
553
                  </div>
554
                </div>
564 555

  
565
              <!--<div>-->
566
              <!--<div class="md-card chartCard">-->
567
              <!--<div class="md-card-content">-->
568
              <!--<iframe width="100%" height="550" src="http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22eCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.classification%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country.continent%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Europe%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.classification%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%220041%22%5D%7D%2C%7B%22field%22%3A%22publication.classification%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%220043%22%5D%7D%2C%7B%22field%22%3A%22publication.classification%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%220044%22%5D%7D%2C%7B%22field%22%3A%22publication.classification%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Unknown%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%7D%2C%22title%22%3A%7B%22text%22%3A%22Publications%20by%20type%22%7D%2C%22yAxis%22%3A%7B%22name%22%3A%22publications%22%7D%2C%22xAxis%22%3A%7B%22name%22%3A%22type%22%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22toolbox%22%3A%7B%22show%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Atrue%7D%2C%22stacking%22%3Afalse%7D%7D%2C%22legend%22%3A%7B%22show%22%3Atrue%2C%22orient%22%3A%22horizontal%22%2C%22left%22%3A%22center%22%2C%22top%22%3A%22bottom%22%7D%2C%22tooltip%22%3A%7B%22show%22%3Atrue%7D%2C%22backgroundColor%22%3A%22%23FFFFFFFF%22%7D%7D"></iframe>-->
569
              <!--</div>-->
570
              <!--</div>-->
571
              <!--</div>-->
556
                <div>
557
                  <div class="md-card">
558
                    <div class="md-card-content">
559
                      <svg *ngIf="countryPageOAData.datasetsAffiliated?.percentage" viewBox="0 0 36 36" class="circular-chart datasets">
560
                        <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>
561
                        <path class="circle" attr.stroke-dasharray="{{countryPageOAData.datasetsAffiliated.percentage}}, 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>
562
                        <text x="18" y="20.35" class="percentage">{{countryPageOAData.datasetsAffiliated.percentage | number : '1.0-1'}}%</text>
563
                      </svg>
564
                      <div class="uk-margin-small-top uk-text-center">OA datasets</div>
565
                    </div>
566
                  </div>
567
                </div>
572 568

  
573
              <!--</div>-->
569
                <div>
570
                  <div class="md-card">
571
                    <div class="md-card-content">
572
                      <svg *ngIf="countryPageOAData.software?.percentage" viewBox="0 0 36 36" class="circular-chart software">
573
                        <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>
574
                        <path class="circle" attr.stroke-dasharray="{{countryPageOAData.software.percentage}}, 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>
575
                        <text x="18" y="20.35" class="percentage">{{countryPageOAData.software.percentage | number : '1.0-1'}}%</text>
576
                      </svg>
577
                      <div class="uk-margin-small-top uk-text-center">OS software</div>
578
                    </div>
579
                  </div>
580
                </div>
574 581

  
575
              <!--<div class="uk-grid uk-grid-row-medium uk-margin-small-top uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">-->
582
                <div>
583
                  <div class="md-card">
584
                    <div class="md-card-content">
585
                      <svg *ngIf="countryPageOAData.other?.percentage" viewBox="0 0 36 36" class="circular-chart other">
586
                        <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>
587
                        <path class="circle" attr.stroke-dasharray="{{countryPageOAData.other.percentage}}, 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>
588
                        <text x="18" y="20.35" class="percentage">{{countryPageOAData.other.percentage | number : '1.0-1'}}%</text>
589
                      </svg>
590
                      <div class="uk-margin-small-top uk-text-center">OA other research products</div>
591
                    </div>
592
                  </div>
593
                </div>
576 594

  
577
              <!--<div class="uk-grid-margin">-->
578
              <!--<div class="md-card chartCard">-->
579
              <!--<div class="md-card-content">-->
580
              <!--<iframe width="100%" height="350" src="http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22eCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Publications%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.publications%22%7D%7D%2C%7B%22name%22%3A%22OA%20Publications%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.publications.oa%22%7D%7D%5D%2C%22chart%22%3A%7B%7D%2C%22title%22%3A%7B%22text%22%3A%22Publications%20over%20the%20years%22%7D%2C%22yAxis%22%3A%7B%22name%22%3A%22publications%22%7D%2C%22xAxis%22%3A%7B%22name%22%3A%22year%22%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22toolbox%22%3A%7B%22show%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Atrue%7D%2C%22stacking%22%3Atrue%7D%7D%2C%22legend%22%3A%7B%22show%22%3Atrue%2C%22orient%22%3A%22horizontal%22%2C%22left%22%3A%22center%22%2C%22top%22%3A%22bottom%22%7D%2C%22tooltip%22%3A%7B%22show%22%3Atrue%7D%2C%22backgroundColor%22%3A%22%23FFFFFFFF%22%7D%7D"></iframe>-->
581
              <!--</div>-->
582
              <!--</div>-->
583
              <!--</div>-->
595
              </div>
584 596

  
585
              <!--<div class="uk-grid-margin">-->
586
              <!--<div class="md-card chartCard">-->
587
              <!--<div class="md-card-content">-->
588
              <!--<iframe width="100%" height="350" src="http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22eCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Datasets%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.datasets%22%7D%7D%2C%7B%22name%22%3A%22OA%20Datasets%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.datasets.oa%22%7D%7D%5D%2C%22chart%22%3A%7B%7D%2C%22title%22%3A%7B%22text%22%3A%22Datasets%20over%20the%20years%22%7D%2C%22yAxis%22%3A%7B%22name%22%3A%22datasets%22%7D%2C%22xAxis%22%3A%7B%22name%22%3A%22year%22%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22toolbox%22%3A%7B%22show%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Atrue%7D%2C%22stacking%22%3Atrue%7D%7D%2C%22legend%22%3A%7B%22show%22%3Atrue%2C%22orient%22%3A%22horizontal%22%2C%22left%22%3A%22center%22%2C%22top%22%3A%22bottom%22%7D%2C%22tooltip%22%3A%7B%22show%22%3Atrue%7D%2C%22backgroundColor%22%3A%22%23FFFFFFFF%22%7D%7D"></iframe>-->
589
              <!--</div>-->
590
              <!--</div>-->
591
              <!--</div>-->
597
              <div class="uk-grid uk-grid-row-medium uk-margin-small-top uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
592 598

  
593
              <!--<div class="uk-grid-margin">-->
594
              <!--<div class="md-card chartCard">-->
595
              <!--<div class="md-card-content">-->
596
              <!--<iframe width="100%" height="350" src="http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22eCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Software%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.software%22%7D%7D%2C%7B%22name%22%3A%22OA%20Software%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.software.oa%22%7D%7D%5D%2C%22chart%22%3A%7B%7D%2C%22title%22%3A%7B%22text%22%3A%22Software%20over%20the%20years%22%7D%2C%22yAxis%22%3A%7B%22name%22%3A%22software%22%7D%2C%22xAxis%22%3A%7B%22name%22%3A%22year%22%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22toolbox%22%3A%7B%22show%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Atrue%7D%2C%22stacking%22%3Atrue%7D%7D%2C%22legend%22%3A%7B%22show%22%3Atrue%2C%22orient%22%3A%22horizontal%22%2C%22left%22%3A%22center%22%2C%22top%22%3A%22bottom%22%7D%2C%22tooltip%22%3A%7B%22show%22%3Atrue%7D%2C%22backgroundColor%22%3A%22%23FFFFFFFF%22%7D%7D"></iframe>-->
597
              <!--</div>-->
598
              <!--</div>-->
599
              <!--</div>-->
599
                <div class="uk-grid-margin">
600
                  <div class="md-card chartCard">
601
                    <div class="md-card-content">
602
                      <iframe *ngIf="oaNonOAPublicationsTimelineChartURL" width="100%" height="350" [src]="oaNonOAPublicationsTimelineChartURL"></iframe>
603
                    </div>
604
                  </div>
605
                </div>
600 606

  
601
              <!--<div class="uk-grid-margin">-->
602
              <!--<div class="md-card chartCard">-->
603
              <!--<div class="md-card-content">-->
604
              <!--<iframe width="100%" height="350" src="http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22eCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Other%20Research%20Products%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.other%22%7D%7D%2C%7B%22name%22%3A%22OA%20Other%20Research%20Products%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.other.oa%22%7D%7D%5D%2C%22chart%22%3A%7B%7D%2C%22title%22%3A%7B%22text%22%3A%22Other%20research%20products%20over%20the%20years%22%7D%2C%22yAxis%22%3A%7B%22name%22%3A%22other%20research%20products%22%7D%2C%22xAxis%22%3A%7B%22name%22%3A%22year%22%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22toolbox%22%3A%7B%22show%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Atrue%7D%2C%22stacking%22%3Atrue%7D%7D%2C%22legend%22%3A%7B%22show%22%3Atrue%2C%22orient%22%3A%22horizontal%22%2C%22left%22%3A%22center%22%2C%22top%22%3A%22bottom%22%7D%2C%22tooltip%22%3A%7B%22show%22%3Atrue%7D%2C%22backgroundColor%22%3A%22%23FFFFFFFF%22%7D%7D"></iframe>-->
605
              <!--</div>-->
606
              <!--</div>-->
607
              <!--</div>-->
607
                <div class="uk-grid-margin">
608
                  <div class="md-card chartCard">
609
                    <div class="md-card-content">
610
                      <iframe *ngIf="oaNonOADatasetsTimelineChartURL" width="100%" height="350" [src]="oaNonOADatasetsTimelineChartURL"></iframe>
611
                    </div>
612
                  </div>
613
                </div>
608 614

  
615
                <div class="uk-grid-margin">
616
                  <div class="md-card chartCard">
617
                    <div class="md-card-content">
618
                      <iframe *ngIf="oaNonOASoftwareTimelineChartURL" width="100%" height="350" [src]="oaNonOASoftwareTimelineChartURL"></iframe>
619
                    </div>
620
                  </div>
621
                </div>
609 622

  
610
              <!--</div>-->
623
                <div class="uk-grid-margin">
624
                  <div class="md-card chartCard">
625
                    <div class="md-card-content">
626
                      <iframe *ngIf="oaNonOAOtherTimelineChartURL" width="100%" height="350" [src]="oaNonOAOtherTimelineChartURL"></iframe>
627
                    </div>
628
                  </div>
629
                </div>
611 630

  
612 631

  
632
              </div>
613 633

  
614
              <!--<app-countries-table [isPercentage]="false" [type]="'overview'" [countries]="overviewData.countries"></app-countries-table>-->
634
              <div class="uk-grid uk-child-width-1-3@m uk-child-width-1-3@l uk-child-width-1-1@s">
635

  
636
                <div class="uk-grid-margin">
637
                  <div class="md-card chartCard">
638
                    <div class="md-card-content">
639
                      <iframe *ngIf="publicationsByDatasourceChartURL" width="100%" height="550" [src]="publicationsByDatasourceChartURL"></iframe>
640
                    </div>
641
                  </div>
642
                </div>
643

  
644
                <div class="uk-grid-margin">
645
                  <div class="md-card chartCard">
646
                    <div class="md-card-content">
647
                      <iframe *ngIf="publicationsByOrganizationChartURL" width="100%" height="550" [src]="publicationsByOrganizationChartURL"></iframe>
648
                    </div>
649
                  </div>
650
                </div>
651

  
652
                <div class="uk-grid-margin">
653
                  <div class="md-card chartCard">
654
                    <div class="md-card-content">
655
                      <app-treemap-highchart *ngIf="publicationsByFunderData" [chartTitle]="'OA Publications by funder'"
656
                                             [chartData]="publicationsByFunderData" [color]="'#F181AE'"></app-treemap-highchart>
657
                    </div>
658
                  </div>
659
                </div>
660

  
661
                <div class="uk-grid-margin">
662
                  <div class="md-card chartCard">
663
                    <div class="md-card-content">
664
                      <iframe *ngIf="datasetsByDatasourceChartURL" width="100%" height="550" [src]="datasetsByDatasourceChartURL"></iframe>
665
                    </div>
666
                  </div>
667
                </div>
668

  
669
                <div class="uk-grid-margin">
670
                  <div class="md-card chartCard">
671
                    <div class="md-card-content">
672
                      <iframe *ngIf="datasetsByOrganizationChartURL" width="100%" height="550" [src]="datasetsByOrganizationChartURL"></iframe>
673
                    </div>
674
                  </div>
675
                </div>
676

  
677
                <div class="uk-grid-margin">
678
                  <div class="md-card chartCard">
679
                    <div class="md-card-content">
680
                      <app-treemap-highchart *ngIf="datasetsByFunderData" [chartTitle]="'OA Datasets by funder'"
681
                                             [chartData]="datasetsByFunderData" [color]="'#BB9CE6'"></app-treemap-highchart>
682
                    </div>
683
                  </div>
684
                </div>
685

  
686
                <div class="uk-grid-margin">
687
                  <div class="md-card chartCard">
688
                    <div class="md-card-content">
689
                      <iframe *ngIf="softwareByDatasourceChartURL" width="100%" height="550" [src]="softwareByDatasourceChartURL"></iframe>
690
                    </div>
691
                  </div>
692
                </div>
693

  
694
                <div class="uk-grid-margin">
695
                  <div class="md-card chartCard">
696
                    <div class="md-card-content">
697
                      <iframe *ngIf="softwareByOrganizationChartURL" width="100%" height="550" [src]="softwareByOrganizationChartURL"></iframe>
698
                    </div>
699
                  </div>
700
                </div>
701

  
702
                <div class="uk-grid-margin">
703
                  <div class="md-card chartCard">
704
                    <div class="md-card-content">
705
                      <app-treemap-highchart *ngIf="softwareByFunderData" [chartTitle]="'OS Software by funder'"
706
                                             [chartData]="softwareByFunderData" [color]="'#C2155A'"></app-treemap-highchart>
707
                    </div>
708
                  </div>
709
                </div>
710

  
711
                <div class="uk-grid-margin">
712
                  <div class="md-card chartCard">
713
                    <div class="md-card-content">
714
                      <iframe *ngIf="otherByDatasourceChartURL" width="100%" height="550" [src]="otherByDatasourceChartURL"></iframe>
715
                    </div>
716
                  </div>
717
                </div>
718

  
719
                <div class="uk-grid-margin">
720
                  <div class="md-card chartCard">
721
                    <div class="md-card-content">
722
                      <iframe *ngIf="otherByOrganizationChartURL" width="100%" height="550" [src]="otherByOrganizationChartURL"></iframe>
723
                    </div>
724
                  </div>
725
                </div>
726

  
727
                <div class="uk-grid-margin">
728
                  <div class="md-card chartCard">
729
                    <div class="md-card-content">
730
                      <app-treemap-highchart *ngIf="otherByFunderData" [chartTitle]="'OA Other research products by funder'"
731
                                             [chartData]="otherByFunderData" [color]="'#00CCCC'"></app-treemap-highchart>
732
                    </div>
733
                  </div>
734
                </div>
735

  
736
              </div>
737

  
738
              <div class="uk-grid uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@s">
739

  
740
                <div class="uk-grid-margin">
741
                  <div class="md-card chartCard">
742
                    <div class="md-card-content">
743
                      <iframe *ngIf="resultsByTypeOANonOAChartURL" width="100%" height="550" [src]="resultsByTypeOANonOAChartURL"></iframe>
744
                    </div>
745
                  </div>
746
                </div>
747

  
748
              </div>
749

  
615 750
            </div>
616 751
          </li>
617 752

  
......
621 756

  
622 757
              <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
623 758
                <li aria-expanded="true" class="uk-active">
624
                  <a class="publicationsSubnav" (click)="changeView('publications')" uk-tooltip="title: Publication; duration: 2000">
759
                  <a class="publicationsSubnav" (click)="changeInnerView('publications')" uk-tooltip="title: Publication; duration: 2000">
625 760
                    <img src="../../../assets/img/icons/publications-icon.svg" width="15">
626 761
                  </a>
627 762
                </li>
628 763
                <li aria-expanded="false" class="">
629
                  <a class="datasetsSubnav" (click)="changeView('datasets')" uk-tooltip="title: Datasets; duration: 2000">
764
                  <a class="datasetsSubnav" (click)="changeInnerView('datasets')" uk-tooltip="title: Datasets; duration: 2000">
630 765
                    <img src="../../../assets/img/icons/datasets-icon.svg" width="15">
631 766
                  </a>
632 767
                </li>
633 768
                <li aria-expanded="false" class="">
634
                  <a class="softwareSubnav" (click)="changeView('software')" uk-tooltip="title: Software; duration: 2000">
769
                  <a class="softwareSubnav" (click)="changeInnerView('software')" uk-tooltip="title: Software; duration: 2000">
635 770
                    <img src="../../../assets/img/icons/software-icon.svg" width="15">
636 771
                  </a>
637 772
                </li>
638 773
                <li aria-expanded="false" class="">
639
                  <a class="otherSubnav" (click)="changeView('other')" uk-tooltip="title: Other research products; duration: 2000">
774
                  <a class="otherSubnav" (click)="changeInnerView('other')" uk-tooltip="title: Other research products; duration: 2000">
640 775
                    <img src="../../../assets/img/icons/other-icon.svg" width="15">
641 776
                  </a>
642 777
                </li>
modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.ts
2 2
import { DataService } from '../../services/data.service';
3 3
import { ActivatedRoute } from '@angular/router';
4 4
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
5
import { CountryOverview, OverviewData } from '../../domain/overview-data';
6 5
import { DataHandlerService } from '../../services/data-handler.service';
7 6
import { CountryPageOverviewData } from '../../domain/overview-map-data';
7
import { TreemapHighchartsData } from '../../domain/treemap-highcharts-data';
8
import { environment } from '../../../environments/environment';
8 9

  
9 10
@Component({
10 11
  selector: 'app-country-page',
......
13 14

  
14 15
export class CountryPageComponent implements OnInit {
15 16

  
17
  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
18

  
19
  lastUpdateDate: string;
20

  
16 21
  countryCode: string;
17 22

  
23
  activeTopView: string = 'overview';
24
  activeInnerView: string = 'publications';
25

  
18 26
  linkToCountryInOpenAIRE: string;
19 27

  
20 28
  countryPageOverviewData: CountryPageOverviewData;
21 29

  
22
  greenGoldLineChartURL: SafeResourceUrl;
23
  goldOrganisationsChartURL: SafeResourceUrl;
24
  greenOrganisationsChartURL: SafeResourceUrl;
25
  publicationsDataSetsSoftwareByYearGraphURL: SafeResourceUrl;
26
  publicationsDataSetsSoftwareByOrganisationTableURL: SafeResourceUrl;
27
  publicationsDataSetsSoftwareByRepoTableURL: SafeResourceUrl;
28
  publicationsDataSetsSoftwareByFunderGraphURL: SafeResourceUrl;
29
  topProjectsByPublicationsGraphURL: SafeResourceUrl;
30
  topProjectsByDatasetsGraphURL: SafeResourceUrl;
31
  topProjectsBySoftwareGraphURL: SafeResourceUrl;
30
  // Overview Tab
31
  overviewTabIsInitialised: boolean = false;
32 32

  
33
  countryPageOAData: CountryPageOverviewData;
34

  
35
  resultsByTypeOANonOAChartURL: SafeResourceUrl;
36

  
37
  oaNonOAPublicationsTimelineChartURL: SafeResourceUrl;
38
  publicationsByDatasourceChartURL: SafeResourceUrl;
39
  publicationsByOrganizationChartURL: SafeResourceUrl;
40

  
41
  oaNonOADatasetsTimelineChartURL: SafeResourceUrl;
42
  datasetsByDatasourceChartURL: SafeResourceUrl;
43
  datasetsByOrganizationChartURL: SafeResourceUrl;
44

  
45
  oaNonOASoftwareTimelineChartURL: SafeResourceUrl;
46
  softwareByDatasourceChartURL: SafeResourceUrl;
47
  softwareByOrganizationChartURL: SafeResourceUrl;
48

  
49
  oaNonOAOtherTimelineChartURL: SafeResourceUrl;
50
  otherByDatasourceChartURL: SafeResourceUrl;
51
  otherByOrganizationChartURL: SafeResourceUrl;
52

  
53
  publicationsByFunderData: TreemapHighchartsData[];
54
  datasetsByFunderData: TreemapHighchartsData[];
55
  softwareByFunderData: TreemapHighchartsData[];
56
  otherByFunderData: TreemapHighchartsData[];
57

  
33 58
  constructor(private dataService: DataService,
34 59
              private dataHandlerService: DataHandlerService,
35 60
              private route: ActivatedRoute,
......
39 64

  
40 65
    window.scroll(0, 0);
41 66

  
67
    this.dataService.getLastUpdateDate().subscribe(
68
      rawData => {
69
        this.lastUpdateDate = this.dataHandlerService.convertRawDataToLastUpdateDate(rawData);
70
      }, error => {
71
        console.log(error);
72
      }
73
    );
74

  
42 75
    this.route.params.subscribe(params => {
43 76

  
44 77
      this.countryCode = params['countryCode'];
......
48 81
          this.countryPageOverviewData = this.dataHandlerService.convertRawDataToCountryPageOverviewData(rawData);
49 82
          if (this.countryPageOverviewData && this.countryPageOverviewData.name) {
50 83
            this.linkToCountryInOpenAIRE = 'https://www.openaire.eu/item/' + this.countryPageOverviewData.name.replace(' ', '-');
51
            this.createChartURLs();
84
            // this.createChartURLs();
52 85
          }
53 86
        }, error => {
54 87
          console.log(error);
55 88
        }
56 89
      );
90

  
91
      this.createOverviewContent();
57 92
    });
58 93

  
59 94

  
60 95

  
61 96
  }
62 97

  
63
  createChartURLs() {
64
    // green: #98A886,  gold: #D3BF3B
65
    this.greenGoldLineChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Green%20OA%22%2C%22type%22%3A%22line%22%2C%22query%22%3A%7B%22name%22%3A%22oso.green.year.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%2C%7B%22name%22%3A%22Gold%20OA%22%2C%22type%22%3A%22line%22%2C%22query%22%3A%7B%22name%22%3A%22oso.gold.year.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Green%20vs%20Gold%20Publications%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22publications%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22year%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%2398A886%22%2C%22%23D3BF3B%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
66
    this.goldOrganisationsChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Gold%20OA%22%2C%22type%22%3A%22bar%22%2C%22color%22%3A%22%23D3BF3B%22%2C%22query%22%3A%7B%22name%22%3A%22oso.gold.organization.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Gold%20Open%20Access%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22Top%2015%20Organizations%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22Publications%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22Organizations%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%7D%7D`);
67
    this.greenOrganisationsChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Green%20OA%22%2C%22type%22%3A%22bar%22%2C%22color%22%3A%22%2398A886%22%2C%22query%22%3A%7B%22name%22%3A%22oso.green.organization.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Green%20Open%20Access%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22Top%2015%20Organizations%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22Publications%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22Organizations%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%7D%7D`);
68
    // publications: #19647E, datasets: #019A85, software: #99B2DD
69
    this.publicationsDataSetsSoftwareByYearGraphURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Publications%22%2C%22type%22%3A%22line%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oapublications.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%2C%7B%22name%22%3A%22Datasets%22%2C%22type%22%3A%22line%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oadatasets.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%2C%7B%22name%22%3A%22Software%22%2C%22type%22%3A%22line%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oasoftwares.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Publications%20vs%20Datasets%20vs%20Software%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22somethings%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%2319647E%22%2C%22%23019A85%22%2C%22%2399B2DD%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
70
    this.publicationsDataSetsSoftwareByFunderGraphURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oapublications.funder.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%2C%7B%22name%22%3A%22Datasets%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oadatasets.funder.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%2C%7B%22name%22%3A%22Software%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oasoftwares.funder.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Publications%20vs%20Datasets%20vs%20Software%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20funder%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22somethings%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22funder%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%2319647E%22%2C%22%23019A85%22%2C%22%2399B2DD%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
71
    this.topProjectsByPublicationsGraphURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.top10.projects.publications.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Top%2010%20Projects%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20publications%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22publications%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22projects%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%2319647E%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
72
    this.topProjectsByDatasetsGraphURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Datasets%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.top10.projects.datasets.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Top%2010%20Projects%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20datasets%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22datasets%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22projects%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%23019A85%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
73
    this.topProjectsBySoftwareGraphURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/chart?json=%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Software%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.top10.projects.software.` + this.countryPageOverviewData.name.replace(' ', '') + `%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Top%2010%20Projects%22%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20software%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22software%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22projects%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Afalse%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Atrue%2C%22text%22%3A%22Created%20by%20OpenAIRE%20via%20HighCharts%22%7D%2C%22colors%22%3A%5B%22%2399B2DD%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
98
  changeTopView(view: string) {
99
    this.activeTopView = view;
100
    // console.log('top view: ', view);
101
    if (view === 'overview') {
102
      this.createOverviewContent();
103
    } else if (view === 'openScience') {
104
      // this.createOpenScienceContent();
105
    }
106
  }
74 107

  
75
    this.publicationsDataSetsSoftwareByOrganisationTableURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/table?json=%7B%22library%22%3A%22GoogleCharts%22%2C%22tableDescription%22%3A%7B%22queriesInfo%22%3A%5B%7B%22name%22%3A%22Data%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22result%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22result.datasource.organization.name%22%2C%22aggregate%22%3Anull%7D%2C%7B%22field%22%3A%22result.type%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.datasource.organization.country.name%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryPageOverviewData.name + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.type%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22other%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22result%22%2C%22profile%22%3A%22OpenAIRE%20original%22%2C%22limit%22%3A%220%22%7D%7D%5D%2C%22columns%22%3A%5B%5D%2C%22options%22%3A%7B%22hAxis%22%3A%7B%7D%2C%22vAxis%22%3A%7B%7D%2C%22chartArea%22%3A%7B%7D%2C%22series%22%3A%5B%5D%2C%22exporting%22%3Afalse%2C%22pageSize%22%3A30%2C%22isStacked%22%3A%22false%22%7D%7D%7D`);
76
    this.publicationsDataSetsSoftwareByRepoTableURL = this.sanitizer.bypassSecurityTrustResourceUrl(`http://88.197.53.71:8080/stats-api/table?json=%7B%22library%22%3A%22GoogleCharts%22%2C%22tableDescription%22%3A%7B%22queriesInfo%22%3A%5B%7B%22name%22%3A%22Data%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22result%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22result.datasource.name%22%2C%22aggregate%22%3Anull%7D%2C%7B%22field%22%3A%22result.type%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.datasource.organization.country.name%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryPageOverviewData.name + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.type%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22other%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22result%22%2C%22profile%22%3A%22OpenAIRE%20original%22%2C%22limit%22%3A%220%22%7D%7D%5D%2C%22columns%22%3A%5B%5D%2C%22options%22%3A%7B%22hAxis%22%3A%7B%7D%2C%22vAxis%22%3A%7B%7D%2C%22chartArea%22%3A%7B%7D%2C%22series%22%3A%5B%5D%2C%22exporting%22%3Afalse%2C%22pageSize%22%3A30%2C%22isStacked%22%3A%22false%22%7D%7D%7D`);
108
  changeInnerView(view: string) {
109
    this.activeInnerView = view;
110
    // console.log('view: ', view);
111
    if (view === 'publications') {
112
      // this.createPublicationsViewForOpenScience();
113
    } else if (view === 'datasets') {
114
      // this.createDatasetsViewForOpenScience();
115
    } else if (view === 'software') {
116
      // this.createSoftwareViewForOpenScience();
117
    } else if (view === 'other') {
118
      // this.createOtherViewForOpenScience();
119
    }
77 120
  }
121

  
122
  createOverviewContent() {
123

  
124
    if (!this.overviewTabIsInitialised) {
125

  
126
      this.dataService.getCountryOAData(this.countryCode).subscribe(
127
        rawData => {
128
          this.countryPageOAData = this.dataHandlerService.convertRawDataToCountryPageOAData(rawData);
129
        }, error => {
130
          console.log(error);
131
        }
132
      );
133

  
134
      this.oaNonOAPublicationsTimelineChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22publication.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22publication.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%2C%7B%22name%22%3A%22Non-OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22publication%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22publication.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22publication.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22publication.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22publication.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22publication%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Publications%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%2C%22stacking%22%3A%22normal%22%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23F181AE%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
135
      this.oaNonOADatasetsTimelineChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22dataset%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22dataset.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22dataset.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22dataset.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22dataset%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%2C%7B%22name%22%3A%22Non-OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22dataset%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22dataset.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22dataset.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22dataset.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22dataset.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22dataset%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Datasets%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%2C%22stacking%22%3A%22normal%22%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23A98BD4%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
136
      this.oaNonOASoftwareTimelineChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22software%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22software.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22software.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22software.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22software%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%2C%7B%22name%22%3A%22Non-OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22software%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22software.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22software.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22software.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22software.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22software%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Software%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%2C%22stacking%22%3A%22normal%22%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23C2155A%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
137
      this.oaNonOAOtherTimelineChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22other%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22other.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22other.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22other.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22other%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%2C%7B%22name%22%3A%22Non-OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22other%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22other.year%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.year%22%2C%22type%22%3A%22%3E%22%2C%22values%22%3A%5B%222010%22%5D%7D%2C%7B%22field%22%3A%22other.year%22%2C%22type%22%3A%22%3C%3D%22%2C%22values%22%3A%5B%222020%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22other.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22other.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22other%22%2C%22profile%22%3A%22OpenAIRE%20All-inclusive%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Other%20research%20products%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%2C%22stacking%22%3A%22normal%22%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%2300CCCC%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
138

  
139
      this.publicationsByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.bydatasource.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22publication%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Publications%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20datasource%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23F181AE%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
140
      this.publicationsByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byorganization.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22publication%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Publications%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20organization%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23F181AE%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
141

  
142
      this.datasetsByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22publications%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.bydatasource.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22dataset%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Datasets%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20datasource%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23A98BD4%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
143
      this.datasetsByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22datasets%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byorganization.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22dataset%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Datasets%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20organization%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23A98BD4%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
144

  
145
      this.softwareByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22software%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.bydatasource.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22software%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OS%20Software%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20datasource%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23C2155A%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
146
      this.softwareByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22software%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byorganization.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22software%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OS%20Software%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20organization%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23C2155A%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
147

  
148
      this.otherByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22other%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.bydatasource.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22other%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Other%20research%20products%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20datasource%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%2300CCCC%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
149
      this.otherByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22other%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byorganization.country%22%2C%22parameters%22%3A%5B%22` + this.countryCode + `%22%2C%22other%22%5D%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22OA%20Other%20research%20products%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%22text%22%3A%22by%20organization%22%2C%22align%22%3A%22left%22%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Afalse%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%2300CCCC%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
150

  
151
      this.resultsByTypeOANonOAChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22result%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22result.type%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22OR%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22result%22%2C%22profile%22%3A%22OpenAIRE%20original%22%2C%22limit%22%3A%2230%22%7D%7D%2C%7B%22name%22%3A%22Non-OA%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22select%22%3A%5B%7B%22field%22%3A%22result%22%2C%22aggregate%22%3A%22count%22%7D%2C%7B%22field%22%3A%22result.type%22%2C%22aggregate%22%3Anull%7D%5D%2C%22filters%22%3A%5B%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Access%22%5D%7D%2C%7B%22field%22%3A%22result.access%20mode%22%2C%22type%22%3A%22!%3D%22%2C%22values%22%3A%5B%22Open%20Source%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%2C%7B%22groupFilters%22%3A%5B%7B%22field%22%3A%22result.organization.country.code%22%2C%22type%22%3A%22%3D%22%2C%22values%22%3A%5B%22` + this.countryCode + `%22%5D%7D%5D%2C%22op%22%3A%22AND%22%7D%5D%2C%22entity%22%3A%22result%22%2C%22profile%22%3A%22OpenAIRE%20original%22%2C%22limit%22%3A%2230%22%7D%7D%5D%2C%22chart%22%3A%7B%22backgroundColor%22%3A%22%23FFFFFFFF%22%2C%22borderColor%22%3A%22%23335cadff%22%2C%22borderRadius%22%3A0%2C%22borderWidth%22%3A0%2C%22plotBorderColor%22%3A%22%23ccccccff%22%2C%22plotBorderWidth%22%3A0%7D%2C%22title%22%3A%7B%22text%22%3A%22Research%20results%20by%20type%22%2C%22align%22%3A%22left%22%2C%22margin%22%3A50%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22%22%7D%7D%2C%22lang%22%3A%7B%22noData%22%3A%22No%20Data%20available%20for%20the%20Query%22%7D%2C%22exporting%22%3A%7B%22enabled%22%3Atrue%7D%2C%22plotOptions%22%3A%7B%22series%22%3A%7B%22dataLabels%22%3A%7B%22enabled%22%3Afalse%7D%7D%7D%2C%22legend%22%3A%7B%22enabled%22%3Atrue%2C%22align%22%3A%22center%22%2C%22verticalAlign%22%3A%22bottom%22%2C%22layout%22%3A%22horizontal%22%7D%2C%22credits%22%3A%7B%22href%22%3Anull%2C%22enabled%22%3Afalse%7D%2C%22colors%22%3A%5B%22%23072AE6%22%2C%22%23787878%22%2C%22%232f7ed8%22%2C%22%230d233a%22%2C%22%238bbc21%22%2C%22%23910000%22%2C%22%231aadce%22%2C%22%23492970%22%2C%22%23f28f43%22%2C%22%2377a1e5%22%2C%22%23c42525%22%2C%22%23a6c96a%22%5D%7D%7D`);
152

  
153
      this.dataService.getFundersResultsByTypeForCountry('publication', this.countryCode).subscribe(
154
        rawData => {
155
          this.publicationsByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
156
        }, error => {
157
          console.log(error);
158
        }
159
      );
160

  
161
      this.dataService.getFundersResultsByTypeForCountry('dataset', this.countryCode).subscribe(
162
        rawData => {
163
          this.datasetsByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
164
        }, error => {
165
          console.log(error);
166
        }
167
      );
168

  
169
      this.dataService.getFundersResultsByTypeForCountry('software', this.countryCode).subscribe(
170
        rawData => {
171
          this.softwareByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
172
        }, error => {
173
          console.log(error);
174
        }
175
      );
176

  
177
      this.dataService.getFundersResultsByTypeForCountry('other', this.countryCode).subscribe(
178
        rawData => {
179
          this.otherByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
180
        }, error => {
181
          console.log(error);
182
        }
183
      );
184

  
185
      this.overviewTabIsInitialised = true;
186
    }
187
  }
188

  
78 189
}
modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/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>
modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.ts
1 1
import { Component, OnInit } from '@angular/core';
2 2
import { ActivatedRoute } from '@angular/router';
3
import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
3
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
4 4
import { DataService } from '../../services/data.service';
5 5
import { DataHandlerService } from '../../services/data-handler.service';
6 6
import { EuropeData } from '../../domain/overview-map-data';
7
import {environment} from '../../../environments/environment';
8
import {TreemapHighchartsData} from '../../domain/treemap-highcharts-data';
9
import {Tree} from '@angular/router/src/utils/tree';
7
import { environment } from '../../../environments/environment';
8
import { TreemapHighchartsData } from '../../domain/treemap-highcharts-data';
10 9

  
11 10
@Component({
12 11
  selector: 'app-continent-overview',
......
17 16

  
18 17
  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
19 18

  
19
  lastUpdateDate: string;
20

  
20 21
  continentName: string;
21 22

  
22 23
  activeTopView: string = 'overview';
......
149 150

  
150 151
    this.continentName = this.route.snapshot.paramMap.get('continentName');
151 152

  
153
    this.dataService.getLastUpdateDate().subscribe(
154
      rawData => {
155
        this.lastUpdateDate = this.dataHandlerService.convertRawDataToLastUpdateDate(rawData);
156
      }, error => {
157
        console.log(error);
158
      }
159
    );
160

  
152 161
    this.dataService.getEuropeOAPercentages().subscribe(
153 162
      rawData => {
154 163
        this.europeOverviewData = this.dataHandlerService.convertRawDataToEuropeOverviewData(rawData);
modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.html
466 466
                <img src="../../../assets/img/flags/{{data.code | lowercase}}-flag.svg" width="15">
467 467
                <span class="countryName uk-margin-small-left">{{data.name}}</span>
468 468
              </div>
469
              <div class="indicator uk-margin-top">
469
              <div class="uk-margin-top">
470 470
                <!--<span class="number publications">18,165</span>-->
471
                <span class="number publications" *ngIf="data.publicationsAffiliated!=null">{{data.publicationsAffiliated | number}}</span>
472
                <span class="number publications" *ngIf="data.publicationsAffiliated===null">--</span>
473
                <span><i>OA publications</i> affiliated to an organization in the country</span>
471
                <div class="number publications" *ngIf="data.publicationsAffiliated!=null">{{data.publicationsAffiliated | number}}</div>
472
                <div class="number publications" *ngIf="data.publicationsAffiliated===null">--</div>
473
                <div class="uk-margin-small-top"><i>OA publications</i> affiliated to an organization in the country</div>
474 474
              </div>
475
              <div class="indicator uk-margin-top">
475
              <div class="uk-margin-top">
476 476
                <!--<span class="number publications">18,165</span>-->
477
                <span class="number publications" *ngIf="data.publicationsDeposited!=null">{{data.publicationsDeposited | number}}</span>
478
                <span class="number publications" *ngIf="data.publicationsDeposited===null">--</span>
479
                <span><i>OA publications</i> from institutional repositories</span>
477
                <div class="number publications" *ngIf="data.publicationsDeposited!=null">{{data.publicationsDeposited | number}}</div>
478
                <div class="number publications" *ngIf="data.publicationsDeposited===null">--</div>
479
                <div class="uk-margin-small-top"><i>OA publications</i> from institutional repositories</div>
480 480
              </div>
481 481
            </div>
482 482
          </div>
modules/open-science-observatory-ui/trunk/src/app/services/data-handler.service.ts
14 14
@Injectable ()
15 15
export class DataHandlerService {
16 16

  
17
  public convertRawDataToLastUpdateDate(rawData: RawData) {
18

  
19
    let lastUpdateDate: string;
20

  
21
    for (const series of rawData.datasets) {
22

  
23
      if (series.series.query.name === 'creation_date') {
24
        lastUpdateDate = series.series.result[0].row[0];
25
      }
26
    }
27

  
28
    return lastUpdateDate;
29
  }
30

  
17 31
  public convertRawMapDataToMapData(rawData: RawData) {
18 32

  
19 33
    const overviewMapData: OverviewMapData = new OverviewMapData();
......
633 647
        publicationsDepositedIndicator.total = Number(series.series.result[0].row[2]);
634 648
        countryPageOverviewData.publicationsDeposited = publicationsDepositedIndicator;
635 649

  
636
      } if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
650
      } else if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
637 651
        && series.series.query.parameters && series.series.query.parameters[0] === 'dataset') {
638 652

  
639 653
        countryPageOverviewData.name = series.series.result[0].row[3];
......
700 714
    return countryPageOverviewData;
701 715
  }
702 716

  
717
  public convertRawDataToCountryPageOAData(rawData: RawData) {
718

  
719
    const countryPageOverviewData: CountryPageOverviewData = new CountryPageOverviewData();
720

  
721
    for (const series of rawData.datasets) {
722

  
723
      if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
724
        && series.series.query.parameters && series.series.query.parameters[0] === 'publication') {
725

  
726
        countryPageOverviewData.name = series.series.result[0].row[3];
727
        countryPageOverviewData.code = series.series.result[0].row[4];
728

  
729
        const publicationsAffiliatedIndicator: Indicator = new Indicator();
730
        publicationsAffiliatedIndicator.percentage = Number(series.series.result[0].row[0]);
731
        publicationsAffiliatedIndicator.oa = Number(series.series.result[0].row[1]);
732
        publicationsAffiliatedIndicator.total = Number(series.series.result[0].row[2]);
733
        countryPageOverviewData.publicationsAffiliated = publicationsAffiliatedIndicator;
734

  
735
      } else  if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
736
        && series.series.query.parameters && series.series.query.parameters[0] === 'dataset') {
737

  
738
        countryPageOverviewData.name = series.series.result[0].row[3];
739
        countryPageOverviewData.code = series.series.result[0].row[4];
740

  
741
        const datasetsAffiliatedIndicator: Indicator = new Indicator();
742
        datasetsAffiliatedIndicator.percentage = Number(series.series.result[0].row[0]);
743
        datasetsAffiliatedIndicator.oa = Number(series.series.result[0].row[1]);
744
        datasetsAffiliatedIndicator.total = Number(series.series.result[0].row[2]);
745
        countryPageOverviewData.datasetsAffiliated = datasetsAffiliatedIndicator;
746

  
747
      } else if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
748
        && series.series.query.parameters && series.series.query.parameters[0] === 'software') {
749

  
750
        countryPageOverviewData.name = series.series.result[0].row[3];
751
        countryPageOverviewData.code = series.series.result[0].row[4];
752

  
753
        const softwareIndicator: Indicator = new Indicator();
754
        softwareIndicator.percentage = Number(series.series.result[0].row[0]);
755
        softwareIndicator.oa = Number(series.series.result[0].row[1]);
756
        softwareIndicator.total = Number(series.series.result[0].row[2]);
757
        countryPageOverviewData.software = softwareIndicator;
758

  
759
      } else if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
760
        && series.series.query.parameters && series.series.query.parameters[0] === 'other') {
761

  
762
        countryPageOverviewData.name = series.series.result[0].row[3];
763
        countryPageOverviewData.code = series.series.result[0].row[4];
764

  
765
        const otherIndicator: Indicator = new Indicator();
766
        otherIndicator.percentage = Number(series.series.result[0].row[0]);
767
        otherIndicator.oa = Number(series.series.result[0].row[1]);
768
        otherIndicator.total = Number(series.series.result[0].row[2]);
769
        countryPageOverviewData.other = otherIndicator;
770

  
771
      }
772
    }
773

  
774
    return countryPageOverviewData;
775
  }
776

  
703 777
  public convertRawDataToTreemapHighchartsData(rawData: RawData) {
704 778

  
705 779
    const treeMapData: TreemapHighchartsData[] = [];
modules/open-science-observatory-ui/trunk/src/app/services/data.service.ts
20 20
  constructor(private httpClient: HttpClient) {
21 21
  }
22 22

  
23
  public getLastUpdateDate(): Observable<RawData> {
24
    const lastUpdateDateQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22creation_date%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
25
    return this.httpClient.get<RawData>(this.apiURL + lastUpdateDateQuery, headerOptions);
26
  }
27

  
23 28
  public getOverviewMapData(): Observable<RawData> {
24 29
    const mapDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
25 30
    return this.httpClient.get<RawData>(this.apiURL + mapDataQuery, headerOptions);
......
30 35
    return this.httpClient.get<RawData>(this.apiURL + countryOverviewDataQuery, headerOptions);
31 36
  }
32 37

  
38
  public getCountryOAData(countryCode: string): Observable<RawData> {
39
    const countryOADataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22software%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22other%22%2C%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
40
    return this.httpClient.get<RawData>(this.apiURL + countryOADataQuery, headerOptions);
41
  }
42

  
33 43
  public getEuropeOverviewData(): Observable<RawData> {
34 44
    const overviewRawDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.europe%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
35 45
    return this.httpClient.get<RawData>(this.apiURL + overviewRawDataQuery, headerOptions);
......
108 118
    return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForGeenQuery, headerOptions);
109 119
  }
110 120

  
121
  public getFundersResultsByTypeForCountry(type: string, countryCode: string): Observable<RawData> {
122
    const fundersResultsByTypeForCountryQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byfunder.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
123
    return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForCountryQuery, headerOptions);
124
  }
111 125

  
112 126

  
113 127

  
modules/open-science-observatory-ui/trunk/src/app/domain/overview-map-data.ts
70 70
  publicationsDeposited: Indicator ;
71 71
  datasetsAffiliated: Indicator;
72 72
  datasetsDeposited: Indicator;
73
  software: Indicator;
74
  other: Indicator;
73 75
  repositories: Indicator;
74 76
  journals: Indicator;
75 77
  policies: number = null;
modules/open-science-observatory-ui/trunk/src/assets/css/os-observatory-custom.css
814 814

  
815 815
.publicationsDot {
816 816
  background-color: #f181ae;
817
  width: 50px;
817
  /*width: 50px;*/
818
  width: 35px;
818 819
  height: 33px;
819 820
  border-radius: 50%;
820 821
}
......
828 829

  
829 830
.datasetsDot {
830 831
  background-color: #BB9CE6;
831
  width: 50px;
832
  /*width: 50px;*/
833
  width: 35px;
832 834
  height: 33px;
833 835
  border-radius: 50%;
834 836
}
......
842 844

  
843 845
.softwareDot {
844 846
  background-color: #C2155A;
845
  width: 50px;
847
  /*width: 50px;*/
848
  width: 35px;
846 849
  height: 33px;
847 850
  border-radius: 50%;
848 851
}
......
856 859

  
857 860
.otherDot {
858 861
  background-color: #00CCCC;
859
  width: 50px;
862
  /*width: 50px;*/
863
  width: 35px;
860 864
  height: 33px;
861 865
  border-radius: 50%;
862 866
}

Also available in: Unified diff