Project

General

Profile

« Previous | Next » 

Revision 58912

Working on the new version of the oso - started incorporating charts and created a treemap highcharts component

View differences:

modules/open-science-observatory-ui/trunk/package.json
21 21
    "@angular/platform-browser-dynamic": "~7.0.0",
22 22
    "@angular/router": "~7.0.0",
23 23
    "@highcharts/map-collection": "^1.1.2",
24
    "angular-ng-autocomplete": "^2.0.1",
24 25
    "core-js": "^2.5.4",
25 26
    "dom-to-image": "^2.6.0",
26 27
    "echarts": "^4.8.0",
modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html
12 12
            <!--LAPTOP & PAD LANDSCAPE-->
13 13
            <div class="uk-visible@m">
14 14
              <ul *ngIf="countryPageOverviewData && countryPageOverviewData.name" class="uk-breadcrumb">
15
                <li><a [routerLink]="['/home']">Home</a></li>
15
                <li><a routerLink="/home">Home</a></li>
16 16
                <li><span>{{countryPageOverviewData.name}}</span></li>
17 17
              </ul>
18 18

  
......
614 614
              <!--<app-countries-table [isPercentage]="false" [type]="'overview'" [countries]="overviewData.countries"></app-countries-table>-->
615 615
            </div>
616 616
          </li>
617

  
617 618
          <!--OPEN SCIENCE tab-->
618 619
          <li aria-hidden="true" style="animation-duration: 200ms;">
619 620
            <div class="uk-margin tabContent">
620
              <app-data-view></app-data-view>
621
              <!--<app-countries-table [isPercentage]="false" [type]="'openScience'" [countries]="overviewData.countries"></app-countries-table>-->
621

  
622
              <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
623
                <li aria-expanded="true" class="uk-active">
624
                  <a class="publicationsSubnav" (click)="changeView('publications')">
625
                    <img src="../../../assets/img/icons/publications-icon.svg" width="15">
626
                  </a>
627
                </li>
628
                <li aria-expanded="false" class="">
629
                  <a class="datasetsSubnav" (click)="changeView('datasets')">
630
                    <img src="../../../assets/img/icons/datasets-icon.svg" width="15">
631
                  </a>
632
                </li>
633
                <li aria-expanded="false" class="">
634
                  <a class="softwareSubnav" (click)="changeView('software')">
635
                    <img src="../../../assets/img/icons/software-icon.svg" width="15">
636
                  </a>
637
                </li>
638
                <li aria-expanded="false" class="">
639
                  <a class="otherSubnav" (click)="changeView('other')">
640
                    <img src="../../../assets/img/icons/other-icon.svg" width="15">
641
                  </a>
642
                </li>
643
              </ul>
644

  
645
              <hr class="uk-visible@m">
646

  
647
              <ul id="switcher-content-a-fade" class="uk-switcher uk-margin" >
648
                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
649
                  <div>
650
                    Publications....
651
                  </div>
652
                </li>
653
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
654
                  <div>
655
                    Datasets...
656
                  </div>
657
                </li>
658
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
659
                  <div>
660
                    Software...
661
                  </div>
662
                </li>
663
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
664
                  <div>
665
                    Other...
666
                  </div>
667
                </li>
668
              </ul>
669

  
622 670
            </div>
623 671
          </li>
672

  
624 673
          <li aria-hidden="true">
625 674
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
626 675
            </div>
627 676
          </li>
677

  
628 678
          <li aria-hidden="true">
629 679
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
630 680
            </div>
631 681
          </li>
682

  
632 683
          <li aria-hidden="true">
633 684
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
634 685
            </div>
modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.ts
30 30
  topProjectsByDatasetsGraphURL: SafeResourceUrl;
31 31
  topProjectsBySoftwareGraphURL: SafeResourceUrl;
32 32

  
33
  overviewData: OverviewData;
34
  countryData: CountryOverview;
35

  
36

  
37 33
  constructor(private dataService: DataService,
38 34
              private dataHandlerService: DataHandlerService,
39 35
              private route: ActivatedRoute,
......
43 39

  
44 40
    window.scroll(0, 0);
45 41

  
46
    this.countryCode = this.route.snapshot.paramMap.get('countryCode');
42
    this.route.params.subscribe(params => {
47 43

  
48
    this.dataService.getCountryPageOverviewData(this.countryCode).subscribe(
49
      rawData => {
50
        this.countryPageOverviewData = this.dataHandlerService.convertRawDataToCountryPageOverviewData(rawData);
51
        if (this.countryPageOverviewData && this.countryPageOverviewData.name) {
52
          this.linkToCountryInOpenAIRE = 'https://www.openaire.eu/item/' + this.countryPageOverviewData.name.replace(' ', '-');
53
          this.createChartURLs();
44
      this.countryCode = params['countryCode'];
45

  
46
      this.dataService.getCountryPageOverviewData(this.countryCode).subscribe(
47
        rawData => {
48
          this.countryPageOverviewData = this.dataHandlerService.convertRawDataToCountryPageOverviewData(rawData);
49
          if (this.countryPageOverviewData && this.countryPageOverviewData.name) {
50
            this.linkToCountryInOpenAIRE = 'https://www.openaire.eu/item/' + this.countryPageOverviewData.name.replace(' ', '-');
51
            this.createChartURLs();
52
          }
53
        }, error => {
54
          console.log(error);
54 55
        }
55
      }, error => {
56
        console.log(error);
57
      }
58
    );
59
    // this.linkToCountryInOpenAIRE = 'https://www.openaire.eu/item/' + this.countryName.replace(' ', '-');
56
      );
57
    });
60 58

  
61
    // this.dataService.getCountryData(this.countryName).subscribe(
62
    //   overviewData => {
63
    //     this.overviewData = overviewData;
64
    //     this.countryData = this.overviewData.countries.filter(x => x.country === this.countryName)[0];
65
    //   },
66
    //   error => {
67
    //     console.log(error);
68
    //   }
69
    // );
70 59

  
71 60

  
72

  
73 61
  }
74 62

  
75 63
  createChartURLs() {
modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.html
6 6
      <!--LAPTOP & PAD LANDSCAPE-->
7 7
      <div class="uk-visible@m">
8 8
        <ul class="uk-breadcrumb">
9
          <li><a [routerLink]="['/home']">Home</a></li>
9
          <li><a routerLink="/home">Home</a></li>
10 10
          <li><span>{{continentName | titlecase}}</span></li>
11 11
        </ul>
12 12

  
......
312 312

  
313 313
        <!--LAPTOP & PAD LANDSCAPE-->
314 314
        <ul class="uk-visible@m uk-tab uk-tab-large uk-flex-center" data-uk-tab="{connect:'#team_tabbed',animation: 'slide-bottom'}">
315
          <li class="uk-active" aria-expanded="true"><a href="#">Overview</a></li>
316
          <li aria-expanded="false"><a href="#">Open Science</a></li>
315
          <li class="uk-active" aria-expanded="true"><a (click)="changeTopView('overview')">Overview</a></li>
316
          <li aria-expanded="false"><a (click)="changeTopView('openScience')">Open Science</a></li>
317 317
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
318 318
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
319 319
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
......
322 322

  
323 323
        <!--MOBILE & PAD PORTRAIT-->
324 324
        <ul class="uk-hidden@m uk-tab" data-uk-tab="{connect:'#team_tabbed',animation: 'slide-bottom'}">
325
          <li class="uk-active" aria-expanded="true"><a href="#">Overview</a></li>
326
          <li aria-expanded="false"><a href="#">Open Science</a></li>
325
          <li class="uk-active" aria-expanded="true"><a (click)="changeTopView('overview')">Overview</a></li>
326
          <li aria-expanded="false"><a (click)="changeTopView('openScience')">Open Science</a></li>
327 327
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
328 328
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
329 329
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
......
337 337
            <div class="uk-margin tabContent">
338 338

  
339 339
              <!--<div class="uk-grid uk-child-width-1-4 uk-grid-match">-->
340
                <!--<div class="md-card">-->
341
                  <!--<div class="md-card-content">-->
342
                    <!--22.888-->
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>-->
343 352
                  <!--</div>-->
344 353
                <!--</div>-->
345
                <!--<div class="md-card">-->
346
                  <!--<div class="md-card-content">-->
347
                    <!--30% open access-->
354

  
355
                <!--<div>-->
356
                  <!--<div class="md-card">-->
357
                    <!--<div class="md-card-content">-->
358
                      <!--30% open access-->
359
                    <!--</div>-->
348 360
                  <!--</div>-->
349 361
                <!--</div>-->
350
                <!--<div class="md-card">-->
351
                  <!--<div class="md-card-content">-->
352
                    <!--18.165 closed access-->
362

  
363
                <!--<div>-->
364
                  <!--<div class="md-card">-->
365
                    <!--<div class="md-card-content">-->
366
                      <!--18.165 closed access-->
367
                    <!--</div>-->
353 368
                  <!--</div>-->
354 369
                <!--</div>-->
355
                <!--<div class="md-card">-->
356
                  <!--<div class="md-card-content">-->
357
                    <!--22.888-->
370

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

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

  
362 381
              <div class="uk-grid uk-child-width-1-1">
......
364 383
                <div>
365 384
                  <div class="md-card chartCard">
366 385
                    <div class="md-card-content">
367
                      <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>
386
                      <iframe width="100%" height="550" [src]="publicationsByTypeChartURL"></iframe>
368 387
                    </div>
369 388
                  </div>
370 389
                </div>
371 390

  
372 391
              </div>
373 392

  
374
              <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">
393
              <div class="uk-grid uk-child-width-1-3@m uk-child-width-1-3@l uk-child-width-1-1@s">
375 394

  
376 395
                <div class="uk-grid-margin">
377 396
                  <div class="md-card chartCard">
378 397
                    <div class="md-card-content">
379
                      <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>
398
                      <iframe width="100%" height="550" [src]="publicationsByCountryChartURL"></iframe>
380 399
                    </div>
381 400
                  </div>
382 401
                </div>
......
384 403
                <div class="uk-grid-margin">
385 404
                  <div class="md-card chartCard">
386 405
                    <div class="md-card-content">
387
                      <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>
406
                      <iframe width="100%" height="550" [src]="publicationsByDatasourceChartURL"></iframe>
388 407
                    </div>
389 408
                  </div>
390 409
                </div>
......
392 411
                <div class="uk-grid-margin">
393 412
                  <div class="md-card chartCard">
394 413
                    <div class="md-card-content">
395
                      <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>
414
                      <iframe width="100%" height="550" [src]="publicationsByOrganizationChartURL"></iframe>
396 415
                    </div>
397 416
                  </div>
398 417
                </div>
......
400 419
                <div class="uk-grid-margin">
401 420
                  <div class="md-card chartCard">
402 421
                    <div class="md-card-content">
403
                      <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>
422
                      <iframe width="100%" height="550" [src]="datasetsByCountryChartURL"></iframe>
404 423
                    </div>
405 424
                  </div>
406 425
                </div>
407 426

  
427
                <div class="uk-grid-margin">
428
                  <div class="md-card chartCard">
429
                    <div class="md-card-content">
430
                      <iframe width="100%" height="550" [src]="datasetsByDatasourceChartURL"></iframe>
431
                    </div>
432
                  </div>
433
                </div>
408 434

  
435
                <div class="uk-grid-margin">
436
                  <div class="md-card chartCard">
437
                    <div class="md-card-content">
438
                      <iframe width="100%" height="550" [src]="datasetsByOrganizationChartURL"></iframe>
439
                    </div>
440
                  </div>
441
                </div>
442

  
443
                <div class="uk-grid-margin">
444
                  <div class="md-card chartCard">
445
                    <div class="md-card-content">
446
                      <iframe width="100%" height="550" [src]="softwareByCountryChartURL"></iframe>
447
                    </div>
448
                  </div>
449
                </div>
450

  
451
                <div class="uk-grid-margin">
452
                  <div class="md-card chartCard">
453
                    <div class="md-card-content">
454
                      <iframe width="100%" height="550" [src]="softwareByDatasourceChartURL"></iframe>
455
                    </div>
456
                  </div>
457
                </div>
458

  
459
                <div class="uk-grid-margin">
460
                  <div class="md-card chartCard">
461
                    <div class="md-card-content">
462
                      <iframe width="100%" height="550" [src]="softwareByOrganizationChartURL"></iframe>
463
                    </div>
464
                  </div>
465
                </div>
466

  
467
                <div class="uk-grid-margin">
468
                  <div class="md-card chartCard">
469
                    <div class="md-card-content">
470
                      <iframe width="100%" height="550" [src]="otherByCountryChartURL"></iframe>
471
                    </div>
472
                  </div>
473
                </div>
474

  
475
                <div class="uk-grid-margin">
476
                  <div class="md-card chartCard">
477
                    <div class="md-card-content">
478
                      <iframe width="100%" height="550" [src]="otherByDatasourceChartURL"></iframe>
479
                    </div>
480
                  </div>
481
                </div>
482

  
483
                <div class="uk-grid-margin">
484
                  <div class="md-card chartCard">
485
                    <div class="md-card-content">
486
                      <iframe width="100%" height="550" [src]="otherByOrganizationChartURL"></iframe>
487
                    </div>
488
                  </div>
489
                </div>
490

  
409 491
              </div>
410 492

  
411 493

  
412 494

  
495

  
413 496
              <!--<app-countries-table [isPercentage]="false" [type]="'overview'" [countries]="overviewData.countries"></app-countries-table>-->
414 497
            </div>
415 498
          </li>
499

  
416 500
          <!--OPEN SCIENCE tab-->
417 501
          <li aria-hidden="true" style="animation-duration: 200ms;">
418 502
            <div class="uk-margin tabContent">
419
              <app-data-view></app-data-view>
420
              <!--<app-countries-table [isPercentage]="false" [type]="'openScience'" [countries]="overviewData.countries"></app-countries-table>-->
503

  
504

  
505
              <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
506
                <li aria-expanded="true" class="uk-active">
507
                  <a class="publicationsSubnav" (click)="changeView('publications')">
508
                    <img src="../../../assets/img/icons/publications-icon.svg" width="15">
509
                  </a>
510
                </li>
511
                <li aria-expanded="false" class="">
512
                  <a class="datasetsSubnav" (click)="changeView('datasets')">
513
                    <img src="../../../assets/img/icons/datasets-icon.svg" width="15">
514
                  </a>
515
                </li>
516
                <li aria-expanded="false" class="">
517
                  <a class="softwareSubnav" (click)="changeView('software')">
518
                    <img src="../../../assets/img/icons/software-icon.svg" width="15">
519
                  </a>
520
                </li>
521
                <li aria-expanded="false" class="">
522
                  <a class="otherSubnav" (click)="changeView('other')">
523
                    <img src="../../../assets/img/icons/other-icon.svg" width="15">
524
                  </a>
525
                </li>
526
              </ul>
527

  
528
              <hr class="uk-visible@m">
529

  
530
              <ul id="switcher-content-a-fade" class="uk-switcher uk-margin" >
531
                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
532
                  <div>
533
                    Publications....
534
                  </div>
535
                </li>
536
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
537
                  <div>
538
                    Datasets...
539
                  </div>
540
                </li>
541
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
542
                  <div>
543
                    Software...
544
                  </div>
545
                </li>
546
                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
547
                  <div>
548
                    Other...
549
                  </div>
550
                </li>
551
              </ul>
552

  
553

  
421 554
            </div>
422 555
          </li>
556

  
423 557
          <li aria-hidden="true">
424 558
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
425 559
            </div>
426 560
          </li>
561

  
427 562
          <li aria-hidden="true">
428 563
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
429 564
            </div>
430 565
          </li>
566

  
431 567
          <li aria-hidden="true">
432 568
            <div class="uk-grid uk-grid-medium uk-grid-width-small-1-2 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid-margin="">
433 569
            </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 } 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';
7 8

  
8 9
@Component({
9 10
  selector: 'app-continent-overview',
......
12 13

  
13 14
export class ContinentOverviewComponent implements OnInit {
14 15

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

  
15 18
  continentName: string;
16 19

  
17 20
  europeOverviewData: EuropeData;
18 21

  
22
  publicationsByTypeChartURL: SafeResourceUrl;
23

  
24
  publicationsByCountryChartURL: SafeResourceUrl;
25
  publicationsByDatasourceChartURL: SafeResourceUrl;
26
  publicationsByOrganizationChartURL: SafeResourceUrl;
27

  
28
  datasetsByCountryChartURL: SafeResourceUrl;
29
  datasetsByDatasourceChartURL: SafeResourceUrl;
30
  datasetsByOrganizationChartURL: SafeResourceUrl;
31

  
32
  softwareByCountryChartURL: SafeResourceUrl;
33
  softwareByDatasourceChartURL: SafeResourceUrl;
34
  softwareByOrganizationChartURL: SafeResourceUrl;
35

  
36
  otherByCountryChartURL: SafeResourceUrl;
37
  otherByDatasourceChartURL: SafeResourceUrl;
38
  otherByOrganizationChartURL: SafeResourceUrl;
39

  
19 40
  constructor(private dataService: DataService,
20 41
              private dataHandlerService: DataHandlerService,
21 42
              private route: ActivatedRoute,
......
34 55
        console.log(error);
35 56
      }
36 57
    );
58

  
59
    this.publicationsByTypeChartURL = 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%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%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%20by%20type%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%22type%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%7D%7D`);
60

  
61
    this.publicationsByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Data%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.bycountry%22%2C%22parameters%22%3A%5B%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%20by%20country%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%22country%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%7D%7D`);
62
    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.bydatasource%22%2C%22parameters%22%3A%5B%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%20by%20datasource%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%22country%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%7D%7D`);
63
    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.byorganization%22%2C%22parameters%22%3A%5B%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%20by%20organization%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%22organization%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%7D%7D`);
64

  
65
    this.datasetsByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + `%7B%22library%22%3A%22HighCharts%22%2C%22chartDescription%22%3A%7B%22queries%22%3A%5B%7B%22name%22%3A%22Data%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.results.bycountry%22%2C%22parameters%22%3A%5B%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%20by%20country%22%7D%2C%22subtitle%22%3A%7B%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%22country%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%7D%7D`);
