Project

General

Profile

« Previous | Next » 

Revision 59559

Added by Stefania Martziou over 3 years ago

Added R&D expenditure in country page

View differences:

data-handler.service.ts
6 6 
  EuropeData,
7 7 
  OverviewMapData,
8 8 
  CountryTableData,
9 
  CountryPageOverviewData
9 
  CountryPageOverviewData, RnDExpenditure
10 10 
} from '../domain/overview-map-data';
11 11 
import {Indicator} from '../domain/overview-data';
12 12 
import {TreemapHighchartsData} from '../domain/treemap-highcharts-data';
......
851 851 

  		




  852
  852
  
    
        countryPageOverviewData.policies = Number(series.series.result[0].row[0]);


  		




  853
  853
  
    

  		




  
  854
  
    
      } else if (series.series.query.name === 'new.oso.rnd.country'


  		




  
  855
  
    
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {


  		




  
  856
  
    

  		




  
  857
  
    
        const rndExpenditure: RnDExpenditure = new RnDExpenditure();


  		




  
  858
  
    
        rndExpenditure.expenditure = Number(series.series.result[0].row[0]);


  		




  
  859
  
    
        rndExpenditure.year = Number(series.series.result[0].row[1]);


  		




  
  860
  
    
        countryPageOverviewData.rndExpenditure = rndExpenditure;


  		




  
  861
  
    

  		




  854
  862
  
    
      } else if (series.series.query.name === 'new.oso.funder.country'


  		




  855
  863
  
    
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {


  		




  856
  864
  
    

  		












Also available in:  Unified diff