-
-
+
OA in Europe
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 688c3a5ee..30685e9df 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -1,46 +1,74 @@
import { Component, DoCheck, OnInit, ViewEncapsulation } from '@angular/core';
import { DataService } from '../../services/data.service';
import { CountryOverview, OverviewData } from '../../domain/overview-data';
+import {CountryOverviewData, EuropeData, SelectedCountry} from '../../domain/overview-map-data';
+import {DataHandlerService} from '../../services/data-handler.service';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
- // styleUrls: ['./top-menu.component.css'],
- encapsulation: ViewEncapsulation.None
})
export class HomeComponent implements OnInit {
- overviewData: OverviewData;
+ // overviewData: OverviewData;
- countrySelectedName: string = null;
- countrySelectedOverview: CountryOverview = null;
+ europeOverviewData: EuropeData;
- constructor(private dataService: DataService) { }
+ selectedCountry: SelectedCountry = null;
+ selectedCountryData: CountryOverviewData = null;
+
+ // countrySelectedName: string = null;
+ // countrySelectedOverview: CountryOverview = null;
+
+ constructor(private dataService: DataService,
+ private dataHandlerService: DataHandlerService) { }
ngOnInit(): void {
- window.scroll(0,0);
+ window.scroll(0, 0);
- this.dataService.getOverviewData().subscribe(
- overviewData => {
- this.overviewData = overviewData;
- },
- error => {
+ this.dataService.getEuropeOverviewData().subscribe(
+ rawData => {
+ this.europeOverviewData = this.dataHandlerService.convertRawDataToEuropeOverviewData(rawData);
+ }, error => {
console.log(error);
}
);
+
+ // this.dataService.getOverviewData().subscribe(
+ // overviewData => {
+ // this.overviewData = overviewData;
+ // },
+ // error => {
+ // console.log(error);
+ // }
+ // );
}
- countrySelected(countryName: string) {
- // console.log('Country selected: ', countryName);
- this.countrySelectedName = countryName;
- this.countrySelectedOverview = this.overviewData.countries.filter(x => x.country === this.countrySelectedName)[0];
+ countrySelected(selectedCountry: SelectedCountry) {
+ this.selectedCountry = selectedCountry;
+ this.selectedCountryData = null;
+
+ this.dataService.getCountryOverviewData(this.selectedCountry.code).subscribe(
+ rawData => {
+ this.selectedCountryData = this.dataHandlerService.convertRawDataToCountryOverviewData(rawData);
+ }, error => {
+ console.log(error);
+ }
+ );
+
+
+ // this.countrySelectedOverview = this.overviewData.countries.filter(x => x.country === this.selectedCountry.name)[0];
// console.log('Country selected overview: ', this.countrySelectedOverview);
}
deselectCountry() {
- this.countrySelectedName = null;
- this.countrySelectedOverview = null;
+
+ this.selectedCountry = null;
+ this.selectedCountryData = null;
+
+ // this.countrySelectedName = null;
+ // this.countrySelectedOverview = null;
}
}
diff --git a/src/app/services/data-handler.service.ts b/src/app/services/data-handler.service.ts
new file mode 100644
index 000000000..24c50f507
--- /dev/null
+++ b/src/app/services/data-handler.service.ts
@@ -0,0 +1,351 @@
+import { Injectable } from '@angular/core';
+import { RawData, Row } from '../domain/raw-data';
+import {CountryOverviewData, CountryMapData, EuropeData, OverviewMapData, CountryTableData} from '../domain/overview-map-data';
+import {Indicator} from '../domain/overview-data';
+
+@Injectable ()
+export class DataHandlerService {
+
+ public convertRawMapDataToMapData(rawData: RawData) {
+
+ const overviewMapData: OverviewMapData = new OverviewMapData();
+
+ for (const series of rawData.datasets) {
+
+ if (series.series.query.name === 'new.oso.publications.affiliated') {
+ overviewMapData.publications = this.rawResultToCountryMapData(series.series.result);
+ } else if (series.series.query.name === 'new.oso.datasets.affiliated') {
+ overviewMapData.datasets = this.rawResultToCountryMapData(series.series.result);
+ } else if (series.series.query.name === 'new.oso.repositories') {
+ overviewMapData.repositories = this.rawResultToCountryMapData(series.series.result);
+ } else if (series.series.query.name === 'new.oso.journals') {
+ overviewMapData.journals = this.rawResultToCountryMapData(series.series.result);
+ } else if (series.series.query.name === 'new.oso.oa_policies') {
+ overviewMapData.policies = this.rawResultToCountryMapData(series.series.result);
+ }
+ }
+
+ // console.log('Overview map data (data-handler)', overviewMapData);
+
+ return overviewMapData;
+ }
+
+ public createJoinedPublicationsCountryMap(rawData: RawData) {
+
+ const joinedPublicationsMap = new Map();
+
+ for (const series of rawData.datasets) {
+ if (series.series.query.name === 'new.oso.publications.affiliated') {
+
+ for (const rowResult of series.series.result) {
+ if (joinedPublicationsMap.has(rowResult.row[1])) {
+ const deposited = joinedPublicationsMap.get(rowResult.row[1]).deposited;
+ joinedPublicationsMap.delete(rowResult.row[1]);
+ joinedPublicationsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: Number(rowResult.row[0]), deposited: deposited});
+ } else {
+ joinedPublicationsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: Number(rowResult.row[0]), deposited: 0});
+ }
+ }
+
+ } else if (series.series.query.name === 'new.oso.publications.deposited') {
+
+ for (const rowResult of series.series.result) {
+ if (joinedPublicationsMap.has(rowResult.row[1])) {
+ const affiliated = joinedPublicationsMap.get(rowResult.row[1]).affiliated;
+ joinedPublicationsMap.delete(rowResult.row[1]);
+ joinedPublicationsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: affiliated, deposited: Number(rowResult.row[0])});
+ }
+ joinedPublicationsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: 0, deposited: Number(rowResult.row[0])});
+ }
+ }
+ }
+
+ return joinedPublicationsMap;
+ }
+
+ public createJoinedDatasetsCountryMap(rawData: RawData) {
+
+ const joinedDatasetsMap = new Map();
+
+ for (const series of rawData.datasets) {
+ if (series.series.query.name === 'new.oso.datasets.affiliated') {
+
+ for (const rowResult of series.series.result) {
+ if (joinedDatasetsMap.has(rowResult.row[1])) {
+ const deposited = joinedDatasetsMap.get(rowResult.row[1]).deposited;
+ joinedDatasetsMap.delete(rowResult.row[1]);
+ joinedDatasetsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: Number(rowResult.row[0]), deposited: deposited});
+ } else {
+ joinedDatasetsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: Number(rowResult.row[0]), deposited: 0});
+ }
+ }
+
+ } else if (series.series.query.name === 'new.oso.datasets.deposited') {
+
+ for (const rowResult of series.series.result) {
+ if (joinedDatasetsMap.has(rowResult.row[1])) {
+ const affiliated = joinedDatasetsMap.get(rowResult.row[1]).affiliated;
+ joinedDatasetsMap.delete(rowResult.row[1]);
+ joinedDatasetsMap.set(rowResult.row[1], {countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: affiliated, deposited: Number(rowResult.row[0])});
+ }
+ joinedDatasetsMap.set(rowResult.row[1], { countryName: rowResult.row[1], countryCode: rowResult.row[2],
+ affiliated: 0, deposited: Number(rowResult.row[0])});
+ }
+ }
+ }
+
+ return joinedDatasetsMap;
+
+ }
+
+ public convertRawDataToCountryOverviewData(rawData: RawData) {
+
+ const countryData: CountryOverviewData = new CountryOverviewData();
+
+ for (const series of rawData.datasets) {
+
+ if (series.series.query.name === 'new.oso.publications.affiliated.country') {
+ countryData.publicationsAffiliated = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.publications.deposited.country') {
+ countryData.publicationsDeposited = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.datasets.affiliated.country') {
+ countryData.datasetsAffiliated = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.datasets.deposited.country') {
+ countryData.datasetsDeposited = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.repositories.doar_re3data.country') {
+ countryData.repositories = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.journals.doaj.country') {
+ countryData.journals = Number(series.series.result[0].row[0]);
+ } else if (series.series.query.name === 'new.oso.oa_policies.country') {
+ countryData.policies = Number(series.series.result[0].row[0]);
+ }
+ }
+
+ return countryData;
+ }
+
+ public convertRawDataToEuropeOverviewData(rawData: RawData) {
+
+ const europeData: EuropeData = new EuropeData();
+
+ for (const series of rawData.datasets) {
+
+ if (series.series.query.name === 'new.oso.publications.oa_percentage') {
+
+ const publicationsIndicator: Indicator = new Indicator();
+ publicationsIndicator.percentage = Number(series.series.result[0].row[0]);
+ publicationsIndicator.oa = Number(series.series.result[0].row[1]);
+ publicationsIndicator.total = Number(series.series.result[0].row[2]);
+ europeData.publications = publicationsIndicator;
+
+ } else if (series.series.query.name === 'new.oso.datasets.oa_percentage') {
+
+ const datasetsIndicator: Indicator = new Indicator();
+ datasetsIndicator.percentage = Number(series.series.result[0].row[0]);
+ datasetsIndicator.oa = Number(series.series.result[0].row[1]);
+ datasetsIndicator.total = Number(series.series.result[0].row[2]);
+ europeData.datasets = datasetsIndicator;
+
+ } else if (series.series.query.name === 'new.oso.repositories.doar_re3data.validated') {
+
+ const repositoriesIndicator: Indicator = new Indicator();
+ repositoriesIndicator.percentage = Number(series.series.result[0].row[0]);
+ repositoriesIndicator.oa = Number(series.series.result[0].row[1]);
+ repositoriesIndicator.total = Number(series.series.result[0].row[2]);
+ europeData.repositories = repositoriesIndicator;
+
+ } else if (series.series.query.name === 'new.oso.journals.doaj.validated') {
+
+ const journalsIndicator: Indicator = new Indicator();
+ journalsIndicator.percentage = Number(series.series.result[0].row[0]);
+ journalsIndicator.oa = Number(series.series.result[0].row[1]);
+ journalsIndicator.total = Number(series.series.result[0].row[2]);
+ europeData.journals = journalsIndicator;
+
+ } else if (series.series.query.name === 'new.oso.oa_policies.europe') {
+
+ const policiesIndicator: Indicator = new Indicator();
+ policiesIndicator.percentage = Number(series.series.result[0].row[0]);
+ policiesIndicator.oa = Number(series.series.result[0].row[1]);
+ policiesIndicator.total = Number(series.series.result[0].row[2]);
+ europeData.policies = policiesIndicator;
+
+ }
+ }
+
+ return europeData;
+ }
+
+ public convertRawDataToAbsoluteTableData(rawData: RawData) {
+
+ const mapTableData: Map
= new Map();
+
+ for (const series of rawData.datasets) {
+
+ if (series.series.query.name.includes('new.oso.publications')) {
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.publications = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.publications = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+
+ } else if (series.series.query.name.includes('new.oso.datasets')) {
+
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.datasets = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.datasets = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+ } else if (series.series.query.name.includes('new.oso.software')) {
+
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.software = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.software = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+ } else if (series.series.query.name.includes('new.oso.other')) {
+
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.other = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.other = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+ } else if (series.series.query.name.includes('new.oso.repositories')) {
+
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.repositories = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.repositories = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+ } else if (series.series.query.name.includes('new.oso.journals')) {
+
+ for (const rowResult of series.series.result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ if (mapTableData.has(rowResult.row[2])) {
+ const countryTableData = mapTableData.get(rowResult.row[2]);
+ countryTableData.journals = Number(rowResult.row[0]);
+ } else {
+ const countryTableData: CountryTableData = new CountryTableData();
+ countryTableData.journals = Number(rowResult.row[0]);
+ countryTableData.name = rowResult.row[1];
+ countryTableData.code = rowResult.row[2];
+ mapTableData.set(rowResult.row[2], countryTableData);
+ }
+ }
+ }
+ }
+
+ const tableData: CountryTableData[] = [];
+
+ mapTableData.forEach((value: CountryTableData, key: string) => {
+ // console.log(key, value);
+ tableData.push(value);
+ });
+
+ return tableData;
+ }
+
+ private rawResultToCountryMapData(result: Row[]) {
+
+ const entityMapData: CountryMapData[] = [];
+ for (const rowResult of result) {
+
+ // remove unwanted countries
+ if (this.isCountryToBeRemoved(rowResult.row[2])) {
+ continue;
+ }
+
+ const countryMapData: CountryMapData = new CountryMapData();
+ countryMapData.value = Number(rowResult.row[0]);
+ countryMapData.name = rowResult.row[1];
+ countryMapData.code = rowResult.row[2];
+
+ entityMapData.push(countryMapData);
+ }
+
+ return entityMapData;
+ }
+
+ private isCountryToBeRemoved(countryCode: string) {
+ return (countryCode === 'GG' || countryCode === 'FO' || countryCode === 'GI' || countryCode === 'VA' || countryCode === 'IM'
+ || countryCode === 'JE' || countryCode === 'LI' || countryCode === 'MC' || countryCode === 'SM' || countryCode === 'SJ'
+ || countryCode === 'AX');
+ }
+}
diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts
index c8a380262..7780e4ed6 100644
--- a/src/app/services/data.service.ts
+++ b/src/app/services/data.service.ts
@@ -2,6 +2,8 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { OverviewData } from '../domain/overview-data';
+import { environment } from '../../environments/environment';
+import { RawData } from '../domain/raw-data';
const headerOptions = {
headers : new HttpHeaders().set('Content-Type', 'application/json')
@@ -10,13 +12,57 @@ const headerOptions = {
@Injectable ()
export class DataService {
- // private _jsonURl = environment.API_ENDPOINT + '/monitor/';
- // private _jsonURl = '/assets/json/';
+
private _jsonURl = 'http://esperos.di.uoa.gr/oss.json';
+ private apiURL = environment.API_ENDPOINT + 'raw?json=';
+
constructor(private httpClient: HttpClient) {
}
+ public getOverviewMapData(): Observable {
+ 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';
+ return this.httpClient.get(this.apiURL + mapDataQuery, headerOptions);
+ }
+
+ public getCountryOverviewData(countryCode: string): Observable {
+ 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';
+ return this.httpClient.get(this.apiURL + countryOverviewDataQuery, headerOptions);
+ }
+
+ public getEuropeOverviewData(): Observable {
+ 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';
+ return this.httpClient.get(this.apiURL + overviewRawDataQuery, headerOptions);
+ }
+
+ public getOverviewTableAbsoluteData(content: string): Observable {
+ let overviewTableAbsoluteDataQuery = '';
+ if (content === 'affiliated') {
+ 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';
+ } else if (content === 'affiliated_peer_reviewed') {
+ 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';
+ } else if (content === 'deposited') {
+ 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';
+ } else if (content === 'deposited_peer_reviewed') {
+ 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';
+ }
+ return this.httpClient.get(this.apiURL + overviewTableAbsoluteDataQuery, headerOptions);
+ }
+
+ public getOverviewTablePercentageData(content: string): Observable {
+ let overviewTablePercentageDataQuery = '';
+ if (content === 'affiliated') {
+ overviewTablePercentageDataQuery = '';
+ } else if (content === 'affiliated_peer_reviewed') {
+ overviewTablePercentageDataQuery = '';
+ } else if (content === 'deposited') {
+ overviewTablePercentageDataQuery = '';
+ } else if (content === 'deposited_peer_reviewed') {
+ overviewTablePercentageDataQuery = '';
+ }
+ return this.httpClient.get(this.apiURL + overviewTablePercentageDataQuery, headerOptions);
+ }
+
public getOverviewData(): Observable {
return this.httpClient.get(this._jsonURl, headerOptions);
}
diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html
index e69de29bb..80772e5b4 100644
--- a/src/app/shared/footer/footer.component.html
+++ b/src/app/shared/footer/footer.component.html
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
OpenAIRE-Advance receives funding from the European Union’s Horizon 2020 Research and Innovation programme
+ under Grant Agreement No. 777541.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Newsletter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
Country
-
-
- 
+ 