66
    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.bydatasource%22%2C%22parameters%22%3A%5B%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%20by%20datasource%22%7D%2C%22subtitle%22%3A%7B%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%22country%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%7D%7D`);
67
    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.byorganization%22%2C%22parameters%22%3A%5B%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%20by%20organization%22%7D%2C%22subtitle%22%3A%7B%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%22organization%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%7D%7D`);
68

  
69
    this.softwareByCountryChartURL = 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.bycountry%22%2C%22parameters%22%3A%5B%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%22OA%20Software%20by%20country%22%7D%2C%22subtitle%22%3A%7B%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%22country%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%7D%7D`);
70
    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.bydatasource%22%2C%22parameters%22%3A%5B%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%22OA%20Software%20by%20datasource%22%7D%2C%22subtitle%22%3A%7B%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%22country%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%7D%7D`);
71
    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.byorganization%22%2C%22parameters%22%3A%5B%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%22OA%20Software%20by%20organization%22%7D%2C%22subtitle%22%3A%7B%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%22organization%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%7D%7D`);
72

  
73
    this.otherByCountryChartURL = 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.bycountry%22%2C%22parameters%22%3A%5B%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%20by%20country%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22other%20research%20products%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22country%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%7D%7D`);
74
    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.bydatasource%22%2C%22parameters%22%3A%5B%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%20by%20datasource%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22other%20research%20products%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22country%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%7D%7D`);
75
    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.byorganization%22%2C%22parameters%22%3A%5B%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%20by%20organization%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22other%20research%20products%22%7D%7D%2C%22xAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22organization%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%7D%7D`);
37 76
  }
38 77

  
39 78
  getHeight(percentage: number) {
......
92 131
    }
93 132
  }
94 133

  
134
  changeTopView(view: string) {
135
    // this.activeView = view;
136
    console.log('top view: ', view);
137
    if (view === 'overview') {
138

  
139

  
140
    }
141
  }
142

  
143
  changeView(view: string) {
144
    console.log('view: ', view);
145
  }
