Revision 60835
Added by Stefania Martziou about 3 years ago
| data.service.ts | ||
|---|---|---|
| 16 | 16 |
private _jsonURl = 'http://esperos.di.uoa.gr/oss.json'; |
| 17 | 17 |
|
| 18 | 18 |
private apiURL = environment.API_ENDPOINT + 'raw?json='; |
| 19 |
private profileName = environment.profileName; |
|
| 19 | 20 |
|
| 20 | 21 |
constructor(private httpClient: HttpClient) {
|
| 21 | 22 |
} |
| 22 | 23 |
|
| 23 | 24 |
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);
|
|
| 25 |
const lastUpdateDateQuery = `{"series":[{"query":{"name":"creation_date","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 26 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(lastUpdateDateQuery), headerOptions);
|
|
| 26 | 27 |
} |
| 27 | 28 |
|
| 28 | 29 |
public getOverviewMapData(): Observable<RawData> {
|
| 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';
|
|
| 30 |
return this.httpClient.get<RawData>(this.apiURL + mapDataQuery, headerOptions);
|
|
| 30 |
const mapDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.publications.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 31 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(mapDataQuery), headerOptions);
|
|
| 31 | 32 |
} |
| 32 | 33 |
|
| 33 | 34 |
public getCountryOverviewData(countryCode: string): Observable<RawData> {
|
| 34 |
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';
|
|
| 35 |
return this.httpClient.get<RawData>(this.apiURL + countryOverviewDataQuery, headerOptions);
|
|
| 35 |
const countryOverviewDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.publications.deposited.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 36 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryOverviewDataQuery), headerOptions);
|
|
| 36 | 37 |
} |
| 37 | 38 |
|
| 38 | 39 |
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);
|
|
| 40 |
const countryOADataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["software","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["other","${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 41 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryOADataQuery), headerOptions);
|
|
| 41 | 42 |
} |
| 42 | 43 |
|
| 43 | 44 |
public getEuropeOverviewData(): Observable<RawData> {
|
| 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';
|
|
| 45 |
return this.httpClient.get<RawData>(this.apiURL + overviewRawDataQuery, headerOptions);
|
|
| 45 |
const overviewRawDataQuery = `{"series":[{"query":{"name":"new.oso.publications.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.europe","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 46 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewRawDataQuery), headerOptions);
|
|
| 46 | 47 |
} |
| 47 | 48 |
|
| 48 | 49 |
public getOverviewTableAbsoluteData(content: string): Observable<RawData> {
|
| 49 | 50 |
let overviewTableAbsoluteDataQuery = ''; |
| 50 | 51 |
if (content === 'affiliated') {
|
| 51 |
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';
|
|
| 52 |
overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.affiliated","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 52 | 53 |
} else if (content === 'affiliated_peer_reviewed') {
|
| 53 |
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';
|
|
| 54 |
overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.affiliated.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 54 | 55 |
} else if (content === 'deposited') {
|
| 55 |
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';
|
|
| 56 |
overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.deposited","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 56 | 57 |
} else if (content === 'deposited_peer_reviewed') {
|
| 57 |
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';
|
|
| 58 |
overviewTableAbsoluteDataQuery = `{"series":[{"query":{"name":"new.oso.publications.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.deposited.peer_reviewed","profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals","profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 58 | 59 |
} |
| 59 |
return this.httpClient.get<RawData>(this.apiURL + overviewTableAbsoluteDataQuery, headerOptions);
|
|
| 60 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewTableAbsoluteDataQuery), headerOptions);
|
|
| 60 | 61 |
} |
| 61 | 62 |
|
| 62 | 63 |
public getOverviewTablePercentageData(content: string): Observable<RawData> {
|
| 63 | 64 |
let overviewTablePercentageDataQuery = ''; |
| 64 | 65 |
if (content === 'affiliated') {
|
| 65 |
overviewTablePercentageDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.bycountry%22%2C%22parameters%22%3A%5B%22publication%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.bycountry%22%2C%22parameters%22%3A%5B%22dataset%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.bycountry%22%2C%22parameters%22%3A%5B%22software%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.bycountry%22%2C%22parameters%22%3A%5B%22other%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.bycountry%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.bycountry%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 66 |
overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 66 | 67 |
} else if (content === 'affiliated_peer_reviewed') {
|
| 67 |
overviewTablePercentageDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22publication%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22dataset%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22software%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22other%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.bycountry%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.bycountry%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 68 |
overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.affiliated.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 68 | 69 |
} else if (content === 'deposited') {
|
| 69 |
overviewTablePercentageDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22publication%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22dataset%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22software%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22other%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.bycountry%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.bycountry%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 70 |
overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 70 | 71 |
} else if (content === 'deposited_peer_reviewed') {
|
| 71 |
overviewTablePercentageDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22publication%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22dataset%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22software%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22other%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.bycountry%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.bycountry%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 72 |
overviewTablePercentageDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["publication"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["dataset"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["software"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.peer_reviewed.bycountry","parameters":["other"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.bycountry","profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.bycountry","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 72 | 73 |
} |
| 73 |
return this.httpClient.get<RawData>(this.apiURL + overviewTablePercentageDataQuery, headerOptions);
|
|
| 74 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(overviewTablePercentageDataQuery), headerOptions);
|
|
| 74 | 75 |
} |
| 75 | 76 |
|
| 76 | 77 |
public getLeadingOpenScienceMobileData(): Observable<RawData> {
|
| 77 |
const leadingOpenScienceMobileDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.mobile.overview%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 78 |
return this.httpClient.get<RawData>(this.apiURL + leadingOpenScienceMobileDataQuery, headerOptions);
|
|
| 78 |
const leadingOpenScienceMobileDataQuery = `{"series":[{"query":{"name":"new.oso.mobile.overview","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 79 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(leadingOpenScienceMobileDataQuery), headerOptions);
|
|
| 79 | 80 |
} |
| 80 | 81 |
|
| 81 | 82 |
public getEuropeOAPercentages(): Observable<RawData> {
|
| 82 |
const europeOAPercentagesQuery = '%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.software.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.oa_percentage%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 83 |
return this.httpClient.get<RawData>(this.apiURL + europeOAPercentagesQuery, headerOptions);
|
|
| 83 |
const europeOAPercentagesQuery = `{"series":[{"query":{"name":"new.oso.publications.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.datasets.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.software.oa_percentage","profile":"${this.profileName}"}},{"query":{"name":"new.oso.other.oa_percentage","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 84 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(europeOAPercentagesQuery), headerOptions);
|
|
| 84 | 85 |
} |
| 85 | 86 |
|
| 86 | 87 |
public getCountryPageOverviewData(countryCode: string): Observable<RawData> {
|
| 87 |
const countryPageOverviewDataQuery = '%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.deposited.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.deposited.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.repositories.doar_re3data.validated.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.validated.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%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.rnd.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.funder.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.funding_organizations.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.ec_funded_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 88 |
return this.httpClient.get<RawData>(this.apiURL + countryPageOverviewDataQuery, headerOptions);
|
|
| 88 |
const countryPageOverviewDataQuery = `{"series":[{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.country", "parameters":["publication","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.oa_percentage.deposited.country", "parameters":["dataset","${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.repositories.doar_re3data.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.journals.doaj.validated.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.oa_policies.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.rnd.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.funder.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.funding_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.ec_funded_organizations.country", "parameters":["${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 89 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(countryPageOverviewDataQuery), headerOptions);
|
|
| 89 | 90 |
} |
| 90 | 91 |
|
| 91 | 92 |
public getFundersResults(): Observable<RawData> {
|
| 92 |
const fundersResultsQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funders.results%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 93 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsQuery, headerOptions);
|
|
| 93 |
const fundersResultsQuery = `{"series":[{"query":{"name":"new.oso.funders.results","profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 94 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsQuery), headerOptions);
|
|
| 94 | 95 |
} |
| 95 | 96 |
|
| 96 | 97 |
public getFundersResultsByType(type: string): Observable<RawData> {
|
| 97 |
const fundersResultsByTypeQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funders.results.type%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 98 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeQuery, headerOptions);
|
|
| 98 |
const fundersResultsByTypeQuery = `{"series":[{"query":{"name":"new.oso.funders.results.type", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 99 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeQuery), headerOptions);
|
|
| 99 | 100 |
} |
| 100 | 101 |
|
| 101 | 102 |
public getFundersResultsByTypeForPID(type: string): Observable<RawData> {
|
| 102 |
const fundersResultsByTypeForPIDQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid.affiliated.byfunder%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 103 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForPIDQuery, headerOptions);
|
|
| 103 |
const fundersResultsByTypeForPIDQuery = `{"series":[{"query":{"name":"new.oso.results.pid.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 104 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForPIDQuery), headerOptions);
|
|
| 104 | 105 |
} |
| 105 | 106 |
|
| 106 | 107 |
public getFundersResultsByTypeForLicence(type: string): Observable<RawData> {
|
| 107 |
const fundersResultsByTypeForLicenceQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence.affiliated.byfunder%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 108 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForLicenceQuery, headerOptions);
|
|
| 108 |
const fundersResultsByTypeForLicenceQuery = `{"series":[{"query":{"name":"new.oso.results.licence.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 109 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForLicenceQuery), headerOptions);
|
|
| 109 | 110 |
} |
| 110 | 111 |
|
| 111 | 112 |
public getFundersResultsByTypeForGold(type: string): Observable<RawData> {
|
| 112 |
const fundersResultsByTypeForGoldQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold.affiliated.byfunder%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 113 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForGoldQuery, headerOptions);
|
|
| 113 |
const fundersResultsByTypeForGoldQuery = `{"series":[{"query":{"name":"new.oso.results.gold.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 114 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForGoldQuery), headerOptions);
|
|
| 114 | 115 |
} |
| 115 | 116 |
|
| 116 | 117 |
public getFundersResultsByTypeForGreen(type: string): Observable<RawData> {
|
| 117 |
const fundersResultsByTypeForGreenQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green.affiliated.byfunder%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 118 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForGreenQuery, headerOptions);
|
|
| 118 |
const fundersResultsByTypeForGreenQuery = `{"series":[{"query":{"name":"new.oso.results.green.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 119 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForGreenQuery), headerOptions);
|
|
| 119 | 120 |
} |
| 120 | 121 |
|
| 121 | 122 |
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);
|
|
| 123 |
const fundersResultsByTypeForCountryQuery = `{"series":[{"query":{"name":"new.oso.results.affiliated.byfunder.country", "parameters":["${countryCode}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 124 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForCountryQuery), headerOptions);
|
|
| 124 | 125 |
} |
| 125 | 126 |
|
| 126 | 127 |
public getFundersResultsByTypeForIndicatorForCountry(type: string, indicator: string, countryCode: string): Observable<RawData> {
|
| 127 |
const fundersResultsByTypeForPIDForCountryQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.' + indicator + '.affiliated.byfunder.country%22%2C%20%22parameters%22%3A%5B%22' + type + '%22%2C%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 128 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForPIDForCountryQuery, headerOptions);
|
|
| 128 |
const fundersResultsByTypeForPIDForCountryQuery = `{"series":[{"query":{"name":"new.oso.results.${indicator}.affiliated.byfunder.country", "parameters":["${type}","${countryCode}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 129 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForPIDForCountryQuery), headerOptions);
|
|
| 129 | 130 |
} |
| 130 | 131 |
|
| 131 | 132 |
public getIndicatorsTableData(type: string, content: string): Observable<RawData> {
|
| 132 | 133 |
|
| 133 | 134 |
let indicatorsTableDataQuery = ''; |
| 134 | 135 |
if (content === 'affiliated') {
|
| 135 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 136 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.affiliated.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 136 | 137 |
} else if (content === 'affiliated_peer_reviewed') {
|
| 137 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 138 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 138 | 139 |
} else if (content === 'deposited') {
|
| 139 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 140 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.deposited.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 140 | 141 |
} else if (content === 'deposited_peer_reviewed') {
|
| 141 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D';
|
|
| 142 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"new.oso.results.pid_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.green_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.gold_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}","${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 142 | 143 |
} |
| 143 |
return this.httpClient.get<RawData>(this.apiURL + indicatorsTableDataQuery, headerOptions);
|
|
| 144 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(indicatorsTableDataQuery), headerOptions);
|
|
| 144 | 145 |
} |
| 145 | 146 |
|
| 146 | 147 |
|
Also available in: Unified diff
Refactored to add a variable in all stats tool queries for the profile name used. Also, added a change in the color palette for the main entities