Correcciones de las vistas de administración de usuarios

sistema-mantenimiento-back/app/Http/Controllers/UsersProfilesController.php

@@ -40,7 +40,8 @@ class UsersProfilesController extends Controller{
                 'USUA_APPA as APEPAT',
                 'USUA_APMA as APEMAT',
                 'USUA_EMAI as EMAIL',
-                'USUA_PERF as PERFIL'
+                'USUA_PERF as PERFIL',
+                'USUA_ESTA as ESTATUS'
             )->where('USUA_IDUS', '=', $id)->get()->first();
         }catch(PDOException $e){
             return $this->responseController->makeResponse(true, "No se pudo realizar la consulta a la base.", [], 500);

sistema-mantenimiento-front/src/app/components/users-profiles/users-admin/new-user/new-user.component.html

@@ -85,9 +85,9 @@
         </div>
     </mat-card-content>
     <mat-card-actions *ngIf="!isLoading && !hasError" align="end">
-        <button mat-flat-button color="warn" style="margin-right: 8px;" (click)="return()">Cancelar</button>
+        <button mat-flat-button color="warn" style="margin-right: 8px;" (click)="return()">Cerrar</button>
         <button mat-flat-button color="accent" style="margin-right: 8px;" *ngIf="isNew">Generar contraseña</button>
-        <button mat-flat-button color="primary" [disabled]="!userForm.valid" (click)="save()">
+        <button *ngIf="saveEnabled" mat-flat-button color="primary" [disabled]="!userForm.valid" (click)="save()">
             {{ isNew ? 'Registrar usuario' : 'Guardar cambios' }}
         </button>
     </mat-card-actions>

sistema-mantenimiento-front/src/app/components/users-profiles/users-admin/new-user/new-user.component.ts

@@ -24,6 +24,7 @@ export class NewUserComponent implements OnInit {
   userForm: FormGroup;
   profiles: Array<any>;
   hide: boolean;
+  saveEnabled: boolean;
 
   passMatcher = new NotSamePasswordsMatcher();
 
@@ -36,6 +37,7 @@ export class NewUserComponent implements OnInit {
     this.errorStr = "";
     this.profiles = [];
     this.hide = true;
+    this.saveEnabled = true;
 
     this.userForm = new FormGroup({
       id: new FormControl(''),
@@ -62,6 +64,7 @@ export class NewUserComponent implements OnInit {
           this.isLoading = false;
           if(!this.hasError){
             this.userConsult = data.response;
+            this.saveEnabled = this.userConsult.ESTATUS != 'Eliminado';
 
             this.userForm.patchValue({
               id: this.userConsult.IDUSUARIO,

sistema-mantenimiento-front/src/app/components/users-profiles/users-admin/users-admin.component.css

@@ -0,0 +1,7 @@
+.yellow{
+    background-color: #ffb300;
+}
+
+.blue{
+    background-color: #1976d2;
+}

sistema-mantenimiento-front/src/app/components/users-profiles/users-admin/users-admin.component.html

@@ -36,16 +36,16 @@
                     <mat-icon>edit</mat-icon>
                 </button>
                 <button mat-mini-fab #tooltip="matTooltip" matTooltip="{{ user.ESTATUS == 'Activo' ? 'Bloquear acceso' : 'Permitir acceso'}}" 
-                style="margin-left: 4px; background-color: #ffb300;" (click)="blockUser(user.IDUSUARIO)">
-                    <mat-icon *ngIf="user.ESTATUS == 'Activo'">block</mat-icon>
+                style="margin-left: 4px;" class="yellow" (click)="blockUser(user.IDUSUARIO)" [disabled]="user.ESTATUS == 'Eliminado'">
+                    <mat-icon *ngIf="user.ESTATUS == 'Activo' || user.ESTATUS == 'Eliminado'">block</mat-icon>
                     <mat-icon *ngIf="user.ESTATUS == 'Inactivo'">check_circle</mat-icon>
                 </button>
-                <button mat-mini-fab #tooltip="matTooltip" matTooltip="Reasignar contraseña" style="margin-left: 4px; background-color: #1976d2;"
-                (click)="openDialog(user.IDUSUARIO)">
+                <button mat-mini-fab #tooltip="matTooltip" matTooltip="Reasignar contraseña" style="margin-left: 4px;" class="blue"
+                (click)="openDialog(user.IDUSUARIO)" [disabled]="user.ESTATUS == 'Eliminado'">
                     <mat-icon>lock</mat-icon>
                 </button>
                 <button mat-mini-fab #tooltip="matTooltip" matTooltip="Eliminar usuario" style="margin-left: 4px;" color="warn" 
-                (click)="openAlert(user.IDUSUARIO)">
+                (click)="openAlert(user.IDUSUARIO)" [disabled]="user.ESTATUS == 'Eliminado'">
                     <mat-icon>delete</mat-icon>
                 </button>
             </div>

sistema-mantenimiento-front/src/app/components/users-profiles/users-admin/users-admin.component.ts

@@ -100,6 +100,8 @@ export class UsersAdminComponent implements OnInit {
       if(result != undefined){
         if(result) this.usersProfilesService.deleteUser({id: usr}).subscribe(data => {
           this.openSnackBar(data.msg);
+          this.isLoading = true;
+          this.getData();
         }, error => {
           this.openSnackBar(error.error.msg);
         })

sistema-mantenimiento-front/src/app/interfaces/user.interface.ts

@@ -11,4 +11,5 @@ export interface UserConsult{
     APEMAT?: string;
     EMAIL: string;
     PERFIL: number;
+    ESTATUS: string;
 }

sistema-mantenimiento-front/src/app/services/users-profiles.service.ts

@@ -7,7 +7,7 @@ import { map } from 'rxjs';
   providedIn: 'root'
 })
 export class UsersProfilesService {
-  token = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJpc3MiOiJqb3NlLmJAaXR0ZWMubXgiLCJhdWQiOiJkb21pbmlvLnN5cC5teCIsImlhdCI6MTY0NzUyNTk4MywiY2FkIjoxNjQ3NjEyMzgzfQ.dIjwq_YQ3Ln7zvTp9027leOd8FfBHa-kpssHMRWIj4do-BTH5uvtgUw05y8gqFSZb2n05ygwRBtKQCmJy39rAA';
+  token = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJpc3MiOiJqb3NlLmJAaXR0ZWMubXgiLCJhdWQiOiJkb21pbmlvLnN5cC5teCIsImlhdCI6MTY0NzYxMjc0NCwiY2FkIjoxNjQ3Njk5MTQ0fQ.BkpH8BMrx0hExtdU0EsNGxQxcbx_RqvTpGq12DqfbS0IEej5enf6V6q2DbqPsueK_0DMR_CWU9kMMYQCN2jrCg';
 
   constructor(private http: HttpClient) {}