Project

General

Profile

« Previous | Next » 

Revision 62830

View differences:

modules/open-science-observatory-ui/trunk/angular.json
23 23
              "src/assets"
24 24
            ],
25 25
            "styles": [
26
              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
26 27
              "src/styles.css",
27
              "node_modules/font-awesome/css/font-awesome.css"
28
              "node_modules/font-awesome/css/font-awesome.css",
29
              "src/assets/css/material.scss"
28 30
            ],
29 31
            "scripts": [
30 32
              "node_modules/jquery/dist/jquery.min.js",
......
85 87
                  "maximumError": "5mb"
86 88
                }
87 89
              ]
90
            },
91
            "madgik": {
92
              "fileReplacements": [
93
                {
94
                  "replace": "src/environments/environment.ts",
95
                  "with": "src/environments/environment.madgik.ts"
96
                }
97
              ],
98
              "optimization": true,
99
              "outputHashing": "all",
100
              "sourceMap": false,
101
              "namedChunks": false,
102
              "aot": true,
103
              "extractLicenses": true,
104
              "vendorChunk": false,
105
              "buildOptimizer": true,
106
              "budgets": [
107
                {
108
                  "type": "initial",
109
                  "maximumWarning": "2mb",
110
                  "maximumError": "5mb"
111
                }
112
              ]
88 113
            }
89 114
          },
90 115
          "defaultConfiguration": ""
......
114 139
            "tsConfig": "src/tsconfig.spec.json",
115 140
            "karmaConfig": "src/karma.conf.js",
116 141
            "styles": [
142
              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
117 143
              "src/styles.css"
118 144
            ],
119 145
            "scripts": [],
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/other-research-products/continent-collaboration-orp-routing.module.ts
1
import { RouterModule, Routes } from '@angular/router';
2
import { NgModule } from '@angular/core';
3
import { ContinentCollaborationORPComponent } from './continent-collaboration-orp.component';
4
import { ContinentCollaborationORPIndicatorsComponent } from './continent-collaboration-orp-indicators.component';
5

  
6

  
7
const continentCollaborationORPRoutes: Routes = [
8
  {
9
    path: '',
10
    component: ContinentCollaborationORPComponent,
11
    children : [
12
      {
13
        path: '',
14
        redirectTo: 'co-funded',
15
        pathMatch: 'full',
16
      },
17
      {
18
        path: ':indicator',
19
        component: ContinentCollaborationORPIndicatorsComponent,
20
      }
21
    ]
22
  },
23
];
24

  
25
@NgModule ({
26
  imports: [RouterModule.forChild(continentCollaborationORPRoutes)],
27
  exports: [RouterModule]
28
})
29

  
30
export class ContinentCollaborationORPRoutingModule {}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/other-research-products/continent-collaboration-orp.module.ts
1
import { NgModule } from '@angular/core';
2
import { CommonModule } from '@angular/common';
3
import { ReusableComponentsModule } from '../../../../shared/reusablecomponents/reusable-components.module';
4
import { DataService } from '../../../../services/data.service';
5
import { DataHandlerService } from '../../../../services/data-handler.service';
6
import { ContinentCollaborationORPRoutingModule } from './continent-collaboration-orp-routing.module';
7
import { ContinentCollaborationORPComponent } from './continent-collaboration-orp.component';
8
import { ContinentCollaborationORPIndicatorsComponent } from './continent-collaboration-orp-indicators.component';
9

  
10

  
11
@NgModule ({
12
  imports: [
13
    CommonModule,
14
    ContinentCollaborationORPRoutingModule,
15
    ReusableComponentsModule,
16
  ],
17
  declarations: [
18
    ContinentCollaborationORPComponent,
19
    ContinentCollaborationORPIndicatorsComponent,
20
  ],
21
  providers: [
22
    DataService,
23
    DataHandlerService
24
  ],
25
})
26

  
27
export class ContinentCollaborationORPModule {}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/publications/continent-collaboration-publications-indicators.component.ts
1
import { Component, OnInit } from '@angular/core';
2
import {
3
  gradientStartColor,
4
  publicationColor,
5
  publicationPalette, publicationIndicatorsPalette, goldGreenIndicatorsPalette
6
} from '../../../../chart-palettes';
7
import {environment} from '../../../../../environments/environment';
8
import {CountryTableData} from '../../../../domain/overview-map-data';
9
import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
10
import {TreemapHighchartsData} from '../../../../domain/treemap-highcharts-data';
11
import {DataHandlerService} from '../../../../services/data-handler.service';
12
import {DataService} from '../../../../services/data.service';
13
import {ActivatedRoute} from '@angular/router';
14

  
15
@Component({
16
  selector: 'app-continent-collaboration-publications-indicators',
17
  templateUrl: './continent-collaboration-publications-indicators.component.html',
18
})
19

  
20
export class ContinentCollaborationPublicationsIndicatorsComponent implements OnInit {
21

  
22
  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
23
  private profileName = environment.profileName;
24

  
25
  indicator: string;
26

  
27
  private publicationIndicatorsPalette = publicationIndicatorsPalette;
28
  publicationColor = publicationColor;
29

  
30
  publicationsCoFundedFundersTimeline: SafeResourceUrl;
31
  publicationsCoFundedProjectsTimeline: SafeResourceUrl;
32
  publicationsCoAuthoredTimeline: SafeResourceUrl;
33

  
34
  publicationsCoFundedFundersGroupByView = 'country';
35
  publicationsCoFundedFundersByCountryChartURL: SafeResourceUrl;
36
  publicationsCoFundedFundersByDatasourceChartURL: SafeResourceUrl;
37
  publicationsCoFundedFundersByOrganizationChartURL: SafeResourceUrl;
38
  publicationsCoFundedFundersByCountryChartURLMobile: SafeResourceUrl;
39

  
40
  publicationsCoFundedProjectsGroupByView = 'country';
41
  publicationsCoFundedProjectsByCountryChartURL: SafeResourceUrl;
42
  publicationsCoFundedProjectsByDatasourceChartURL: SafeResourceUrl;
43
  publicationsCoFundedProjectsByOrganizationChartURL: SafeResourceUrl;
44
  publicationsCoFundedProjectsByCountryChartURLMobile: SafeResourceUrl;
45

  
46
  publicationsCoAuthoredGroupByView = 'country';
47
  publicationsCoAuthoredByCountryChartURL: SafeResourceUrl;
48
  publicationsCoAuthoredByDatasourceChartURL: SafeResourceUrl;
49
  publicationsCoAuthoredByOrganizationChartURL: SafeResourceUrl;
50
  publicationsCoAuthoredByCountryChartURLMobile: SafeResourceUrl;
51

  
52
  publicationsCoFundedFundersByFunderData: TreemapHighchartsData[];
53
  publicationsCoFundedProjectsByFunderData: TreemapHighchartsData[];
54
  publicationsCoAuthoredByFunderData: TreemapHighchartsData[];
55

  
56
  loadingPublicationsAbsoluteTable: boolean = true;
57
  loadingPublicationsPercentageTable: boolean = true;
58
  publicationsTableContentSelection: string = 'affiliated_peer_reviewed';
59
  publicationsAbsoluteTableData: CountryTableData[];
60
  publicationsPercentageTableData: CountryTableData[];
61

  
62
  constructor(private dataService: DataService,
63
              private dataHandlerService: DataHandlerService,
64
              private route: ActivatedRoute,
65
              private sanitizer: DomSanitizer) { }
66

  
67
  ngOnInit(): void {
68

  
69
    this.route.params.subscribe(params => {
70

  
71
      this.indicator = params['indicator'];
72
    });
73

  
74
    this.publicationsCoFundedFundersTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab_timeline.affiliated","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab_timeline.affiliated","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
75
    this.publicationsCoFundedProjectsTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab_timeline.affiliated","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab_timeline.affiliated","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
76
    this.publicationsCoAuthoredTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab_timeline.affiliated","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab_timeline.affiliated","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
77

  
78
    this.publicationsCoFundedFundersByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
79
    this.publicationsCoFundedFundersByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
80

  
81
    this.publicationsCoFundedProjectsByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
82
    this.publicationsCoFundedProjectsByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
83

  
84
    this.publicationsCoAuthoredByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
85
    this.publicationsCoAuthoredByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
86

  
87
    this.dataService.getFundersResultsByPublicationForCollaborationIndicatorForCountry('funders').subscribe(
88
      rawData => {
89
        this.publicationsCoFundedFundersByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
90
      }, error => {
91
        console.log(error);
92
      }
93
    );
94

  
95
    this.dataService.getFundersResultsByPublicationForCollaborationIndicatorForCountry('projects').subscribe(
96
      rawData => {
97
        this.publicationsCoFundedProjectsByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
98
      }, error => {
99
        console.log(error);
100
      }
101
    );
102

  
103
    this.dataService.getFundersResultsByPublicationForCollaborationIndicatorForCountry('authors').subscribe(
104
      rawData => {
105
        this.publicationsCoAuthoredByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
106
      }, error => {
107
        console.log(error);
108
      }
109
    );
110

  
111
    this.getPublicationsTableData(this.publicationsTableContentSelection);
112
  }
113

  
114
  getPublicationsTableData(contentSelection: string) {
115

  
116
    this.loadingPublicationsAbsoluteTable = true;
117
    this.loadingPublicationsPercentageTable = true;
118
    this.dataService.getCollaborationIndicatorsTableData('publication', contentSelection).subscribe(
119
      rawData => {
120
        this.publicationsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
121
        this.publicationsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
122
        this.loadingPublicationsAbsoluteTable = false;
123
        this.loadingPublicationsPercentageTable = false;
124
      }, error => {
125
        console.log(error);
126
        this.loadingPublicationsAbsoluteTable = false;
127
        this.loadingPublicationsPercentageTable = false;
128
      }
129
    );
130
  }
131

  
132
  getContent(type: string, contentSelection: string): void {
133
    this.publicationsTableContentSelection = contentSelection;
134
    this.getPublicationsTableData(this.publicationsTableContentSelection);
135
  }
136

  
137
  getPublicationsCoFundedFundersGroupBy(contentSelection: string): void {
138
    this.publicationsCoFundedFundersGroupByView = contentSelection;
139
    if (contentSelection === 'country' && !this.publicationsCoFundedFundersByCountryChartURL) {
140
      this.publicationsCoFundedFundersByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"column","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
141
    } else if (contentSelection === 'datasource' && !this.publicationsCoFundedFundersByDatasourceChartURL) {
142
      this.publicationsCoFundedFundersByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
143
    } else if (contentSelection === 'organization' && !this.publicationsCoFundedFundersByOrganizationChartURL) {
144
      this.publicationsCoFundedFundersByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
145
    }
146
  }
147

  
148
  getPublicationsCoFundedFundersGroupByMobile(contentSelection: string): void {
149
    this.publicationsCoFundedFundersGroupByView = contentSelection;
150
    if (contentSelection === 'country' && !this.publicationsCoFundedFundersByCountryChartURLMobile) {
151
      this.publicationsCoFundedFundersByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
152
    } else if (contentSelection === 'datasource' && !this.publicationsCoFundedFundersByDatasourceChartURL) {
153
      this.publicationsCoFundedFundersByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
154
    } else if (contentSelection === 'organization' && !this.publicationsCoFundedFundersByOrganizationChartURL) {
155
      this.publicationsCoFundedFundersByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} funders","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.funders_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open access publications with multiple funders","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
156
    }
157
  }
