Просмотр исходного кода

Merge branch 'master' of http://209.50.56.224/git/ITTEC/SistemaMantenimiento

JeanBenitez 1 год назад
Родитель
Сommit
6d15043acb

+ 40 - 10
sistema-mantenimiento-front/src/app/components/preventive-maintenance/unprogrammed-visits/unprogrammed-visits.component.html

@@ -21,9 +21,13 @@
               (click)="applyFilter('', 'EST')" matSuffix>close</mat-icon>
           </mat-form-field>
           <div class="override-buttons">
-            <button mat-raised-button class="override_no_shadow mr-10 animated fadeIn" color="primary" (click)="registerVisit()">
+            <button mat-raised-button class="override_no_shadow mr-10 animated fadeIn" color="primary" (click)="registerVisit()" *ngIf="!btnSmall">
               <mat-icon>add</mat-icon> Registrar visita no programada
             </button>
+            <button mat-mini-fab class="override_no_shadow mr-10 animated fadeIn" color="primary" (click)="registerVisit()" *ngIf="btnSmall" 
+            matTooltip="Registrar visita no programada">
+              <mat-icon>add</mat-icon>
+            </button>
             <button mat-mini-fab class="cyan_dark_background white_font override_no_shadow mr-10" matTooltip="Actualizar datos" (click)="getUnprogrammedVisits()">
               <mat-icon>refresh</mat-icon>
             </button>
@@ -62,25 +66,51 @@
           <ng-container matColumnDef="ACCONES">
             <th mat-header-cell *matHeaderCellDef mat-sort-header>Acciones</th>
             <td mat-cell *matCellDef="let row">
-              <button mat-mini-fab color="primary" class="mr-10 override_no_shadow" matTooltip="Ver detalles" (click)="openVisitDetails(row.IDVISITA)">
+              <button mat-mini-fab color="primary" class="mr-4 override_no_shadow animated fadeIn" matTooltip="Ver detalles" (click)="openVisitDetails(row.IDVISITA)" 
+              *ngIf="!btnSmall">
                 <mat-icon>visibility</mat-icon>
               </button>
-              <button mat-mini-fab class="white_font green_primary_background mr-10 override_no_shadow" matTooltip="Aprobar visita" 
-              *ngIf="row.ESTATUS == 'P'" (click)="openCommentsDialog(row.IDVISITA, 'auth')">
+              <button mat-mini-fab class="white_font green_primary_background mr-4 override_no_shadow animated fadeIn" matTooltip="Aprobar visita" 
+              *ngIf="row.ESTATUS == 'P' && !btnSmall" (click)="openCommentsDialog(row.IDVISITA, 'auth')">
                 <mat-icon>done</mat-icon>
               </button>
-              <button mat-mini-fab class="white_font red_primary_background mr-10 override_no_shadow" matTooltip="Rechazar visita" 
-              *ngIf="row.ESTATUS == 'P'" (click)="openCommentsDialog(row.IDVISITA, 'decline')">
+              <button mat-mini-fab class="white_font red_primary_background mr-4 override_no_shadow animated fadeIn" matTooltip="Rechazar visita" 
+              *ngIf="row.ESTATUS == 'P' && !btnSmall" (click)="openCommentsDialog(row.IDVISITA, 'decline')">
                 <mat-icon>close</mat-icon>
               </button>
-              <button mat-mini-fab class="white_font green_primary_background mr-10 override_no_shadow" matTooltip="Finalizar visita" 
-              *ngIf="row.ESTATUS == 'A'" (click)="openCommentsDialog(row.IDVISITA, 'end')">
+              <button mat-mini-fab class="white_font green_primary_background mr-4 override_no_shadow animated fadeIn" matTooltip="Finalizar visita" 
+              *ngIf="row.ESTATUS == 'A' && !btnSmall" (click)="openCommentsDialog(row.IDVISITA, 'end')">
                 <mat-icon>check_circle</mat-icon>
               </button>
-              <button mat-mini-fab class="white_font red_primary_background mr-10 override_no_shadow" matTooltip="Cancelar visita" 
-              *ngIf="row.ESTATUS == 'A'" (click)="openCommentsDialog(row.IDVISITA, 'cancel')">
+              <button mat-mini-fab class="white_font red_primary_background mr-4 override_no_shadow animated fadeIn" matTooltip="Cancelar visita" 
+              *ngIf="row.ESTATUS == 'A' && !btnSmall" (click)="openCommentsDialog(row.IDVISITA, 'cancel')">
                 <mat-icon>cancel</mat-icon>
               </button>
+              <button mat-mini-fab color="primary" class="override_no_shadow animated fadeIn" *ngIf="btnSmall" [matMenuTriggerFor]="menu">
+                <mat-icon>more_vert</mat-icon>
+              </button>
+              <mat-menu #menu>
+                <button mat-menu-item>
+                  <mat-icon>visibility</mat-icon>
+                  <span>Ver detalles</span>
+                </button>
+                <button mat-menu-item *ngIf="row.ESTATUS == 'P'" (click)="openCommentsDialog(row.IDVISITA, 'auth')">
+                  <mat-icon>done</mat-icon>
+                  <span>Aprobar visita</span>
+                </button>
+                <button mat-menu-item *ngIf="row.ESTATUS == 'P'" (click)="openCommentsDialog(row.IDVISITA, 'decline')">
+                  <mat-icon>close</mat-icon>
+                  <span>Rechazar visita</span>
+                </button>
+                <button mat-menu-item *ngIf="row.ESTATUS == 'A'" (click)="openCommentsDialog(row.IDVISITA, 'end')">
+                  <mat-icon>check_circle</mat-icon>
+                  <span>Finalizar visita</span>
+                </button>
+                <button mat-menu-item *ngIf="row.ESTATUS == 'A'" (click)="openCommentsDialog(row.IDVISITA, 'cancel')">
+                  <mat-icon>cancel</mat-icon>
+                  <span>Cancelar visita</span>
+                </button>
+              </mat-menu>
             </td>
           </ng-container>
 

+ 2 - 2
sistema-mantenimiento-front/src/app/components/preventive-maintenance/unprogrammed-visits/unprogrammed-visits.component.ts

@@ -38,7 +38,7 @@ export class UnprogrammedVisitsComponent implements OnInit {
     private _router: Router,
     private _resourcesService: ResourcesService,
   ) { 
-    this.btnSmall = window.innerWidth <= 1405;
+    this.btnSmall = window.innerWidth <= 1530;
     this.txtBuscador = '';
     this.isLoading = true;
     this.hasError = false;
@@ -74,7 +74,7 @@ export class UnprogrammedVisitsComponent implements OnInit {
   }
 
   public onResize():void {
-    this.btnSmall = window.innerWidth <= 1405;
+    this.btnSmall = window.innerWidth <= 1530;
   }
 
   goBack(steps: number){