소스 검색

Avances actualización stock

Jose Brito 10 달 전
부모
커밋
ac7c1fbed1

+ 5 - 7
src/app/components/preventive-maintenance/preventive-maintenance.component.html

@@ -1,10 +1,8 @@
-<div class="module-container">
-  <div id="navigation" class="mb-8 animated fadeIn" style="float: left; margin: 20px;">
-    <div class="prev-page prevent-select indigo_primary_background mat-elevation-z8"
-    [routerLink]="['/sam/home']" matRipple>
-      <mat-icon style="color: white;">arrow_back</mat-icon>
-      <div class="page-name ml-4">Regresar</div>
-    </div>
+<div class="module-container prevent-select">
+  <div class="row-tools-bar">
+    <button mat-raised-button class="raised-button-background mb-16" [routerLink]="['/sam/home']">
+      Regresar<mat-icon>arrow_back</mat-icon>
+    </button>
   </div>
   
   <div class="menu-title animated fadeIn">

+ 5 - 6
src/app/components/preventive-maintenance/work-orders/new-work-order/new-work-order.component.html

@@ -1,9 +1,8 @@
 <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>
-      <mat-icon style="color: white;">arrow_back</mat-icon>
-      <div class="page-name ml-4">Órdenes de trabajo preventivo</div>
-    </div>
+  <div class="row-tools-bar no-padding">
+    <button mat-raised-button class="raised-button-background mb-8" (click)="goBack(1)">
+      Órdenes de trabajo preventivo<mat-icon>arrow_back</mat-icon>
+    </button>
   </div>
   <mat-card class="override-elevation-z8" style="width: 100%; height: 100%;">
     <mat-card-title style="text-align: center; margin: 15px 0;">{{ action }} orden de trabajo preventivo</mat-card-title>
@@ -13,7 +12,7 @@
           <div class="section-divider">Configuración de activación</div>
           <div class="form-row">
             <div class="form-cell" [ngClass]="{ C06: activCols == 2, C12: activCols == 1 }">
-              <mat-form-field class="w-100" appearance="outline">
+              <mat-form-field class="w-100" appearance="outline"> 
                 <mat-label>Tipo de activador</mat-label>
                 <mat-select (valueChange)="getActivatorsByType(activatorType.value, null)" #activatorType formControlName="activatorTypeControl">
                   <mat-option value="CA">Calendario</mat-option>

+ 6 - 7
src/app/components/preventive-maintenance/work-orders/work-orders.component.html

@@ -1,11 +1,10 @@
 <main class="main-container animated fadeIn prevent-select" (window:resize)="onResize()">
 
-  <header id="navigation" class="btn-navigate mb-8">
-    <div class="prev-page prevent-select indigo_primary_background mat-elevation-z8" (click)="goBack(1)" matRipple>
-      <mat-icon style="color: white;">arrow_back</mat-icon>
-      <div class="page-name ml-4">Gestión de mantenimiento preventivo</div>
-    </div>
-  </header>
+  <div class="row-tools-bar card-view-padding">
+    <button mat-raised-button class="raised-button-background mb-16" (click)="goBack(1)">
+      Gestión de mantenimiento preventivo<mat-icon>arrow_back</mat-icon>
+    </button>
+  </div>
 
   <mat-card class="override-card override-elevation-z8">
     <section class="override-section">
@@ -74,7 +73,7 @@
           <ng-container matColumnDef="ACTIVADOR">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>Activador</th>
             <td mat-cell *matCellDef="let row">
-              {{ row.ACTIVADOR != null ? 'Activador #' + row.ACTIVADOR + ' - ' + row.TIPOACTIVADOR  : '-' }}
+              {{ row.TIPOACTIVADOR != null ? 'Activador #' + row.ACTIVADOR + ' - ' + row.TIPOACTIVADOR  : '-' }}
             </td>
           </ng-container>
           

+ 1 - 1
src/app/components/template/menu-item/submodule-functions/submodule-functions.component.html

@@ -8,7 +8,7 @@
     <mat-icon class="red_primary_font mt-50">error</mat-icon>
     <h2>{{ errorStr }}</h2>
   </div>
-  <div class="w-100 animated fadeIn" *ngIf="functions.length > 0 && !isLoading && !hasError">
+  <div class="w-100 animated fadeIn pv-8" *ngIf="functions.length > 0 && !isLoading && !hasError">
     <button mat-button style="width: 100%;" *ngFor="let func of functions" [mat-dialog-close]="func">
       <mat-icon>{{ func.ICONOFUNCION }}</mat-icon> {{ func.NOMBREFUNCION }}
     </button>

+ 2 - 2
src/app/components/users-profiles/users-profiles.component.ts

@@ -37,7 +37,7 @@ export class UsersProfilesComponent implements OnInit {
     private _resourcesService: ResourcesService,
     private _functionsService: FunctionsService,
   ) { 
-    //this._functionsService.consultModuleStatus(ID_MODULE);
+    this._functionsService.consultModuleStatus(ID_MODULE);
     this.isLoading = true;
     this.hasError = false;
     this.errorStr = "";
@@ -102,7 +102,7 @@ export class UsersProfilesComponent implements OnInit {
       }
     });
 
-    //this._socketService.refreshModules().subscribe(async () => this._functionsService.consultModuleStatus(ID_MODULE));
+    this._socketService.refreshModules().subscribe(async () => this._functionsService.consultModuleStatus(ID_MODULE));
   }
 
   async getSubmodules(){