From e44d0a63929cdaddc72da6e07a6a406b91efc8c9 Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Fri, 10 Jan 2020 11:32:23 +0000 Subject: [PATCH] [monitor dashboard] Parameters: Update parameters names: use 'index_id', 'index_name', 'index_shortName' change the way they are replaced update default EC creation: create a method that adds EC specific charts Create StakeholderUtils.defaultProfiles to add ids for showcase default profile monitor: get stakeholder from DB git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57965 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../manageStakeholders.component.ts | 1 - src/app/monitor/monitor.component.ts | 46 ++-- src/app/topic/topic.component.html | 3 + src/app/utils/entities/stakeholder.ts | 246 +----------------- src/app/utils/entities/stakeholderCreator.ts | 75 +++--- src/app/utils/indicator-utils.ts | 29 ++- 6 files changed, 96 insertions(+), 304 deletions(-) diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index 5fc07fa..d7934a7 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -8,7 +8,6 @@ import {StakeholderUtils} from "../utils/indicator-utils"; import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {AlertModal} from "../openaireLibrary/utils/modal/alert"; import {StakeholderCreator} from "../utils/entities/stakeholderCreator"; -import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; import {Option} from "../openaireLibrary/dashboard/sharedComponents/input/input.component"; @Component({ diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 6bd8d1f..967beb4 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -96,26 +96,28 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent this.status = this.errorCodes.LOADING; this.numberResults = new Map(); this.chartsActiveType = new Map(); - // subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { - let stakeholder: Stakeholder = null; - if (params['stakeholder'] == "fwf") { - stakeholder = new Stakeholder(null, "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF", - "fwf", true, true, null); - stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); - stakeholder.logoUrl = "./assets/fwf.png"; - } else if (params['stakeholder'] == "arc") { - stakeholder = new Stakeholder(null, "funder", "arc_________::ARC", - "Australian Research Council (ARC)", "ARC", "arc", true, true, null); - stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); - stakeholder.logoUrl = "./assets/arc1.gif"; - } else { - stakeholder = new Stakeholder(null, "funder", "ec__________::EC", - "European Commission", "EC", - "ec", true, true, null); - stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); - stakeholder.logoUrl = "./assets/ec.png"; - } + subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { + // let stakeholder: Stakeholder = null; + // if (params['stakeholder'] == "fwf") { + // stakeholder = new Stakeholder(null, "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF", + // "fwf", true, true, null); + // stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); + // stakeholder.logoUrl = "./assets/fwf.png"; + // } else if (params['stakeholder'] == "arc") { + // stakeholder = new Stakeholder(null, "funder", "arc_________::ARC", + // "Australian Research Council (ARC)", "ARC", "arc", true, true, null); + // stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); + // stakeholder.logoUrl = "./assets/arc1.gif"; + // } else { + // stakeholder = new Stakeholder(null, "funder", "ec__________::EC", + // "European Commission", "EC", + // "ec", true, true, null); + // stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); + // stakeholder.logoUrl = "./assets/ec.png"; + // } if (stakeholder) { + console.info(stakeholder); + // StakeholderCreator.updateECProfile(stakeholder); this.stakeholder = stakeholder; console.info(this.stakeholder); @@ -136,9 +138,9 @@ export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent this.setView(params); this.layoutService.setOpen(true); } - // }, error => { - // this.navigateToError(); - // }); + }, error => { + this.navigateToError(); + }); this.subscriptions.push(subscription); } else { this.setView(params); diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 39294e0..1359dc4 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1,5 +1,8 @@