Project

General

Profile

« Previous | Next » 

Revision 60861

Added by Stefania Martziou about 3 years ago

Created extra commented out variables for the various color paletted, and changed a graph's profile name until it is fixed in production

View differences:

modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.ts
242 242 
      this.otherByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"other","type":"bar","query":{"name":"new.oso.results.affiliated.bydatasource.country","parameters":["${this.countryCode}","other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products","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.otherResearchProductsPalette.join('","')}\"]}}`));
243 243 
      this.otherByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"other","type":"bar","query":{"name":"new.oso.results.affiliated.byorganization.country","parameters":["${this.countryCode}","other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products","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.otherResearchProductsPalette.join('","')}\"]}}`));
244 244 

  		




  
  245
  
    
      // fixme use the profileName variable when this chart is available for the same profile as the rest (in 2 places)


  		




  
  246
  
    
      this.resultsByTypeOANonOAChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA","type":"column","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.type","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.access mode","type":"=","values":["Open Access"]},{"field":"result.access mode","type":"=","values":["Open Source"]}],"op":"OR"},{"groupFilters":[{"field":"result.organization.country.code","type":"=","values":["${this.countryCode}"]}],"op":"AND"}],"entity":"result","profile":"OpenAIRE original","limit":"30"}},{"name":"Non-OA","type":"column","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.type","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.access mode","type":"!=","values":["Open Access"]},{"field":"result.access mode","type":"!=","values":["Open Source"]}],"op":"AND"},{"groupFilters":[{"field":"result.organization.country.code","type":"=","values":["${this.countryCode}"]}],"op":"AND"}],"entity":"result","profile":"OpenAIRE original","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Research results by type","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":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":false},"colors":[\"${this.resultsPalette.join('","')}\"]}}`));


  		




  245
  247
  
    

  		




  246
  
  
    
      this.resultsByTypeOANonOAChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA","type":"column","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.type","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.access mode","type":"=","values":["Open Access"]},{"field":"result.access mode","type":"=","values":["Open Source"]}],"op":"OR"},{"groupFilters":[{"field":"result.organization.country.code","type":"=","values":["${this.countryCode}"]}],"op":"AND"}],"entity":"result","profile":"${this.profileName}","limit":"30"}},{"name":"Non-OA","type":"column","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.type","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.access mode","type":"!=","values":["Open Access"]},{"field":"result.access mode","type":"!=","values":["Open Source"]}],"op":"AND"},{"groupFilters":[{"field":"result.organization.country.code","type":"=","values":["${this.countryCode}"]}],"op":"AND"}],"entity":"result","profile":"${this.profileName}","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Research results by type","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":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":false},"colors":[\"${this.resultsPalette.join('","')}\"]}}`));


  		




  247
  
  
    

  		




  248
  248
  
    
      this.dataService.getFundersResultsByTypeForCountry('publication', this.countryCode).subscribe(


  		




  249
  249
  
    
        rawData => {


  		




  250
  250
  
    
          this.publicationsByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/pages/home/europe-map-overview.component.ts
    
  





  154
  154
  
    
        // center: [15.2551, 54.5260],


  		




  155
  155
  
    
        center: [14, 51],


  		




  156
  156
  
    
        // zoom: 4.7,


  		




  157
  
  
    
        zoom: 4.3,


  		




  
  157
  
    
        // zoom: 4.3,


  		




  
  158
  
    
        zoom: 6,


  		




  158
  159
  
    
        // roam: true,


  		




  159
  160
  
    
        label: {


  		




  160
  161
  
    
          emphasis: {


  		




  ......




  235
  236
  
    
              itemStyle: {


  		




  236
  237
  
    
                normal: {


  		




  237
  238
  
    
                  color:  seriesColor,


  		




  
  239
  
    
                  // color:  {


  		




  
  240
  
    
                  //   type: 'linear',


  		




  
  241
  
    
                  //   x: 0,


  		




  
  242
  
    
                  //   y: 0,


  		




  
  243
  
    
                  //   x2: 0,


  		




  
  244
  
    
                  //   y2: 1,


  		




  
  245
  
    
                  //   colorStops: [{


  		




  
  246
  
    
                  //     offset: 0, color: '#A1AAB8' // color at 0% position


  		




  
  247
  
    
                  //   }, {


  		




  
  248
  
    
                  //     offset: 1, color: seriesColor // color at 100% position


  		




  
  249
  
    
                  //   }],


  		




  
  250
  
    
                  //   global: false // false by default


  		




  
  251
  
    
                  // },


  		




  238
  252
  
    
                  // color:  '#f8d5e3',


  		




  239
  
  
    
                  // opacity: 0.8,


  		




  
  253
  
    
                  // opacity: 0.5,


  		




  240
  254
  
    
                  borderColor: seriesColor,


  		




  241
  255
  
    
                  borderWidth: 2


  		




  242
  256
  
    
                }


  		












  

    
      modules/open-science-observatory-ui/trunk/src/app/chart-palettes.ts
    
  





  1
  1
  
    
export const publicationColor = '#F181AE';


  		




  2
  2
  
    
export const publicationTooltipColor = '#a52e5d';


  		




  3
  3
  
    
export const publicationBackgroundColor = '#f8d5e3';


  		




  4
  
  
    
// export const publicationColor = '#263C7E';


  		




  
  4
  
    
// export const publicationColor = '#0d6b96';


  		




  5
  5
  
    
// export const publicationTooltipColor = '#1c2d5e';


  		




  6
  6
  
    
// export const publicationBackgroundColor = '#8197D9';


  		




  7
  7
  
    

  		




  8
  8
  
    
export const datasetColor = '#A98BD4';


  		




  9
  
  
    
// export const datasetColor = '#916AC8';


  		




  10
  9
  
    
export const datasetTooltipColor = '#7658a1';


  		




  11
  10
  
    
export const datasetBackgroundColor = '#e2daf0';


  		




  
  11
  
    
// export const datasetColor = '#2ec0f9';


  		




  
  12
  
    
// export const datasetTooltipColor = '#7658a1';


  		




  
  13
  
    
// export const datasetBackgroundColor = '#e2daf0';


  		




  12
  14
  
    

  		




  13
  
  
    

  		




  14
  15
  
    
export const repositoriesColor = '#708AA5';


  		




  15
  16
  
    
export const repositoriesTooltipColor = '#3d5772';


  		




  16
  17
  
    
export const repositoriesBackgroundColor = '#ADD3E0';


  		




  
  18
  
    
// export const repositoriesColor = '#708AA5';


  		




  
  19
  
    
// export const repositoriesTooltipColor = '#3d5772';


  		




  
  20
  
    
// export const repositoriesBackgroundColor = '#ADD3E0';


  		




  17
  21
  
    

  		




  18
  22
  
    
export const journalsColor = '#FFCE4E';


  		




  19
  23
  
    
export const journalsTooltipColor = '#cc9b1b';


  		




  20
  24
  
    
export const journalsBackgroundColor = '#FBE8B1';


  		




  21
  
  
    
// export const journalsColor = '#639C66';


  		




  22
  
  
    
// export const journalsTooltipColor = '#306933';


  		




  
  25
  
    
// export const journalsColor = '#FFCE4E';


  		




  
  26
  
    
// export const journalsTooltipColor = '#cc9b1b';


  		




  
  27
  
    
// export const journalsBackgroundColor = '#FBE8B1';


  		




  23
  28
  
    

  		




  24
  29
  
    
export const policiesColor = '#639C66';


  		




  25
  30
  
    
export const policiesTooltipColor = '#306933';


  		




  26
  31
  
    

  		




  27
  32
  
    
export const softwareColor = '#C2155A';


  		




  28
  
  
    
// export const softwareColor = '#9C0D38';


  		




  
  33
  
    
// export const softwareColor = '#8affc1';


  		




  29
  34
  
    

  		




  30
  35
  
    
export const otherResearchProductsColor = '#00CCCC';


  		




  31
  
  
    
// export const otherResearchProductsColor = '#17BEBB';


  		




  
  36
  
    
// export const otherResearchProductsColor = '#4ea699';


  		




  32
  37
  
    

  		




  33
  38
  
    
export const nonOAColor = '#787878';


  		




  34
  39
  
    

  		












  

    
      modules/open-science-observatory-ui/trunk/src/assets/css/os-observatory-custom.css
    
  





  11
  11
  
    
  --link-hover-color: #CA4D9A;


  		




  12
  12
  
    

  		




  13
  13
  
    
  --publication-color: #F17AA9;


  		




  14
  
  
    
  /*--publication-color: #263C7E;*/


  		




  15
  14
  
    
  --publication-background-color: #f8d5e3;


  		




  
  15
  
    
  /*--publication-color: #0d6b96;*/


  		




  16
  16
  
    
  /*--publication-background-color: #8197D9;*/


  		




  17
  17
  
    

  		




  18
  18
  
    
  --dataset-color: #A98BD4;


  		




  19
  
  
    
  /*--dataset-color: #916AC8;*/


  		




  20
  19
  
    
  --dataset-background-color: #e2daf0;


  		




  
  20
  
    
  /*--dataset-color: #2ec0f9;*/


  		




  
  21
  
    
  /*--dataset-background-color: #e2daf0;*/


  		




  21
  22
  
    

  		




  22
  23
  
    
  --software-color: #C2155A;


  		




  23
  
  
    
  /*--software-color: #9C0D38;*/


  		




  24
  24
  
    
  --software-background-color: #F2D0DE;


  		




  
  25
  
    
  /*--software-color: #8affc1;*/


  		




  
  26
  
    
  /*--software-background-color: #F2D0DE;*/


  		




  25
  27
  
    

  		




  26
  28
  
    
  --other-color: #00CCCC;


  		




  27
  
  
    
  /*--other-color: #17BEBB;*/


  		




  28
  29
  
    
  --other-background-color: #CCF4F4;


  		




  
  30
  
    
  /*--other-color: #4ea699;*/


  		




  
  31
  
    
  /*--other-background-color: #CCF4F4;*/


  		




  29
  32
  
    

  		




  30
  33
  
    
  --repository-color: #708AA5;


  		




  31
  34
  
    
  --repository-background-color: #ADD3E0;


  		




  ......




  34
  37
  
    

  		




  35
  38
  
    
  --journal-color: #FFCE4E;


  		




  36
  39
  
    
  --journal-background-color: #FBE8B1;


  		




  
  40
  
    
  /*--journal-color: #FFCE4E;*/


  		




  
  41
  
    
  /*--journal-background-color: #FBE8B1;*/


  		




  37
  42
  
    

  		




  38
  43
  
    
  --policies-color: #639C66;


  		




  39
  44
  
    
  --policies-background-color: #D4ECD6;


  		












Also available in:  Unified diff