Project

General

Profile

« Previous | Next » 

Revision 58923

Added by Stefania Martziou almost 4 years ago

Finished the charts for the overview tab of the country page

View differences:

data.service.ts
20 20 
  constructor(private httpClient: HttpClient) {
21 21 
  }
22 22 

  		




  
  23
  
    
  public getLastUpdateDate(): Observable<RawData> {


  		




  
  24
  
    
    const lastUpdateDateQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22creation_date%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		




  
  25
  
    
    return this.httpClient.get<RawData>(this.apiURL + lastUpdateDateQuery, headerOptions);


  		




  
  26
  
    
  }


  		




  
  27
  
    

  		




  23
  28
  
    
  public getOverviewMapData(): Observable<RawData> {


  		




  24
  29
  
    
    const mapDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		




  25
  30
  
    
    return this.httpClient.get<RawData>(this.apiURL + mapDataQuery, headerOptions);


  		




  ......




  30
  35
  
    
    return this.httpClient.get<RawData>(this.apiURL + countryOverviewDataQuery, headerOptions);


  		




  31
  36
  
    
  }


  		




  32
  37
  
    

  		




  
  38
  
    
  public getCountryOAData(countryCode: string): Observable<RawData> {


  		




  
  39
  
    
    const countryOADataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22software%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22other%22%2C%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		




  
  40
  
    
    return this.httpClient.get<RawData>(this.apiURL + countryOADataQuery, headerOptions);


  		




  
  41
  
    
  }


  		




  
  42
  
    

  		




  33
  43
  
    
  public getEuropeOverviewData(): Observable<RawData> {


  		




  34
  44
  
    
    const overviewRawDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.europe%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		




  35
  45
  
    
    return this.httpClient.get<RawData>(this.apiURL + overviewRawDataQuery, headerOptions);


  		




  ......




  108
  118
  
    
    return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForGeenQuery, headerOptions);


  		




  109
  119
  
    
  }


  		




  110
  120
  
    

  		




  
  121
  
    
  public getFundersResultsByTypeForCountry(type: string, countryCode: string): Observable<RawData> {


  		




  
  122
  
    
    const fundersResultsByTypeForCountryQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.affiliated.byfunder.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';


  		




  
  123
  
    
    return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForCountryQuery, headerOptions);


  		




  
  124
  
    
  }


  		




  111
  125
  
    

  		




  112
  126
  
    

  		




  113
  127
  
    

  		












Also available in:  Unified diff