146

  
95 147
}
modules/open-science-observatory-ui/trunk/src/app/pages/home/countries-map-overview.component.ts
84 84

  
85 85
  loadMapCountryData() {
86 86
    this.mapCountryData = [];
87
    for(let index in this.countries) {
87
    for (const index in this.countries) {
88 88
      this.mapCountryData.push(this.overviewToMapData(this.countries[index]));
89 89
    }
90 90

  
modules/open-science-observatory-ui/trunk/src/app/pages/home/countries-table.component.html
53 53
  </thead>
54 54
  <tbody>
55 55
    <tr *ngFor="let countryOverview of countries">
56
      <td class=""><a [routerLink]="['/countryDashboard/' + countryOverview.code]">{{countryOverview.name}}</a></td>
56
      <td class=""><a [routerLink]="['/countryDashboard', countryOverview.code]">{{countryOverview.name}}</a></td>
57 57
      <td class="uk-text-center">
58 58
        <ng-container *ngIf="countryOverview.repositories===null">--</ng-container>
59 59
        <ng-container *ngIf="countryOverview.repositories!=null">
modules/open-science-observatory-ui/trunk/src/app/pages/home/data-view.component.html
17 17
</ul>
18 18

  
19 19
<div class="goToDetailedViewLink uk-text-right">
20
  <a class="" [routerLink]="['/overview/' + 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
20
  <a class="" [routerLink]="['/overview', 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
21 21
</div>
22 22

  
23 23
<hr>
......
58 58
  </li>
59 59
  <li aria-hidden="true" style="animation-duration: 200ms;" class="">
60 60
    <div id="graphs">
61
      <div *ngIf="type=='overview'" class="uk-grid uk-margin-top">
62
        <div class="uk-width-1-2">
63
          <iframe *ngIf="oaJournalsURL" width="100%" height="440" [src]="oaJournalsURL"></iframe>
61

  
62
      <div *ngIf="europeOverviewData" class="uk-grid uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-2@s uk-grid-match">
63

  
64
        <div>
65
          <div class="md-card">
66
            <div class="md-card-content">
67
              <svg *ngIf="europeOverviewData.publications?.percentage" viewBox="0 0 36 36" class="circular-chart publications">
68
                <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>
69
                <path class="circle" attr.stroke-dasharray="{{europeOverviewData.publications.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>
70
                <text x="18" y="20.35" class="percentage">{{europeOverviewData.publications.percentage | number : '1.0-1'}}%</text>
71
              </svg>
72
              <div class="uk-margin-small-top uk-text-center">OA publications</div>
73
            </div>
74
          </div>
64 75
        </div>
65
        <div class="uk-width-1-2">
66
          <iframe *ngIf="oaRepositoriesURL" width="100%" height="440" [src]="oaRepositoriesURL"></iframe>
76

  
77
        <div>
78
          <div class="md-card">
79
            <div class="md-card-content">
80
              <svg *ngIf="europeOverviewData.datasets?.percentage" viewBox="0 0 36 36" class="circular-chart datasets">
81
                <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>
82
                <path class="circle" attr.stroke-dasharray="{{europeOverviewData.datasets.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>
83
                <text x="18" y="20.35" class="percentage">{{europeOverviewData.datasets.percentage | number : '1.0-1'}}%</text>
84
              </svg>
85
              <div class="uk-margin-small-top uk-text-center">OA datasets</div>
86
            </div>
87
          </div>
67 88
        </div>
68
      </div>
69
      <div class="uk-grid uk-margin-top">
70
        <div class="uk-width-1-2">
71
          <iframe *ngIf="oaPublicationsURL" width="100%" height="440" [src]="oaPublicationsURL"></iframe>
89

  
90
        <div>
91
          <div class="md-card">
92
            <div class="md-card-content">
93
              <svg *ngIf="europeOverviewData.software?.percentage" viewBox="0 0 36 36" class="circular-chart software">
94
                <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>
95
                <path class="circle" attr.stroke-dasharray="{{europeOverviewData.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>
96
                <text x="18" y="20.35" class="percentage">{{europeOverviewData.software.percentage | number : '1.0-1'}}%</text>
97
              </svg>
98
              <div class="uk-margin-small-top uk-text-center">OS software</div>
99
            </div>
100
          </div>
72 101
        </div>
73
        <div class="uk-width-1-2">
74
          <iframe *ngIf="oaDatasetsURL" width="100%" height="440" [src]="oaDatasetsURL"></iframe>
102

  
103
        <div>
104
          <div class="md-card">
105
            <div class="md-card-content">
106
              <svg *ngIf="europeOverviewData.other?.percentage" viewBox="0 0 36 36" class="circular-chart other">
107
                <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>
108
                <path class="circle" attr.stroke-dasharray="{{europeOverviewData.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>
109
                <text x="18" y="20.35" class="percentage">{{europeOverviewData.other.percentage | number : '1.0-1'}}%</text>
110
              </svg>
111
              <div class="uk-margin-small-top uk-text-center">OA other research products</div>
112
            </div>
113
          </div>
75 114
        </div>
115

  
76 116
      </div>
77
      <div class="uk-grid uk-margin-top">
78
        <div class="uk-width-1-2">
79
          <iframe *ngIf="oaSoftwareURL" width="100%" height="440" [src]="oaSoftwareURL"></iframe>
117

  
118
      <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">
119

  
120
        <div class="uk-grid-margin">
121
          <div class="md-card chartCard">
122
            <div class="md-card-content">
123
              <iframe *ngIf="oaNoaPublicationsTimelineURL" width="100%" height="350" [src]="oaNoaPublicationsTimelineURL"></iframe>
124
            </div>
125
          </div>
80 126
        </div>
81
        <div class="uk-width-1-2">
82
          <iframe *ngIf="oaOtherURL" width="100%" height="440" [src]="oaOtherURL"></iframe>
127

  
128
        <div class="uk-grid-margin">
129
          <div class="md-card chartCard">
130
            <div class="md-card-content">
131
              <iframe *ngIf="oaNoaDatasetsTimelineURL" width="100%" height="350" [src]="oaNoaDatasetsTimelineURL"></iframe>
132
            </div>
133
          </div>
83 134
        </div>
135

  
136
        <div class="uk-grid-margin">
137
          <div class="md-card chartCard">
138
            <div class="md-card-content">
139
              <iframe *ngIf="oaNoaSoftwareTimelineURL" width="100%" height="350" [src]="oaNoaSoftwareTimelineURL"></iframe>
140
            </div>
141
          </div>
142
        </div>
143

  
144
        <div class="uk-grid-margin">
145
          <div class="md-card chartCard">
146
            <div class="md-card-content">
147
              <iframe *ngIf="oaNoaOtherTimelineURL" width="100%" height="350" [src]="oaNoaOtherTimelineURL"></iframe>
148
            </div>
149
          </div>
150
        </div>
151

  
152

  
84 153
      </div>
154

  
155
      <div class="uk-grid uk-grid-row-medium uk-margin-small-top uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@s">
156
        <div class="uk-grid-margin">
157
          <div class="md-card chartCard">
158
            <div class="md-card-content">
159
              <!--<app-treemap-highchart></app-treemap-highchart>-->
160
              <app-treemap-highchart *ngIf="fundersResultsData" [chartTitle]="'Funders for all research results'"
161
                                     [chartData]="fundersResultsData" [color]="'#072AE6'"></app-treemap-highchart>
162
            </div>
163
          </div>
164
        </div>
165
      </div>
166

  
85 167
    </div>
86 168
  </li>
87 169
</ul>
modules/open-science-observatory-ui/trunk/src/app/pages/home/data-view.component.ts
3 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
import { CountryTableData } from '../../domain/overview-map-data';
6
import {CountryTableData, EuropeData} from '../../domain/overview-map-data';
7
import {environment} from '../../../environments/environment';
8
import {TreemapHighchartsData} from '../../domain/treemap-highcharts-data';
7 9

  
8 10
@Component({
9 11
  selector: 'app-data-view',
......
15 17
  // @Input() type: string;
16 18
  // @Input() countries: CountryOverview[];
17 19

  
20
  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
21

  
18 22
  activeView: string = 'absolute';
19 23
  contentAbsoluteSelection: string = 'affiliated';
20 24
  contentPercentageSelection: string = 'affiliated';
......
25 29
  loadingAbsoluteTable: boolean = true;
26 30
  loadingPercentageTable: boolean = true;
27 31

  
28
  oaPublicationsURL: SafeResourceUrl;
29
  oaRepositoriesURL: SafeResourceUrl;
30
  oaJournalsURL: SafeResourceUrl;
31
  oaDatasetsURL: SafeResourceUrl;
32
  oaSoftwareURL: SafeResourceUrl;
33
  oaOtherURL: SafeResourceUrl;
32
  europeOverviewData: EuropeData;
34 33

  
34
  oaNoaPublicationsTimelineURL: SafeResourceUrl;
35
  oaNoaDatasetsTimelineURL: SafeResourceUrl;
36
  oaNoaSoftwareTimelineURL: SafeResourceUrl;
37
  oaNoaOtherTimelineURL: SafeResourceUrl;
38

  
39
  fundersResultsData: TreemapHighchartsData[];
40

  
41
  // oaPublicationsURL: SafeResourceUrl;
42
  // oaRepositoriesURL: SafeResourceUrl;
43
  // oaJournalsURL: SafeResourceUrl;
44
  // oaDatasetsURL: SafeResourceUrl;
45
  // oaSoftwareURL: SafeResourceUrl;
46
  // oaOtherURL: SafeResourceUrl;
47

  
35 48
  constructor(private sanitizer: DomSanitizer,
36 49
              private dataService: DataService,
37 50
              private dataHandlerService: DataHandlerService) {}
......
39 52
  ngOnInit(): void {
40 53
    this.getAbsoluteData();
41 54
    this.getPercentageData();
55
    this.getEuropeOverviewData();
56
    this.getFundersResults();
42 57
  }
43 58

  
44 59
  getAbsoluteData() {
......
67 82
    );
68 83
  }
69 84

  
85
  getEuropeOverviewData() {
86
    this.dataService.getEuropeOAPercentages().subscribe(
87
      rawData => {
88
        this.europeOverviewData = this.dataHandlerService.convertRawDataToEuropeOverviewData(rawData);
89
      }, error => {
90
        console.log(error);
91
      }
92
    );
93
  }
94

  
95
  getFundersResults() {
96
    this.dataService.getFundersResults().subscribe(
97
      rawData => {
98
        this.fundersResultsData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
99
      }, error => {
100
        console.log(error);
101
      }
102
    );
103
  }
104

  
70 105
  getContentAbsolute(contentSelection: string): void {
71 106
    this.contentAbsoluteSelection = contentSelection;
72 107
    this.getAbsoluteData();
......
80 115
  changeView(view: string) {
81 116
    this.activeView = view;
82 117
    if (view === 'graph') {
83
      if (!this.oaPublicationsURL) {
84
        // publications: #19647E
85
        this.oaPublicationsURL = 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%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%22Open%20Access%20Publications%22%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%3Afalse%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%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`);
118

  
119
      if (!this.oaNoaPublicationsTimelineURL) {
120
        this.oaNoaPublicationsTimelineURL = 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%20Publications%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.oa%22%2C%22parameters%22%3A%5B%22publication%22%5D%7D%7D%2C%7B%22name%22%3A%22Non-OA%20Publications%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.non_oa%22%2C%22parameters%22%3A%5B%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%22Publications%20over%20the%20years%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%7D%7D`);
86 121
      }
87
      if (!this.oaRepositoriesURL) {
88
        // repositories: #A03245
89
        this.oaRepositoriesURL = 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%22Repositories%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oarepositories%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%22Open%20Access%20Repositories%22%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%3Afalse%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%23A03245%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`);
122
      if (!this.oaNoaDatasetsTimelineURL) {
123
        this.oaNoaDatasetsTimelineURL = 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%20Datasets%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.oa%22%2C%22parameters%22%3A%5B%22dataset%22%5D%7D%7D%2C%7B%22name%22%3A%22Non-OA%20Datasets%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.non_oa%22%2C%22parameters%22%3A%5B%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%22Datasets%20over%20the%20years%22%7D%2C%22subtitle%22%3A%7B%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%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%7D%7D`);
90 124
      }
91
      if (!this.oaJournalsURL) {
92
        // journals: #2B243C
93
        this.oaJournalsURL = 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.oajournals%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%22Open%20Access%20Journals%22%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%3Afalse%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%232B243C%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`);
125
      if (!this.oaNoaSoftwareTimelineURL) {
126
        this.oaNoaSoftwareTimelineURL = 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%20Software%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.oa%22%2C%22parameters%22%3A%5B%22software%22%5D%7D%7D%2C%7B%22name%22%3A%22Non-OA%20Software%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.non_oa%22%2C%22parameters%22%3A%5B%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%22Software%20over%20the%20years%22%7D%2C%22subtitle%22%3A%7B%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%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%7D%7D`);
94 127
      }
95
      if (!this.oaDatasetsURL) {
96
        // datasets: #019A85
97
        this.oaDatasetsURL = 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.oadatasets%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%22Open%20Access%20Datasets%22%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%3Afalse%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%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`);
128
      if (!this.oaNoaOtherTimelineURL) {
129
        this.oaNoaOtherTimelineURL = 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%20Other%20Research%20Products%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.oa%22%2C%22parameters%22%3A%5B%22other%22%5D%7D%7D%2C%7B%22name%22%3A%22Non-OA%20Other%20Research%20Products%22%2C%22type%22%3A%22column%22%2C%22query%22%3A%7B%22name%22%3A%22new.oso.result_timeline.results.non_oa%22%2C%22parameters%22%3A%5B%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%22Other%20Research%20Products%20over%20the%20years%22%7D%2C%22subtitle%22%3A%7B%7D%2C%22yAxis%22%3A%7B%22title%22%3A%7B%22text%22%3A%22other%20research%20products%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%7D%7D`);
98 130
      }
99
      if (!this.oaSoftwareURL) {
100
        // software: #99B2DD
101
        this.oaSoftwareURL = 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.oasoftware%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%22Open%20Access%20Software%22%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%3Afalse%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%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`);
102
      }
103
      if (!this.oaOtherURL) {
104
        // other reasearch products: #310A31
105
        this.oaOtherURL = 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%22Other%20Research%20Products%22%2C%22type%22%3A%22bar%22%2C%22query%22%3A%7B%22name%22%3A%22oso.oaother%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%22Open%20Access%20Other%20Research%20Products%22%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%3Afalse%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%23310A31%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`);
106
      }
107 131
    }
108 132
  }
109 133

  
modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.html
121 121
                </div>
122 122

  
123 123
                <div class="uk-text-center uk-margin-medium-top">
124
                  <!--<button [routerLink]="['/countryDashboard/' + countrySelectedName]" class="md-btn md-btn-primary">View Details</button>-->
125
                  <button [routerLink]="['/countryDashboard/' + selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>
126
                  <!--<a class="" [routerLink]="['/countryDashboard/' + countrySelectedName]">Detailed View <i class="fas fa-arrow-right uk-margin-small-left"></i></a>-->
124
                  <!--<button [routerLink]="['/countryDashboard/' + selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>-->
125
                  <button [routerLink]="['/countryDashboard' , selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>
127 126
                </div>
128 127

  
129 128
              </div>
......
308 307
      <!--</div>-->
309 308

  
310 309
      <div class="uk-margin-top">
311
        <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">
312
          <span uk-search-icon></span>
313
          <input class="uk-search-input" type="search" placeholder="Search for a country...">
314
          <!--<input type="text">-->
