diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java index c2dc3dc..7f8620a 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java @@ -27,9 +27,11 @@ public class EstadoSolicitudQuery extends QueryRule{ codigosolicitud=codigosolicitud.replace("TRA", ""); } - StringBuilder sql = new StringBuilder("select DISTINCT ta.ACTIVITYNAME,ta.USERCODE,ta.GROUPCODE,tk.STATUS,ta.CREATED,ta.STARTED,ta.COMPLETED " - + " from jbpm6.VARIABLEINSTANCELOG d, TBPMACTIVITIES ta, jbpm6.TASK tk " - + " where d.processInstanceId = ta.internalcode and tk.id (+) = ta.TASKID "); + StringBuilder sql = new StringBuilder("select DISTINCT ta.ACTIVITYNAME,ta.USERCODE,ta.GROUPCODE,tk.STATUS,ta.CREATED,ta.STARTED,\n" + + "ta.COMPLETED from jbpm6.VARIABLEINSTANCELOG d, TBPMACTIVITIES ta \n" + + "LEFT JOIN jbpm6.TASK tk\n" + + "ON (tk.id = ta.TASKID)\n" + + "where cast(d.processInstanceId as varchar(50))= ta.internalcode"); if(codigosolicitud.contains("SOL") || codigosolicitud.contains("TRA")){ sql.append(" and (d.value like '%SOL"+codigosolicitud+"%' or d.value like '%TRA"+codigosolicitud+"%') ");//SOL-0000491173 diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/EjecucionPermiso.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/EjecucionPermiso.bpmn index 551ca9e..6e2887f 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/EjecucionPermiso.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/EjecucionPermiso.bpmn @@ -8,7 +8,7 @@ - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/autorizarDocumentoCarlos.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/autorizarDocumentoCarlos.bpmn index 4728c5e..45a5ee8 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/autorizarDocumentoCarlos.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/autorizarDocumentoCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -198,7 +198,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/decomisarArmaCarlos.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/decomisarArmaCarlos.bpmn index df1fcde..261b972 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/decomisarArmaCarlos.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/decomisarArmaCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -144,7 +144,7 @@ FlowUtil.endFlow(kcontext); - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/notificacionAnulacionTramite.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/notificacionAnulacionTramite.bpmn index 4d78c1b..f90942e 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/notificacionAnulacionTramite.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/notificacionAnulacionTramite.bpmn @@ -6,7 +6,7 @@ - + @@ -136,7 +136,7 @@ FlowUtil.endFlow(kcontext); - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitud.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitud.bpmn index ea8f060..42bb7f7 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitud.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitud.bpmn @@ -16,7 +16,7 @@ - + @@ -190,7 +190,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudCarlos.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudCarlos.bpmn index ca0b574..580eac7 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudCarlos.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -121,7 +121,7 @@ tasksMetaData.put("Notificar fecha de Emision",old); - + diff --git a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudFlow.bpmn b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudFlow.bpmn index 7ef9d5e..78f454a 100644 --- a/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudFlow.bpmn +++ b/base/bpm/bpmlib/src/main/resources/flows/comaco/solicitudFlow.bpmn @@ -10,7 +10,7 @@ - + @@ -369,7 +369,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index 529f2cf..137d886 100644 Binary files a/base/bpm/bpmlib/target/bpmlib-2.1.jar and b/base/bpm/bpmlib/target/bpmlib-2.1.jar differ diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.class index 3fed293..6df4fef 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.class differ diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/EjecucionPermiso.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/EjecucionPermiso.bpmn index 551ca9e..6e2887f 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/EjecucionPermiso.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/EjecucionPermiso.bpmn @@ -8,7 +8,7 @@ - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/autorizarDocumentoCarlos.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/autorizarDocumentoCarlos.bpmn index 4728c5e..45a5ee8 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/autorizarDocumentoCarlos.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/autorizarDocumentoCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -198,7 +198,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/decomisarArmaCarlos.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/decomisarArmaCarlos.bpmn index df1fcde..261b972 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/decomisarArmaCarlos.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/decomisarArmaCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -144,7 +144,7 @@ FlowUtil.endFlow(kcontext); - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/notificacionAnulacionTramite.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/notificacionAnulacionTramite.bpmn index 4d78c1b..f90942e 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/notificacionAnulacionTramite.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/notificacionAnulacionTramite.bpmn @@ -6,7 +6,7 @@ - + @@ -136,7 +136,7 @@ FlowUtil.endFlow(kcontext); - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/solicitud.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/solicitud.bpmn index ea8f060..42bb7f7 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/solicitud.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/solicitud.bpmn @@ -16,7 +16,7 @@ - + @@ -190,7 +190,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/solicitudCarlos.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/solicitudCarlos.bpmn index ca0b574..580eac7 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/solicitudCarlos.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/solicitudCarlos.bpmn @@ -6,7 +6,7 @@ - + @@ -121,7 +121,7 @@ tasksMetaData.put("Notificar fecha de Emision",old); - + diff --git a/base/bpm/bpmlib/target/classes/flows/comaco/solicitudFlow.bpmn b/base/bpm/bpmlib/target/classes/flows/comaco/solicitudFlow.bpmn index 7ef9d5e..78f454a 100644 --- a/base/bpm/bpmlib/target/classes/flows/comaco/solicitudFlow.bpmn +++ b/base/bpm/bpmlib/target/classes/flows/comaco/solicitudFlow.bpmn @@ -10,7 +10,7 @@ - + @@ -369,7 +369,7 @@ tasksMetaData.put("Aprobar tramite",old); - + diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 820fd71..1e532d5 100644 --- a/base/bpm/bpmlib/target/maven-archiver/pom.properties +++ b/base/bpm/bpmlib/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:55 ECT 2022 +#Fri Nov 18 16:48:26 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=bpmlib diff --git a/base/bpm/simple/target/maven-archiver/pom.properties b/base/bpm/simple/target/maven-archiver/pom.properties index 7d34794..a5907ab 100644 --- a/base/bpm/simple/target/maven-archiver/pom.properties +++ b/base/bpm/simple/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:50 ECT 2022 +#Fri Nov 18 16:48:19 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=simple diff --git a/base/bpm/simple/target/simple-2.1.jar b/base/bpm/simple/target/simple-2.1.jar index 74e91e0..8535220 100644 Binary files a/base/bpm/simple/target/simple-2.1.jar and b/base/bpm/simple/target/simple-2.1.jar differ diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index 90447b3..d1d6db3 100644 Binary files a/base/business/armas/target/armas-2.1.jar and b/base/business/armas/target/armas-2.1.jar differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 25d755f..0878296 100644 --- a/base/business/armas/target/maven-archiver/pom.properties +++ b/base/business/armas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:18 ECT 2022 +#Fri Nov 18 16:48:53 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=armas diff --git a/base/business/general/target/general-2.1.jar b/base/business/general/target/general-2.1.jar index 89b3f2e..58ba222 100644 Binary files a/base/business/general/target/general-2.1.jar and b/base/business/general/target/general-2.1.jar differ diff --git a/base/business/general/target/maven-archiver/pom.properties b/base/business/general/target/maven-archiver/pom.properties index a10da97..3c67f47 100644 --- a/base/business/general/target/maven-archiver/pom.properties +++ b/base/business/general/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:09 ECT 2022 +#Fri Nov 18 16:48:46 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=general diff --git a/base/business/log/target/log-2.1.jar b/base/business/log/target/log-2.1.jar index 3896551..73465ac 100644 Binary files a/base/business/log/target/log-2.1.jar and b/base/business/log/target/log-2.1.jar differ diff --git a/base/business/log/target/maven-archiver/pom.properties b/base/business/log/target/maven-archiver/pom.properties index 3b62fe9..6807da1 100644 --- a/base/business/log/target/maven-archiver/pom.properties +++ b/base/business/log/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:12 ECT 2022 +#Fri Nov 18 16:48:48 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=log diff --git a/base/business/person/target/maven-archiver/pom.properties b/base/business/person/target/maven-archiver/pom.properties index c6b9123..36086ca 100644 --- a/base/business/person/target/maven-archiver/pom.properties +++ b/base/business/person/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:07 ECT 2022 +#Fri Nov 18 16:48:42 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=person diff --git a/base/business/person/target/person-2.1.jar b/base/business/person/target/person-2.1.jar index f54c197..a4c764a 100644 Binary files a/base/business/person/target/person-2.1.jar and b/base/business/person/target/person-2.1.jar differ diff --git a/base/business/report/target/maven-archiver/pom.properties b/base/business/report/target/maven-archiver/pom.properties index 8e4eb7d..b4db35e 100644 --- a/base/business/report/target/maven-archiver/pom.properties +++ b/base/business/report/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:11 ECT 2022 +#Fri Nov 18 16:48:47 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=report diff --git a/base/business/report/target/report-2.1.jar b/base/business/report/target/report-2.1.jar index 061914f..0af56d7 100644 Binary files a/base/business/report/target/report-2.1.jar and b/base/business/report/target/report-2.1.jar differ diff --git a/base/business/viaticos/target/maven-archiver/pom.properties b/base/business/viaticos/target/maven-archiver/pom.properties index 4f354b2..afddec8 100644 --- a/base/business/viaticos/target/maven-archiver/pom.properties +++ b/base/business/viaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:14 ECT 2022 +#Fri Nov 18 16:48:50 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=viaticos diff --git a/base/business/viaticos/target/viaticos-2.1.jar b/base/business/viaticos/target/viaticos-2.1.jar index 161a0a2..f6b9718 100644 Binary files a/base/business/viaticos/target/viaticos-2.1.jar and b/base/business/viaticos/target/viaticos-2.1.jar differ diff --git a/base/core/alfresco-client/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index 50ec6f7..f0ab0f1 100644 Binary files a/base/core/alfresco-client/target/alfresco-client-2.1.jar and b/base/core/alfresco-client/target/alfresco-client-2.1.jar differ diff --git a/base/core/alfresco-client/target/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index 328f398..d7dab00 100644 --- a/base/core/alfresco-client/target/maven-archiver/pom.properties +++ b/base/core/alfresco-client/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:04 ECT 2022 +#Fri Nov 18 16:48:38 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=alfresco-client diff --git a/base/core/bpm/target/bpm-2.1.jar b/base/core/bpm/target/bpm-2.1.jar index e6129cb..9c2e28a 100644 Binary files a/base/core/bpm/target/bpm-2.1.jar and b/base/core/bpm/target/bpm-2.1.jar differ diff --git a/base/core/bpm/target/maven-archiver/pom.properties b/base/core/bpm/target/maven-archiver/pom.properties index 5275551..3d3d42d 100644 --- a/base/core/bpm/target/maven-archiver/pom.properties +++ b/base/core/bpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:52 ECT 2022 +#Fri Nov 18 16:48:21 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=bpm diff --git a/base/core/firmas/target/firmas-2.1.jar b/base/core/firmas/target/firmas-2.1.jar index 3abdeb5..84c1fc4 100644 Binary files a/base/core/firmas/target/firmas-2.1.jar and b/base/core/firmas/target/firmas-2.1.jar differ diff --git a/base/core/firmas/target/maven-archiver/pom.properties b/base/core/firmas/target/maven-archiver/pom.properties index 169fbd4..1847e4f 100644 --- a/base/core/firmas/target/maven-archiver/pom.properties +++ b/base/core/firmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:03 ECT 2022 +#Fri Nov 18 16:48:37 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=firmas diff --git a/base/dto/common/target/common-2.1.jar b/base/dto/common/target/common-2.1.jar index 12288db..3549801 100644 Binary files a/base/dto/common/target/common-2.1.jar and b/base/dto/common/target/common-2.1.jar differ diff --git a/base/dto/common/target/maven-archiver/pom.properties b/base/dto/common/target/maven-archiver/pom.properties index 309794b..f38e2d6 100644 --- a/base/dto/common/target/maven-archiver/pom.properties +++ b/base/dto/common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:37 ECT 2022 +#Fri Nov 18 16:48:02 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=common diff --git a/base/dto/dto/target/dto-2.1.jar b/base/dto/dto/target/dto-2.1.jar index a97106b..7e52139 100644 Binary files a/base/dto/dto/target/dto-2.1.jar and b/base/dto/dto/target/dto-2.1.jar differ diff --git a/base/dto/dto/target/maven-archiver/pom.properties b/base/dto/dto/target/maven-archiver/pom.properties index cb4c68a..bf18802 100644 --- a/base/dto/dto/target/maven-archiver/pom.properties +++ b/base/dto/dto/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:35 ECT 2022 +#Fri Nov 18 16:47:59 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=dto diff --git a/base/facade/src/main/java/com/fp/facade/ejb/QueryBean.java b/base/facade/src/main/java/com/fp/facade/ejb/QueryBean.java index 4dea168..45d4adc 100644 --- a/base/facade/src/main/java/com/fp/facade/ejb/QueryBean.java +++ b/base/facade/src/main/java/com/fp/facade/ejb/QueryBean.java @@ -49,6 +49,7 @@ public class QueryBean extends BeanHelper implements FacadeBeanJsfRemote { BeanHelper.cleanThreadLocal(); // PersistenceHelper.beginTransaction(); QueryAction qa = new QueryAction(); + resp = qa.process(request); // PersistenceHelper.commitTransaction(); return resp; diff --git a/base/facade/target/classes/com/fp/facade/ejb/QueryBean.class b/base/facade/target/classes/com/fp/facade/ejb/QueryBean.class index 48d087b..3433cf0 100644 Binary files a/base/facade/target/classes/com/fp/facade/ejb/QueryBean.class and b/base/facade/target/classes/com/fp/facade/ejb/QueryBean.class differ diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index 8224fd0..2419ba6 100644 Binary files a/base/facade/target/facade-2.1.jar and b/base/facade/target/facade-2.1.jar differ diff --git a/base/facade/target/maven-archiver/pom.properties b/base/facade/target/maven-archiver/pom.properties index 1118274..41a6982 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:20 ECT 2022 +#Fri Nov 18 16:48:56 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index 5bb2f9f..0b13be4 100644 Binary files a/base/facadeclient/target/facadeclient-2.1.jar and b/base/facadeclient/target/facadeclient-2.1.jar differ diff --git a/base/facadeclient/target/maven-archiver/pom.properties b/base/facadeclient/target/maven-archiver/pom.properties index 1464f31..e9166c3 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:19 ECT 2022 +#Fri Nov 18 16:48:55 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facadeclient diff --git a/base/persistence/commondb/target/commondb-2.1.jar b/base/persistence/commondb/target/commondb-2.1.jar index fa4e440..8a0a7ee 100644 Binary files a/base/persistence/commondb/target/commondb-2.1.jar and b/base/persistence/commondb/target/commondb-2.1.jar differ diff --git a/base/persistence/commondb/target/maven-archiver/pom.properties b/base/persistence/commondb/target/maven-archiver/pom.properties index 62f1a36..b811f74 100644 --- a/base/persistence/commondb/target/maven-archiver/pom.properties +++ b/base/persistence/commondb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:46 ECT 2022 +#Fri Nov 18 16:48:12 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index 5148f5f..0e90ce8 100644 --- a/base/persistence/parmas/target/maven-archiver/pom.properties +++ b/base/persistence/parmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:02 ECT 2022 +#Fri Nov 18 16:48:35 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=parmas diff --git a/base/persistence/parmas/target/parmas-2.1.jar b/base/persistence/parmas/target/parmas-2.1.jar index 5505173..abe84cb 100644 Binary files a/base/persistence/parmas/target/parmas-2.1.jar and b/base/persistence/parmas/target/parmas-2.1.jar differ diff --git a/base/persistence/pbpm/target/maven-archiver/pom.properties b/base/persistence/pbpm/target/maven-archiver/pom.properties index 8f6662c..f787b89 100644 --- a/base/persistence/pbpm/target/maven-archiver/pom.properties +++ b/base/persistence/pbpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:39 ECT 2022 +#Fri Nov 18 16:48:04 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pbpm diff --git a/base/persistence/pbpm/target/pbpm-2.1.jar b/base/persistence/pbpm/target/pbpm-2.1.jar index 0b2c48f..783e229 100644 Binary files a/base/persistence/pbpm/target/pbpm-2.1.jar and b/base/persistence/pbpm/target/pbpm-2.1.jar differ diff --git a/base/persistence/pcustomer/target/maven-archiver/pom.properties b/base/persistence/pcustomer/target/maven-archiver/pom.properties index 00f7450..79bbd94 100644 --- a/base/persistence/pcustomer/target/maven-archiver/pom.properties +++ b/base/persistence/pcustomer/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:48 ECT 2022 +#Fri Nov 18 16:48:16 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pcustomer diff --git a/base/persistence/pcustomer/target/pcustomer-2.1.jar b/base/persistence/pcustomer/target/pcustomer-2.1.jar index caf8c56..4ab87dc 100644 Binary files a/base/persistence/pcustomer/target/pcustomer-2.1.jar and b/base/persistence/pcustomer/target/pcustomer-2.1.jar differ diff --git a/base/persistence/pfirmas/target/maven-archiver/pom.properties b/base/persistence/pfirmas/target/maven-archiver/pom.properties index 493e0cf..242135d 100644 --- a/base/persistence/pfirmas/target/maven-archiver/pom.properties +++ b/base/persistence/pfirmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:59 ECT 2022 +#Fri Nov 18 16:48:31 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pfirmas diff --git a/base/persistence/pfirmas/target/pfirmas-2.1.jar b/base/persistence/pfirmas/target/pfirmas-2.1.jar index 65512ea..d5f0171 100644 Binary files a/base/persistence/pfirmas/target/pfirmas-2.1.jar and b/base/persistence/pfirmas/target/pfirmas-2.1.jar differ diff --git a/base/persistence/pgeneral/target/maven-archiver/pom.properties b/base/persistence/pgeneral/target/maven-archiver/pom.properties index f6b012e..9795d3e 100644 --- a/base/persistence/pgeneral/target/maven-archiver/pom.properties +++ b/base/persistence/pgeneral/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:44 ECT 2022 +#Fri Nov 18 16:48:10 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pgeneral diff --git a/base/persistence/pgeneral/target/pgeneral-2.1.jar b/base/persistence/pgeneral/target/pgeneral-2.1.jar index 21f2279..861c274 100644 Binary files a/base/persistence/pgeneral/target/pgeneral-2.1.jar and b/base/persistence/pgeneral/target/pgeneral-2.1.jar differ diff --git a/base/persistence/plog/target/maven-archiver/pom.properties b/base/persistence/plog/target/maven-archiver/pom.properties index 96a66c9..94c29e7 100644 --- a/base/persistence/plog/target/maven-archiver/pom.properties +++ b/base/persistence/plog/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:56 ECT 2022 +#Fri Nov 18 16:48:28 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=plog diff --git a/base/persistence/plog/target/plog-2.1.jar b/base/persistence/plog/target/plog-2.1.jar index be1b4f4..b29554c 100644 Binary files a/base/persistence/plog/target/plog-2.1.jar and b/base/persistence/plog/target/plog-2.1.jar differ diff --git a/base/persistence/pviaticos/target/maven-archiver/pom.properties b/base/persistence/pviaticos/target/maven-archiver/pom.properties index 89331cf..7565f4a 100644 --- a/base/persistence/pviaticos/target/maven-archiver/pom.properties +++ b/base/persistence/pviaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:58 ECT 2022 +#Fri Nov 18 16:48:30 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pviaticos diff --git a/base/persistence/pviaticos/target/pviaticos-2.1.jar b/base/persistence/pviaticos/target/pviaticos-2.1.jar index 80bac3e..3923174 100644 Binary files a/base/persistence/pviaticos/target/pviaticos-2.1.jar and b/base/persistence/pviaticos/target/pviaticos-2.1.jar differ diff --git a/base/persistence/util/target/maven-archiver/pom.properties b/base/persistence/util/target/maven-archiver/pom.properties index 9f76a36..bb92668 100644 --- a/base/persistence/util/target/maven-archiver/pom.properties +++ b/base/persistence/util/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:16:49 ECT 2022 +#Fri Nov 18 16:48:17 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=util diff --git a/base/persistence/util/target/util-2.1.jar b/base/persistence/util/target/util-2.1.jar index 711bc4f..ad1e64e 100644 Binary files a/base/persistence/util/target/util-2.1.jar and b/base/persistence/util/target/util-2.1.jar differ diff --git a/base/sessionbeans/target/maven-archiver/pom.properties b/base/sessionbeans/target/maven-archiver/pom.properties index 8493cb2..b44817c 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:05 ECT 2022 +#Fri Nov 18 16:48:40 ECT 2022 version=2.1 groupId=com.fp.base artifactId=sessionbeans diff --git a/base/sessionbeans/target/sessionbeans-2.1.jar b/base/sessionbeans/target/sessionbeans-2.1.jar index eb0cee6..ca3ddcc 100644 Binary files a/base/sessionbeans/target/sessionbeans-2.1.jar and b/base/sessionbeans/target/sessionbeans-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1.ear b/clients/comaco/ear/target/maiaear-2.1.ear index 3bc6361..d005c67 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1.ear and b/clients/comaco/ear/target/maiaear-2.1.ear differ diff --git a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar index 90447b3..d1d6db3 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar index e6129cb..9c2e28a 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar index 529f2cf..137d886 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar and b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar index 12288db..3549801 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar index fa4e440..8a0a7ee 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar index a97106b..7e52139 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar index 0ff3660..d8aaeaa 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facade.jar b/clients/comaco/ear/target/maiaear-2.1/facade.jar index 8224fd0..2419ba6 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facade.jar and b/clients/comaco/ear/target/maiaear-2.1/facade.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar index 5bb2f9f..0b13be4 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar and b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar index 3abdeb5..84c1fc4 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar index 89b3f2e..58ba222 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar index 3896551..73465ac 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar index 5505173..abe84cb 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar index 0b2c48f..783e229 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar index caf8c56..4ab87dc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar index f54c197..a4c764a 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar index 65512ea..d5f0171 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar index 21f2279..861c274 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar index be1b4f4..b29554c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar index 061914f..0af56d7 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar index eb0cee6..ca3ddcc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar and b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar index 74e91e0..8535220 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar index 711bc4f..ad1e64e 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar differ diff --git a/clients/comaco/ear/target/maven-archiver/pom.properties b/clients/comaco/ear/target/maven-archiver/pom.properties index 2103745..851e659 100644 --- a/clients/comaco/ear/target/maven-archiver/pom.properties +++ b/clients/comaco/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:21 ECT 2022 +#Fri Nov 18 16:48:56 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear diff --git a/clients/comaco/environment-eap6/src/main/resources/META-INF/orm.xml b/clients/comaco/environment-eap6/src/main/resources/META-INF/orm.xml index 4ec95c4..d63675c 100644 --- a/clients/comaco/environment-eap6/src/main/resources/META-INF/orm.xml +++ b/clients/comaco/environment-eap6/src/main/resources/META-INF/orm.xml @@ -21,6 +21,14 @@ + + + + + + + +
diff --git a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml index f6cd9ac..76f5327 100644 --- a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml @@ -65,7 +65,7 @@ - + @@ -78,10 +78,12 @@ org.hibernate.ejb.HibernatePersistence java:jboss/datasources/FLIPDS1 + + diff --git a/clients/comaco/environment-eap6/target/classes/META-INF/orm.xml b/clients/comaco/environment-eap6/target/classes/META-INF/orm.xml index 4ec95c4..d63675c 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/orm.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/orm.xml @@ -21,6 +21,14 @@ + +
+ + + + + +
diff --git a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml index f6cd9ac..76f5327 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml @@ -65,7 +65,7 @@ - + @@ -78,10 +78,12 @@ org.hibernate.ejb.HibernatePersistence java:jboss/datasources/FLIPDS1 + + diff --git a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar index 0ff3660..d8aaeaa 100644 Binary files a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar and b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar differ diff --git a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties index 765e3d4..d0d1a53 100644 --- a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties +++ b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:20 ECT 2022 +#Fri Nov 18 16:48:56 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java index ed9b396..e4c1510 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java @@ -56,6 +56,7 @@ import com.fp.persistence.parmas.fun.TarmRegistroArmas; import com.fp.persistence.parmas.param.TarmTipoArmaExplosivo; import com.fp.persistence.parmas.param.TarmTramite; import com.fp.persistence.parmas.soli.TarmArmas; +import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante; import com.fp.persistence.pcustomer.gene.TcustPersonDetail; import com.fp.persistence.pgeneral.gene.TgeneCanton; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; @@ -235,7 +236,11 @@ public class ArmasController extends AbstractController { private String tipoSeleccionado; private Integer seleccionados; - + /** + * Obtener datos de consulta en armas + */ +private String descategoria; + private String usoActividad; @ManagedProperty(value = "#{alfrescoController}") private AlfrescoController alfrescoController; @@ -684,6 +689,7 @@ public class ArmasController extends AbstractController { @Override public void update() throws Exception { + System.out.println(" Estamos en la matrix"); TgeneCatalogDetail estado = CatalogDetailController.findxCodigoCodcatalogo(record.getEstado(), record.getEstadocodigo()); TgeneCatalogDetail marca = CatalogDetailController.findxCodigoCodcatalogo(record.getMarca(), record.getMarcacodigo()); record.getModifiedData().put("estado", estado.getDescription()); @@ -1589,6 +1595,7 @@ public class ArmasController extends AbstractController { public void actualizar(TarmArmas arma) throws Exception { record = arma; super.update(); + super.save(); } /*Busca un arma por código @@ -2325,6 +2332,70 @@ public class ArmasController extends AbstractController { querydatabase(); } + + /** + * Ejecucion para mostrar el arma que se va a definir como perdida robada + */ + public void loadAlertLose(){ + record.getModifiedData().put("estado", CatalogDetailController.findCatalogo("ESTADOARMA", "RPER").getDescription()); + record.setEstadocodigo("ESTADOARMA"); + record.setEstado("RPER"); + + record.getModifiedData().put("provincia", + ProvinceController.getDescProvByCodigo(record.getCountrycode(), record.getProvincecode())); + record.getModifiedData().put("canton", CantonController.getDescCantonByCodigo(record.getCountrycode(), + record.getProvincecode(), record.getCantoncode())); + record.getModifiedData().put("ciudad", CityController.getDescCiudadByCodigo(record.getCountrycode(), + record.getProvincecode(), record.getCantoncode(), record.getCitycode())); + record.getModifiedData().put("parroquia", ParroquiaController.getDescParroquiaByCodigo(record.getCountrycode(), + record.getProvincecode(), record.getCantoncode(), record.getParroquiacode())); + if (record.getModifiedData().get("paisorigencode") != null) { + record.getModifiedData().put("paisorigen", CountryController + .findcountry(record.getModifiedData().get("paisorigencode").toString()).getDescription()); + } + if (record.getColor() != null) { + record.getModifiedData().put("colorD", CatalogDetailController + .findxCodigoCodcatalogo(record.getColor(), record.getColorcodigo()).getDescription()); + } + /* Aumentado */ + TarmDocumentoHabilitante documento = DocumentoHabilitanteController + .findxarma(record.getCodigoarma().toString()); + + if (documento != null) { + TarmTramite tramite = TarmTramiteController.find(documento.getCtramite().toString()); + if (tramite != null) { + TgeneCatalogDetail catalogo = CatalogDetailController.findxCodigoCodcatalogo(tramite.getCategoria(), + tramite.getCategoriacodigo()); + descategoria = catalogo.getDescription(); + TgeneCatalogDetail uso = CatalogDetailController.findxCodigoCodcatalogo(tramite.getUsoactividad(), + tramite.getUsoactividadcodigo()); + usoActividad = uso.getDescription(); + } + } + + + } + + /** + * de consultaArmasController + */ + + + public void setUsoActividad(String usoActividad) { + this.usoActividad = usoActividad; + } + + public String getUsoActividad() { + return usoActividad; + } + + public void setDescategoria(String descategoria) { + this.descategoria = descategoria; + } + + public String getDescategoria() { + return descategoria; + } public UploadedFile getUploadedFile() { return uploadedFile; diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.java index 86ddac0..4b297e4 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.java @@ -40,6 +40,7 @@ import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante; import com.fp.persistence.pcustomer.gene.TcustPersonDetail; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.safe.TsafeUserDetail; +import org.openide.util.Exceptions; /** * Controlador principal de la funcionalidad de consulta de armas @@ -125,6 +126,13 @@ public class ConsultaArmasController extends AbstractController { private Date fec_actual; @ManagedProperty(value = "#{reportController}") private ReportController reportController; + + /** + * Controlador que maneja armas + */ + @ManagedProperty(value = "#{armasController}") + private ArmasController armasController; + private TcustPersonDetail customerperson; private TsafeUserDetail tsafeUserDetailUsuario = null; @@ -150,6 +158,7 @@ public class ConsultaArmasController extends AbstractController { lrecord = new ArrayList<>(); beanalias = "ARMAS"; filtroPersona = ""; + this.armasController.clearAll(); this.tsafeUserDetailUsuario = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); } catch (Exception e) { MessageHelper.setMessageError(e); @@ -371,12 +380,30 @@ public class ConsultaArmasController extends AbstractController { return dto; } + + /** + * Declarar arma perdida + */ + public void loseWeapon() { + try { + + armasController.actualizar((TarmArmas) record.cloneMe()); + + } catch(Exception ex) { + MessageHelper.setMessageError(String.format("ERROR AL DECLARAR EL ARMA %s COMO PERDIDA: %s", this.record.getPk(), ex.getMessage())); + + } + + } + + /** * Método que se ejecuta al abrir el LOV de visualizar item * seleccionado * * @throws Exception */ + public void loadEdit() throws Exception { verificaArmaExplosivo = Boolean.TRUE; record.getModifiedData().put("provincia", @@ -566,6 +593,15 @@ public class ConsultaArmasController extends AbstractController { return reportController; } + public ArmasController getArmasController() { + return armasController; + } + + public void setArmasController(ArmasController armasController) { + this.armasController = armasController; + } + + public void setReportController(ReportController reportController) { this.reportController = reportController; } diff --git a/frontend/src/main/resources/controlarmas_es.properties b/frontend/src/main/resources/controlarmas_es.properties index 02066d8..e294cce 100644 --- a/frontend/src/main/resources/controlarmas_es.properties +++ b/frontend/src/main/resources/controlarmas_es.properties @@ -1020,7 +1020,10 @@ lbl_numero_armas_error=N\u00famero de Errores lbl_numero_armas_correctas=Armas Correctas lbl_numoficio=No. Oficio lbl_boton_factura=Generar Factura - +# DECLARAR ARMAS PERDIDAS/ROBADAS +btn_armaperdida +lbl_alertadeclaracion=\u00bfESTA SEGURO QUE DESEA DECLARAR ESTA ARMA COMO PERDIDA? +btn_declararperdida='ARMA PERDIDA/ROBADA' # * PAGO CON TARJETA lbl_total_pagar=Total a Pagar lbl_interes_tarjeta=Interes por pago con tarjeta diff --git a/frontend/src/main/resources/general_es.properties b/frontend/src/main/resources/general_es.properties index 990ef61..e8dd2e5 100644 --- a/frontend/src/main/resources/general_es.properties +++ b/frontend/src/main/resources/general_es.properties @@ -56,7 +56,6 @@ btn_reload=Recargar (F4) btn_queryTran=Consultar (F5) btn_saveTran=Guardar (F10) btn_helpTran=Ayuda (F1) - #Cabecera de tablas htbl_catalog=CAT\u00c1LOGO htbl_catalogdetail=DETALLE DE CAT\u00c1LOGO diff --git a/frontend/src/main/webapp/pages/armas/declararPerdidaArma.xhtml b/frontend/src/main/webapp/pages/armas/declararPerdidaArma.xhtml new file mode 100644 index 0000000..e17b832 --- /dev/null +++ b/frontend/src/main/webapp/pages/armas/declararPerdidaArma.xhtml @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index 1720eba..2cb43f5 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class index 49563e1..92bc99a 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class differ diff --git a/frontend/target/classes/controlarmas_es.properties b/frontend/target/classes/controlarmas_es.properties index 02066d8..e294cce 100644 --- a/frontend/target/classes/controlarmas_es.properties +++ b/frontend/target/classes/controlarmas_es.properties @@ -1020,7 +1020,10 @@ lbl_numero_armas_error=N\u00famero de Errores lbl_numero_armas_correctas=Armas Correctas lbl_numoficio=No. Oficio lbl_boton_factura=Generar Factura - +# DECLARAR ARMAS PERDIDAS/ROBADAS +btn_armaperdida +lbl_alertadeclaracion=\u00bfESTA SEGURO QUE DESEA DECLARAR ESTA ARMA COMO PERDIDA? +btn_declararperdida='ARMA PERDIDA/ROBADA' # * PAGO CON TARJETA lbl_total_pagar=Total a Pagar lbl_interes_tarjeta=Interes por pago con tarjeta diff --git a/frontend/target/classes/general_es.properties b/frontend/target/classes/general_es.properties index 990ef61..e8dd2e5 100644 --- a/frontend/target/classes/general_es.properties +++ b/frontend/target/classes/general_es.properties @@ -56,7 +56,6 @@ btn_reload=Recargar (F4) btn_queryTran=Consultar (F5) btn_saveTran=Guardar (F10) btn_helpTran=Ayuda (F1) - #Cabecera de tablas htbl_catalog=CAT\u00c1LOGO htbl_catalogdetail=DETALLE DE CAT\u00c1LOGO diff --git a/frontend/target/maia.war b/frontend/target/maia.war index bc37073..4c4e291 100644 Binary files a/frontend/target/maia.war and b/frontend/target/maia.war differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index 1720eba..2cb43f5 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class index 49563e1..92bc99a 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ConsultaArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties b/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties index 02066d8..e294cce 100644 --- a/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties +++ b/frontend/target/maia/WEB-INF/classes/controlarmas_es.properties @@ -1020,7 +1020,10 @@ lbl_numero_armas_error=N\u00famero de Errores lbl_numero_armas_correctas=Armas Correctas lbl_numoficio=No. Oficio lbl_boton_factura=Generar Factura - +# DECLARAR ARMAS PERDIDAS/ROBADAS +btn_armaperdida +lbl_alertadeclaracion=\u00bfESTA SEGURO QUE DESEA DECLARAR ESTA ARMA COMO PERDIDA? +btn_declararperdida='ARMA PERDIDA/ROBADA' # * PAGO CON TARJETA lbl_total_pagar=Total a Pagar lbl_interes_tarjeta=Interes por pago con tarjeta diff --git a/frontend/target/maia/WEB-INF/classes/general_es.properties b/frontend/target/maia/WEB-INF/classes/general_es.properties index 990ef61..e8dd2e5 100644 --- a/frontend/target/maia/WEB-INF/classes/general_es.properties +++ b/frontend/target/maia/WEB-INF/classes/general_es.properties @@ -56,7 +56,6 @@ btn_reload=Recargar (F4) btn_queryTran=Consultar (F5) btn_saveTran=Guardar (F10) btn_helpTran=Ayuda (F1) - #Cabecera de tablas htbl_catalog=CAT\u00c1LOGO htbl_catalogdetail=DETALLE DE CAT\u00c1LOGO diff --git a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar index e6129cb..9c2e28a 100644 Binary files a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/common-2.1.jar b/frontend/target/maia/WEB-INF/lib/common-2.1.jar index 12288db..3549801 100644 Binary files a/frontend/target/maia/WEB-INF/lib/common-2.1.jar and b/frontend/target/maia/WEB-INF/lib/common-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar index fa4e440..8a0a7ee 100644 Binary files a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar and b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar index a97106b..7e52139 100644 Binary files a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar and b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar index 5bb2f9f..0b13be4 100644 Binary files a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar and b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar index 3abdeb5..84c1fc4 100644 Binary files a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar index 5505173..abe84cb 100644 Binary files a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar index 0b2c48f..783e229 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar index caf8c56..4ab87dc 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar index 65512ea..d5f0171 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar index 21f2279..861c274 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar index 74e91e0..8535220 100644 Binary files a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar and b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/util-2.1.jar b/frontend/target/maia/WEB-INF/lib/util-2.1.jar index 711bc4f..ad1e64e 100644 Binary files a/frontend/target/maia/WEB-INF/lib/util-2.1.jar and b/frontend/target/maia/WEB-INF/lib/util-2.1.jar differ diff --git a/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml b/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml new file mode 100644 index 0000000..e17b832 --- /dev/null +++ b/frontend/target/maia/pages/armas/declararPerdidaArma.xhtml @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/target/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 3a142e7..f373a34 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 16 14:17:35 ECT 2022 +#Fri Nov 18 16:49:15 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend