Jelajahi Sumber

Modificación de responsividad del módulo de administración

JeanBenitez 1 tahun lalu
induk
melakukan
a73f1e796f

+ 5 - 0
sistema-mantenimiento-front/src/app/components/personal-management/employee/documents-employee/documents-employee.component.html

@@ -32,6 +32,11 @@
             </button>
           </div>
         </div>
+      } @empty {
+        <div class="mt-50" align="center">
+          <object data="assets/img/empty_data.svg" width="150"></object>
+          <h2>Sin datos</h2>
+        </div>
       }
       <a class="hidden" id="file"></a>
     </div>

+ 1 - 1
sistema-mantenimiento-front/src/app/components/personal-management/employee/documents-employee/documents-employee.component.ts

@@ -58,7 +58,7 @@ export class DocumentsEmployeeComponent implements OnInit {
       this.hasError = employee.error;
       this.errorStr = employee.msg;
 
-      if(!this.hasError){
+      if(!this.hasError){        
         let attached = JSON.parse(employee.response.DOCUMENTS);
         for(const doc of attached){
           let idDec = await this._encService.decrypt(doc.FILE_ID);

+ 3 - 1
sistema-mantenimiento-front/src/app/components/personal-management/employee/orders-employee/orders-employee.component.ts

@@ -80,9 +80,11 @@ export class OrdersEmployeeComponent implements OnInit {
   public async getData() {
     try{
       let idUser = localStorage.getItem('idusuario')!;
+      const LINE = this._resourcesService.getLineNumber();
       let orders: ResponseDataEmployeeInterventions = await lastValueFrom(this._employeeService.getInterventionsByEmployee(
         this.idEmployee,
-        idUser
+        idUser,
+        LINE
       ));
 
       this.hasError = orders.error;

+ 0 - 3
sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/form-schedule-activity/form-schedule-activity.component.ts

@@ -429,7 +429,6 @@ export class FormScheduleActivityComponent implements OnInit{
         customRepeat += 'ciones.';
       }
     }
-    console.log(value);
     
     this.hintPernsonality = customRepeat.replace('  ', ' ');
     this.formGroup.controls['PERIODICIDAD_PERSONALIZADA'].setValue(value);
@@ -503,7 +502,6 @@ export class FormScheduleActivityComponent implements OnInit{
     let idOrden = this.formGroup.controls['ID_ORDEN'].value;
     idOrden = idOrden === '' || idOrden === undefined ? null : idOrden;
     if (tipoActividad !== 'NA' && idOrden !== null) {
-      console.log(idOrden);
       
       if (!idOrden.includes('-')) {
         this.resourcesService.openSnackBar(`El formato del valor de la orden no es correcto.`);
@@ -569,7 +567,6 @@ export class FormScheduleActivityComponent implements OnInit{
       USUARIO: this.resourcesService.getUser(),
       NUMERO_LINEA: this.resourcesService.getLineNumber(),
     }
-    console.log(dataForm);    
     return dataForm;
   }
 

+ 1 - 2
sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/schedule-activities.component.css

@@ -15,13 +15,12 @@
 }
 table {
     width: 100%;
-  }
+}
 
 .override-card-personality {
     width: 95% !important;
     height: calc(100% - 77px);
     justify-content: normal !important;
-    /* overflow: auto; */
 }
 
 @media all and (max-width: 1200px) {

+ 0 - 6
sistema-mantenimiento-front/src/app/components/personal-management/employee/schedule-activities/schedule-activities.component.ts

@@ -141,8 +141,6 @@ export class ScheduleActivitiesComponent implements OnInit{
         if (!responseData.error) {
           this.arrScheduleActivities = responseData.response;
           this.dataSource.data = responseData.response;
-          console.log(responseData.response);
-          
           this.setValueRow();
 
           this.dateSelected.setValue(moment());
@@ -306,14 +304,10 @@ export class ScheduleActivitiesComponent implements OnInit{
         
         for (let days = 0; days < diffDays; days++) {
           let dayDifference: Date = new Date( fechaInicio.getFullYear(), fechaInicio.getMonth(), fechaInicio.getDate() + days );
-          // console.log(dayDifference);
-          
           this.arrWeek.map((week: string, index: number) => {
             let dateOfWeek: Date = new Date( this.startDateWeek.getFullYear(), this.startDateWeek.getMonth(), this.startDateWeek.getDate() + index );
             
             if (dateOfWeek.getTime() === dayDifference.getTime()) {
-              console.log(index);
-              console.log(dateOfWeek);
               this.setColorCell(index, rowEmployee, activityEmployeeElement.COLOR);
             }          
           });

+ 2 - 2
sistema-mantenimiento-front/src/app/components/personal-management/intervention/intervention.component.ts

@@ -207,7 +207,8 @@ export class InterventionComponent implements OnInit {
   public async getContracts() {
     try{
       let idUser = localStorage.getItem('idusuario')!;
-      let contracts: ResponseDataInterventionContracts = await lastValueFrom(this._interventionService.getConsultOfContracts(idUser));
+      const LINE: number = this.resourcesService.getLineNumber();
+      let contracts: ResponseDataInterventionContracts = await lastValueFrom(this._interventionService.getConsultOfContracts(idUser, LINE));
       
       this.hasError = contracts.error;
       this.errorStr = contracts.msg;
@@ -222,7 +223,6 @@ export class InterventionComponent implements OnInit {
           contract.CONTRACT_NAME = `${contract.CONTRACT_NAME} (${idDec})`;
           contract.CONTRACT_COST = `${valueDec}`;
 
-          contractsArr.push(contract);
         }
 
         this.dataSourceContracts = new MatTableDataSource(contractsArr);

+ 5 - 5
sistema-mantenimiento-front/src/app/components/system-admin/security-politics/security-politics.component.html

@@ -19,8 +19,8 @@
             </div>
             <div class="table-container" [hidden]="!(!isLoading && !hasError)" style="overflow: hidden;" class="animated fadeIn">
                 <mat-tab-group class="prevent-select">
-                    <mat-tab label="Patrón de contraseñas">
-                        <div class="form-pass-container animated fadeIn" [formGroup]="politicsForm" *ngIf="passwordPatternEnabled">
+                    <mat-tab label="Patrón de contraseñas" >
+                        <div class="form-pass-container animated fadeIn" style="height: calc(100vh - 304px);" [formGroup]="politicsForm" *ngIf="passwordPatternEnabled">
                             <div class="element">
                                 <mat-checkbox [disabled]="true" checked>Longitud mínima</mat-checkbox>
                                 <mat-form-field appearance="outline" style="width: 100%;">
@@ -78,7 +78,7 @@
                         </div>
                     </mat-tab>
                     <mat-tab label="Duración de sesiones">
-                        <div class="form-pass-container animated fadeIn" [formGroup]="sessionsForm" *ngIf="sessionsDurationEnabled">
+                        <div class="form-pass-container animated fadeIn" style="height: calc(100vh - 304px);" [formGroup]="sessionsForm" *ngIf="sessionsDurationEnabled">
                             <div class="element">
                                 <mat-label>Días</mat-label>
                                 <mat-form-field appearance="outline" style="width: 100%;">
@@ -136,7 +136,7 @@
                         </div>
                     </mat-tab>
                     <mat-tab label="Autenticación en dos pasos">
-                        <div class="auth-table-container animated fadeIn" *ngIf="twoFactorAuthEnabled">
+                        <div class="auth-table-container animated fadeIn" style="height: calc(100vh - 304px);" *ngIf="twoFactorAuthEnabled">
                             <table mat-table [dataSource]="dataSourceAuth!">
                                 <ng-container matColumnDef="ID">
                                     <th mat-header-cell *matHeaderCellDef>ID</th>
@@ -166,7 +166,7 @@
                         </div>
                     </mat-tab>
                     <mat-tab label="Número de sesiones activas">
-                        <div class="form-pass-container animated fadeIn" [formGroup]="sessionsNumberForm" *ngIf="activeSessionsNumberEnabled">
+                        <div class="form-pass-container animated fadeIn" style="height: calc(100vh - 304px);" [formGroup]="sessionsNumberForm" *ngIf="activeSessionsNumberEnabled">
                             <div class="element">
                                 <mat-label>Sesiones configuradas</mat-label>
                                 <mat-form-field appearance="outline" style="width: 100%;">

+ 2 - 3
sistema-mantenimiento-front/src/app/services/personal-management/employee.service.ts

@@ -37,9 +37,8 @@ export class EmployeeService {
       map((data: any) => data))
   }
 
-  public getInterventionsByEmployee(employeeId: string, idUser: string) {
-    return this._httpRequestService.getQuery(`${this._url}/orders/${employeeId}/${idUser}`).pipe(
-      map((data: any) => data))
+  public getInterventionsByEmployee(employeeId: string, idUser: string, line: number) {
+    return this._httpRequestService.getQuery(`${this._url}/orders/${employeeId}/${idUser}/${line}`).pipe(map((data: any) => data));
   }
 
   public updateToInactiveStatus(response: any) {

+ 2 - 3
sistema-mantenimiento-front/src/app/services/personal-management/intervention.service.ts

@@ -23,9 +23,8 @@ export class InterventionService {
       map((data: any) => data));
   }
 
-  public getConsultOfContracts(idUser: string) {
-    return this._httpRequestService.getQuery(`${this._url}/contract/consult/${idUser}`).pipe(
-      map((data: any) => data));
+  public getConsultOfContracts(idUser: string, line: number) {
+    return this._httpRequestService.getQuery(`${this._url}/contract/consult/${idUser}/${line}`).pipe(map((data: any) => data));
   }
 
   public getContractById(contractId: string) {

+ 4 - 5
sistema-mantenimiento-front/src/environments/environment.prod.ts

@@ -119,11 +119,10 @@ export const supportedFiles = [
 ];
 
 export const validateRFC = "/^([A-ZÑ&]{3,4}) ?(?:- ?)?(\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])) ?(?:- ?)?([A-Z\d]{2})([A\d])$/";
-export const socket = 'http://localhost:3200';
-// export const socket = 'https://a9cf-209-50-56-224.ngrok-free.app';
-
-export const apiTemp = `http://192.168.100.105:8000/api/`;
-// export const apiTemp = 'http://git.ittec.mx/sam/public/api/';
+// export const socket = 'http://localhost:3200';
+export const socket = 'https://a9cf-209-50-56-224.ngrok-free.app';
+// export const apiTemp = `http://192.168.100.105:8000/api/`;
+export const apiTemp = 'http://git.ittec.mx/sam/public/api/';
 
 
 /*******************************************************************************/