310

  
311
        <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry">
312
          <span id="search-icon" uk-search-icon></span>
313
          <ng-autocomplete
314
            [data]="countriesCollection"
315
            [searchKeyword]="keyword"
316
            placeHolder="Search for a country..."
317
            (selected)='selectCountryFromAutocompleteEvent($event)'
318
            (inputChanged)='onChangeSearch($event)'
319
            (inputFocused)='onFocused($event)'
320
            historyIdentifier="countriesCollection"
321
            [itemTemplate]="itemTemplate"
322
            [notFoundTemplate]="notFoundTemplate">
323
          </ng-autocomplete>
324

  
325
          <ng-template #itemTemplate let-item>
326
            <a [innerHTML]="item.name"></a>
327
          </ng-template>
328

  
329
          <ng-template #notFoundTemplate let-notFound>
330
            <div [innerHTML]="notFound"></div>
331
          </ng-template>
315 332
        </div>
333

  
334

  
335

  
336
        <!--<div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">-->
337
          <!--<span uk-search-icon></span>-->
338
          <!--<input class="uk-search-input" type="search" placeholder="Search for a country...">-->
339
          <!--&lt;!&ndash;<input type="text">&ndash;&gt;-->
340
        <!--</div>-->
341

  
316 342
      </div>
317 343

  
318 344

  
......
433 459

  
434 460
        <div *ngFor="let data of leadingOpenScienceData" class="uk-margin-small-top">
435 461
          <div class="md-card leadingOpenScienceCard">
436
            <a [routerLink]="['/countryDashboard/' + data.code]" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
462
            <a [routerLink]="['/countryDashboard', data.code]" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
437 463
            <div class="md-card-content">
438 464
              <div class="uk-flex">
439 465
                <img src="../../../assets/img/flags/{{data.code | lowercase}}-flag.svg" width="15">
......
463 489
  <section class="section">
464 490
    <div class="uk-container uk-container-expand uk-container-center ">
465 491
      <div class="goToDetailedViewLink">
466
        <a class="" [routerLink]="['/overview/' + 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
492
        <a class="" [routerLink]="['/overview' , 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
467 493
      </div>
468 494
    </div>
469 495
  </section>
modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.ts
1 1
import { Component, OnInit } from '@angular/core';
2 2
import { DataService } from '../../services/data.service';
3
import {CountryOverviewData, EuropeData, SelectedCountry} from '../../domain/overview-map-data';
4
import {DataHandlerService} from '../../services/data-handler.service';
3
import { CountryOverviewData, EuropeData, SelectedCountry } from '../../domain/overview-map-data';
4
import { DataHandlerService } from '../../services/data-handler.service';
5
import { countries } from '../../domain/countries';
6
import { Router } from '@angular/router';
5 7

  
6 8
@Component({
7 9
  selector: 'app-home',
......
17 19

  
18 20
  leadingOpenScienceData: CountryOverviewData[];
19 21

  
22
  countriesCollection = countries;
23
  keyword = 'name';
24

  
20 25
  constructor(private dataService: DataService,
21
              private dataHandlerService: DataHandlerService) { }
26
              private dataHandlerService: DataHandlerService,
27
              private router: Router) { }
22 28

  
23 29
  ngOnInit(): void {
24 30

  
25 31
    window.scroll(0, 0);
26 32

  
33
    // const searchIcon = document.getElementById('search-icon');
34
    // const inputContainer = document.getElementsByClassName('input-container')[0];
35
    // inputContainer.insertAdjacentElement('afterbegin', searchIcon);
36

  
27 37
    this.dataService.getEuropeOverviewData().subscribe(
28 38
      rawData => {
29 39
        this.europeOverviewData = this.dataHandlerService.convertRawDataToEuropeOverviewData(rawData);
......
58 68
    this.selectedCountry = null;
59 69
    this.selectedCountryData = null;
60 70
  }
71

  
72

  
73
  selectCountryFromAutocompleteEvent(item) {
74
    // do something with selected item
75
    // console.log('country selected: ', item);
76
    this.router.navigate([`/countryDashboard/${item.id}`]);
77
  }
78

  
79
  onChangeSearch(search: string) {
80
    // fetch remote data from here
81
    // And reassign the 'data' which is binded to 'data' property.
82
  }
83

  
84
  onFocused(e) {
85
    // do something
86
  }
61 87
}
modules/open-science-observatory-ui/trunk/src/app/pages/methodology/methodology.component.html
2 2

  
3 3
  <div class="uk-container uk-container-expand uk-container-center uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up" data-uk-scrollspy="{cls:'uk-animation-scale-up uk-invisible',delay:300,topoffset:-100}">
4 4

  
5
    <!--Introduction-->
6
    <div class="">
7
      <h2>Introduction</h2>
5
    <div style="min-height: 500px;">
6
      <h4>Coming soon....</h4>
7
    </div>
8 8

  
9
      <div class="md-card uk-margin-bottom">
10
        <div class="md-card-content large-padding">
11
          <p>
12
            This document describes the methodology , terms, and definitions of the indicators presented in Open Science Observatory.
13
            The Open Science Observatory combines data gathered from OpenAIRE and other data sources to develop and operate an
14
            interactive and dynamic portal, which informs users via rich visualizations and reports on different Open Science
15
            aspects and facets in Europe. The Observatory is an extendable monitor portal with indicators on open science and
16
            the framework uptake by national and sectoral set.
17
          </p>
18
          <p>
19
            The dynamic <strong>Open Science Observatory</strong> leverages existing information collected by OpenAIRE and
20
            <strong>at little additional cost or effort, produces and reports value added metrics</strong> regarding Open Science
21
            trends and evolution for Horizon 2020 and other funding sources. The goal is to provide an EU Open Science Observatory
22
            as key OpenAIRE product, and employing open metrics based on open data gathered by OpenAire to measure the openness
23
            of publications and data on various aspects (e.g., gold/green/fair), the metadata completeness, the regional or
24
            thematic distributions and will test out preliminary metrics for their FAIRness. This will ensure that research can
25
            be evaluated at the right level (including article-level metrics and altmetrics), in an <strong>open and transparent
26
            manner</strong>. Such services will deliver accurate metrics for European Research and enable informed recommendations
27
            to high-level decision makers.
28
          </p>
29
        </div>
30
      </div>
31 9

  
32
    </div>
10
    <!--&lt;!&ndash;Introduction&ndash;&gt;-->
11
    <!--<div class="">-->
12
      <!--<h2>Introduction</h2>-->
33 13

  
34
    <!--Methodological Approach and Indicators-->
35
    <div class="">
36
      <h2>Methodological Approach and Indicators</h2>
14
      <!--<div class="md-card uk-margin-bottom">-->
15
        <!--<div class="md-card-content large-padding">-->
16
          <!--<p>-->
17
            <!--This document describes the methodology , terms, and definitions of the indicators presented in Open Science Observatory.-->
18
            <!--The Open Science Observatory combines data gathered from OpenAIRE and other data sources to develop and operate an-->
19
            <!--interactive and dynamic portal, which informs users via rich visualizations and reports on different Open Science-->
20
            <!--aspects and facets in Europe. The Observatory is an extendable monitor portal with indicators on open science and-->
21
            <!--the framework uptake by national and sectoral set.-->
22
          <!--</p>-->
23
          <!--<p>-->
24
            <!--The dynamic <strong>Open Science Observatory</strong> leverages existing information collected by OpenAIRE and-->
25
            <!--<strong>at little additional cost or effort, produces and reports value added metrics</strong> regarding Open Science-->
26
            <!--trends and evolution for Horizon 2020 and other funding sources. The goal is to provide an EU Open Science Observatory-->
27
            <!--as key OpenAIRE product, and employing open metrics based on open data gathered by OpenAire to measure the openness-->
28
            <!--of publications and data on various aspects (e.g., gold/green/fair), the metadata completeness, the regional or-->
29
            <!--thematic distributions and will test out preliminary metrics for their FAIRness. This will ensure that research can-->
30
            <!--be evaluated at the right level (including article-level metrics and altmetrics), in an <strong>open and transparent-->
31
            <!--manner</strong>. Such services will deliver accurate metrics for European Research and enable informed recommendations-->
32
            <!--to high-level decision makers.-->
33
          <!--</p>-->
34
        <!--</div>-->
35
      <!--</div>-->
37 36

  
38
      <div class="md-card uk-margin-bottom">
39
        <div class="md-card-content large-padding">
40
          <p>
41
            Monitoring and evaluating the advancements, trends and impact of OS in Europe is recognised as one of the most
42
            important steps towards the realisation of the EOSC vision. The implementation of the Open Science Observatory
43
            follows the guidelines and <a target="_blank" href="https://eoscpilot.eu/wp3-policy/eosc-open-science-monitor-specifications/methodological-approach-monitoring-open-science">
44
            methodological approach</a> which was specified by the EOSCPilot project and more specifically the
45
            <a target="_blank" href="https://eoscpilot.eu/content/d32-eosc-open-science-monitor-specifications">EOSCpilot Open Science Monitor Framework (EOSCpilot OSMF)</a>.
46
            It aimed to build a model and initial high-level specifications for providing useful analytics to researchers as well
47
            as enabling research performing and funding organizations within EOSC to monitor and gain insights about the OS movement,
48
            regardless of their service management systems and the technology behind them. The six core steps of the specified methodology are:
49
          </p>
50
          <ul style="font-style: italic">
51
            <li>Step 1. Identification of the Open Science Activities;</li>
52
            <li>Step 2. Policy-driven derivation of monitoring targets;</li>
53
            <li>Step 3. Identification of the main Open Science Resources and Indicators;</li>
54
            <li>Step 4. Design of monitoring processes, tasks and workflows;</li>
55
            <li>Step 5. Modelling and implementation of the framework;</li>
56
            <li>Step 6. Continuous validation of the monitoring targets;</li>
57
          </ul>
37
    <!--</div>-->
58 38

  
59
          <p>
60
            <span style="font-style: italic">Step 1. Identification of the Open Science Activities:</span> The first step addresses the need to identify
61
            which parts of the OS lifecycle are of interest in the monitoring process. These can include the conceptualization
62
            of a research task, the data and literature collection, the analysis and development of the research output, the
63
            publication, the review and evaluation of the research result as well as the reuse and reproducibility of results
64
            by the scientific community. These phases entail different open access practices and elements which are being considered
65
            by the monitor, with a special focus on the policies that these elements fall under.
66
          </p>
67
          <p>
68
            <span style="font-style: italic">Step 2. Policy-driven derivation of monitoring targets:</span> The proposed monitoring
69
            framework adopts a policy-driven approach for deriving high level objectives, i.e., target dimensions to be measured
70
            in the monitoring process. Policies on Open Access at different levels, such as the international, national and
71
            regional levels, as well as micro policies are considered as primary sources for deriving more concrete measurable
72
            targets (e.g., Openness, FAIRness, etc.) that should be monitored in the framework. Furthermore, monitoring targets
73
            can be organised into more specialised sub-targets, to measure more specific aspects of OS. For example, a policy
74
            recommendation stating that research data repositories should follow a data archiving plan indicates the monitoring
75
            target for long-term preservation of OS artefacts monitored by a set of indicators, such as whether an organization
76
            applies such a plan, or the period (e.g., months, years) for which preservation is guaranteed.
77
          </p>
78
          <p>
79
            <span style="font-style: italic">Step 3. Identification of the main Open Science Resources and Indicators:</span>
80
            In the next step, the monitoring targets are being mapped to OS elements they apply to, as well as to indicators
81
            that quantify these targets. OS elements are well-defined artefacts of OS practices, such as publication in open
82
            access journals, research data made available in open access repositories, open source software, open educational
83
            material, etc. In the context of this framework, these elements are called OS resources to state the importance
84
            of their contribution for the development of the “Open Science World”.
85
          </p>
86
          <p>
87
            <span style="font-style: italic">Step 4. Design of monitoring processes, tasks and workflows:</span> Each indicator
88
            must be associated with a set of processes, which are employed for the collection of data, the validation and
89
            scoring of metrics (e.g., combination and aggregation of metrics for deriving an accumulated score for a target
90
            dimension), the visualization of the results, and so on. These processes must be well documented in the form of
91
            workflows and tasks, to be performed for the collection and quantification of the indicators.
92
          </p>
93
          <p>
94
            <span style="font-style: italic">Step 5. Modelling and implementation of the framework:</span> The next step
95
            involves the detailed design, implementation, and customization of the framework, which includes the design of
96
            the functionality at its whole, as well as all added value services offered by the framework.
97
          </p>
98
          <p>
99
            <span style="font-style: italic">Step 6. Continuous validation of the monitoring targets:</span> The last step
100
            follows the operation of the OS monitoring framework and refers to the continuous validation and refinement of
101
            the monitoring methodology (i.e., targets and indicators) and results in EOSC. Α monitoring process, to be effective,
102
            must adapt to new OS practices and new policies, validating and readjusting its target goals as well as the indicators
103
            for their evaluation.
104
          </p>
39
    <!--&lt;!&ndash;Methodological Approach and Indicators&ndash;&gt;-->
40
    <!--<div class="">-->
41
      <!--<h2>Methodological Approach and Indicators</h2>-->
105 42

  
106
          <p>
107
            <strong>The Open Science Observatory of the OpenAIRE is the first implementation</strong> of these specifications
108
            and it aspires to become a dynamic tool in the future, with benefits both to the organisations using it to measure
109
            the OA levels of implementation and impact to their community and for the High Level Stakeholders which are the
110
            European Union’s Legal Entities and Bodies, including the Member States and their respective Units. Gaps, implications
111
            and new ways of performing OS are among the elements that could be identified through OA Open Science Observatory
112
            which could then be easily incorporated within the stakeholders’ scope and strategic planning for OS.
113
          </p>
114
        </div>
115
      </div>
43
      <!--<div class="md-card uk-margin-bottom">-->
44
        <!--<div class="md-card-content large-padding">-->
45
          <!--<p>-->
46
            <!--Monitoring and evaluating the advancements, trends and impact of OS in Europe is recognised as one of the most-->
47
            <!--important steps towards the realisation of the EOSC vision. The implementation of the Open Science Observatory-->
48
            <!--follows the guidelines and <a target="_blank" href="https://eoscpilot.eu/wp3-policy/eosc-open-science-monitor-specifications/methodological-approach-monitoring-open-science">-->
49
            <!--methodological approach</a> which was specified by the EOSCPilot project and more specifically the-->
50
            <!--<a target="_blank" href="https://eoscpilot.eu/content/d32-eosc-open-science-monitor-specifications">EOSCpilot Open Science Monitor Framework (EOSCpilot OSMF)</a>.-->
51
            <!--It aimed to build a model and initial high-level specifications for providing useful analytics to researchers as well-->
52
            <!--as enabling research performing and funding organizations within EOSC to monitor and gain insights about the OS movement,-->
53
            <!--regardless of their service management systems and the technology behind them. The six core steps of the specified methodology are:-->
54
          <!--</p>-->
55
          <!--<ul style="font-style: italic">-->
56
            <!--<li>Step 1. Identification of the Open Science Activities;</li>-->
57
            <!--<li>Step 2. Policy-driven derivation of monitoring targets;</li>-->
58
            <!--<li>Step 3. Identification of the main Open Science Resources and Indicators;</li>-->
59
            <!--<li>Step 4. Design of monitoring processes, tasks and workflows;</li>-->
60
            <!--<li>Step 5. Modelling and implementation of the framework;</li>-->
61
            <!--<li>Step 6. Continuous validation of the monitoring targets;</li>-->
62
          <!--</ul>-->
116 63

  
117
    </div>
64
          <!--<p>-->
65
            <!--<span style="font-style: italic">Step 1. Identification of the Open Science Activities:</span> The first step addresses the need to identify-->
66
            <!--which parts of the OS lifecycle are of interest in the monitoring process. These can include the conceptualization-->
67
            <!--of a research task, the data and literature collection, the analysis and development of the research output, the-->
68
            <!--publication, the review and evaluation of the research result as well as the reuse and reproducibility of results-->
69
            <!--by the scientific community. These phases entail different open access practices and elements which are being considered-->
70
            <!--by the monitor, with a special focus on the policies that these elements fall under.-->
71
          <!--</p>-->
72
          <!--<p>-->
73
            <!--<span style="font-style: italic">Step 2. Policy-driven derivation of monitoring targets:</span> The proposed monitoring-->
74
            <!--framework adopts a policy-driven approach for deriving high level objectives, i.e., target dimensions to be measured-->
75
            <!--in the monitoring process. Policies on Open Access at different levels, such as the international, national and-->
76
            <!--regional levels, as well as micro policies are considered as primary sources for deriving more concrete measurable-->
77
            <!--targets (e.g., Openness, FAIRness, etc.) that should be monitored in the framework. Furthermore, monitoring targets-->
78
            <!--can be organised into more specialised sub-targets, to measure more specific aspects of OS. For example, a policy-->
79
            <!--recommendation stating that research data repositories should follow a data archiving plan indicates the monitoring-->
80
            <!--target for long-term preservation of OS artefacts monitored by a set of indicators, such as whether an organization-->
81
            <!--applies such a plan, or the period (e.g., months, years) for which preservation is guaranteed.-->
82
          <!--</p>-->
83
          <!--<p>-->
84
            <!--<span style="font-style: italic">Step 3. Identification of the main Open Science Resources and Indicators:</span>-->
85
            <!--In the next step, the monitoring targets are being mapped to OS elements they apply to, as well as to indicators-->
86
            <!--that quantify these targets. OS elements are well-defined artefacts of OS practices, such as publication in open-->
87
            <!--access journals, research data made available in open access repositories, open source software, open educational-->
88
            <!--material, etc. In the context of this framework, these elements are called OS resources to state the importance-->
89
            <!--of their contribution for the development of the “Open Science World”.-->
90
          <!--</p>-->
91
          <!--<p>-->
92
            <!--<span style="font-style: italic">Step 4. Design of monitoring processes, tasks and workflows:</span> Each indicator-->
93
            <!--must be associated with a set of processes, which are employed for the collection of data, the validation and-->
94
            <!--scoring of metrics (e.g., combination and aggregation of metrics for deriving an accumulated score for a target-->
95
            <!--dimension), the visualization of the results, and so on. These processes must be well documented in the form of-->
96
            <!--workflows and tasks, to be performed for the collection and quantification of the indicators.-->
97
          <!--</p>-->
98
          <!--<p>-->
99
            <!--<span style="font-style: italic">Step 5. Modelling and implementation of the framework:</span> The next step-->
100
            <!--involves the detailed design, implementation, and customization of the framework, which includes the design of-->
101
            <!--the functionality at its whole, as well as all added value services offered by the framework.-->
102
          <!--</p>-->
103
          <!--<p>-->
104
            <!--<span style="font-style: italic">Step 6. Continuous validation of the monitoring targets:</span> The last step-->
105
            <!--follows the operation of the OS monitoring framework and refers to the continuous validation and refinement of-->
106
            <!--the monitoring methodology (i.e., targets and indicators) and results in EOSC. Α monitoring process, to be effective,-->
107
            <!--must adapt to new OS practices and new policies, validating and readjusting its target goals as well as the indicators-->
108
            <!--for their evaluation.-->
109
          <!--</p>-->
118 110

  
119
    <!--Indicators-->
120
    <div class="">
121
      <h2>Indicators</h2>
111
          <!--<p>-->
112
            <!--<strong>The Open Science Observatory of the OpenAIRE is the first implementation</strong> of these specifications-->
113
            <!--and it aspires to become a dynamic tool in the future, with benefits both to the organisations using it to measure-->
114
            <!--the OA levels of implementation and impact to their community and for the High Level Stakeholders which are the-->
115
            <!--European Union’s Legal Entities and Bodies, including the Member States and their respective Units. Gaps, implications-->
116
            <!--and new ways of performing OS are among the elements that could be identified through OA Open Science Observatory-->
117
            <!--which could then be easily incorporated within the stakeholders’ scope and strategic planning for OS.-->
118
          <!--</p>-->
119
        <!--</div>-->
120
      <!--</div>-->
122 121

  
123
      <div class="md-card uk-margin-bottom">
124
        <div class="md-card-content large-padding">
122
    <!--</div>-->
125 123

  
126
          <div class="">
127
            <ul class="uk-tab uk-tab-large uk-flex-center" data-uk-tab="{connect:'#tabs',animation: 'slide-bottom'}">
128
              <li class="uk-active" aria-expanded="true"><a href="#">Terms and definitions</a></li>
129
              <li aria-expanded="false"><a href="#">Continent overview</a></li>
130
              <li aria-expanded="false"><a href="#">COuntry page</a></li>
131
            </ul>
124
    <!--&lt;!&ndash;Indicators&ndash;&gt;-->
125
    <!--<div class="">-->
126
      <!--<h2>Indicators</h2>-->
132 127

  
133
            <ul id="tabs" class="uk-switcher">
128
      <!--<div class="md-card uk-margin-bottom">-->
129
        <!--<div class="md-card-content large-padding">-->
134 130

  
135
              <!--OVERVIEW tab-->
136
              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
137
                <div class="uk-margin">
131
          <!--<div class="">-->
132
            <!--<ul class="uk-tab uk-tab-large uk-flex-center" data-uk-tab="{connect:'#tabs',animation: 'slide-bottom'}">-->
133
              <!--<li class="uk-active" aria-expanded="true"><a href="#">Terms and definitions</a></li>-->
134
              <!--<li aria-expanded="false"><a href="#">Continent overview</a></li>-->
135
              <!--<li aria-expanded="false"><a href="#">COuntry page</a></li>-->
136
            <!--</ul>-->
138 137

  
139
                  <!--Terms and definitions-->
140
                  <div>
141
                    <!--<h3>Terms and definitions</h3>-->
142
                    <dl>
143
                      <dt>Publication</dt>
144
                      <dd>a scientific publication</dd>
138
            <!--<ul id="tabs" class="uk-switcher">-->
145 139

  
146
                      <dt>Repository</dt>
147
                      <dd>a repository of publications</dd>
140
              <!--&lt;!&ndash;OVERVIEW tab&ndash;&gt;-->
141
              <!--<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">-->
142
                <!--<div class="uk-margin">-->
148 143

  
149
                      <dt>Dataset</dt>
150
                      <dd>a dataset, usually associated with a publication</dd>
144
                  <!--&lt;!&ndash;Terms and definitions&ndash;&gt;-->
145
                  <!--<div>-->
146
                    <!--&lt;!&ndash;<h3>Terms and definitions</h3>&ndash;&gt;-->
147
                    <!--<dl>-->
148
                      <!--<dt>Publication</dt>-->
149
                      <!--<dd>a scientific publication</dd>-->
151 150

  
152
                      <dt>Software</dt>
153
                      <dd>software (e.g., open source), usually associated with a publication/dataset</dd>
151
                      <!--<dt>Repository</dt>-->
152
                      <!--<dd>a repository of publications</dd>-->
154 153

  
155
                      <dt>Other Research Products</dt>
156
                      <dd>Other research outputs (e.g., dissemination or educational material) associated with a publication, dataset or software.</dd>
154
                      <!--<dt>Dataset</dt>-->
155
                      <!--<dd>a dataset, usually associated with a publication</dd>-->
157 156

  
158
                      <dt>Journal</dt>
159
                      <dd>a scientific journal where authors publish their results in the form of publications</dd>
157
                      <!--<dt>Software</dt>-->
158
                      <!--<dd>software (e.g., open source), usually associated with a publication/dataset</dd>-->
160 159

  
161
                      <dt>Policy</dt>
162
                      <dd>an Open Science mandate that organizations follow in order to engage in Open Science best practices</dd>
160
                      <!--<dt>Other Research Products</dt>-->
161
                      <!--<dd>Other research outputs (e.g., dissemination or educational material) associated with a publication, dataset or software.</dd>-->
163 162

  
164
                      <dt>Organization</dt>
165
                      <dd>an academic institution, company, or any other legal entity with the context of OpenAIRE</dd>
163
                      <!--<dt>Journal</dt>-->
164
                      <!--<dd>a scientific journal where authors publish their results in the form of publications</dd>-->
166 165

  
167
                      <dt>Vocabularies</dt>
168
                      <dd>used in the Observatory are described in <a target="_blank" href="http://api.openaire.eu/vocabularies">http://api.openaire.eu/vocabularies</a></dd>
169
                    </dl>
170
                  </div>
166
                      <!--<dt>Policy</dt>-->
167
                      <!--<dd>an Open Science mandate that organizations follow in order to engage in Open Science best practices</dd>-->
171 168

  
172
                </div>
173
              </li>
169
                      <!--<dt>Organization</dt>-->
170
                      <!--<dd>an academic institution, company, or any other legal entity with the context of OpenAIRE</dd>-->
174 171

  
175
              <!--OPEN SCIENCE tab-->
176
              <li aria-hidden="true" style="animation-duration: 200ms;">
177
                <div class="uk-margin">
172
                      <!--<dt>Vocabularies</dt>-->
173
                      <!--<dd>used in the Observatory are described in <a target="_blank" href="http://api.openaire.eu/vocabularies">http://api.openaire.eu/vocabularies</a></dd>-->
174
                    <!--</dl>-->
175
                  <!--</div>-->
178 176

  
179
                  <!--Continent overview-->
180
                  <div>
181
                    <!--<h3>Continent overview</h3>-->
182
                    <dl>
183
                      <dt>Number of OA publications</dt>
184
                      <dd>The total number of open access publications currently in OpenAIRE, along with the percentage they represent with respect to the total number of publications.</dd>
177
                <!--</div>-->
178
              <!--</li>-->
185 179

  
186
                      <dt>Number of OA datasets</dt>
187
                      <dd>The total number of open access datasets currently in OpenAIRE, along with the percentage they represent with respect to the total number of datasets.</dd>
180
              <!--&lt;!&ndash;OPEN SCIENCE tab&ndash;&gt;-->
181
              <!--<li aria-hidden="true" style="animation-duration: 200ms;">-->
182
                <!--<div class="uk-margin">-->
188 183

  
189
                      <dt>Number of OA repositories</dt>
190
                      <dd>The total number of open access repositories currently in OpenAIRE.</dd>
184
                  <!--&lt;!&ndash;Continent overview&ndash;&gt;-->
185
                  <!--<div>-->
186
                    <!--&lt;!&ndash;<h3>Continent overview</h3>&ndash;&gt;-->
187
                    <!--<dl>-->
188
                      <!--<dt>Number of OA publications</dt>-->
189
                      <!--<dd>The total number of open access publications currently in OpenAIRE, along with the percentage they represent with respect to the total number of publications.</dd>-->
191 190

  
192
                      <dt>Number of OA journals</dt>
193
                      <dd>The total number of open access journals currently in OpenAIRE, along with the percentage they represent with respect to the total number of journals. Source: DOAJ.</dd>
191
                      <!--<dt>Number of OA datasets</dt>-->
192
                      <!--<dd>The total number of open access datasets currently in OpenAIRE, along with the percentage they represent with respect to the total number of datasets.</dd>-->
194 193

  
195
                      <dt>Number of organizations with OA policies</dt>
196
                      <dd>The total number of organizations in OpenAIRE that have Open Access policies associated with them. Source: RoarMap.</dd>
197
                    </dl>
194
                      <!--<dt>Number of OA repositories</dt>-->
195
                      <!--<dd>The total number of open access repositories currently in OpenAIRE.</dd>-->
198 196

  
199
                    <!--Overview-->
200
                    <div>
201
                      <h4>Overview</h4>
202
                      <p>Each table row refers to a country. For each country, the table shows <span style="font-style: italic">total numbers of OA repositories,
203
          journals, policies, publications, datasets, software and other research products.</span><br>
204
                        The total numbers and percentages are computed as described in the continent overview.
205
                      </p>
206
                    </div>
197
                      <!--<dt>Number of OA journals</dt>-->
198
                      <!--<dd>The total number of open access journals currently in OpenAIRE, along with the percentage they represent with respect to the total number of journals. Source: DOAJ.</dd>-->
207 199

  
208
                    <!--Open Science-->
209
                    <div>
210
                      <h4>Open Science</h4>
211
                      <p>Open science related resources, specifically OA publications, datasets, software and other research products.</p>
212
                    </div>
200
                      <!--<dt>Number of organizations with OA policies</dt>-->
201
                      <!--<dd>The total number of organizations in OpenAIRE that have Open Access policies associated with them. Source: RoarMap.</dd>-->
202
                    <!--</dl>-->
213 203

  
214
                  </div>
204
                    <!--&lt;!&ndash;Overview&ndash;&gt;-->
205
                    <!--<div>-->
206
                      <!--<h4>Overview</h4>-->
207
                      <!--<p>Each table row refers to a country. For each country, the table shows <span style="font-style: italic">total numbers of OA repositories,-->
208
          <!--journals, policies, publications, datasets, software and other research products.</span><br>-->
209
                        <!--The total numbers and percentages are computed as described in the continent overview.-->
210
                      <!--</p>-->
211
                    <!--</div>-->
215 212

  
216
                </div>
217
              </li>
213
                    <!--&lt;!&ndash;Open Science&ndash;&gt;-->
214
                    <!--<div>-->
215
                      <!--<h4>Open Science</h4>-->
216
                      <!--<p>Open science related resources, specifically OA publications, datasets, software and other research products.</p>-->
217
                    <!--</div>-->
218 218

  
219
              <li aria-hidden="true" style="animation-duration: 200ms;">
220
                <div class="uk-margin">
219
                  <!--</div>-->
221 220

  
222
                  <!--Country page-->
223
                  <div>
224
                    <!--<h3>Country page</h3>-->
221
                <!--</div>-->
222
              <!--</li>-->
225 223

  
226
                    <!--Country overview-->
227
                    <div>
228
                      <h4>Country overview</h4>
229
                      <dl>
230
                        <dt>Number of OA publications</dt>
231
                        <dd>The total number of open access publications currently in OpenAIRE for this country, along with the
232
                          percentage they represent with respect to the total number of publications of this country.</dd>
224
              <!--<li aria-hidden="true" style="animation-duration: 200ms;">-->
225
                <!--<div class="uk-margin">-->
233 226

  
234
                        <dt>Number of OA datasets</dt>
235
                        <dd>The total number of open access datasets currently in OpenAIRE for this country, along with the percentage
236
                          they represent with respect to the total number of datasets of this country.
237
                        </dd>
227
                  <!--&lt;!&ndash;Country page&ndash;&gt;-->
228
                  <!--<div>-->
229
                    <!--&lt;!&ndash;<h3>Country page</h3>&ndash;&gt;-->
238 230

  
239
                        <dt>Number of OA repositories</dt>
240
                        <dd>The total number of open access repositories currently in OpenAIRE for this country.</dd>
231
                    <!--&lt;!&ndash;Country overview&ndash;&gt;-->
232
                    <!--<div>-->
233
                      <!--<h4>Country overview</h4>-->
234
                      <!--<dl>-->
235
                        <!--<dt>Number of OA publications</dt>-->
236
                        <!--<dd>The total number of open access publications currently in OpenAIRE for this country, along with the-->
237
                          <!--percentage they represent with respect to the total number of publications of this country.</dd>-->
241 238

  
242
                        <dt>Number of OA journals</dt>
243
                        <dd>The total number of open access journals currently in OpenAIRE for this country, along with the percentage
244
                          they represent with respect to the total number of journals. Source: DOAJ.</dd>
239
                        <!--<dt>Number of OA datasets</dt>-->
240
                        <!--<dd>The total number of open access datasets currently in OpenAIRE for this country, along with the percentage-->
241
                          <!--they represent with respect to the total number of datasets of this country.-->
242
                        <!--</dd>-->
245 243

  
246
                        <dt>Number of organizations with OA policies</dt>
247
                        <dd>The total number of organizations in OpenAIRE for this country that have Open Access policies associated
248
                          with them. Source: RoarMap.</dd>
249
                      </dl>
250
                    </div>
244
                        <!--<dt>Number of OA repositories</dt>-->
245
                        <!--<dd>The total number of open access repositories currently in OpenAIRE for this country.</dd>-->
251 246

  
252
                    <!--Info Box-->
253
                    <div>
254
                      <h4>Info Box</h4>
255
                      <dl>
256
                        <dt>R&D Expenditure</dt>
257
                        <dd>The total R&D expenditure for this country since 2008. Source: Eurostat.</dd>
247
                        <!--<dt>Number of OA journals</dt>-->
248
                        <!--<dd>The total number of open access journals currently in OpenAIRE for this country, along with the percentage-->
249
                          <!--they represent with respect to the total number of journals. Source: DOAJ.</dd>-->
258 250

  
259
                        <dt>Funding sources</dt>
260
                        <dd></dd>
251
                        <!--<dt>Number of organizations with OA policies</dt>-->
252
                        <!--<dd>The total number of organizations in OpenAIRE for this country that have Open Access policies associated-->
253
                          <!--with them. Source: RoarMap.</dd>-->
254
                      <!--</dl>-->
255
                    <!--</div>-->
261 256

  
262
                        <dt>Funding Organizations</dt>
263
                        <dd></dd>
257
                    <!--&lt;!&ndash;Info Box&ndash;&gt;-->
258
                    <!--<div>-->
259
                      <!--<h4>Info Box</h4>-->
260
                      <!--<dl>-->
261
                        <!--<dt>R&D Expenditure</dt>-->
262
                        <!--<dd>The total R&D expenditure for this country since 2008. Source: Eurostat.</dd>-->
264 263

  
265
                        <dt>Organizations funded by the European Commission since 2013</dt>
266
                        <dd>The total number of organizations in this country that have participated/participate in a project that was/is
267
                          funded by the European Commission.</dd>
268
                      </dl>
269
                    </div>
264
                        <!--<dt>Funding sources</dt>-->
265
                        <!--<dd></dd>-->
270 266

  
271
                    <!--Green vs. Gold-->
272
                    <div>
273
                      <h4>Green vs. Gold</h4>
274
                      <dl>
275
                        <dt>Green vs Gold Publications</dt>
276
                        <dd>The line shows the evolution of the total number of publications that have been published through a green
277
                          open access route, vs the total number of publications that have been published through a gold open access route.</dd>
267
                        <!--<dt>Funding Organizations</dt>-->
268
                        <!--<dd></dd>-->
278 269

  
279
                        <dt>Gold Open Access</dt>
280
                        <dd>The chart shows a ranking of the top 15 organizations of this country in descending order of their total
281
                          count of gold open access publications.</dd>
270
                        <!--<dt>Organizations funded by the European Commission since 2013</dt>-->
271
                        <!--<dd>The total number of organizations in this country that have participated/participate in a project that was/is-->
272
                          <!--funded by the European Commission.</dd>-->
273
                      <!--</dl>-->
274
                    <!--</div>-->
282 275

  
283
                        <dt>Green Open Access</dt>
284
                        <dd>The chart shows a ranking of the top 15 organizations of this country in descending order of their total
285
                          count of green open access publications. </dd>
286
                      </dl>
287
                    </div>
276
                    <!--&lt;!&ndash;Green vs. Gold&ndash;&gt;-->
277
                    <!--<div>-->
278
                      <!--<h4>Green vs. Gold</h4>-->
279
                      <!--<dl>-->
280
                        <!--<dt>Green vs Gold Publications</dt>-->
281
                        <!--<dd>The line shows the evolution of the total number of publications that have been published through a green-->
282
                          <!--open access route, vs the total number of publications that have been published through a gold open access route.</dd>-->
288 283

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff