sigesp 1.1.24-20241113 → 1.1.26-20241119

package/fesm2020/sigesp.mjs

@@ -2384,6 +2384,8 @@ class MUserDetail extends MBasicModel {
         this.telephone = '';
         this.admin = false;
         this.rights = [];
+        this.ultcon = '';
+        this.id_personal = 0;
         if (user) {
             this.idCompany = parseInt(user.id_empresa);
             this.idEnterprise = parseInt(user.id_enterprise);
@@ -2403,6 +2405,8 @@ class MUserDetail extends MBasicModel {
             this.password = user.pwdusu;
             this.telephone = user.telusu;
             this.admin = user.usuadm == "1";
+            this.ultcon = user.ultcon;
+            this.id_personal = +user.id_personal;
             this.rights = user.derechos ? user.derechos.map(e => new MRights(e)) : [];
         }
         else {
@@ -2429,6 +2433,8 @@ class MUserDetail extends MBasicModel {
             pwdusu: this.password,
             telusu: this.telephone,
             usuadm: this.admin ? '1' : '2',
+            ultcon: this.ultcon,
+            id_personal: this.id_personal.toString(),
             derechos: this.rights.map(e => e.interface())
         };
     }
@@ -7751,16 +7757,16 @@ class SigespService {
             return res;
         }));
     }
-    getCharges() {
-        return this.http.get(`${this.URL}/dao/stb/cargos_dao.php`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
+    getCharges(idEnterprise) {
+        return this.http.get(`${this.URL}/dao/stb/cargos_dao.php?linea=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MCargo(e));
             }
             return res;
         }));
     }
-    getDeductions() {
-        return this.http.get(`${this.URL}/dao/stb/deducciones_dao.php`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
+    getDeductions(idEnterprise) {
+        return this.http.get(`${this.URL}/dao/stb/deducciones_dao.php?linea=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MDeduction(e));
             }
@@ -7787,8 +7793,8 @@ class SigespService {
     * @author Dimaly Crespo
     * @date 20-07-2021
     */
-    getTiposDocumetos() {
-        return this.http.get(`${this.URL}/dao/cxp/tipo_documento_dao.php?operacion=${'buscar'}&existen=${'existen'}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    getTiposDocumetos(idEnterprise) {
+        return this.http.get(`${this.URL}/dao/cxp/tipo_documento_dao.php?operacion=${'buscar'}&i=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MTipoDocumentoCXP(e));
             }
@@ -7821,8 +7827,8 @@ class SigespService {
      * @author Dimaly Crespo
      * @date 20-07-2021
      */
-    getConceptosCxP() {
-        return this.http.get(`${this.URL}/dao/cxp/concepto_dao.php?operacion=${'buscar'}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    getConceptosCxP(idEnterprise) {
+        return this.http.get(`${this.URL}/dao/cxp/concepto_dao.php?operacion=${'buscar'}&i=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MConceptosCXP(e));
             }
@@ -7835,8 +7841,8 @@ class SigespService {
   * @author Dimaly Crespo
   * @date 26-07-2021
   */
-    getConceptosRetencion() {
-        return this.http.get(`${this.URL}/dao/stb/deducciones_dao.php?code=${'conceptos'}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    getConceptosRetencion(tipo, idTipoDeduccion) {
+        return this.http.get(`${this.URL}/dao/stb/deducciones_dao.php?tipo=${tipo}&code=${idTipoDeduccion}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MConceptoRetencion(e));
             }
@@ -7848,8 +7854,8 @@ class SigespService {
     * @return Observable<IResponse>
     * @author Dimaly Crespo
     */
-    obtenerConfiguracionSNO() {
-        return this.http.get(`${this.URL}/dao/sno/configuracion_dao.php?tipo=${'configuracion'}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    obtenerConfiguracionSNO(idEnterprise) {
+        return this.http.get(`${this.URL}/dao/sno/configuracion_dao.php?tipo=${'configuracion'}e=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 if (res.data.length > 0) {
                     res.data = res.data.map(e => new MConfiguracionSNO(e));
@@ -7870,8 +7876,8 @@ class SigespService {
      * @actualizado 26-05-2024
      *
     */
-    getNomina(tipo, id, act) {
-        return this.http.get(`${this.URL}/dao/sno/definicion_nomina_dao.php?tipo=${tipo}&id=${id}`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
+    getNomina(tipo, idEnterprise, id, act) {
+        return this.http.get(`${this.URL}/dao/sno/definicion_nomina_dao.php?tipo=${tipo}&id=${id}&e=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MDefinicionNomina(e));
             }
@@ -7897,8 +7903,8 @@ class SigespService {
    * @return Observable<IResponse>
    * @author Dimaly Crespo
    */
-    getPersonalSRH(tipo, id) {
-        return this.http.get(`${this.URL}/dao/sno/personal_dao.php?tipo=${tipo}&id=${id}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    getPersonalSRH(tipo, idEnterprise, id) {
+        return this.http.get(`${this.URL}/dao/sno/personal_dao.php?tipo=${tipo}&id=${id}&e=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MPersonal(e));
             }
@@ -7910,8 +7916,8 @@ class SigespService {
    * @return Observable<IResponse>
    * @author Dimaly Crespo
    */
-    getAgenciaBanco(tipo, id) {
-        return this.http.get(`${this.URL}/dao/scb/agencia_dao.php?code=${tipo}&id=${id}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
+    getAgenciaBanco(tipo, idEnterprise, id) {
+        return this.http.get(`${this.URL}/dao/scb/agencia_dao.php?code=${tipo}&id=${id}e=${idEnterprise}`, { headers: this.getHttpHeaders() }).pipe(retry(3), catchError(this.handlerError), map((res) => {
             if (res.success) {
                 res.data = res.data.map(e => new MAgenciaBanco(e));
             }