general-library-union 2.7.2 → 2.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "general-library-union",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

package/public-api.ts

@@ -194,4 +194,8 @@ export * from './src/app/webcommon/pages/fuente-reporte/fuente-reporte.component
 export * from './src/app/webcommon/popups/popup-sentencia/popup-sentencia.component';
 
 //plantillas
-export * from './src/app/webcommon/pages/cargue-plantilla/cargue-plantilla-general/cargue-plantilla-general.component';
+export * from './src/app/webcommon/pages/cargue-plantilla/cargue-plantilla-general/cargue-plantilla-general.component';
+
+//spinner load blockui
+export * from './src/app/core/servicios/spinner-service';
+export * from './src/app/core/servicios/interceptores/loading-interceptor';

package/src/app/core/servicios/data-exporter-table.utils.ts

@@ -28,9 +28,9 @@ export class DataExporter {
         this.saveAsExcelFile(buffer, nombreArchivo);
     }
 
-    async exportExcelColumnas(lista: any[], nombreArchivo: string, columnas: string[]) {
+    async exportExcelColumnas(lista: any[], nombreArchivo: string, columnas: string[], nombreHoja?: string) {
         const workbook = new Workbook();
-        const worksheet = workbook.addWorksheet('data');
+        const worksheet = workbook.addWorksheet(nombreHoja ? nombreHoja : 'data');
 
         worksheet.columns = columnas.map(col => ({ header: col, key: col }));
 
@@ -50,7 +50,7 @@ export class DataExporter {
         const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
         const EXCEL_EXTENSION = '.xlsx';
         const data: Blob = new Blob([buffer], { type: EXCEL_TYPE });
-        FileSaver.saveAs(data, `${fileName}_export_${new Date().getTime()}${EXCEL_EXTENSION}`);
+        FileSaver.saveAs(data, `${fileName}${EXCEL_EXTENSION}`);
     }
 
     exportCSV(lista: any[], columnas: string[], nombreArchivo: string) {

package/src/app/core/servicios/interceptores/loading-interceptor.ts

@@ -0,0 +1,37 @@
+import { Inject, Injectable } from '@angular/core';
+import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpErrorResponse } from '@angular/common/http';
+import { Observable, throwError, TimeoutError, timer } from 'rxjs';
+import { catchError, finalize, timeoutWith } from 'rxjs/operators';
+import { SpinnerService } from '../spinner-service';
+
+@Injectable({
+  providedIn: 'root',
+})
+
+export class LoadingInterceptor implements HttpInterceptor {
+
+  constructor(private spinnerService: SpinnerService) {}
+
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>{
+    var spinnerActivated = false;
+    var timeElapsed: number = 0;
+    var intervalId: any; 
+    intervalId = setInterval(() => {
+        timeElapsed++;
+        if (timeElapsed > 5 && !spinnerActivated) {
+            spinnerActivated = true;
+            this.spinnerService.show();
+        }
+      }, 1000);
+
+    return next.handle(req).pipe(
+      finalize(() => {
+          this.spinnerService.hide();
+        if (intervalId) {
+            clearInterval(intervalId);
+          }
+      })
+    );
+  }
+  
+}

package/src/app/core/servicios/spinner-service.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SpinnerService {
+  private spinnerSubject = new BehaviorSubject<boolean>(false);
+  spinner$ = this.spinnerSubject.asObservable();
+
+  show(): void {
+    this.spinnerSubject.next(true);
+  }
+
+  hide(): void {
+    this.spinnerSubject.next(false);
+  }
+}

package/src/styles/primeng/sass/overrides/_theme_styles_dark.scss

@@ -871,10 +871,6 @@ body {
   padding: 5px;
 }
 
-// .p-toast.p-toast-top-right, .p-toast.p-toast-top-left, .p-toast.p-toast-top-center {
-//   z-index: 1105 !important;
-// }
-
 .my-toast.toast-text-small .p-toast-detail {
   font-size: 0.7rem !important;
   line-height: 18px !important;