sigesp 0.8.98-20220615 → 0.8.101-20220727

package/fesm2015/sigesp.js

@@ -870,6 +870,7 @@ class MPlanUnicoCuenta {
 }
 
 class TableSelectComponent {
+    //disableMasterToggle: boolean = false;
     constructor(dialogRef, dialogData) {
         this.dialogRef = dialogRef;
         this.dialogData = dialogData;
@@ -878,7 +879,6 @@ class TableSelectComponent {
         this.selections = [];
         this.names = [];
         this.loaded = false;
-        this.disableMasterToggle = false;
         this.columns.push(...dialogData.columns);
         this.columnsAux = dialogData.columns;
         this.data = dialogData.dataSource;
@@ -886,7 +886,7 @@ class TableSelectComponent {
         if (this.dialogData.columnNames) {
             this.names = this.dialogData.columnNames;
         }
-        this.disableMasterToggle = this.dialogData.disableMasterToggle;
+        //  this.disableMasterToggle = this.dialogData.disableMasterToggle
     }
     ngAfterViewInit() {
         this.dataSource.paginator = this.paginator;
@@ -894,28 +894,14 @@ class TableSelectComponent {
         this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
     }
     isAllSelected() {
-        if (this.getFilter()) {
-            const numSelected = this.selection.selected.length;
-            const numRows = this.dataSource.data.length;
-            return numSelected === numRows;
-        }
-        else {
-            const numSelected = this.selection.selected.length;
-            const numRows = this.dataSource.filteredData.length;
-            return numSelected === numRows;
-        }
+        const numSelected = this.selection.selected.length;
+        const numRows = this.dataSource.data.length;
+        return numSelected === numRows;
     }
     masterToggle() {
-        if (this.getFilter()) {
-            this.isAllSelected() ?
-                this.selection.clear() :
-                this.dataSource.data.forEach(row => this.selection.select(row));
-        }
-        else {
-            this.isAllSelected() ?
-                this.selection.clear() :
-                this.dataSource.filteredData.forEach(row => this.selection.select(row));
-        }
+        this.isAllSelected() ?
+            this.selection.clear() :
+            this.dataSource.data.forEach(row => this.selection.select(row));
     }
     checkboxLabel(row) {
         if (!row) {
@@ -948,7 +934,7 @@ class TableSelectComponent {
 TableSelectComponent.decorators = [
     { type: Component, args: [{
                 selector: 'app-table-select',
-                template: "<div class=\"container\">\r\n    <!-- HEADER DE EL COMPONENTE -->\r\n    <div class=\"header mainColor\">\r\n        <!-- T\u00CDTULO -->\r\n        <h2>{{dialogData.title}}</h2>\r\n        <!-- BTN CERRAR -->\r\n        <div class=\"close\">\r\n            <div class=\"btn\" (click)=\"cancelDialog()\">\r\n                <icon-m [name]=\"'close'\" [color]=\"'black'\"></icon-m>\r\n            </div>\r\n        </div>\r\n    </div>\r\n\r\n    <!-- BODY -->\r\n    <div class=\"body\">\r\n        <!-- FILTER -->\r\n        <div class=\"filter\">\r\n            <mat-form-field class=\"input\">\r\n                <input type=\"text\" matInput placeholder=\"Filtrar\"\r\n                (keyup)=\"filterTable($event.target.value)\">\r\n            </mat-form-field>\r\n        </div>\r\n        <!-- TABLA -->\r\n        <div class=\"table-container\">\r\n            <table mat-table [dataSource]=\"dataSource\" matSort>\r\n\r\n                <!-- CHECKS -->\r\n                <ng-container matColumnDef=\"select\">\r\n                    <th mat-header-cell *matHeaderCellDef mat-sort-header>\r\n                        <mat-checkbox (change)=\"$event ? masterToggle() : null\"\r\n                        [disabled]=\"disableMasterToggle || getFilter()\" color=\"primary\"\r\n                        [checked]=\"selection.hasValue() && isAllSelected()\"                       \r\n                        [indeterminate]=\"selection.hasValue() && !isAllSelected()\"\r\n                        [aria-label]=\"checkboxLabel()\"\r\n                        ></mat-checkbox>\r\n                    </th>\r\n                    <td mat-cell *matCellDef=\"let row\">\r\n                        <mat-checkbox (click)=\"$event.stopPropagation()\"\r\n                        (change)=\"$event ? selection.toggle(row) : null\"\r\n                        [checked]=\"selection.isSelected(row)\" color=\"primary\"\r\n                        [aria-label]=\"checkboxLabel(row)\"></mat-checkbox>\r\n                    </td>\r\n                </ng-container>\r\n\r\n                <!-- DATA -->\r\n                <ng-container *ngFor=\"let column of columnsAux; let i = index\" [matColumnDef]=\"column\">\r\n                    <th mat-header-cell *matHeaderCellDef mat-sort-header> \r\n                        {{(names[i] ? names[i] : column) | uppercase}} \r\n                    </th>\r\n                    <td mat-cell *matCellDef=\"let row\"> \r\n                        {{row[column]}} \r\n                    </td>\r\n                </ng-container>\r\n\r\n                <tr mat-header-row *matHeaderRowDef=\"columns\"></tr>\r\n                <tr mat-row *matRowDef=\"let row; columns: columns;\"\r\n                (click)=\"selection.toggle(row)\">\r\n                </tr>\r\n            </table>\r\n        </div>\r\n        <mat-paginator [pageSizeOptions]=\"[5, 10, 25, 100]\" class=\"paginator\"></mat-paginator>\r\n\r\n        <div class=\"buttons\">\r\n            <button mat-raised-button color=\"primary\" \r\n            [disabled]=\"selection.selected.length==0\"\r\n            (click)=\"closeDialog()\">Aceptar</button>\r\n        </div>\r\n    </div>\r\n</div>\r\n",
+                template: "<div class=\"container\">\r\n    <!-- HEADER DE EL COMPONENTE -->\r\n    <div class=\"header mainColor\">\r\n        <!-- T\u00CDTULO -->\r\n        <h2>{{dialogData.title}}</h2>\r\n        <!-- BTN CERRAR -->\r\n        <div class=\"close\">\r\n            <div class=\"btn\" (click)=\"cancelDialog()\">\r\n                <icon-m [name]=\"'close'\" [color]=\"'black'\"></icon-m>\r\n            </div>\r\n        </div>\r\n    </div>\r\n\r\n    <!-- BODY -->\r\n    <div class=\"body\">\r\n        <!-- FILTER -->\r\n        <div class=\"filter\">\r\n            <mat-form-field class=\"input\">\r\n                <input type=\"text\" matInput placeholder=\"Filtrar\"\r\n                (keyup)=\"filterTable($event.target.value)\">\r\n            </mat-form-field>\r\n        </div>\r\n        <!-- TABLA -->\r\n        <div class=\"table-container\">\r\n            <table mat-table [dataSource]=\"dataSource\" matSort>\r\n\r\n                <!-- CHECKS -->\r\n                <ng-container matColumnDef=\"select\">\r\n                    <th mat-header-cell *matHeaderCellDef>\r\n                        <mat-checkbox (change)=\"$event ? masterToggle() : null\"\r\n                        [disabled]=\"getFilter()\" color=\"primary\"\r\n                        [checked]=\"selection.hasValue() && isAllSelected()\"                       \r\n                        [indeterminate]=\"selection.hasValue() && !isAllSelected()\"\r\n                        [aria-label]=\"checkboxLabel()\"\r\n                        ></mat-checkbox>\r\n                    </th>\r\n                    <td mat-cell *matCellDef=\"let row\">\r\n                        <mat-checkbox (click)=\"$event.stopPropagation()\"\r\n                        (change)=\"$event ? selection.toggle(row) : null\"\r\n                        [checked]=\"selection.isSelected(row)\" color=\"primary\"\r\n                        [aria-label]=\"checkboxLabel(row)\"></mat-checkbox>\r\n                    </td>\r\n                </ng-container>\r\n\r\n                <!-- DATA -->\r\n                <ng-container *ngFor=\"let column of columnsAux; let i = index\" [matColumnDef]=\"column\">\r\n                    <th mat-header-cell *matHeaderCellDef mat-sort-header> \r\n                        {{(names[i] ? names[i] : column) | uppercase}} \r\n                    </th>\r\n                    <td mat-cell *matCellDef=\"let row\"> \r\n                        {{row[column]}} \r\n                    </td>\r\n                </ng-container>\r\n\r\n                <tr mat-header-row *matHeaderRowDef=\"columns\"></tr>\r\n                <tr mat-row *matRowDef=\"let row; columns: columns;\"\r\n                (click)=\"selection.toggle(row)\">\r\n                </tr>\r\n            </table>\r\n            <mat-paginator [pageSizeOptions]=\"[5, 10, 25, 100]\" showFirstLastButtons class=\"paginator\"></mat-paginator>\r\n        </div>\r\n\r\n        <div class=\"buttons\">\r\n            <button mat-raised-button color=\"primary\" \r\n            [disabled]=\"selection.selected.length==0\"\r\n            (click)=\"closeDialog()\">Aceptar</button>\r\n        </div>\r\n    </div>\r\n</div>\r\n",
                 styles: [".container .header{border-radius:5px 5px 0 0;display:grid;grid-template-columns:repeat(10,10%);padding:15px;text-align:center}.container .header h2{grid-column:1/10;margin:0;text-align:left}.container .header .close{align-items:center;display:flex;grid-column:10/11;justify-content:center}.container .header .close .btn{align-items:center;background:#fff;border-radius:50%;cursor:pointer;display:flex;height:30px;justify-content:center;width:30px}.container .header .close .btn Icon{display:flex}.container .body{margin-top:10px;padding:15px}.container .body .filter .input,.container .body .table-container table{width:100%}.container .body .table-container table .row:hover{background:#777;cursor:pointer}.container .body .table-container table .mat-cell{padding-bottom:5px!important;padding-right:5px!important;padding-top:5px!important}.container .body .paginator{margin-top:15px}.container .body .buttons{display:flex;justify-content:flex-end;padding:10px}.container .body .buttons button{font-size:17px}"]
             },] }
 ];
@@ -3717,8 +3703,8 @@ class MCargosNominas extends MBasicModel {
             this.denominacionNomina = e.dennom;
             this.idDtNomina = parseInt(e.id_dt_carnom);
             this.periodoActualNomina = e.peractnom;
-            this.calculada = e.calculado == '1' ? true : false;
-            this.prenomina = e.prenomina == '1' ? true : false;
+            (e.calculado) ? this.calculada = parseInt(e.calculado) > 0 ? true : false : this.calculada = false;
+            (e.prenomina) ? this.prenomina = parseInt(e.prenomina) > 0 ? true : false : this.prenomina = false;
             this.estatus = this.calculada ? 'Calculada' :
                 !this.calculada && this.prenomina ? 'Pre-Calculada' : 'Sin Calcular';
             this.editables = (this.calculada || this.prenomina) ? false : true;
@@ -3777,8 +3763,8 @@ class MNominaSimple extends MBasicModel {
             this.idPeriodoActual = +e.id_periodoactual;
             this.totalPeriodo = parseFloat(e.totper),
                 this.estatusPeriodo = parseInt(e.cerper);
-            this.calculada = e.calculado == '1' ? true : false;
-            this.prenomina = e.prenomina == '1' ? true : false;
+            (e.calculado) ? this.calculada = parseInt(e.calculado) > 0 ? true : false : this.calculada = false;
+            (e.prenomina) ? this.prenomina = parseInt(e.prenomina) > 0 ? true : false : this.prenomina = false;
             this.estatus = this.calculada ? 'Calculada' :
                 !this.calculada && this.prenomina ? 'Pre-Calculada' : 'Sin Calcular';
             this.editable = (this.calculada || this.prenomina) ? false : true;
@@ -5514,7 +5500,6 @@ class SigespService {
     columns, title, dataSource, columnNames = null, width = '450px', options = {
         disableClose: false,
         hasBackdrop: false,
-        disableMasterToggle: false
     }) {
         let dialogRef = this.dialog.open(TableSelectComponent, {
             data: {
@@ -5522,7 +5507,6 @@ class SigespService {
                 columns: columns,
                 dataSource: dataSource,
                 columnNames,
-                disableMasterToggle: options.disableMasterToggle
             },
             width: width,
             maxHeight: '90vh',
@@ -5608,37 +5592,17 @@ class SigespService {
         return formGroup.get(name);
     }
     /**
-     * @description Función para escribir solo decimales (Usar en evento keypress)
+     * @description Previene que se escriban letras en el input (Usar en keypress)
      * @param event Evento del teclado
      * @return boolean
      * @author Miguel Ramírez
+     * @modificado como onlyNumero para corregir codigo, usar currency-input si quiere usar decimales
      */
     onlyDecimal(event) {
-        // console.log(event);
-        let contPoint = 0;
-        let number = event.target.value + event.key;
-        // console.log(number);
-        if (this.onlyNumbers(event) || event.key === ',') {
-            for (let i = 0; i < number.length; i++) {
-                if (number.charAt(i) === ',') {
-                    contPoint++;
-                }
-            }
-            if (contPoint > 1) {
-                return false;
-            }
-            else {
-                if (number.indexOf(',') !== -1) {
-                    if (number.substring(number.indexOf(',') + 1, number.length).length > 2) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        else {
-            return false;
+        if (!isNaN(+event.key) && event.keyCode != 32) {
+            return true;
         }
+        return false;
     }
     /**
      * @description Previene que se escriban letras en el input (Usar en keypress)