cambios post-merge en estilos front

src/app/components/corrective-maintenance/security-management/security-management.component.html

@@ -74,22 +74,22 @@
               <td mat-cell *matCellDef="let row">
                 <button mat-mini-fab color="primary" matTooltip="Editar gerencia" class="override_no_shadow mr-4 white_font orange_primary_background" 
                 *ngIf="!btnSmall"
-                (click)="openSecurityManagementForm('Editar', row.ID_GERENCIA_SEGURIDAD)" [disabled]="row.ESTADO == 'Eliminado'">
+                (click)="openSecurityManagementForm('Editar', row.ID_GERENCIA_SEGURIDAD)" [disabled]="row.ESTADO == 'Eliminado'" [hidden]="row.ESTADO == 'Eliminado'">
                   <mat-icon>edit</mat-icon>
                 </button>
                 <button mat-mini-fab [ngClass]="{ pink_primary_background: row.ESTADO != 'Eliminado', white_font: row.ESTADO != 'Eliminado' }" 
                 class="override_no_shadow mr-4" matTooltip="Ver detalles" 
                 *ngIf="!btnSmall"
                 (click)="openSecurityManagementDetails(row.ID_GERENCIA_SEGURIDAD)" 
-                [disabled]="row.ESTADO == 'Eliminado'">
+                [disabled]="row.ESTADO == 'Eliminado'" [hidden]="row.ESTADO == 'Eliminado'">
                   <mat-icon>visibility</mat-icon>
                 </button>
-                <button mat-mini-fab color="primary" class="override_no_shadow animated fadeIn gray_dark_font transparent_background" *ngIf="btnSmall" [matMenuTriggerFor]="menu">
+                <button mat-mini-fab color="primary" class="override_no_shadow animated fadeIn gray_dark_font transparent_background" [hidden]="row.ESTADO == 'Eliminado'"  *ngIf="btnSmall" [matMenuTriggerFor]="menu">
                 <mat-icon>more_vert</mat-icon>
               </button>
                 <button mat-mini-fab color="warn" matTooltip="Eliminar gerencia" class="override_no_shadow red_primary_background white_font" 
                 *ngIf="!btnSmall"                
-                (click)="openDeleteConfirm(row.ID_GERENCIA_SEGURIDAD)" [disabled]="row.ESTADO == 'Eliminado'">
+                (click)="openDeleteConfirm(row.ID_GERENCIA_SEGURIDAD)" [disabled]="row.ESTADO == 'Eliminado'" [hidden]="row.ESTADO == 'Eliminado'">
                   <mat-icon>delete</mat-icon>
                 </button>
 

src/app/components/counters-activators/activators-management/activator-fields/activator-fields.component.html

@@ -57,7 +57,7 @@
             </mat-option>
           </mat-select>
           <mat-hint align="end">
-            <a [ngClass]="{ hint_button_disabled: activatorFieldsFormGroup.controls['counterControl'].invalid,  
+            <a style="color: #00458f;" [ngClass]="{ hint_button_disabled: activatorFieldsFormGroup.controls['counterControl'].invalid,  
             hint_button: activatorFieldsFormGroup.controls['counterControl'].valid}" (click)="counterDetails(counterSelect.value)">
               Ver detalles
             </a>

src/app/components/equipment-management/equipment-location/pcc-location/pcc-location.component.html

@@ -14,7 +14,7 @@
       <div class="equipment-code">
         {{ equipment.TIPO }} - {{ equipment.MODELO }}
       </div>
-      <button mat-mini-fab color="primary" class="override_no_shadow ml-8" mstTooltip="Ver detalles" 
+      <button mat-mini-fab class="override_no_shadow ml-8 white_font pink_primary_background" mstTooltip="Ver detalles" 
       (click)="openEquipmentDetails(equipment.CODIGO)">
         <mat-icon>visibility</mat-icon>
       </button>

src/app/components/gdel/search-file-dialog/search-file-dialog.component.html

@@ -73,8 +73,8 @@
             <ng-container matColumnDef="ACCIONES">
               <th mat-header-cell *matHeaderCellDef>Acciones</th>
               <td mat-cell *matCellDef="let row">
-                <button mat-mini-fab color="primary" matTooltip="Ver opciones" [matMenuTriggerFor]="menu" class="override_no_shadow">
-                  <mat-icon>settings</mat-icon>
+                <button mat-mini-fab matTooltip="Ver opciones" [matMenuTriggerFor]="menu" class="override_no_shadow gray_dark_font transparent_background">
+                  <mat-icon>more_vert</mat-icon>
                 </button>
                 <mat-menu #menu>
                   <button mat-menu-item (click)="attachFile(row)">

src/app/components/preventive-maintenance/unprogrammed-visits/unprogrammed-visits.component.html

@@ -73,13 +73,13 @@
               <button mat-mini-fab #toolTip="matTooltip" matTooltip="Aprobar visita" 
               [ngClass]="{green_primary_background: !isLoading && row.ESTATUS == 'P', white_font: !isLoading && row.ESTATUS == 'P', hidden : row.ESTATUS == 'A' || row.ESTATUS == 'R'
               }" class="no_shadow" (click)="openCommentsDialog(row.IDVISITA, 'auth')"
