diff --git a/src/app/navbar/global-admin/global-admin.component.html b/src/app/navbar/administration/administration.component.html
similarity index 74%
rename from src/app/navbar/global-admin/global-admin.component.html
rename to src/app/navbar/administration/administration.component.html
index a4bdc917..8270c6e2 100644
--- a/src/app/navbar/global-admin/global-admin.component.html
+++ b/src/app/navbar/administration/administration.component.html
@@ -1,4 +1,6 @@
-@if(isGlobalAdmin){
+@if(isGlobalAdmin || isUserAdmin){
+
+
{{ "NAV.TITLES.ADMINISTRATION" | translate }}
-
@@ -11,7 +13,7 @@
{{ "NAV.PERMISSIONS" | translate }}
- -
+
-
{{ "NAV.ORGANISATIONS" | translate }}
diff --git a/src/app/navbar/global-admin/global-admin.component.scss b/src/app/navbar/administration/administration.component.scss
similarity index 84%
rename from src/app/navbar/global-admin/global-admin.component.scss
rename to src/app/navbar/administration/administration.component.scss
index 545b7387..d799878d 100644
--- a/src/app/navbar/global-admin/global-admin.component.scss
+++ b/src/app/navbar/administration/administration.component.scss
@@ -1,5 +1,15 @@
@import "../../../assets/scss/setup/variables";
+.nav-bar-title {
+ color: $default-color;
+ font-size: 14px;
+ font-weight: 400;
+ font-family: "Inter", sans-serif;
+ margin-top: 40px;
+ margin-left: 5px;
+ margin-bottom: 10px;
+}
+
mat-expansion-panel {
box-shadow: none !important;
}
diff --git a/src/app/navbar/global-admin/global-admin.component.ts b/src/app/navbar/administration/administration.component.ts
similarity index 50%
rename from src/app/navbar/global-admin/global-admin.component.ts
rename to src/app/navbar/administration/administration.component.ts
index 90e64127..676ae0de 100644
--- a/src/app/navbar/global-admin/global-admin.component.ts
+++ b/src/app/navbar/administration/administration.component.ts
@@ -1,21 +1,29 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, Input, OnInit } from "@angular/core";
import { UserResponse } from "@app/admin/users/user.model";
+import { OrganizationAccessScope } from "@shared/enums/access-scopes";
import { MeService } from "@shared/services/me.service";
import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
@Component({
- selector: "app-global-admin",
- templateUrl: "./global-admin.component.html",
- styleUrls: ["./global-admin.component.scss"],
+ selector: "app-administration",
+ templateUrl: "./administration.component.html",
+ styleUrls: ["./administration.component.scss"],
})
-export class GlobalAdminComponent implements OnInit {
+export class AdministrationComponent implements OnInit {
public user: UserResponse;
public isGlobalAdmin = false;
+ public isUserAdmin = false;
+ @Input() orgId: number;
+
constructor(private sharedVariableService: SharedVariableService, private meService: MeService) {}
ngOnInit(): void {
this.user = this.sharedVariableService.getUserInfo().user;
this.isGlobalAdmin = this.meService.hasGlobalAdmin();
+ this.isUserAdmin = this.meService.hasAccessToTargetOrganization(
+ OrganizationAccessScope.UserAdministrationWrite,
+ this.orgId
+ );
}
}
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index a9e46eda..d8ee8d09 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -3,7 +3,7 @@
aria-expanded="false"
class="navbar-container navbar navbar-expand-md navbar-light d-md-flex align-items-md-start flex-md-column p-3 no-shadow"
>
-
+
@@ -43,7 +43,7 @@
-

+
{{ getOrgName(selected) }}
@@ -54,8 +54,8 @@
@@ -118,10 +118,8 @@
-
{{ "NAV.TITLES.ADMINISTRATION" | translate }}
-
-
-
+
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index 904a8d13..73aab4ab 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -15,10 +15,10 @@ import { TranslateModule } from "@ngx-translate/core";
import { NGMaterialModule } from "@shared/Modules/materiale.module";
import { InlineSVGModule } from "ng-inline-svg-2";
import { RestService } from "../shared/services/rest.service";
-import { GlobalAdminComponent } from "./global-admin/global-admin.component";
+import { AdministrationComponent } from "./administration/administration.component";
@NgModule({
- declarations: [NavbarComponent, GlobalAdminComponent],
+ declarations: [NavbarComponent, AdministrationComponent],
imports: [
CommonModule,
SharedModule,