diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index d5b5dbe..2625764 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -62,8 +62,9 @@
  • {{stakeholder.isPublic ? 'Private' : 'Public'}}
    • -
    -
  • Delete +
    +
  • Delete
    • diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index fa4be2e..3907d47 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -10,6 +10,8 @@ import {AlertModal} from "../openaireLibrary/utils/modal/alert"; import {StakeholderCreator} from "../utils/entities/stakeholderCreator"; import {Option} from "../openaireLibrary/dashboard/sharedComponents/input/input.component"; import {Title} from "@angular/platform-browser"; +import {UserManagementService} from "../openaireLibrary/services/user-management.service"; +import {Session} from "../openaireLibrary/login/utils/helper.class"; declare var UIkit; @@ -27,7 +29,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { public stakeholder: Stakeholder; public stakeholderFb: FormGroup; public index: number; - + public user = null; /** * Filtered Stakeholders */ @@ -54,7 +56,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { @ViewChild('editStakeholderModal') editStakeholderModal: AlertModal; @ViewChild('deleteStakeholderModal') deleteStakeholderModal: AlertModal; - constructor(private stakeholderService: StakeholderService, + constructor(private stakeholderService: StakeholderService,private userManagementService: UserManagementService, private propertiesService: EnvironmentSpecificService, private title: Title, private fb: FormBuilder) { @@ -66,6 +68,9 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { .then(properties => { this.properties = properties; this.title.setTitle('Manage Stakeholders'); + this.userManagementService.getUserInfo().subscribe(user => { + this.user = user; + }); let data = zip( this.stakeholderService.getDefaultStakeholders(this.properties.monitorServiceAPIURL), this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL) @@ -307,4 +312,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { stakeholder.isPublic = isPublic; }); } + + public isAdministrator(): boolean { + return Session.isPortalAdministrator(this.user); + } } diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 519936c..3d68fca 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -131,7 +131,7 @@
    + [class.uk-width-1-2]="indicator.width === 'large'" class=" uk-margin-bottom">

    @@ -154,7 +154,7 @@
    + [class.uk-width-1-1]="indicator.width === 'large'" class="uk-margin-bottom">

    {{indicator.name + " "}}
    diff --git a/src/app/stakeholder/stakeholder.component.html b/src/app/stakeholder/stakeholder.component.html index f83c17f..20f3881 100644 --- a/src/app/stakeholder/stakeholder.component.html +++ b/src/app/stakeholder/stakeholder.component.html @@ -27,13 +27,17 @@

    diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 35eceae..db6b4fb 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -70,9 +70,13 @@ uk-sortable="group: number" uk-grid>
    - + -
    @@ -117,7 +121,7 @@
    @@ -202,9 +206,13 @@ uk-sortable="group: chart" uk-grid>
    - + -
    @@ -269,8 +277,9 @@
  • {{indicator.isPublic ? 'Private' : 'Public'}}
    • -
    -
  • Delete
    • +
    +
  • + Delete

    • diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 3d78621..1276a9f 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -29,8 +29,10 @@
  • {{stakeholder.topics[topicIndex].isPublic ? 'Private' : 'Public'}}
    • -
    -
  • Delete
    • +
    +
  • Delete +
    • @@ -39,13 +41,16 @@
  • {{category.icon}} -
    +
    {{category.name}} + + +
    @@ -60,8 +65,10 @@
  • {{category.isPublic ? 'Private' : 'Public'}}
    • -
    -
  • Delete
    • +
    +
  • Delete
    • @@ -69,12 +76,16 @@ diff --git a/src/app/utils/indicator-utils.ts b/src/app/utils/indicator-utils.ts index 97ac581..26dfada 100644 --- a/src/app/utils/indicator-utils.ts +++ b/src/app/utils/indicator-utils.ts @@ -100,9 +100,9 @@ export class StakeholderUtils { indicator.defaultId = indicator._id; indicator._id = null; for (let indicatorPath of indicator.indicatorPaths) { - indicatorPath.url = indicatorPath.url.replace("index_id", encodeURIComponent(funder.index_id)); + /* indicatorPath.url = indicatorPath.url.replace("index_id", encodeURIComponent(funder.index_id)); indicatorPath.url = indicatorPath.url.replace("index_name", encodeURIComponent(funder.index_name)); - indicatorPath.url = indicatorPath.url.replace("index_shortName", encodeURIComponent(funder.index_shortName)); + indicatorPath.url = indicatorPath.url.replace("index_shortName", encodeURIComponent(funder.index_shortName));*/ // if(indicatorPath.parameters) { // indicatorPath.parameters.forEach((value: string, key: string) => { // if (value.indexOf("_funder_name_")!=-1) { diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index 56d509a..61b106e 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -64,7 +64,7 @@ color: #000000B3; /*text-transform: uppercase;*/ } -.dashboard #header_main.light_header circle, .dashboard #header_main.light_header .login svg * { +.dashboard #header_main.light_header user-mini svg * , .dashboard #header_main.light_header .login svg * { stroke: #000000B3; } .stakeholderPage #hide_controls:hover #toggle:hover .material-icons, .stakeholderPage #hide_controls #toggle:not(.sidebar_main_open) .material-icons {