diff --git a/dashboard/sharedComponents/input/input.component.ts b/dashboard/sharedComponents/input/input.component.ts index ef1c5e09..2eabc28a 100644 --- a/dashboard/sharedComponents/input/input.component.ts +++ b/dashboard/sharedComponents/input/input.component.ts @@ -93,7 +93,7 @@ export class InputComponent implements OnInit, OnDestroy, OnChanges { } this.subscriptions.push(this.formControl.valueChanges.subscribe(value => { value = (value === '')?null:value; - if(this.initValue === value) { + if(this.initValue === value || (this.initValue === '' && value === null)) { this.formControl.markAsPristine(); } })); diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.ts b/dashboard/sharedComponents/sidebar/sideBar.component.ts index 2b996730..cf9fa001 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.ts +++ b/dashboard/sharedComponents/sidebar/sideBar.component.ts @@ -39,7 +39,7 @@ export class SideBarComponent implements OnInit { if (subItem) { return MenuItem.isTheActiveMenu(subItem, this.router.url.split('?')[0]) } - console.debug(item.route + " " + this.router.url.split('?')[0] + MenuItem.isTheActiveMenu(item,this.router.url.split('?')[0])) + //console.debug(item.route + " " + this.router.url.split('?')[0] + MenuItem.isTheActiveMenu(item,this.router.url.split('?')[0])) return MenuItem.isTheActiveMenu(item,this.router.url.split('?')[0]); } } diff --git a/dashboard/users/members/members.component.html b/dashboard/users/members/members.component.html index af4dced8..4b9756cf 100644 --- a/dashboard/users/members/members.component.html +++ b/dashboard/users/members/members.component.html @@ -1,5 +1,5 @@
-
+
@@ -28,7 +28,7 @@
-
+
diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts index 4ea164ee..8906258d 100644 --- a/monitor/services/stakeholder.service.ts +++ b/monitor/services/stakeholder.service.ts @@ -3,9 +3,10 @@ import {HttpClient} from "@angular/common/http"; import {BehaviorSubject, from, Observable} from "rxjs"; import {Indicator, Section, Stakeholder, StakeholderInfo, Visibility} from "../entities/stakeholder"; import {HelperFunctions} from "../../utils/HelperFunctions.class"; -import {map} from "rxjs/operators"; +import {catchError, map} from "rxjs/operators"; import {ActivatedRoute} from "@angular/router"; import {properties} from "../../../../environments/environment"; +import {CustomOptions} from "../../services/servicesUtils/customOptions.class"; let maps: string[] = ['parameters', 'filters']; @@ -54,9 +55,15 @@ export class StakeholderService { return this.formalize(stakeholders); })); } + + getMyStakeholders(url: string, type: string = null): Observable<(Stakeholder & StakeholderInfo)[]> { + return this.http.get(url + '/my-stakeholder' + ((type)?('?type=' + type):''), CustomOptions.registryOptions()).pipe(map(stakeholders => { + return this.formalize(stakeholders); + })); + } getDefaultStakeholders(url: string, type: string = null): Observable { - return this.http.get(url + '/stakeholder/default' + ((type)?('?type=' + type):'')).pipe(map(stakeholders => { + return this.http.get(url + '/stakeholder/default' + ((type)?('?type=' + type):''), CustomOptions.registryOptions()).pipe(map(stakeholders => { return this.formalize(stakeholders); })); } diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts index 8563b74a..f71df0d3 100644 --- a/utils/icons/icons.ts +++ b/utils/icons/icons.ts @@ -64,7 +64,7 @@ export const bullet: Icon = { export const remove_circle_outline = { name: 'remove_circle_outline', - data: '' + data: '' } export const person_add = { @@ -96,3 +96,13 @@ export const search = { name: 'search', data: '' } + +export const refresh = { + name: 'refresh', + data: '' +} + +export const close = { + name: 'close', + data: '' +}