From ef9852e93176ec8c18244c7b10c35d5b8faeca34 Mon Sep 17 00:00:00 2001
From: apuente <apuente@qindel.com>
Date: Mon, 3 Jun 2024 10:44:30 +0200
Subject: [PATCH] Eliminar roles

---
 ogWebconsole/src/app/app-routing.module.ts               | 2 --
 .../pages/admin/roles/roles/roles.component.html         | 2 +-
 .../users/edit-user-modal/edit-user-modal.component.html | 9 +++++++++
 .../users/edit-user-modal/edit-user-modal.component.ts   | 8 +++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts
index e80e89f..ba8e87d 100644
--- a/ogWebconsole/src/app/app-routing.module.ts
+++ b/ogWebconsole/src/app/app-routing.module.ts
@@ -18,7 +18,6 @@ const routes: Routes = [
     { path: 'admin', component: AdminComponent },
     { path: 'users', component: UsersComponent },
     { path: 'user-groups', component: RolesComponent },
-    // otras rutas que usan el MainLayoutComponent
   ],
 },
 {
@@ -26,7 +25,6 @@ const routes: Routes = [
   component: AuthLayoutComponent,
   children: [
     { path: 'login', component: LoginComponent },
-    // otras rutas de autenticación
   ],
 },
 { path: '**', component: PageNotFoundComponent },  
diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
index 8fc0e5b..3247992 100644
--- a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
+++ b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
@@ -13,7 +13,7 @@
   <ng-container matColumnDef="actions">
     <th mat-header-cell *matHeaderCellDef> Acciones </th>
     <td mat-cell *matCellDef="let role">
-      <button mat-button color="warn"  [disabled]="role.id === 1" (click)="deleteRole(role)">Eliminar</button>
+      <button mat-button color="warn"  [disabled]="role.name=== 'Super Admin' " (click)="deleteRole(role)">Eliminar</button>
     </td>
   </ng-container>
 
diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
index 0c0dc5a..80b0a4c 100644
--- a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
+++ b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
@@ -17,6 +17,15 @@
         </mat-option>
       </mat-select>
     </mat-form-field>
+
+    <mat-form-field class="form-field">
+      <mat-label>Organizational Units</mat-label>
+      <mat-select multiple formControlName="organizationalUnit">
+        <mat-option *ngFor="let unit of organizationalUnits" [value]="unit['@id']">
+          {{unit.name}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
     
   </form>
 </div>
diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
index 0501aed..dd76248 100644
--- a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
+++ b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
@@ -17,6 +17,7 @@ interface UserGroup {
 export class EditUserModalComponent implements OnInit {@Output() userEdited = new EventEmitter<void>();
   userForm: FormGroup;
   userGroups: UserGroup[] = [];
+  organizationalUnits: any[] = [];
 
   constructor(
     public dialogRef: MatDialogRef<EditUserModalComponent>,
@@ -24,10 +25,12 @@ export class EditUserModalComponent implements OnInit {@Output() userEdited = ne
     private fb: FormBuilder,
     private userService: UserService // Inyecta el servicio
   ) {
+    console.log(this.data)
     this.userForm = this.fb.group({
       username: [this.data.user.username],
       password: [''],
-      role: this.data.user.allowedOrganizationalUnits,  // Control para el permiso seleccionado
+      role: this.data.user.allowedOrganizationalUnits,
+      organizationalUnit: [[this.data.user.allowedOrganizationalUnits], Validators.required]
     });
   }
 
@@ -35,6 +38,9 @@ export class EditUserModalComponent implements OnInit {@Output() userEdited = ne
     this.userService.getUserGroups().subscribe((data) => {
       this.userGroups = data['hydra:member'];
     });
+    this.userService.getOrganizationalUnits().subscribe((data) => {
+      this.organizationalUnits = data['hydra:member'];
+    });
   }
 
   onNoClick(): void {