158

  
159
  getPublicationsCoFundedProjectsGroupBy(contentSelection: string): void {
160
    this.publicationsCoFundedProjectsGroupByView = contentSelection;
161
    if (contentSelection === 'country' && !this.publicationsCoFundedProjectsByCountryChartURL) {
162
      this.publicationsCoFundedProjectsByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"column","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
163
    } else if (contentSelection === 'datasource' && !this.publicationsCoFundedProjectsByDatasourceChartURL) {
164
      this.publicationsCoFundedProjectsByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
165
    } else if (contentSelection === 'organization' && !this.publicationsCoFundedProjectsByOrganizationChartURL) {
166
      this.publicationsCoFundedProjectsByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
167
    }
168
  }
169

  
170
  getPublicationsCoFundedProjectsGroupByMobile(contentSelection: string): void {
171
    this.publicationsCoFundedProjectsGroupByView = contentSelection;
172
    if (contentSelection === 'country' && !this.publicationsCoFundedProjectsByCountryChartURLMobile) {
173
      this.publicationsCoFundedProjectsByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
174
    } else if (contentSelection === 'datasource' && !this.publicationsCoFundedProjectsByDatasourceChartURL) {
175
      this.publicationsCoFundedProjectsByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
176
    } else if (contentSelection === 'organization' && !this.publicationsCoFundedProjectsByOrganizationChartURL) {
177
      this.publicationsCoFundedProjectsByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"> 1 projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"{0,1} projects","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.projects_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access publications linked to multiple projects","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
178
    }
179
  }
180

  
181
  getPublicationsCoAuthoredGroupBy(contentSelection: string): void {
182
    this.publicationsCoAuthoredGroupByView = contentSelection;
183
    if (contentSelection === 'country' && !this.publicationsCoAuthoredByCountryChartURL) {
184
      this.publicationsCoAuthoredByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry.all","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"column","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry.all","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
185
    } else if (contentSelection === 'datasource' && !this.publicationsCoAuthoredByDatasourceChartURL) {
186
      this.publicationsCoAuthoredByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
187
    } else if (contentSelection === 'organization' && !this.publicationsCoAuthoredByOrganizationChartURL) {
188
      this.publicationsCoAuthoredByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
189
    }
190
  }
191

  
192
  getPublicationsCoAuthoredGroupByMobile(contentSelection: string): void {
193
    this.publicationsCoAuthoredGroupByView = contentSelection;
194
    if (contentSelection === 'country' && !this.publicationsCoAuthoredByCountryChartURLMobile) {
195
      this.publicationsCoAuthoredByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bycountry","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
196
    } else if (contentSelection === 'datasource' && !this.publicationsCoAuthoredByDatasourceChartURL) {
197
      this.publicationsCoAuthoredByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bydatasource","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.bydatasource","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
198
    } else if (contentSelection === 'organization' && !this.publicationsCoAuthoredByOrganizationChartURL) {
199
      this.publicationsCoAuthoredByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"co-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.byorganization","parameters":[1],"profile":"${this.profileName}"}},{"name":"single-authored","type":"bar","query":{"name":"new.oso.publications.peer_reviewed.authors_collab.affiliated.byorganization","parameters":[0],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Co-authored Open Access publications","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.publicationIndicatorsPalette.join('","')}\"]}}`));
200
    }
201
  }
202
}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/publications/continent-collaboration-publications.component.html
1
<div>
2

  
3
  <div class="uk-margin-large-top uk-margin-medium-bottom">
4
    <h3>Publications</h3>
5
  </div>
6

  
7
  <ul uk-tab class="uk-tab-large">
8
    <li [routerLinkActive]="['uk-active']"><a [routerLink]="['./co-funded']">Co-funded</a></li>
9
    <li [routerLinkActive]="['uk-active']"><a [routerLink]="['./co-authored']">Co-authored</a></li>
10
    <li [routerLinkActive]="['uk-active']" class="uk-visible@m"><a [routerLink]="['./more-details']">More Details</a></li>
11
  </ul>
12

  
13
  <router-outlet></router-outlet>
14

  
15
</div>
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/publications/continent-collaboration-publications.module.ts
1
import { NgModule } from '@angular/core';
2
import { CommonModule } from '@angular/common';
3
import { ReusableComponentsModule } from '../../../../shared/reusablecomponents/reusable-components.module';
4
import { DataService } from '../../../../services/data.service';
5
import { DataHandlerService } from '../../../../services/data-handler.service';
6
import { ContinentCollaborationPublicationsRoutingModule } from './continent-collaboration-publications-routing.module';
7
import { ContinentCollaborationPublicationsComponent } from './continent-collaboration-publications.component';
8
import { ContinentCollaborationPublicationsIndicatorsComponent } from './continent-collaboration-publications-indicators.component';
9

  
10

  
11
@NgModule ({
12
  imports: [
13
    CommonModule,
14
    ContinentCollaborationPublicationsRoutingModule,
15
    ReusableComponentsModule,
16
  ],
17
  declarations: [
18
    ContinentCollaborationPublicationsComponent,
19
    ContinentCollaborationPublicationsIndicatorsComponent,
20
  ],
21
  providers: [
22
    DataService,
23
    DataHandlerService
24
  ],
25
})
26

  
27
export class ContinentCollaborationPublicationsModule {}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/continent-collaboration-routing.module.ts
1
import { RouterModule, Routes } from '@angular/router';
2
import { NgModule } from '@angular/core';
3
import { ContinentCollaborationComponent } from './continent-collaboration.component';
4

  
5

  
6
const continentCollaborationRoutes: Routes = [
7
  {
8
    path: '',
9
    component: ContinentCollaborationComponent,
10
    children : [
11
      {
12
        path: '',
13
        redirectTo: 'publications',
14
        pathMatch: 'full',
15
      },
16
      {
17
        path: 'publications',
18
        loadChildren: () => import('./publications/continent-collaboration-publications.module').then(m => m.ContinentCollaborationPublicationsModule),
19
      },
20
      {
21
        path: 'datasets',
22
        loadChildren: () => import('./datasets/continent-collaboration-datasets.module').then(m => m.ContinentCollaborationDatasetsModule),
23
      },
24
      {
25
        path: 'software',
26
        loadChildren: () => import('./software/continent-collaboration-software.module').then(m => m.ContinentCollaborationSoftwareModule),
27
      },
28
      {
29
        path: 'other-research-products',
30
        loadChildren: () => import('./other-research-products/continent-collaboration-orp.module').then(m => m.ContinentCollaborationORPModule),
31
      },
32
    ]
33
  },
34
];
35

  
36
@NgModule ({
37
  imports: [RouterModule.forChild(continentCollaborationRoutes)],
38
  exports: [RouterModule]
39
})
40

  
41
export class ContinentCollaborationRoutingModule {}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/continent-collaboration.component.html
1
<div class="uk-margin tabContent">
2

  
3

  
4
  <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
5
    <li aria-expanded="true" [routerLinkActive]="['uk-active']">
6
      <a class="publicationsSubnav" [routerLink]="['./publications']" uk-tooltip="title: Publications; duration: 2000">
7
        <img src="../../../../assets/img/icons/publications-icon.svg" width="15">
8
      </a>
9
    </li>
10
    <li aria-expanded="false" [routerLinkActive]="['uk-active']">
11
      <a class="datasetsSubnav" [routerLink]="['./datasets']" uk-tooltip="title: Datasets; duration: 2000">
12
        <img src="../../../../assets/img/icons/datasets-icon.svg" width="15">
13
      </a>
14
    </li>
15
    <li aria-expanded="false" [routerLinkActive]="['uk-active']">
16
      <a class="softwareSubnav" [routerLink]="['./software']" uk-tooltip="title: Software; duration: 2000">
17
        <img src="../../../../assets/img/icons/software-icon.svg" width="15">
18
      </a>
19
    </li>
20
    <li aria-expanded="false" [routerLinkActive]="['uk-active']">
21
      <a class="otherSubnav" [routerLink]="['./other-research-products']" uk-tooltip="title: Other research products; duration: 2000">
22
        <img src="../../../../assets/img/icons/other-icon.svg" width="15">
23
      </a>
24
    </li>
25
  </ul>
26

  
27
  <hr class="uk-visible@m">
28

  
29
  <router-outlet></router-outlet>
30

  
31
</div>
modules/open-science-observatory-ui/trunk/src/app/pages/continent/collaboration/continent-collaboration.component.ts
1
import { Component } from '@angular/core';
2

  
3
@Component({
4
  selector: 'app-continent-collaboration',
5
  templateUrl: './continent-collaboration.component.html',
6
})
7

  
8
export class ContinentCollaborationComponent {}
9

  
modules/open-science-observatory-ui/trunk/src/app/pages/continent/continent.component.ts
3 3
import { DomSanitizer } from '@angular/platform-browser';
4 4
import { DataService } from '../../services/data.service';
5 5
import { DataHandlerService } from '../../services/data-handler.service';
6
import {CountryOverviewData, EuropeData, SelectedCountry} from '../../domain/overview-map-data';
6
import { CountryOverviewData, EuropeData, SelectedCountry } from '../../domain/overview-map-data';
7
import { MatSlideToggleChange } from '@angular/material/slide-toggle';
7 8

  
8 9
@Component({
9 10
  selector: 'app-continent',
......
17 18
  continentName: string;
18 19

  
19 20
  europeOverviewData: EuropeData;
21
  europeOverviewMapData: EuropeData;
20 22

  
21 23
  mapViewActive = false;
22 24
  selectedCountry: SelectedCountry = null;
......
52 54
      }
53 55
    );
54 56

  
57
    this.dataService.getEuropeOverviewData().subscribe(
58
      rawData => {
59
        this.europeOverviewMapData = this.dataHandlerService.convertRawDataToEuropeOverviewData(rawData);
60
      }, error => {
61
        console.log(error);
62
      }
63
    );
64

  
55 65
    // this.createOverviewContent();
56 66
  }
57 67

  
......
112 122
  }
113 123

  
114 124
  /** Europe Map  --> **/
