Project

General

Profile

« Previous | Next » 

Revision 58825

Added by Stefania Martziou almost 4 years ago

Working on the new version of the oso. Work on the home page almost done

View differences:

data.service.ts
2 2 
import { Injectable } from '@angular/core';
3 3 
import { Observable } from 'rxjs';
4 4 
import { OverviewData } from '../domain/overview-data';
5 
import { environment } from '../../environments/environment';
6 
import { RawData } from '../domain/raw-data';
5 7 

  		




  6
  8
  
    
const headerOptions = {


  		




  7
  9
  
    
  headers : new HttpHeaders().set('Content-Type', 'application/json')


  		




  ......




  10
  12
  
    

  		




  11
  13
  
    
@Injectable ()


  		




  12
  14
  
    
export class DataService {


  		




  13
  
  
    
  // private _jsonURl = environment.API_ENDPOINT + '/monitor/';


  		




  14
  
  
    
  // private _jsonURl = '/assets/json/';


  		




  
  15
  
    

  		




  15
  16
  
    
  private _jsonURl = 'http://esperos.di.uoa.gr/oss.json';


  		




  16
  17
  
    

  		




  
  18
  
    
  private apiURL = environment.API_ENDPOINT + 'raw?json=';


  		




  
  19
  
    

  		




  17
  20
  
    
  constructor(private httpClient: HttpClient) {


  		




  18
  21
  
    
  }


  		




  19
  22
  
    

  		




  
  23
  
    
  public getOverviewMapData(): Observable<RawData> {


  		




  
  24
  
    
    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.journals%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
  
    
    return this.httpClient.get<RawData>(this.apiURL + mapDataQuery, headerOptions);


  		




  
  26
  
    
  }


  		




  
  27
  
    

  		




  
  28
  
    
  public getCountryOverviewData(countryCode: string): Observable<RawData> {


  		




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


  		




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


  		




  
  31
  
    
  }


  		




  
  32
  
    

  		




  
  33
  
    
  public getEuropeOverviewData(): Observable<RawData> {


  		




  
  34
  
    
    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
  
    
    return this.httpClient.get<RawData>(this.apiURL + overviewRawDataQuery, headerOptions);


  		




  
  36
  
    
  }


  		




  
  37
  
    

  		




  
  38
  
    
  public getOverviewTableAbsoluteData(content: string): Observable<RawData> {


  		




  
  39
  
    
    let overviewTableAbsoluteDataQuery = '';


  		




  
  40
  
    
    if (content === 'affiliated') {


  		




  
  41
  
    
      overviewTableAbsoluteDataQuery = '%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.datasets.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.software.affiliated%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.affiliated%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.journals%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';


  		




  
  42
  
    
    } else if (content === 'affiliated_peer_reviewed') {


  		




  
  43
  
    
      overviewTableAbsoluteDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.affiliated.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.affiliated.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.software.affiliated.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.affiliated.peer_reviewed%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.journals%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';


  		




  
  44
  
    
    } else if (content === 'deposited') {


  		




  
  45
  
    
      overviewTableAbsoluteDataQuery = '%7B%22series%22%3A%5B%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.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.software.deposited%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.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.journals%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';


  		




  
  46
  
    
    } else if (content === 'deposited_peer_reviewed') {


  		




  
  47
  
    
      overviewTableAbsoluteDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.deposited.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.deposited.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.software.deposited.peer_reviewed%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.deposited.peer_reviewed%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.journals%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';


  		




  
  48
  
    
    }


  		




  
  49
  
    
    return this.httpClient.get<RawData>(this.apiURL + overviewTableAbsoluteDataQuery, headerOptions);


  		




  
  50
  
    
  }


  		




  
  51
  
    

  		




  
  52
  
    
  public getOverviewTablePercentageData(content: string): Observable<RawData> {


  		




  
  53
  
    
    let overviewTablePercentageDataQuery = '';


  		




  
  54
  
    
    if (content === 'affiliated') {


  		




  
  55
  
    
      overviewTablePercentageDataQuery = '';


  		




  
  56
  
    
    } else if (content === 'affiliated_peer_reviewed') {


  		




  
  57
  
    
      overviewTablePercentageDataQuery = '';


  		




  
  58
  
    
    } else if (content === 'deposited') {


  		




  
  59
  
    
      overviewTablePercentageDataQuery = '';


  		




  
  60
  
    
    } else if (content === 'deposited_peer_reviewed') {


  		




  
  61
  
    
      overviewTablePercentageDataQuery = '';


  		




  
  62
  
    
    }


  		




  
  63
  
    
    return this.httpClient.get<RawData>(this.apiURL + overviewTablePercentageDataQuery, headerOptions);


  		




  
  64
  
    
  }


  		




  
  65
  
    

  		




  20
  66
  
    
  public getOverviewData(): Observable<OverviewData> {


  		




  21
  67
  
    
    return this.httpClient.get<OverviewData>(this._jsonURl, headerOptions);


  		




  22
  68
  
    
  }


  		












Also available in:  Unified diff