diff --git a/src/app/library/sidebar/sidebar-open.service.ts b/src/app/library/sidebar/sidebar-open.service.ts new file mode 100644 index 0000000..04d3e68 --- /dev/null +++ b/src/app/library/sidebar/sidebar-open.service.ts @@ -0,0 +1,20 @@ +import {Injectable} from "@angular/core"; +import {BehaviorSubject} from "rxjs"; + +@Injectable({ + providedIn: 'root' +}) +export class SidebarOpenService { + + private openSubject: BehaviorSubject = new BehaviorSubject(true); + + constructor() {} + + get open(): boolean { + return this.openSubject.getValue(); + } + + setOpen(value: boolean) { + this.openSubject.next(value); + } +} diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 4cbeb62..d9ca45e 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -1,7 +1,10 @@ -
-
+
+
-
+ id="page_content" click-outside-or-esc targetId="page_content" (clickOutside)="toggleOpen($event)">
Indicators
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 3828046..760d81f 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; import {ActivatedRoute, Params, Router} from '@angular/router'; import {DomSanitizer, Meta, Title} from '@angular/platform-browser'; import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; @@ -14,12 +14,13 @@ import {StakeholderService} from "../services/stakeholder.service"; import {Category, IndicatorPath, Stakeholder, SubCategory, Topic} from "../utils/entities/stakeholder"; import {StatisticsService} from "../utils/services/statistics.service"; import {Item, Sidebar} from "../utils/entities/sidebar"; +import {SidebarOpenService} from "../library/sidebar/sidebar-open.service"; @Component({ selector: 'monitor', templateUrl: 'monitor.component.html', }) -export class MonitorComponent { +export class MonitorComponent implements OnInit, OnDestroy { public piwiksub: any; public pageContents = null; public divContents = null; @@ -45,11 +46,12 @@ export class MonitorComponent { private helper: HelperService, private stakeholderService: StakeholderService, private statisticsService: StatisticsService, + private sidebarOpenService: SidebarOpenService, private seoService: SEOService, private sanitizer: DomSanitizer) { - this.errorCodes = new ErrorCodes(); - this.errorMessages = new ErrorMessagesComponent(); - this.status = this.errorCodes.LOADING; + this.errorCodes = new ErrorCodes(); + this.errorMessages = new ErrorMessagesComponent(); + this.status = this.errorCodes.LOADING; } public ngOnInit() { @@ -60,7 +62,7 @@ export class MonitorComponent { var url = data.envSpecific.baseLink + this._router.url; if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) { this.status = this.errorCodes.LOADING; - this.numberResults= new Map(); + this.numberResults = new Map(); this.chartsActiveType = new Map(); this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => { this.stakeholder = stakeholder; @@ -89,6 +91,18 @@ export class MonitorComponent { }); } + public get open() { + return this.sidebarOpenService.open; + } + + public toggleOpen(event = null) { + if(!event) { + this.sidebarOpenService.setOpen(!this.open); + } else if(event && event['value'] === true) { + this.sidebarOpenService.setOpen(false); + } + } + private getPageContents() { this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => { this.pageContents = contents; @@ -126,8 +140,8 @@ export class MonitorComponent { this.setIndicators(); return; } else { - let subCategory: SubCategory = this.activeCategory.subCategories.filter( subCategory => - subCategory.isPublic && subCategory.isActive)[0]; + let subCategory: SubCategory = this.activeCategory.subCategories.filter(subCategory => + subCategory.isPublic && subCategory.isActive)[0]; this.navigateTo(this.stakeholder.alias, this.activeTopic.alias, this.activeCategory.alias, subCategory.alias); return; } @@ -165,7 +179,7 @@ export class MonitorComponent { private setIndicators() { let urls: Map = new Map(); this.activeSubCategory.numbers.forEach((number, index) => { - if(number.isActive && number.isPublic) { + if (number.isActive && number.isPublic) { const pair = JSON.stringify([number.indicatorPaths[0].source, number.indicatorPaths[0].url]); const indexes = urls.get(pair) ? urls.get(pair) : []; indexes.push(index); @@ -174,11 +188,13 @@ export class MonitorComponent { }); urls.forEach((indexes, pair) => { pair = JSON.parse(pair); - this.statisticsService.getNumbers(pair[0], pair[1]).subscribe( response => { - indexes.forEach( index => { + this.statisticsService.getNumbers(pair[0], pair[1]).subscribe(response => { + indexes.forEach(index => { let result = JSON.parse(JSON.stringify(response)); this.activeSubCategory.numbers[index].indicatorPaths[0].jsonPath.forEach(jsonPath => { - result = result[jsonPath]; + if (result) { + result = result[jsonPath]; + } }); this.numberResults.set(index, result); }); @@ -192,8 +208,7 @@ export class MonitorComponent { } public getUrlByStakeHolder(indicatorPath: IndicatorPath) { - return this.sanitizer. - bypassSecurityTrustResourceUrl(this.statisticsService.getChartUrl(indicatorPath.source, indicatorPath.url)); + return this.sanitizer.bypassSecurityTrustResourceUrl(this.statisticsService.getChartUrl(indicatorPath.source, indicatorPath.url)); } public setActiveChart(index, type: string) { diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index a1a8ca6..5dc3d12 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -16,11 +16,12 @@ import {MonitorComponent} from "./monitor.component"; import {StakeholderService} from "../services/stakeholder.service"; import {StatisticsService} from "../utils/services/statistics.service"; import {SideBarModule} from "../library/sidebar/sideBar.module"; +import {ModalModule} from "../openaireLibrary/utils/modal/modal.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, - HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule + HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, ModalModule ], declarations: [ MonitorComponent diff --git a/src/app/utils/entities/stakeholder.ts b/src/app/utils/entities/stakeholder.ts index 9af7b87..06bd177 100644 --- a/src/app/utils/entities/stakeholder.ts +++ b/src/app/utils/entities/stakeholder.ts @@ -118,7 +118,7 @@ export class Stakeholder { pubDefSub.charts.push(c_pubs_per_project); //TO check - let c_pubs_per_datasource = new Indicator("Which are the top repositories containing "+stakeholder.index_shortName+" research outputs?",null, "chart","small",false, + /* let c_pubs_per_datasource = new Indicator("Which are the top repositories containing "+stakeholder.index_shortName+" research outputs?",null, "chart","small",false, true, [new IndicatorPath("column", "old", "chart.php?com=query&data="+encodeURIComponent('{"table":"result","fields":[{"fld":"number","agg":"count","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"result_datasources-datasource-name","agg":"avg"},"group":"","color":"","type":"chart","size":"20","sort":"count-number","yaxisheaders":[""],"fieldsheaders":["publications"],"in":[],"filters":[{"name":"type","values":["publication"],"to":"-1"},{"name":"result_projects-project-funder","values":["'+stakeholder.index_name+'"],"to":"-1"},{"name":"result_datasources-datasource-type","exvalues":["Publication Catalogue"]}],"having":[],"xStyle":{"r":-90,"s":"-","l":"-","ft":10,"wt":"-"},"title":"Publications by content provider (top 20)","subtitle":"","xaxistitle":"content providers","order":"d"}'), null)]); pubDefSub.charts.push(c_pubs_per_datasource); @@ -129,7 +129,7 @@ export class Stakeholder { let c_pubs_funding_scheme = new Indicator("What is the percentage publications by funding scheme / programme?",null, "chart","small",true, true, [new IndicatorPath("bar", "stats-tool", "chart?json="+encodeURIComponent('{"library":"HighCharts","chartDescription":{"colors":["#42a5f5","#26a69a","#90ed7d","#607d8b","#00838f","#689f38","#e4d354","#2b908f","#546e7a","#01579"],"queries":[{"name":"Open Access","type":"bar","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.project.funder","type":"=","values":["'+stakeholder.index_name+'"]},{"field":"result.project.funding level 0","type":"=","values":["H2020"]},{"field":"result.type","type":"=","values":["publication"]},{"field":"result.access mode","type":"=","values":["Open Access"]}],"op":"AND"}],"entity":"result","profile":"OpenAIRE original","limit":"0"}},{"name":"Total","type":"bar","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.project.funder","type":"=","values":["'+stakeholder.index_name+'"]},{"field":"result.type","type":"=","values":["publication"]}],"op":"AND"}],"entity":"result","profile":"OpenAIRE original","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Publications"},"subtitle":{"text":"by funding scheme"},"yAxis":{"title":{"text":"Publications"}},"xAxis":{"title":{"text":"Funding scheme"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}'), null)]); pubDefSub.charts.push(c_pubs_funding_scheme); - +*/ /* //TODO check why doesn't load let c_pubs_gg_funding_scheme = new Indicator("What is the percentage of green and gold publications by funding scheme / programme?",null, "chart","medium",true, true, [new IndicatorPath("bar", "stats-tool", "chart?json="+encodeURIComponent('{"library":"HighCharts","chartDescription":{"colors":["#42a5f5","#26a69a","#90ed7d","#607d8b","#00838f","#689f38","#e4d354","#2b908f","#546e7a","#01579"],"queries":[{"name":"Gold","color":"#f8b500","type":"bar","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.project.funder","type":"=","values":["'+stakeholder.index_name+'"]},,{"field":"result.type","type":"=","values":["publication"]},{"field":"result.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"result.datasource.type","type":"=","values":["Journal"]},{"field":"result.datasource.type","type":"=","values":["Journal Aggregator/Publisher"]}],"op":"OR"}],"entity":"result","profile":"OpenAIRE original","limit":"0"}},{"name":"Green","color":"#239d60","type":"bar","query":{"select":[{"field":"result","aggregate":"count"},{"field":"result.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"result.project.funder","type":"=","values":["'+stakeholder.index_name+'"]},{"field":"result.project.funding level 0","type":"=","values":["H2020"]},{"field":"result.type","type":"=","values":["publication"]},{"field":"result.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"result.datasource.type","type":"=","values":["Institutional Repository"]},{"field":"result.datasource.type","type":"=","values":["Thematic Repository"]}],"op":"OR"}],"entity":"result","profile":"OpenAIRE original","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"H2020 green and gold publications"},"subtitle":{"text":"by funding scheme"},"yAxis":{"title":{"text":"Publications"}},"xAxis":{"title":{"text":"Funding scheme"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}'), null)]); diff --git a/src/index.html b/src/index.html index 2026eda..4caede6 100644 --- a/src/index.html +++ b/src/index.html @@ -42,7 +42,7 @@ -
+