-              [disabled]="row.ESTATUS =='F' || row.ESTATUS == 'C'"
+              [disabled]="row.ESTATUS =='F' || row.ESTATUS == 'C'" [hidden]="row.ESTATUS =='F' || row.ESTATUS == 'C'"
               *ngIf="!btnSmall">
                 <mat-icon>done</mat-icon>
               </button>
               <button mat-mini-fab class="ml-4 no_shadow"  matTooltip="Rechazar visita" 
               [ngClass]="{red_primary_background: row.ESTATUS == 'P', white_font: row.ESTATUS == 'P', hidden : row.ESTATUS == 'A' || row.ESTATUS == 'R'}" (click)="openCommentsDialog(row.IDVISITA, 'decline')"
-              [disabled]="row.ESTATUS == 'C' || row.ESTATUS == 'F'"
+              [disabled]="row.ESTATUS == 'C' || row.ESTATUS == 'F'" [hidden]="row.ESTATUS == 'C' || row.ESTATUS == 'F'"
               *ngIf="!btnSmall">
                 <mat-icon>close</mat-icon>
               </button>

src/app/components/preventive-maintenance/work-orders/budget-analysis/budget-analysis.component.html

@@ -1,6 +1,6 @@
 <div class="items-container animated fadeIn prevent-select" (window:resize)="onResize()">
   <div id="navigation" class="mb-8">
-    <div class="prev-page prevent-select indigo_primary_background mat-elevation-z8" (click)="goBack(1)" matRipple>
+    <div class="prev-page prevent-select raised-button-background mat-elevation-z8" (click)="goBack(1)" matRipple>
       <mat-icon style="color: white;">arrow_back</mat-icon>
       <div class="page-name ml-4">Órdenes de trabajo preventivo</div>
     </div>

src/app/components/process-management/workflow-management/workflow-management.component.html

@@ -21,14 +21,14 @@
           (dataValue)="dataSource = $event" />
 
           <div class="override-buttons">
-            <!--<app-btn-resize 
+            <app-btn-resize 
             class="mr-8"
             (click)="goForm('REG')"
             [disabled]="isLoading || isLoadingForm"
             [backgroundColor]="'primary'" 
             [textColor]="'white_font'" 
             [nameButton]="interService.get('nuevo')" 
-            [icon]="'add'"/>-->
+            [icon]="'add'"/>
             <app-btn-resize 
               class="mr-8 raised_button_background"
               (click)="alertRestore()"

src/app/components/template/template.component.ts

@@ -131,39 +131,39 @@ export class TemplateComponent implements OnInit {
       let permissions = localStorage.getItem('permisos');
       let permStr = await this._encService.decrypt(permissions!);
       let permObj: Permissions = JSON.parse(permStr);
-       for(const item of menu.response){
-         let idMod = await this._encService.decrypt(item.ID_MODULO);
-         let modPerm = permObj.permissions.filter(item2 => item2.id == idMod);
-
-         if(modPerm.length > 0){
-           let access = modPerm[0].access;
-
-      //     if(access > 0){
-      //       let customIconEnc = await this._encService.isEncrypted(item.ICONO_PERSONALIZADO);
-      //       // let customIcon = customIconEnc ? await this._encService.decrypt(item.ICONO_PERSONALIZADO) : item.ICONO_PERSONALIZADO;
-      //       // item.ICONO_PERSONALIZADO = customIcon;
-
-      //       // if(customIcon == 'S'){
-      //       //   let customIconFileURL = await lastValueFrom(this._gdelService.getPublicDocumentUrl(
-      //       //     item.ARCHIVO_ICONO_PERSONALIZADO!,
-      //       //     idUser!,
-      //       //     1
-      //       //   ));
-
-      //       //   item.ARCHIVO_ICONO_PERSONALIZADO_URL = customIconFileURL.response.public_uri;
-      //       //   this._matIconRegistry.addSvgIcon(
-      //       //     item.ICONO_MODULO,
-      //       //     this._domSanitizer.bypassSecurityTrustResourceUrl(customIconFileURL.response.public_uri)
-      //       //   );
-      //       // }
+      for(const item of menu.response){
+        let idMod = await this._encService.decrypt(item.ID_MODULO);
+        let modPerm = permObj.permissions.filter(item2 => item2.id == idMod);
+
+        if(modPerm.length > 0){
+          let access = modPerm[0].access;
+
+          if(access > 0){
+            let customIconEnc = await this._encService.isEncrypted(item.ICONO_PERSONALIZADO);
+            let customIcon = customIconEnc ? await this._encService.decrypt(item.ICONO_PERSONALIZADO) : item.ICONO_PERSONALIZADO;
+            item.ICONO_PERSONALIZADO = customIcon;
+
+            if(customIcon == 'S'){
+              let customIconFileURL = await lastValueFrom(this._gdelService.getPublicDocumentUrl(
+                item.ARCHIVO_ICONO_PERSONALIZADO!,
+                idUser!,
+                1
+              ));
+
+              item.ARCHIVO_ICONO_PERSONALIZADO_URL = customIconFileURL.response.public_uri;
+              this._matIconRegistry.addSvgIcon(
+                item.ICONO_MODULO,
+                this._domSanitizer.bypassSecurityTrustResourceUrl(customIconFileURL.response.public_uri)
+              );
+            }
             
-         item.ID_MODULO_DEC = idMod;
-        this.menuItems.push(item);
+            item.ID_MODULO_DEC = idMod;
+            this.menuItems.push(item);
 
 
           }
-         }
-       
+        }
+      }
       
       //Conexiones a los eventos del Socket
       if (window.innerWidth <= 616) {
@@ -716,6 +716,7 @@ export class TemplateComponent implements OnInit {
           notification.FECREG_DISP = this._functionsService.notificationDate(notification.FECREG);
           notificationsAux.push(notification);
         } 
+
         this.totalNotifications = notificationsAux;
       }, 30000);
     }catch(error: any){