Prechádzať zdrojové kódy

refactor que elimina funcion activar_workflow y restore_workflows

EmilianoOrtiz 2 mesiacov pred
rodič
commit
d597fdf382

+ 1 - 7
src/app/components/process-management/workflow-management/workflow-management.component.html

@@ -179,13 +179,7 @@
                   <mat-icon>account_tree</mat-icon>
                   {{ interService.get("ver_flujo") }}
                 </button>
-                <button
-                  mat-menu-item
-                  (click)="alertActivateWorkflow(element.ID_WORKFLOW)"
-                >
-                  <mat-icon>check_circle</mat-icon>
-                  {{ interService.get("activar_flujo_trabajo") }}
-                </button>
+
                 <button mat-menu-item (click)="goForm(element)">
                   <mat-icon>edit</mat-icon> {{ interService.get("editar") }}
                 </button>

+ 18 - 94
src/app/components/process-management/workflow-management/workflow-management.component.ts

@@ -1,7 +1,6 @@
 import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import {
-  ActivateWorkflow,
   ChangeWorkflowStatusRequest,
   GetWorkflows,
   ResponseDataGetWorkflows,
@@ -135,9 +134,13 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
     console.log('Llamando getWorkflowById para ID:', idWorkflow);
     const user: string = this.resourcesService.getUser();
     const line: number = this.resourcesService.getLineNumber();
-    
+
     await lastValueFrom(
-      this._processManagementService.getWorkflowById(idWorkflow.toString(), user, line)
+      this._processManagementService.getWorkflowById(
+        idWorkflow.toString(),
+        user,
+        line
+      )
     ).then(
       (responseData: ResponseDataWorkflow) => {
         if (!responseData.error) {
@@ -160,47 +163,6 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
     );
   }
 
-  public alertActivateWorkflow(idWorkflow: number) {
-    this._dialog
-      .open(AlertComponent, {
-        disableClose: true,
-        data: {
-          title: `${this.interService.get('confirmacion')}`,
-          description: `${this.interService.get(
-            'register_workflow_description_alert'
-          )}`,
-          icon: `warning`,
-        },
-      })
-      .afterClosed()
-      .subscribe(async (result) => {
-        if (result) {
-          await this.activateWorkflow(idWorkflow);
-        }
-      });
-  }
-
-  private async activateWorkflow(idWorkflow: number) {
-    const ACTIVATE_WORKFLOW: ActivateWorkflow = {
-      ID_WORKFLOW: idWorkflow,
-      USUARIO: this.resourcesService.getUser(),
-      NUMERO_LINEA: this.resourcesService.getLineNumber(),
-    };
-    await lastValueFrom(
-      this._processManagementService.activateWorkflow(ACTIVATE_WORKFLOW)
-    ).then(
-      async (responseData: ResponseData) => {
-        if (!responseData.error) {
-          await this.getWorkflows();
-        } else {
-          this.resourcesService.openSnackBar(`${responseData.msg}`);
-        }
-      },
-      (httpErrorResponse) =>
-        this.resourcesService.checkErrors(httpErrorResponse)
-    );
-  }
-
   public goForm(element: GetWorkflows) {
     this._dialog
       .open(FormWorkflowComponent, {
@@ -220,52 +182,6 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
       });
   }
 
-  public alertRestore() {
-    let dialogRef = this._dialog.open(AlertComponent, {
-      disableClose: true,
-      data: {
-        title: this.interService.get('confirmacion'),
-        description: this.interService.get('reset_description_alert'),
-        icon: 'warning',
-      },
-    });
-
-    dialogRef.afterClosed().subscribe((res) => {
-      if (res) {
-        this._restoreWorkflows();
-      }
-    });
-  }
-
-  private async _restoreWorkflows() {
-    try {
-      this.isLoading = true;
-
-      const requestRestoreWorkflows: RequestUserNumberLine =
-        this.resourcesService.objectUserLine();
-      let response = await lastValueFrom(
-        this._processManagementService.restoreWorkflows(requestRestoreWorkflows)
-      );
-
-      if (response.error) {
-        this.resourcesService.openSnackBar(response.msg);
-        this.isLoading = false;
-      } else {
-        this.getWorkflows();
-      }
-    } catch (error: any) {
-      if (error.error == undefined) {
-        this.resourcesService.openSnackBar('Ocurrió un error inesperado.');
-      } else if (error.error.msg == undefined) {
-        this.resourcesService.openSnackBar('Ocurrió un error inesperado.');
-      } else {
-        this.resourcesService.openSnackBar(error.error.msg);
-      }
-
-      this.isLoading = false;
-    }
-  }
-
   public changeWorkflowStatus(element: GetWorkflows) {
     this._dialog
       .open(ChangeStatusWorkflowComponent, {
@@ -278,12 +194,20 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
       .afterClosed()
       .subscribe(async (result) => {
         if (result) {
-          await this._changeStatus(element.ID_WORKFLOW, result.newStatus, result.comentario);
+          await this._changeStatus(
+            element.ID_WORKFLOW,
+            result.newStatus,
+            result.comentario
+          );
         }
       });
   }
 
-  private async _changeStatus(idWorkflow: number, newStatus: string, comentario: string) {
+  private async _changeStatus(
+    idWorkflow: number,
+    newStatus: string,
+    comentario: string
+  ) {
     this.isLoading = true;
     const changeStatusRequest: ChangeWorkflowStatusRequest = {
       ID_WORKFLOW: idWorkflow,
@@ -292,7 +216,7 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
       USUARIO: this.resourcesService.getUser(),
       NUMERO_LINEA: this.resourcesService.getLineNumber(),
     };
-    
+
     await lastValueFrom(
       this._processManagementService.changeWorkflowStatus(changeStatusRequest)
     ).then(
@@ -318,7 +242,7 @@ export class WorkflowManagementComponent implements OnInit, AfterViewInit {
     this._dialog.open(WorkflowHistoryComponent, {
       disableClose: true,
       width: '700px',
-      data: { idWorkflow }
+      data: { idWorkflow },
     });
   }
 }

+ 0 - 6
src/app/interfaces/process-managementv/workflow-management.interface.ts

@@ -295,12 +295,6 @@ export interface DetailsNotificate {
   FECHA_MODIFICA: string;
 }
 
-export interface ActivateWorkflow {
-  ID_WORKFLOW: number;
-  USUARIO: string;
-  NUMERO_LINEA: number;
-}
-
 export interface ChangeWorkflowStatusRequest {
   ID_WORKFLOW: number;
   ESTADO: string;

+ 2 - 4
src/app/services/internationalization/internationalization.service.ts

@@ -143,8 +143,7 @@ export class InternationalizationService {
         no_es_valido: 'no es válido',
         detalles_notificacion: 'Detalles de la notificación',
         numero_secuencia: 'Número de secuencia',
-        activar_flujo_trabajo: 'Activar flujo de trabajo',
-        register_workflow_description_alert: '¿Está seguro de activar el flujo de trabajo?',
+
         reset_configuration: 'Restaurar configuración',
         reset_description_alert: '¿Está seguro de restablecer la configuración por defecto de todos los flujos de trabajo?',
         register_task: 'Registrar tarea',
@@ -286,8 +285,7 @@ export class InternationalizationService {
         no_es_valido: 'it is not valid',
         detalles_notificacion: 'Notification details',
         numero_secuencia: 'Sequence number',
-        activar_flujo_trabajo: 'Activate workflow',
-        register_workflow_description_alert: '¿Está seguro de activar el flujo de trabajo?',
+
         reset_configuration: 'Restore settings',
         reset_description_alert: 'Are you sure you want to reset all workflows to default settings?',
         register_task: 'Add task',

+ 1 - 5
src/app/services/process-management/process-management.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpRequestService } from '../http-request.service';
 import { map, Observable } from 'rxjs';
-import { ActivateWorkflow, ChangeWorkflowStatusRequest, RequestFormRequestWorkflow, RequestFormTask, RequestFormWorkflow, RequestNotificate, RequestSearch, ResponseDataDetailsNotificate, ResponseDataDetailsRequest, ResponseDataFilterNotificate, ResponseDataFilterRequest, ResponseDataGetExecuteTask, ResponseDataGetExecuteWorkflow, ResponseDataGetHistoryNotificateTask, ResponseDataGetTaskByWorkflow, ResponseDataGetTasks, ResponseDataGetWorkflows, ResponseDataProcessWorkflow, ResponseDataTask, ResponseDataWorkflow } from '../../interfaces/process-managementv/workflow-management.interface';
+import { ChangeWorkflowStatusRequest, RequestFormRequestWorkflow, RequestFormTask, RequestFormWorkflow, RequestNotificate, RequestSearch, ResponseDataDetailsNotificate, ResponseDataDetailsRequest, ResponseDataFilterNotificate, ResponseDataFilterRequest, ResponseDataGetExecuteTask, ResponseDataGetExecuteWorkflow, ResponseDataGetHistoryNotificateTask, ResponseDataGetTaskByWorkflow, ResponseDataGetTasks, ResponseDataGetWorkflows, ResponseDataProcessWorkflow, ResponseDataTask, ResponseDataWorkflow } from '../../interfaces/process-managementv/workflow-management.interface';
 import { ResponseData } from '../resources.service';
 import { RequestUserNumberLine } from '../../interfaces/response-data';
 
@@ -92,10 +92,6 @@ export class ProcessManagementService {
     return this._httpRequestService.getQuery(`${this._url}/get-details-notificate/${idNotificate}/${user}/${line}`).pipe(map((data:any) => data));
   }
 
-  public activateWorkflow(activateWorkflow: ActivateWorkflow): Observable<ResponseData> {
-    return this._httpRequestService.postQuery(`${this._url}/activate-workflow-automatic`, activateWorkflow).pipe(map((data:any) => data));
-  }
-
   public changeWorkflowStatus(changeStatusRequest: ChangeWorkflowStatusRequest): Observable<ResponseData> {
     return this._httpRequestService.postQuery(`${this._url}/change-workflow-status`, changeStatusRequest).pipe(map((data:any) => data));
   }