Project

General

Profile

« Previous | Next » 

Revision 61543

Finished the europe overview page

View differences:

data.service.ts
42 42
  }
43 43

  
44 44
  public getEuropeOverviewData(): Observable<RawData> {
45
    const overviewRawDataQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies.europe","profile":"${this.profileName}"}}],"verbose":true}`;
45
    const overviewRawDataQuery = `{"series":[{"query":{"name":"new.oso.publications.peer_reviewed.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.repositories.doar_re3data.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.journals.doaj.validated","profile":"${this.profileName}"}},{"query":{"name":"oso.oa_policies.europe","profile":"${this.profileName}"}}],"verbose":true}`;
46 46
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewRawDataQuery), headerOptions);
47 47
  }
48 48

  
......
80 80
  }
81 81

  
82 82
  public getEuropeOAPercentages(): Observable<RawData> {
83
    const europeOAPercentagesQuery = `{"series":[{"query":{"name":"oso.results.oa_percentage","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["other"],"profile":"${this.profileName}"}}],"verbose":true}`;
83
    const europeOAPercentagesQuery = `{"series":[{"query":{"name":"new.oso.publications.peer_reviewed.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.oa_percentage","parameters":["other"],"profile":"${this.profileName}"}}],"verbose":true}`;
84 84
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(europeOAPercentagesQuery), headerOptions);
85 85
  }
86 86

  
......
95 95
  }
96 96

  
97 97
  public getFundersResultsByType(type: string): Observable<RawData> {
98
    const fundersResultsByTypeQuery = `{"series":[{"query":{"name":"oso.funders.results.type", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
98
    const fundersResultsByTypeQuery = `{"series":[{"query":{"name":"new.oso.results.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
99 99
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeQuery), headerOptions);
100 100
  }
101 101

  
102
  public getFundersResultsByPublications(): Observable<RawData> {
103
    const fundersResultsByPublicationsQuery = `{"series":[{"query":{"name":"new.oso.publications.peer_reviewed.byfunder","profile":"${this.profileName}"}}],"verbose":true}`;
104
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByPublicationsQuery), headerOptions);
105
  }
106

  
102 107
  public getFundersResultsByTypeForPID(type: string): Observable<RawData> {
103 108
    const fundersResultsByTypeForPIDQuery = `{"series":[{"query":{"name":"oso.results.pid.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
104 109
    return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForPIDQuery), headerOptions);

Also available in: Unified diff