115
  toggleView(show: string) {
116
    if (show === 'map') {
125
  // toggleView(show: string) {
126
  //   if (show === 'map') {
127
  //     this.mapViewActive = true;
128
  //   } else if (show === 'columns') {
129
  //     this.mapViewActive = false;
130
  //   }
131
  // }
132

  
133
  toggleView(ob: MatSlideToggleChange) {
134
    if (ob.checked) {
117 135
      this.mapViewActive = true;
118
    } else if (show === 'columns') {
136
    } else {
119 137
      this.mapViewActive = false;
120 138
    }
121 139
  }
modules/open-science-observatory-ui/trunk/src/app/pages/continent/open-science/continent-open-science.component.html
3 3

  
4 4
  <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
5 5
    <li aria-expanded="true" [routerLinkActive]="['uk-active']">
6
      <a class="publicationsSubnav" [routerLink]="['./publications']" uk-tooltip="title: Publication; duration: 2000">
6
      <a class="publicationsSubnav" [routerLink]="['./publications']" uk-tooltip="title: Publications; duration: 2000">
7 7
        <img src="../../../../assets/img/icons/publications-icon.svg" width="15">
8 8
      </a>
9 9
    </li>
modules/open-science-observatory-ui/trunk/src/app/pages/continent/continent.component.html
10 10
          <li><span>{{continentName | titlecase}}</span></li>
11 11
        </ul>
12 12

  
13
        <!-- Europe Map -->
14
        <div class="uk-align-right">
15
          <a *ngIf="mapViewActive" (click)="toggleView('columns')">
16
            <img src="../../../assets/img/icons/switch_view_list_active.svg">
17
          </a>
18
          <a *ngIf="!mapViewActive" (click)="toggleView('map')">
19
            <img src="../../../assets/img/icons/switch_view_grid_active.svg">
20
          </a>
21
        </div>
22

  
23 13
        <div *ngIf="continentName" class="">
24 14
          <img src="../../../assets/img/flags/{{continentName}}-flag.jpg" class="flag-image" width="132" height="132">
25 15
          <div class="uk-inline uk-margin-left">
......
36 26
          <img src="../../../assets/img/flags/{{continentName}}-flag.jpg" class="flag-image uk-display-block uk-margin-auto-left uk-margin-auto-right" width="103" height="103">
37 27
          <div class="uk-margin-top">
38 28
            <h1 class="uk-margin-small-bottom">{{continentName | titlecase}}</h1>
39
            <span class="lastUpdateInfo">Data Last Updated: 21 May 2020</span>
29
            <span class="lastUpdateInfo">Data Last Updated: </span>
30
            <span *ngIf="lastUpdateDate" class="lastUpdateInfo">{{lastUpdateDate}}</span>
40 31
          </div>
41 32
        </div>
42 33
      </div>
......
46 37

  
47 38

  
48 39

  
49
  <section class="uk-padding-small uk-margin-top">
50
    <div class="uk-container uk-container-center uk-margin-medium-top" [ngClass]="{'uk-container-expand': mapViewActive}">
40
  <section class="uk-padding-small">
41
    <!--<div class="uk-container uk-container-center uk-margin-medium-top" [ngClass]="{'uk-container-expand': mapViewActive}">-->
42
    <div class="uk-container uk-container-center uk-margin-medium-top">
51 43

  
52 44
      <!--LAPTOP & PAD LANDSCAPE-->
45
      <div class="uk-visible@m">
46
        <div class="uk-flex uk-flex-right uk-margin-bottom">
47

  
48
          <mat-slide-toggle (change)="toggleView($event)">Map</mat-slide-toggle>
49

  
50
        </div>
51
      </div>
52

  
53 53
      <div *ngIf="!mapViewActive" class="uk-visible@m">
54 54
        <div *ngIf="!europeOverviewData" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-5x loader" aria-hidden="true"></i></div>
55 55
        <div *ngIf="europeOverviewData" class="uk-grid uk-child-width-1-4 entitiesContainer">
......
64 64
              {{europeOverviewData.publications.percentage | number :'1.0-1'}}%
65 65
            </span>
66 66
                <span class="number" [style.font-size.px]="getEntityNameFontSize(europeOverviewData.publications.percentage)"
67
                      [ngStyle]="{'margin-top' :europeOverviewData.publications.percentage * 30 /100 + 'px'}">Publications</span>
67
                      [ngStyle]="{'margin-top' :europeOverviewData.publications.percentage * 30 /100 + 'px'}">OA Publications</span>
68 68
              </div>
69 69
            </div>
70 70
          </ng-container>
......
84 84
              {{europeOverviewData.datasets.percentage | number :'1.0-1'}}%
85 85
            </span>
86 86
                <span class="number" [style.font-size.px]="getEntityNameFontSize(europeOverviewData.datasets.percentage)"
87
                      [ngStyle]="{'margin-top' :europeOverviewData.datasets.percentage * 30 /100 + 'px'}">Datasets</span>
87
                      [ngStyle]="{'margin-top' :europeOverviewData.datasets.percentage * 30 /100 + 'px'}">OA Datasets</span>
88 88
              </div>
89 89
            </div>
90 90
          </ng-container>
......
104 104
              {{europeOverviewData.software.percentage | number :'1.0-1'}}%
105 105
            </span>
106 106
                <span class="number" [style.font-size.px]="getEntityNameFontSize(europeOverviewData.software.percentage)"
107
                      [ngStyle]="{'margin-top' :europeOverviewData.software.percentage * 30 /100 + 'px'}">Software</span>
107
                      [ngStyle]="{'margin-top' :europeOverviewData.software.percentage * 30 /100 + 'px'}">OS Software</span>
108 108
              </div>
109 109
            </div>
110 110
          </ng-container>
......
124 124
              {{europeOverviewData.other.percentage | number :'1.0-1'}}%
125 125
            </span>
126 126
                <span class="number" [style.font-size.px]="getEntityNameFontSize(europeOverviewData.other.percentage)"
127
                      [ngStyle]="{'margin-top' :europeOverviewData.other.percentage * 30 /100 + 'px'}">Other</span>
127
                      [ngStyle]="{'margin-top' :europeOverviewData.other.percentage * 30 /100 + 'px'}">OA Other</span>
128 128
              </div>
129 129
            </div>
130 130
          </ng-container>
......
184 184
      <div *ngIf="mapViewActive" class="uk-visible@m">
185 185
        <div class="uk-grid uk-grid-small">
186 186

  
187
          <div class="uk-width-4-5@m">
187
          <div class="uk-width-3-4@m">
188 188

  
189 189
            <!--Map Container-->
190 190
            <app-europe-map-overview (emitSelectedCountry)="countrySelected($event)"></app-europe-map-overview>
......
192 192

  
193 193
          </div>
194 194

  
195
          <div class="uk-width-1-5@m">
195
          <div class="uk-width-1-4@m">
196 196
            <div class="md-card infoBox">
197 197
              <ng-container *ngIf="!selectedCountry">
198 198
                <div class="md-card-toolbar">
199
                  <h3 class="uk-text-center">OPENAIRE OPEN SCIENCE OBSERVATORY</h3>
199
                  <h3 class="uk-text-center">EUROPE</h3>
200 200
                </div>
201
                <div *ngIf="!selectedCountry" class="md-card-content">
202
                  <div>An OpenAIRE service to:</div>
203
                  <ul>
204
                    <li>
205
                      Better understand the European open research landscape
206
                    </li>
207
                    <li>
208
                      Track trends for open access to publications, data, software
209
                    </li>
210
                    <li>
211
                      Reveal hidden potential on existing resources
212
                    </li>
213
                    <li>
214
                      View open collaboration patterns
215
                    </li>
216
                  </ul>
217
                  <!--<div class="uk-text-center uk-margin-medium-top uk-margin-medium-bottom">-->
218
                  <!--<button [routerLink]="['/methodology']" class="md-btn md-btn-primary">Learn More</button>-->
219
                  <!--</div>-->
201
                <div class="md-card-content">
220 202

  
203
                  <div *ngIf="europeOverviewMapData" class="numbers">
204
                    <div class="uk-margin-small-top">
205

  
206
                      <div class="indicator">
207
                        <span class="number publications" *ngIf="europeOverviewMapData.publications?.oa!=null">{{europeOverviewMapData.publications?.oa | number}}</span>
208
                        <span class="number publications" *ngIf="europeOverviewMapData.publications?.oa===null">--</span>
209
                        <span><i>Open Access publications</i></span>
210
                      </div>
211

  
212
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
213

  
214
                      <div class="indicator">
215
                        <span class="number datasets" *ngIf="europeOverviewMapData.datasets?.oa!=null">{{europeOverviewMapData.datasets?.oa | number}}</span>
216
                        <span class="number datasets" *ngIf="europeOverviewMapData.datasets?.oa===null">--</span>
217
                        <span><i>Open Access datasets</i></span>
218
                      </div>
219

  
220
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
221

  
222
                      <div class="indicator">
223
                        <span class="number repositories" *ngIf="europeOverviewMapData.repositories?.total!=null">{{europeOverviewMapData.repositories?.total | number}}</span>
224
                        <span class="number repositories" *ngIf="europeOverviewMapData.repositories?.total===null">--</span>
225
                        <span><i>repositories</i> in OpenDOAR and Re3data</span>
226
                      </div>
227

  
228
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
229

  
230
                      <div class="indicator">
231
                        <span class="number journals" *ngIf="europeOverviewMapData.journals?.total!=null">{{europeOverviewMapData.journals?.total | number}}</span>
232
                        <span class="number journals" *ngIf="europeOverviewMapData.journals?.total===null">--</span>
233
                        <span><i>Open Access journals</i> in DOAJ</span>
234
                      </div>
235

  
236
                    </div>
237

  
238
                  </div>
239

  
221 240
                </div>
222 241
                <div></div>
223 242
              </ng-container>
......
251 270
                      <div class="indicator uk-margin-small-top">
252 271
                        <span class="number publications" *ngIf="selectedCountryData.publicationsDeposited!=null">{{selectedCountryData.publicationsDeposited | number}}</span>
253 272
                        <span class="number publications" *ngIf="selectedCountryData.publicationsDeposited===null">--</span>
254
                        <span><i>OA publications</i> from institutional repositories</span>
273
                        <span><i>OA publications</i> in the country's institutional repositories</span>
255 274
                      </div>
256 275

  
257 276
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
......
265 284
                      <div class="indicator uk-margin-small-top">
266 285
                        <span class="number datasets" *ngIf="selectedCountryData.datasetsDeposited!=null">{{selectedCountryData.datasetsDeposited | number}}</span>
267 286
                        <span class="number datasets" *ngIf="selectedCountryData.datasetsDeposited===null">--</span>
268
                        <span><i>OA datasets</i> from institutional repositories</span>
287
                        <span><i>OA datasets</i> in the country's repositories</span>
269 288
                      </div>
270 289

  
271 290
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
......
273 292
                      <div class="indicator">
274 293
                        <span class="number repositories" *ngIf="selectedCountryData.repositories!=null">{{selectedCountryData.repositories | number}}</span>
275 294
                        <span class="number repositories" *ngIf="selectedCountryData.repositories===null">--</span>
276
                        <span><i>repositories</i> from openDOAR & re3data</span>
295
                        <span><i>repositories</i> in openDOAR & re3data</span>
277 296
                      </div>
278 297

  
279 298
                      <hr class="greyBoldDivider uk-margin-top uk-margin-bottom">
......
281 300
                      <div class="indicator">
282 301
                        <span class="number journals" *ngIf="selectedCountryData.journals!=null">{{selectedCountryData.journals | number}}</span>
283 302
                        <span class="number journals" *ngIf="selectedCountryData.journals===null">--</span>
284
                        <span><i>journals</i> from DOAJ</span>
303
                        <span><i>journals</i> in DOAJ</span>
285 304
                      </div>
286 305

  
287 306
                      <!--<hr class="greyBoldDivider uk-margin-top uk-margin-bottom">-->
......
307 326
            </div>
308 327
          </div>
309 328

  
310
          <!--<div class="uk-width-large-3-5 uk-container-center uk-text-center">-->
311
          <!--<h2 class="heading_b">-->
312
          <!--Our Team-->
313
          <!--<span class="sub-heading">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</span>-->
314
          <!--</h2>-->
315
          <!--</div>-->
316 329
        </div>
317 330
      </div>
318 331

  
332

  
319 333
      <!--MOBILE & PAD PORTRAIT-->
320 334
      <div class="uk-hidden@m uk-text-center">
321 335
        <div *ngIf="!europeOverviewData" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-5x loader" aria-hidden="true"></i></div>
......
473 487
          <li [routerLinkActive]="['uk-active']" aria-expanded="true"><a [routerLink]="['./overview']">Overview</a></li>
474 488
          <!--<li [routerLinkActive]="['uk-active']" aria-expanded="true"><a [routerLink]="['/continent/' + continentName + '/overview']">Overview</a></li>-->
475 489
          <li [routerLinkActive]="['uk-active']" aria-expanded="false"><a [routerLink]="['./open-science']">Open Science</a></li>
476
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
490
          <li [routerLinkActive]="['uk-active']" aria-expanded="false"><a [routerLink]="['./collaboration']">Collaboration</a></li>
477 491
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
478 492
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
479 493
          <!--<li class="uk-tab-responsive uk-active uk-hidden" aria-haspopup="true" aria-expanded="false"><a>Developers</a><div class="uk-dropdown uk-dropdown-small" aria-hidden="true"><ul class="uk-nav uk-nav-dropdown"></ul><div></div></div></li>-->
......
483 497
        <ul class="uk-hidden@m uk-tab" data-uk-tab="{connect:'#team_tabbed',animation: 'slide-bottom'}">
484 498
          <li [routerLinkActive]="['uk-active']" aria-expanded="true"><a [routerLink]="['./overview']">Overview</a></li>
485 499
          <li [routerLinkActive]="['uk-active']" aria-expanded="false"><a [routerLink]="['./open-science']">Open Science</a></li>
486
          <li class="uk-disabled" aria-expanded="false"><a href="#" data-uk-tooltip="{title: Stay tuned..; pos: top-left}">Collaboration</a></li>
500
          <li [routerLinkActive]="['uk-active']" aria-expanded="false"><a [routerLink]="['./collaboration']">Collaboration</a></li>
487 501
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Impact</a></li>
488 502
          <li class="uk-disabled" aria-expanded="false" data-uk-tooltip="Stay tuned.."><a href="#">Innovation</a></li>
489 503
          <!--<li class="uk-tab-responsive uk-active uk-hidden" aria-haspopup="true" aria-expanded="false"><a>Developers</a><div class="uk-dropdown uk-dropdown-small" aria-hidden="true"><ul class="uk-nav uk-nav-dropdown"></ul><div></div></div></li>-->
......
493 507
          <router-outlet></router-outlet>
494 508
        </div>
495 509

  
496

  
497
        <!--<ul id="team_tabbed" class="uk-switcher dataContainer">-->
498

  
499
          <!--&lt;!&ndash;<router-outlet></router-outlet>&ndash;&gt;-->
500

  
501
          <!--&lt;!&ndash;&lt;!&ndash;OVERVIEW tab&ndash;&gt;&ndash;&gt;-->
502
          <!--&lt;!&ndash;<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">&ndash;&gt;-->
503
            <!--&lt;!&ndash;<app-continent-overview></app-continent-overview>&ndash;&gt;-->
504
          <!--&lt;!&ndash;</li>&ndash;&gt;-->
505

  
506
          <!--&lt;!&ndash;&lt;!&ndash;OPEN SCIENCE tab&ndash;&gt;&ndash;&gt;-->
507
          <!--&lt;!&ndash;<li aria-hidden="true" style="animation-duration: 200ms;">&ndash;&gt;-->
508
            <!--&lt;!&ndash;<app-continent-open-science></app-continent-open-science>&ndash;&gt;-->
509
          <!--&lt;!&ndash;</li>&ndash;&gt;-->
510

  
511
          <!--&lt;!&ndash;<li aria-hidden="true">&ndash;&gt;-->
512
            <!--&lt;!&ndash;<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="">&ndash;&gt;-->
513
            <!--&lt;!&ndash;</div>&ndash;&gt;-->
514
          <!--&lt;!&ndash;</li>&ndash;&gt;-->
515

  
516
          <!--&lt;!&ndash;<li aria-hidden="true">&ndash;&gt;-->
517
            <!--&lt;!&ndash;<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="">&ndash;&gt;-->
518
            <!--&lt;!&ndash;</div>&ndash;&gt;-->
519
          <!--&lt;!&ndash;</li>&ndash;&gt;-->
520

  
521
          <!--&lt;!&ndash;<li aria-hidden="true">&ndash;&gt;-->
522
            <!--&lt;!&ndash;<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="">&ndash;&gt;-->
523
            <!--&lt;!&ndash;</div>&ndash;&gt;-->
524
          <!--&lt;!&ndash;</li>&ndash;&gt;-->
525
        <!--</ul>-->
526 510
      </div>
527 511

  
528 512
    </div>
modules/open-science-observatory-ui/trunk/src/app/pages/continent/open-science/continent-open-science-routing.module.ts
1 1
import { RouterModule, Routes } from '@angular/router';
2 2
import { NgModule } from '@angular/core';
3
import { ContinentOSPublicationsComponent } from './publications/continent-os-publications.component';
4 3
import { ContinentOpenScienceComponent } from './continent-open-science.component';
5
import { ContinentOSDatasetsComponent } from './datasets/continent-os-datasets.component';
6
import { ContinentOSSoftwareComponent } from './software/continent-os-software.component';
7
import { ContinentOSORPComponent } from './other-research-products/continent-os-orp.component';
8 4

  
9

  
10 5
const continentOpenScienceRoutes: Routes = [
11 6
  {
12 7
    path: '',
......
20 15
      {
21 16
        path: 'publications',
22 17
        loadChildren: () => import('./publications/continent-os-publications.module').then(m => m.ContinentOpenSciencePublicationsModule),
23
        // component: ContinentOSPublicationsComponent,
24 18
      },
25 19
      {
26 20
        path: 'datasets',
27 21
        loadChildren: () => import('./datasets/continent-os-datasets.module').then(m => m.ContinentOpenScienceDatasetsModule),
28
        // component: ContinentOSDatasetsComponent,
29 22
      },
30 23
      {
31 24
        path: 'software',
32 25
        loadChildren: () => import('./software/continent-os-software.module').then(m => m.ContinentOpenScienceSoftwareModule),
33
        // component: ContinentOSSoftwareComponent,
34 26
      },
35 27
      {
36 28
        path: 'other-research-products',
37 29
        loadChildren: () => import('./other-research-products/continent-os-orp.module').then(m => m.ContinentOpenScienceORPModule),
38
        // component: ContinentOSORPComponent,
39 30
      },
40 31
    ]
41 32
  },
modules/open-science-observatory-ui/trunk/src/app/pages/continent/open-science/datasets/continent-os-datasets-indicators.component.ts
2 2
import {
3 3
  datasetColor,
4 4
  datasetPalette,
5
  datasetIndicatorsPalette,
5 6
  gradientStartColor,
6 7
} from '../../../../chart-palettes';
7 8
import {environment} from '../../../../../environments/environment';
......
25 26
  indicator: string;
26 27

  
27 28
  private datasetPalette = datasetPalette;
29
  private datasetIndicatorsPalette = datasetIndicatorsPalette;
28 30

  
29 31
  datasetColor = datasetColor;
30 32
  gradientStartColor = gradientStartColor;
......
32 34

  
33 35
  datasetsWithPIDTimeline: SafeResourceUrl;
34 36
  datasetsWithLicenceTimeline: SafeResourceUrl;
37
  datasetsWithCCLicenceTimeline: SafeResourceUrl;
35 38

  
36 39
  datasetsWithPIDGroupByView = 'country';
37 40
  datasetsWithPIDByCountryChartURL: SafeResourceUrl;
38 41
  datasetsWithPIDByDatasourceChartURL: SafeResourceUrl;
39 42
  datasetsWithPIDByOrganizationChartURL: SafeResourceUrl;
40 43
  datasetsWithPIDByCountryChartURLMobile: SafeResourceUrl;
41
  datasetsWithPIDByDatasourceChartURLMobile: SafeResourceUrl;
42
  datasetsWithPIDByOrganizationChartURLMobile: SafeResourceUrl;
43 44

  
44 45
  datasetsWithLicenceGroupByView = 'country';
45 46
  datasetsWithLicenceByCountryChartURL: SafeResourceUrl;
46 47
  datasetsWithLicenceByDatasourceChartURL: SafeResourceUrl;
47 48
  datasetsWithLicenceByOrganizationChartURL: SafeResourceUrl;
48 49
  datasetsWithLicenceByCountryChartURLMobile: SafeResourceUrl;
49
  datasetsWithLicenceByDatasourceChartURLMobile: SafeResourceUrl;
50
  datasetsWithLicenceByOrganizationChartURLMobile: SafeResourceUrl;
51 50

  
51
  datasetsWithCCLicenceGroupByView = 'country';
52
  datasetsWithCCLicenceByCountryChartURL: SafeResourceUrl;
53
  datasetsWithCCLicenceByDatasourceChartURL: SafeResourceUrl;
54
  datasetsWithCCLicenceByOrganizationChartURL: SafeResourceUrl;
55
  datasetsWithCCLicenceByCountryChartURLMobile: SafeResourceUrl;
56

  
52 57
  datasetsWithPIDByFunderData: TreemapHighchartsData[];
53 58
  datasetsWithLicenceByFunderData: TreemapHighchartsData[];
59
  datasetsWithCCLicenceByFunderData: TreemapHighchartsData[];
54 60

  
55 61
  loadingDatasetsAbsoluteTable: boolean = true;
56 62
  loadingDatasetsPercentageTable: boolean = true;
......
70 76
      this.indicator = params['indicator'];
71 77
    });
72 78

  
73
    // this.datasetsWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
74
    this.datasetsWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
75
    // this.datasetsWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
76
    this.datasetsWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
79
    this.datasetsWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"column","query":{"name":"new.oso.results.pid_timeline.affiliated","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"column","query":{"name":"new.oso.results.pid_timeline.affiliated","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
80
    this.datasetsWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"column","query":{"name":"new.oso.results.licence_timeline.affiliated","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"column","query":{"name":"new.oso.results.licence_timeline.affiliated","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
81
    this.datasetsWithCCLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"column","query":{"name":"new.oso.results.cc_licence_timeline.affiliated","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"column","query":{"name":"new.oso.results.cc_licence_timeline.affiliated","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"over time","align":"left","margin":50},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
77 82

  
78
    // // this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
79
    // this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
80
    // // this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
81
    // this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
83
    this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"column","query":{"name":"new.oso.results.pid.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"column","query":{"name":"new.oso.results.pid.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
84
    this.datasetsWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
82 85

  
83
    // // this.datasetsWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
84
    // this.datasetsWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
85
    // // this.datasetsWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
86
    // this.datasetsWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
87
    //
88
    // // this.datasetsWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
89
    // this.datasetsWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
90
    // // this.datasetsWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetPalette.join('","')}\"]}}`));
91
    // this.datasetsWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
86
    this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"column","query":{"name":"new.oso.results.licence.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"column","query":{"name":"new.oso.results.licence.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
87
    this.datasetsWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
92 88

  
93
    this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
94
    this.datasetsWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
89
    this.datasetsWithCCLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"column","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"column","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
90
    this.datasetsWithCCLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
95 91

  
96
    this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
97
    this.datasetsWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
98

  
99

  
100 92
    this.dataService.getFundersResultsByTypeForPID('dataset').subscribe(
101 93
      rawData => {
102 94
        this.datasetsWithPIDByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
......
113 105
      }
114 106
    );
115 107

  
108
    this.dataService.getFundersResultsByTypeForCCLicence('dataset').subscribe(
109
      rawData => {
110
        this.datasetsWithCCLicenceByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
111
      }, error => {
112
        console.log(error);
113
      }
114
    );
115

  
116 116
    this.getDatasetsTableData(this.datasetsTableContentSelection);
117 117
  }
118 118

  
119 119
  getDatasetsTableData(contentSelection: string) {
120 120
    this.loadingDatasetsAbsoluteTable = true;
121 121
    this.loadingDatasetsPercentageTable = true;
122
    this.dataService.getIndicatorsTableData('dataset', contentSelection).subscribe(
122
    this.dataService.getOpenScienceIndicatorsTableData('dataset', contentSelection).subscribe(
123 123
      rawData => {
124 124
        this.datasetsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
125 125
        this.datasetsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
......
142 142
  getDatasetsWithPIDGroupBy(contentSelection: string): void {
143 143
    this.datasetsWithPIDGroupByView = contentSelection;
144 144
    if (contentSelection === 'country' && !this.datasetsWithPIDByCountryChartURL) {
145
      this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
145
      this.datasetsWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"column","query":{"name":"new.oso.results.pid.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"column","query":{"name":"new.oso.results.pid.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
146 146
    } else if (contentSelection === 'datasource' && !this.datasetsWithPIDByDatasourceChartURL) {
147
      this.datasetsWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
147
      this.datasetsWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
148 148
    } else if (contentSelection === 'organization' && !this.datasetsWithPIDByOrganizationChartURL) {
149
      this.datasetsWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
149
      this.datasetsWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
150 150
    }
151 151
  }
152 152

  
153 153
  getDatasetsWithPIDGroupByMobile(contentSelection: string): void {
154 154
    this.datasetsWithPIDGroupByView = contentSelection;
155 155
    if (contentSelection === 'country' && !this.datasetsWithPIDByCountryChartURLMobile) {
156
      this.datasetsWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
157
    } else if (contentSelection === 'datasource' && !this.datasetsWithPIDByDatasourceChartURLMobile) {
158
      this.datasetsWithPIDByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
159
    } else if (contentSelection === 'organization' && !this.datasetsWithPIDByOrganizationChartURLMobile) {
160
      this.datasetsWithPIDByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
156
      this.datasetsWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
157
    } else if (contentSelection === 'datasource' && !this.datasetsWithPIDByDatasourceChartURL) {
158
      this.datasetsWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
159
    } else if (contentSelection === 'organization' && !this.datasetsWithPIDByOrganizationChartURL) {
160
      this.datasetsWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without PID","type":"bar","query":{"name":"new.oso.results.pid.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with PID","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
161 161
    }
162 162
  }
163 163

  
164 164
  getDatasetsWithLicenceGroupBy(contentSelection: string): void {
165 165
    this.datasetsWithLicenceGroupByView = contentSelection;
166 166
    if (contentSelection === 'country' && !this.datasetsWithLicenceByCountryChartURL) {
167
      this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
167
      this.datasetsWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"column","query":{"name":"new.oso.results.licence.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"column","query":{"name":"new.oso.results.licence.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
168 168
    } else if (contentSelection === 'datasource' && !this.datasetsWithLicenceByDatasourceChartURL) {
169
      this.datasetsWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
169
      this.datasetsWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
170 170
    } else if (contentSelection === 'organization' && !this.datasetsWithLicenceByOrganizationChartURL) {
171
      this.datasetsWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
171
      this.datasetsWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
172 172
    }
173 173
  }
174 174

  
175 175
  getDatasetsWithLicenceGroupByMobile(contentSelection: string): void {
176 176
    this.datasetsWithLicenceGroupByView = contentSelection;
177 177
    if (contentSelection === 'country' && !this.datasetsWithLicenceByCountryChartURLMobile) {
178
      this.datasetsWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
179
    } else if (contentSelection === 'datasource' && !this.datasetsWithLicenceByDatasourceChartURLMobile) {
180
      this.datasetsWithLicenceByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
181
    } else if (contentSelection === 'organization' && !this.datasetsWithLicenceByOrganizationChartURLMobile) {
182
      this.datasetsWithLicenceByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.datasetColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
178
      this.datasetsWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
179
    } else if (contentSelection === 'datasource' && !this.datasetsWithLicenceByDatasourceChartURL) {
180
      this.datasetsWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
181
    } else if (contentSelection === 'organization' && !this.datasetsWithLicenceByOrganizationChartURL) {
182
      this.datasetsWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without licence","type":"bar","query":{"name":"new.oso.results.licence.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with licence","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
183 183
    }
184 184
  }
185

  
186
  getDatasetsWithCCLicenceGroupBy(contentSelection: string): void {
187
    this.datasetsWithCCLicenceGroupByView = contentSelection;
188
    if (contentSelection === 'country' && !this.datasetsWithCCLicenceByCountryChartURL) {
189
      this.datasetsWithCCLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"column","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry.all","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"column","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry.all","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
190
    } else if (contentSelection === 'datasource' && !this.datasetsWithCCLicenceByDatasourceChartURL) {
191
      this.datasetsWithCCLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
192
    } else if (contentSelection === 'organization' && !this.datasetsWithCCLicenceByOrganizationChartURL) {
193
      this.datasetsWithCCLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
194
    }
195
  }
196

  
197
  getDatasetsWithCCLicenceGroupByMobile(contentSelection: string): void {
198
    this.datasetsWithCCLicenceGroupByView = contentSelection;
199
    if (contentSelection === 'country' && !this.datasetsWithCCLicenceByCountryChartURLMobile) {
200
      this.datasetsWithCCLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bycountry","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
201
    } else if (contentSelection === 'datasource' && !this.datasetsWithCCLicenceByDatasourceChartURL) {
202
      this.datasetsWithCCLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bydatasource","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.bydatasource","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by datasource (top datasources)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
203
    } else if (contentSelection === 'organization' && !this.datasetsWithCCLicenceByOrganizationChartURL) {
204
      this.datasetsWithCCLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"with CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.byorganization","parameters":[1,"dataset"],"profile":"${this.profileName}"}},{"name":"without CC licence","type":"bar","query":{"name":"new.oso.results.cc_licence.affiliated.byorganization","parameters":[0,"dataset"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access datasets with CC licence","align":"left","margin":50},"subtitle":{"text":"by organization (top organizations)","align":"left"},"yAxis":{"title":{"text":""},"reversedStacks":false},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"stacking":"normal"}},"legend":{"enabled":true},"credits":{"href":null,"enabled":false},"colors":[\"${this.datasetIndicatorsPalette.join('","')}\"]}}`));
205
    }
206
  }
185 207
}
modules/open-science-observatory-ui/trunk/src/app/pages/continent/open-science/datasets/continent-os-datasets-indicators.component.html
1
<div *ngIf="indicator && indicator=='pid'" class="pidIndicator">
2
  <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
1
<div *ngIf="indicator && indicator=='licence'" class="licenceIndicator">
2
  <div class="uk-grid uk-grid-match uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
3 3

  
4 4
    <div class="uk-grid-margin">
5 5
      <div class="md-card chartCard">
6 6
        <div class="md-card-content">
7
          <iframe *ngIf="datasetsWithPIDTimeline" width="100%" height="550" [src]="datasetsWithPIDTimeline"></iframe>
7
          <iframe *ngIf="datasetsWithLicenceTimeline" width="100%" height="550" [src]="datasetsWithLicenceTimeline"></iframe>
8 8
        </div>
9 9
      </div>
10 10
    </div>
......
12 12
    <div class="uk-grid-margin">
13 13
      <div class="md-card chartCard">
14 14
        <div class="md-card-content">
15
          <iframe *ngIf="datasetsWithCCLicenceTimeline" width="100%" height="550" [src]="datasetsWithCCLicenceTimeline"></iframe>
16
        </div>
17
      </div>
18
    </div>
15 19

  
20
    <div class="uk-grid-margin">
21
      <div class="md-card chartCard">
22
        <div class="md-card-content">
23

  
16 24
          <!--MOBILE & PAD PORTRAIT-->
17 25
          <div class="uk-hidden@m">
18 26
            <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
19 27
              <label class="uk-margin-right">Show by: </label>
20
              <select class="md-input" #selectPIDGroupBy (change)="getDatasetsWithPIDGroupByMobile(selectPIDGroupBy.value)" style="width: 230px; display: inline-block">
28
              <select class="md-input" #selectLicenceGroupBy (change)="getDatasetsWithLicenceGroupByMobile(selectLicenceGroupBy.value)" style="display: inline-block">
21 29
                <option value="country">country</option>
22 30
                <option value="datasource">datasource</option>
23 31
                <option value="organization">organization</option>
......
25 33
              </select>
26 34
            </div>
27 35

  
28
            <iframe *ngIf="datasetsWithPIDGroupByView==='country' && datasetsWithPIDByCountryChartURLMobile"
29
                    width="100%" height="550" [src]="datasetsWithPIDByCountryChartURLMobile"></iframe>
30
            <iframe *ngIf="datasetsWithPIDGroupByView==='datasource' && datasetsWithPIDByDatasourceChartURLMobile"
31
                    width="100%" height="550" [src]="datasetsWithPIDByDatasourceChartURLMobile"></iframe>
32
            <iframe *ngIf="datasetsWithPIDGroupByView==='organization' && datasetsWithPIDByOrganizationChartURLMobile"
33
                    width="100%" height="550" [src]="datasetsWithPIDByOrganizationChartURLMobile"></iframe>
34
            <app-treemap-highchart *ngIf="datasetsWithPIDGroupByView==='funder' && datasetsWithPIDByFunderData"
35
                                   [chartTitle]="'OA Datasets with PID by funder'"
36
                                   [chartData]="datasetsWithPIDByFunderData" [color]="datasetColor"></app-treemap-highchart>
36
            <iframe *ngIf="datasetsWithLicenceGroupByView==='country' && datasetsWithLicenceByCountryChartURLMobile"
37
                    width="100%" height="550" [src]="datasetsWithLicenceByCountryChartURLMobile"></iframe>
38
            <iframe *ngIf="datasetsWithLicenceGroupByView==='datasource' && datasetsWithLicenceByDatasourceChartURL"
39
                    width="100%" height="550" [src]="datasetsWithLicenceByDatasourceChartURL"></iframe>
40
            <iframe *ngIf="datasetsWithLicenceGroupByView==='organization' && datasetsWithLicenceByOrganizationChartURL"
41
                    width="100%" height="550" [src]="datasetsWithLicenceByOrganizationChartURL"></iframe>
42
            <app-treemap-highchart *ngIf="datasetsWithLicenceGroupByView==='funder' && datasetsWithLicenceByFunderData"
43
                                   [chartTitle]="'OA Datasets with licence by funder (top funders)'"
44
                                   [chartData]="datasetsWithLicenceByFunderData" [color]="datasetColor"></app-treemap-highchart>
37 45

  
38 46
          </div>
39 47

  
40 48
          <!--LAPTOP & PAD LANDSCAPE-->
41 49
          <div class="uk-visible@m">
42
            <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
43
                data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
44
              <li class="uk-active"><a (click)="getDatasetsWithPIDGroupBy('country')">Country</a></li>
45
              <li><a (click)="getDatasetsWithPIDGroupBy('datasource')">Datasource</a></li>
46
              <li><a (click)="getDatasetsWithPIDGroupBy('organization')">Organization</a></li>
47
              <li><a (click)="getDatasetsWithPIDGroupBy('funder')">Funder</a></li>
50
            <ul class="group-by-cdof uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
51
                data-uk-switcher="{connect:'#switcher-content-a-fade-datasets-licence', animation: 'fade'}">
52
              <li class="uk-active"><a (click)="getDatasetsWithLicenceGroupBy('country')">Country</a></li>
53
              <li><a (click)="getDatasetsWithLicenceGroupBy('datasource')">Datasource</a></li>
54
              <li><a (click)="getDatasetsWithLicenceGroupBy('organization')">Organization</a></li>
55
              <li><a (click)="getDatasetsWithLicenceGroupBy('funder')">Funder</a></li>
48 56
            </ul>
49 57

  
50
            <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
58
            <ul id="switcher-content-a-fade-datasets-licence" class="uk-switcher uk-margin">
51 59
              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
52
                <iframe *ngIf="datasetsWithPIDByCountryChartURL"
53
                        width="100%" height="350" [src]="datasetsWithPIDByCountryChartURL"></iframe>
60
                <iframe *ngIf="datasetsWithLicenceByCountryChartURL"
61
                        width="100%" height="650" [src]="datasetsWithLicenceByCountryChartURL"></iframe>
54 62
              </li>
55 63
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
56
                <iframe *ngIf="datasetsWithPIDByDatasourceChartURL"
57
                        width="100%" height="350" [src]="datasetsWithPIDByDatasourceChartURL"></iframe>
64
                <iframe *ngIf="datasetsWithLicenceByDatasourceChartURL"
65
                        width="100%" height="650" [src]="datasetsWithLicenceByDatasourceChartURL"></iframe>
58 66
              </li>
59 67
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
60
                <iframe *ngIf="datasetsWithPIDByOrganizationChartURL"
61
                        width="100%" height="350" [src]="datasetsWithPIDByOrganizationChartURL"></iframe>
68
                <iframe *ngIf="datasetsWithLicenceByOrganizationChartURL"
69
                        width="100%" height="650" [src]="datasetsWithLicenceByOrganizationChartURL"></iframe>
62 70
              </li>
63 71
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
64
                <app-treemap-highchart *ngIf="datasetsWithPIDByFunderData"
65
                                       [chartTitle]="'OA Datasets with PID by funder'"
66
                                       [chartData]="datasetsWithPIDByFunderData" [color]="datasetColor"></app-treemap-highchart>
72
                <app-treemap-highchart *ngIf="datasetsWithLicenceByFunderData"
73
                                       [chartTitle]="'OA Datasets with licence by funder (top funders)'"
74
                                       [chartData]="datasetsWithLicenceByFunderData" [color]="datasetColor" [height]="650"></app-treemap-highchart>
67 75
              </li>
68 76
            </ul>
69 77
          </div>
......
72 80
      </div>
73 81
    </div>
74 82

  
83
    <div class="uk-grid-margin">
84
      <div class="md-card chartCard">
85
        <div class="md-card-content">
86

  
87
          <!--MOBILE & PAD PORTRAIT-->
88
          <div class="uk-hidden@m">
89
            <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
90
              <label class="uk-margin-right">Show by: </label>
91
              <select class="md-input" #selectCCLicenceGroupBy (change)="getDatasetsWithCCLicenceGroupByMobile(selectCCLicenceGroupBy.value)" style="display: inline-block">
92
                <option value="country">country</option>
93
                <option value="datasource">datasource</option>
94
                <option value="organization">organization</option>
95
                <option value="funder">funder</option>
96
              </select>
97
            </div>
98

  
99
            <iframe *ngIf="datasetsWithCCLicenceGroupByView==='country' && datasetsWithCCLicenceByCountryChartURLMobile"
100
                    width="100%" height="550" [src]="datasetsWithCCLicenceByCountryChartURLMobile"></iframe>
101
            <iframe *ngIf="datasetsWithCCLicenceGroupByView==='datasource' && datasetsWithCCLicenceByDatasourceChartURL"
102
                    width="100%" height="550" [src]="datasetsWithCCLicenceByDatasourceChartURL"></iframe>
103
            <iframe *ngIf="datasetsWithCCLicenceGroupByView==='organization' && datasetsWithCCLicenceByOrganizationChartURL"
104
                    width="100%" height="550" [src]="datasetsWithCCLicenceByOrganizationChartURL"></iframe>
105
            <app-treemap-highchart *ngIf="datasetsWithCCLicenceGroupByView==='funder' && datasetsWithCCLicenceByFunderData"
106
                                   [chartTitle]="'Open Access datasets with CC licence'" [chartSubtitle]="'by funder (top funders)'"
107
                                   [chartData]="datasetsWithCCLicenceByFunderData" [color]="datasetColor"></app-treemap-highchart>
108

  
109
          </div>
110

  
111
          <!--LAPTOP & PAD LANDSCAPE-->
112
          <div class="uk-visible@m">
113
            <ul class="group-by-cdof uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
114
                data-uk-switcher="{connect:'#switcher-content-a-fade-datasets-cc-licence', animation: 'fade'}">
115
              <li class="uk-active"><a (click)="getDatasetsWithCCLicenceGroupBy('country')">Country</a></li>
116
              <li><a (click)="getDatasetsWithCCLicenceGroupBy('datasource')">Datasource</a></li>
117
              <li><a (click)="getDatasetsWithCCLicenceGroupBy('organization')">Organization</a></li>
118
              <li><a (click)="getDatasetsWithCCLicenceGroupBy('funder')">Funder</a></li>
119
            </ul>
120

  
121
            <ul id="switcher-content-a-fade-datasets-cc-licence" class="uk-switcher uk-margin">
122
              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
123
                <iframe *ngIf="datasetsWithCCLicenceByCountryChartURL"
124
                        width="100%" height="650" [src]="datasetsWithCCLicenceByCountryChartURL"></iframe>
125
              </li>
126
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
127
                <iframe *ngIf="datasetsWithCCLicenceByDatasourceChartURL"
128
                        width="100%" height="650" [src]="datasetsWithCCLicenceByDatasourceChartURL"></iframe>
129
              </li>
130
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
131
                <iframe *ngIf="datasetsWithCCLicenceByOrganizationChartURL"
132
                        width="100%" height="650" [src]="datasetsWithCCLicenceByOrganizationChartURL"></iframe>
133
              </li>
134
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
135
                <app-treemap-highchart *ngIf="datasetsWithCCLicenceByFunderData"
136
                                       [chartTitle]="'Open Access datasets with CC licence'" [chartSubtitle]="'by funder (top funders)'"
137
                                       [chartData]="datasetsWithCCLicenceByFunderData" [color]="datasetColor" [height]="650"></app-treemap-highchart>
138
              </li>
139
            </ul>
140
          </div>
141

  
142
        </div>
143
      </div>
144
    </div>
145

  
75 146
  </div>
76 147
</div>
77
<div *ngIf="indicator && indicator=='licence'" class="licenceIndicator">
78
  <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
79 148

  
80
    <div class="uk-grid-margin">
149
<div *ngIf="indicator && indicator=='pid'" class="pidIndicator">
150

  
151
  <div class="uk-grid uk-grid-margin">
152
    <div class="uk-width-3-4@l uk-width-1-1@m uk-width-1-1@s">
81 153
      <div class="md-card chartCard">
82 154
        <div class="md-card-content">
83
          <iframe *ngIf="datasetsWithLicenceTimeline" width="100%" height="550" [src]="datasetsWithLicenceTimeline"></iframe>
155
          <iframe *ngIf="datasetsWithPIDTimeline" width="100%" height="550" [src]="datasetsWithPIDTimeline"></iframe>
84 156
        </div>
85 157
      </div>
86 158
    </div>
159
  </div>
87 160

  
88
    <div class="uk-grid-margin">
161
  <div class="uk-grid uk-grid-margin">
162
    <div class="uk-width-3-4@l uk-width-1-1@m uk-width-1-1@s">
89 163
      <div class="md-card chartCard">
90 164
        <div class="md-card-content">
91 165

  
......
93 167
          <div class="uk-hidden@m">
94 168
            <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
95 169
              <label class="uk-margin-right">Show by: </label>
96
              <select class="md-input" #selectLicenceGroupBy (change)="getDatasetsWithLicenceGroupByMobile(selectLicenceGroupBy.value)" style="width: 230px; display: inline-block">
170
              <select class="md-input" #selectPIDGroupBy (change)="getDatasetsWithPIDGroupByMobile(selectPIDGroupBy.value)" style="display: inline-block">
97 171
                <option value="country">country</option>
98 172
                <option value="datasource">datasource</option>
99 173
                <option value="organization">organization</option>
......
101 175
              </select>
102 176
            </div>
103 177

  
104
            <iframe *ngIf="datasetsWithLicenceGroupByView==='country' && datasetsWithLicenceByCountryChartURLMobile"
105
                    width="100%" height="550" [src]="datasetsWithLicenceByCountryChartURLMobile"></iframe>
106
            <iframe *ngIf="datasetsWithLicenceGroupByView==='datasource' && datasetsWithLicenceByDatasourceChartURLMobile"
107
                    width="100%" height="550" [src]="datasetsWithLicenceByDatasourceChartURLMobile"></iframe>
108
            <iframe *ngIf="datasetsWithLicenceGroupByView==='organization' && datasetsWithLicenceByOrganizationChartURLMobile"
109
                    width="100%" height="550" [src]="datasetsWithLicenceByOrganizationChartURLMobile"></iframe>
110
            <app-treemap-highchart *ngIf="datasetsWithLicenceGroupByView==='funder' && datasetsWithLicenceByFunderData"
111
                                   [chartTitle]="'OA Datasets with licence by funder'"
112
                                   [chartData]="datasetsWithLicenceByFunderData" [color]="datasetColor"></app-treemap-highchart>
178
            <iframe *ngIf="datasetsWithPIDGroupByView==='country' && datasetsWithPIDByCountryChartURLMobile"
179
                    width="100%" height="550" [src]="datasetsWithPIDByCountryChartURLMobile"></iframe>
180
            <iframe *ngIf="datasetsWithPIDGroupByView==='datasource' && datasetsWithPIDByDatasourceChartURL"
181
                    width="100%" height="550" [src]="datasetsWithPIDByDatasourceChartURL"></iframe>
182
            <iframe *ngIf="datasetsWithPIDGroupByView==='organization' && datasetsWithPIDByOrganizationChartURL"
183
                    width="100%" height="550" [src]="datasetsWithPIDByOrganizationChartURL"></iframe>
184
            <app-treemap-highchart *ngIf="datasetsWithPIDGroupByView==='funder' && datasetsWithPIDByFunderData"
185
                                   [chartTitle]="'OA Datasets with PID by funder (top funders)'"
186
                                   [chartData]="datasetsWithPIDByFunderData" [color]="datasetColor"></app-treemap-highchart>
113 187

  
114 188
          </div>
115 189

  
116 190
          <!--LAPTOP & PAD LANDSCAPE-->
117 191
          <div class="uk-visible@m">
118
            <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
119
                data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
120
              <li class="uk-active"><a (click)="getDatasetsWithLicenceGroupBy('country')">Country</a></li>
121
              <li><a (click)="getDatasetsWithLicenceGroupBy('datasource')">Datasource</a></li>
122
              <li><a (click)="getDatasetsWithLicenceGroupBy('organization')">Organization</a></li>
123
              <li><a (click)="getDatasetsWithLicenceGroupBy('funder')">Funder</a></li>
192
            <ul class="group-by-cdof uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
193
                data-uk-switcher="{connect:'#switcher-content-a-fade-datasets-pid', animation: 'fade'}">
194
              <li class="uk-active"><a (click)="getDatasetsWithPIDGroupBy('country')">Country</a></li>
195
              <li><a (click)="getDatasetsWithPIDGroupBy('datasource')">Datasource</a></li>
196
              <li><a (click)="getDatasetsWithPIDGroupBy('organization')">Organization</a></li>
197
              <li><a (click)="getDatasetsWithPIDGroupBy('funder')">Funder</a></li>
124 198
            </ul>
125 199

  
126
            <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
200
            <ul id="switcher-content-a-fade-datasets-pid" class="uk-switcher uk-margin">
127 201
              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
128
                <iframe *ngIf="datasetsWithLicenceByCountryChartURL"
129
                        width="100%" height="350" [src]="datasetsWithLicenceByCountryChartURL"></iframe>
202
                <iframe *ngIf="datasetsWithPIDByCountryChartURL"
203
                        width="100%" height="650" [src]="datasetsWithPIDByCountryChartURL"></iframe>
130 204
              </li>
131 205
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
132
                <iframe *ngIf="datasetsWithLicenceByDatasourceChartURL"
133
                        width="100%" height="350" [src]="datasetsWithLicenceByDatasourceChartURL"></iframe>
206
                <iframe *ngIf="datasetsWithPIDByDatasourceChartURL"
207
                        width="100%" height="650" [src]="datasetsWithPIDByDatasourceChartURL"></iframe>
134 208
              </li>
135 209
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
136
                <iframe *ngIf="datasetsWithLicenceByOrganizationChartURL"
137
                        width="100%" height="350" [src]="datasetsWithLicenceByOrganizationChartURL"></iframe>
210
                <iframe *ngIf="datasetsWithPIDByOrganizationChartURL"
211
                        width="100%" height="650" [src]="datasetsWithPIDByOrganizationChartURL"></iframe>
138 212
              </li>
139 213
              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
140
                <app-treemap-highchart *ngIf="datasetsWithLicenceByFunderData"
141
                                       [chartTitle]="'OA Datasets with licence by funder'"
142
                                       [chartData]="datasetsWithLicenceByFunderData" [color]="datasetColor"></app-treemap-highchart>
214
                <app-treemap-highchart *ngIf="datasetsWithPIDByFunderData"
215
                                       [chartTitle]="'Open Access datasets with PID'" [chartSubtitle]="'by funder (top funders)'"
216
                                       [chartData]="datasetsWithPIDByFunderData" [color]="datasetColor" [height]="650"></app-treemap-highchart>
143 217
              </li>
144 218
            </ul>
145 219
          </div>
......
147 221
        </div>
148 222
      </div>
149 223
    </div>
224
  </div>
150 225

  
151
  </div>
152 226
</div>
227

  
153 228
<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top">
154 229

  
155
  <h3 class="">More details for datasets</h3>
230
  <!--<h3 class="">More details for datasets</h3>-->
156 231

  
157 232
  <div class="uk-margin-top uk-margin-bottom">
158 233
    <label class="uk-margin-right">Show: </label>
159
    <select class="md-input" #selectDatasetsContent (change)="getContent('dataset', selectDatasetsContent.value)" style="width: 230px; display: inline-block">
234
    <select class="md-input" #selectDatasetsContent (change)="getContent('dataset', selectDatasetsContent.value)" style="display: inline-block">
160 235
      <option value="affiliated">affiliated</option>
161
      <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
236
      <!--<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>-->
162 237
      <option value="deposited">deposited</option>
163
      <option value="deposited_peer_reviewed">deposited peer reviewed</option>
238
      <!--<option value="deposited_peer_reviewed">deposited peer reviewed</option>-->
164 239
    </select>
165 240
    <!--<span class="md-input-bar"></span>-->
166 241
  </div>
......
185 260

  
186 261
          <ul id="data-indicators-content-a-fade" class="uk-switcher uk-margin" >
187 262
            <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
188
              <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
263
              <div *ngIf="loadingDatasetsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
189 264
              <app-countries-table *ngIf="datasetsAbsoluteTableData" [isPercentage]="false" [countries]="datasetsAbsoluteTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>
190 265
            </li>
191 266
            <li aria-hidden="true" style="animation-duration: 200ms;" class="">
192
              <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
267
              <div *ngIf="loadingDatasetsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
193 268
              <app-countries-table *ngIf="datasetsPercentageTableData" [isPercentage]="true" [countries]="datasetsPercentageTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table>
194 269
            </li>
195 270
          </ul>
modules/open-science-observatory-ui/trunk/package-lock.json
5 5
  "requires": true,
6 6
  "packages": {
7 7
    "": {
8
      "name": "open-science-observatory-ui",
9 8
      "version": "0.0.0",
10 9
      "dependencies": {
11
        "@angular/animations": "~12.2.16",
12
        "@angular/common": "~12.2.16",
13
        "@angular/compiler": "~12.2.16",
14
        "@angular/core": "~12.2.16",
15
        "@angular/forms": "~12.2.16",
10
        "@angular/animations": "~12.1.1",
11
        "@angular/cdk": "^12.2.5",
12
        "@angular/common": "~12.1.1",
13
        "@angular/compiler": "~12.1.1",
14
        "@angular/core": "~12.1.1",
15
        "@angular/forms": "~12.1.1",
16 16
        "@angular/localize": "^12.1.1",
17
        "@angular/platform-browser": "~12.2.16",
18
        "@angular/platform-browser-dynamic": "~12.2.16",
19
        "@angular/router": "~12.2.16",
17
        "@angular/material": "^12.2.5",
18
        "@angular/platform-browser": "~12.1.1",
19
        "@angular/platform-browser-dynamic": "~12.1.1",
20
        "@angular/router": "~12.1.1",
20 21
        "@highcharts/map-collection": "^1.1.2",
21 22
        "angular-ng-autocomplete": "^2.0.5",
22 23
        "core-js": "^2.6.12",
......
28 29
        "jquery": "^3.4.1",
29 30
        "jspdf": "^1.5.3",
30 31
        "ngx-echarts": "^4.2.2",
31
        "ngx-matomo": "1.0.0-rc.0",
32
        "ngx-matomo": "^1.0.0-rc.0",
32 33
        "proj4": "^2.5.0",
33 34
        "rxjs": "~6.6.7",
34 35
        "tslib": "^2.0.0",
......
36 37
        "zone.js": "~0.11.4"
37 38
      },
38 39
      "devDependencies": {
39
        "@angular-devkit/build-angular": "~12.2.16",
40
        "@angular/cli": "~12.2.16",
41
        "@angular/compiler-cli": "~12.2.16",
42
        "@angular/language-service": "~12.2.16",
40
        "@angular-devkit/build-angular": "~12.1.1",
41
        "@angular/cli": "~12.1.1",
42
        "@angular/compiler-cli": "~12.1.1",
43
        "@angular/language-service": "~12.1.1",
43 44
        "@types/jasmine": "~3.6.0",
44 45
        "@types/jasminewd2": "~2.0.3",
45 46
        "codelyzer": "^6.0.0",
......
55 56
        "typescript": "~4.3.5"
56 57
      }
57 58
    },
58
    "node_modules/@ampproject/remapping": {
59
      "version": "1.0.1",
60
      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-1.0.1.tgz",
61
      "integrity": "sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA==",
62
      "dev": true,
63
      "dependencies": {
64
        "@jridgewell/resolve-uri": "1.0.0",
65
        "sourcemap-codec": "1.4.8"
66
      },
67
      "engines": {
68
        "node": ">=6.0.0"
69
      }
70
    },
71 59
    "node_modules/@angular-devkit/architect": {
72
      "version": "0.1202.18",
73
      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.18.tgz",
74
      "integrity": "sha512-C4ASKe+xBjl91MJyHDLt3z7ICPF9FU6B0CeJ1phwrlSHK9lmFG99WGxEj/Tc82+vHyPhajqS5XJ38KyVAPBGzA==",
60
      "version": "0.1201.1",
61
      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz",
62
      "integrity": "sha512-n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ==",
75 63
      "dev": true,
76 64
      "dependencies": {
77
        "@angular-devkit/core": "12.2.18",
65
        "@angular-devkit/core": "12.1.1",
78 66
        "rxjs": "6.6.7"
79 67
      },
80 68
      "engines": {
81 69
        "node": "^12.14.1 || >=14.0.0",
82
        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
70
        "npm": "^6.11.0 || ^7.5.6",
83 71
        "yarn": ">= 1.13.0"
84 72
      }
85 73
    },
86 74
    "node_modules/@angular-devkit/build-angular": {
87
      "version": "12.2.18",
88
      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-12.2.18.tgz",
89
      "integrity": "sha512-Hf3s7etN7zkHc7lhZZx3Bsm6hfLozuvN3z2aI39RDSlHOA83SoYpltnD9UV4B4d3cxU4PLUzpirb96QeS+E53Q==",
75
      "version": "12.1.1",
76
      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-12.1.1.tgz",
77
      "integrity": "sha512-mJjpPuJlS55gwi/W2g8CIMjPVtUjKCKJdjn34eeYk1Kgw9JYRIsiEivx1hcGyLmiSTF8gRGvW1TEyO+k55/QqA==",
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff