diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index 9413aee..5a715aa 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/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 1f25a1e..d635009 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 02 15:37:09 ECT 2022 +#Fri Nov 11 16:29:35 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 17946f6..4cb5e65 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 02 15:37:03 ECT 2022 +#Fri Nov 11 16:29:28 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 785b95a..abd4f5a 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/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java index a0a81cb..4b201ec 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java @@ -323,6 +323,7 @@ public class ScheduleXMLSolicitud { public TgeneParameters obtenerParametro(String code, EntityManager entityManager) throws Exception{ return TgeneParameters.find(entityManager, new TgeneParametersKey(code, 1)); } + @Schedule( hour = "*",second = "0", minute = "1,10,20,30,40,50", persistent = false) public void generarXMLs() { try { diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index 682ae09..4e5c11b 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/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class index 9f5eeee..3089f9b 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class and b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index f524327..16e7bdf 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 02 15:37:29 ECT 2022 +#Fri Nov 11 16:29:57 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 a6e0eec..fb6f53a 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 703ff2f..46f71cb 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 02 15:37:23 ECT 2022 +#Fri Nov 11 16:29:50 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 322cb50..dc1748a 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 f15e011..0e565e3 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 02 15:37:25 ECT 2022 +#Fri Nov 11 16:29:52 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=log diff --git a/base/business/person/src/main/java/com/fp/person/rules/save/JuridicalPerson.java b/base/business/person/src/main/java/com/fp/person/rules/save/JuridicalPerson.java index 2f56e04..358f97c 100644 --- a/base/business/person/src/main/java/com/fp/person/rules/save/JuridicalPerson.java +++ b/base/business/person/src/main/java/com/fp/person/rules/save/JuridicalPerson.java @@ -1,13 +1,9 @@ package com.fp.person.rules.save; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.List; -import org.joda.time.DateTime; - import com.fp.dto.rules.TransactionRule; import com.fp.dto.save.SaveRequest; import com.fp.persistence.commondb.PersistenceHelper; diff --git a/base/business/person/src/main/java/com/fp/person/rules/save/LogoImage.java b/base/business/person/src/main/java/com/fp/person/rules/save/LogoImage.java index b21c3a0..b2e6045 100644 --- a/base/business/person/src/main/java/com/fp/person/rules/save/LogoImage.java +++ b/base/business/person/src/main/java/com/fp/person/rules/save/LogoImage.java @@ -44,7 +44,9 @@ public class LogoImage extends TransactionRule { if(fileItem.get(0).getExtension() != null){ if (fileItem.get(0).getExtension().toLowerCase().compareTo("jpg") == 0 || fileItem.get(0).getExtension().toLowerCase().compareTo("gif") == 0 - || fileItem.get(0).getExtension().toLowerCase().compareTo("png") == 0) { + || fileItem.get(0).getExtension().toLowerCase().compareTo("png") == 0 + || fileItem.get(0).getExtension().toLowerCase().compareTo("jpeg") == 0 + ) { int contador = 1; if (logocode == null) { logocode = PersonImage.getFileCode(); @@ -93,7 +95,7 @@ public class LogoImage extends TransactionRule { PersistenceHelper.getEntityManager().detach(tcustCompany); sr.putSaveBean("TCUSTCOMPANY", tcustCompany, (contador++)); } else { - throw new GeneralException("CUST-0007", "Los tipos de archivos permitidos son jpg, gif y png"); + throw new GeneralException("CUST-0007", "Los tipos de archivos permitidos son jpg, jpeg, gif y png"); } } } diff --git a/base/business/person/src/main/java/com/fp/person/rules/save/PersonImage.java b/base/business/person/src/main/java/com/fp/person/rules/save/PersonImage.java index 82ecf26..af61e01 100644 --- a/base/business/person/src/main/java/com/fp/person/rules/save/PersonImage.java +++ b/base/business/person/src/main/java/com/fp/person/rules/save/PersonImage.java @@ -103,6 +103,7 @@ public class PersonImage extends TransactionRule { if (!fileItem.getName().equals("")) { if (fileItem.getExtension().toLowerCase().compareTo("jpg") == 0 || fileItem.getExtension().toLowerCase().compareTo("gif") == 0 + || fileItem.getExtension().toLowerCase().compareTo("jpeg") == 0 || fileItem.getExtension().toLowerCase().compareTo("png") == 0) { if (photocode == null) { photocode = getFileCode(); @@ -129,7 +130,7 @@ public class PersonImage extends TransactionRule { } } else { throw new GeneralException("CUST-0007", - "LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, GIF Y PNG"); + "LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, JPEG, GIF Y PNG"); } } return photocode; diff --git a/base/business/person/src/main/resources/personmessages_es.properties b/base/business/person/src/main/resources/personmessages_es.properties index bab0cfc..fd5e940 100644 --- a/base/business/person/src/main/resources/personmessages_es.properties +++ b/base/business/person/src/main/resources/personmessages_es.properties @@ -1,12 +1,12 @@ CUST-0001=PERSONA NO DEFINIDA EN TCUSTPERSONDETAIL: PERSONCODE:{0} CUST-0002=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - SINDICADO, NO SE PUEDE REGISTRAR EL CLIENTE" -CUST-0003=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - HOM\u00D3NIMO, NO SE REGISTRO EL CLIENTE +CUST-0003=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - HOM\u00d3NIMO, NO SE REGISTRO EL CLIENTE CUST-0004=El ARCHIVO NO ES EL CORRECTO - BG CUST-0005=El ARCHIVO NO ES EL CORRECTO - BG(IFIS) -CUST-0006=EXTENSI\u00D2N INCORRECTA DEL ARCHIVO -CUST-0007=LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, GIF Y PNG -CUST-0008=NO SE PUEDE CAMBIAR LA IDENTIFICACI\u00D3N YA QUE ESTA SE ENCUENTRA COMO SINDICADA +CUST-0006=EXTENSI\u00d2N INCORRECTA DEL ARCHIVO +CUST-0007=LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, JPEG, GIF Y PNG +CUST-0008=NO SE PUEDE CAMBIAR LA IDENTIFICACI\u00d3N YA QUE ESTA SE ENCUENTRA COMO SINDICADA CUST-0009=ARCHIVO NO CUMPLE CON FORMATO REQUERIDO -CUST-0010=NO SE PUEDE ELIMINAR LA DIRECCI\u00D3N PORQUE SE ENCUENTRA ASOCIADA -CUST-0013=C\u00C9DULA NO V\u00C1LIDA -CUST-0014=RUC NO V\u00C1LIDO \ No newline at end of file +CUST-0010=NO SE PUEDE ELIMINAR LA DIRECCI\u00d3N PORQUE SE ENCUENTRA ASOCIADA +CUST-0013=C\u00c9DULA NO V\u00c1LIDA +CUST-0014=RUC NO V\u00c1LIDO \ No newline at end of file diff --git a/base/business/person/target/classes/com/fp/person/rules/save/JuridicalPerson.class b/base/business/person/target/classes/com/fp/person/rules/save/JuridicalPerson.class index dc646a5..c756858 100644 Binary files a/base/business/person/target/classes/com/fp/person/rules/save/JuridicalPerson.class and b/base/business/person/target/classes/com/fp/person/rules/save/JuridicalPerson.class differ diff --git a/base/business/person/target/classes/com/fp/person/rules/save/LogoImage.class b/base/business/person/target/classes/com/fp/person/rules/save/LogoImage.class index b42fd5d..8d0901e 100644 Binary files a/base/business/person/target/classes/com/fp/person/rules/save/LogoImage.class and b/base/business/person/target/classes/com/fp/person/rules/save/LogoImage.class differ diff --git a/base/business/person/target/classes/com/fp/person/rules/save/PersonImage.class b/base/business/person/target/classes/com/fp/person/rules/save/PersonImage.class index 8872d71..1f83573 100644 Binary files a/base/business/person/target/classes/com/fp/person/rules/save/PersonImage.class and b/base/business/person/target/classes/com/fp/person/rules/save/PersonImage.class differ diff --git a/base/business/person/target/classes/personmessages_es.properties b/base/business/person/target/classes/personmessages_es.properties index bab0cfc..fd5e940 100644 --- a/base/business/person/target/classes/personmessages_es.properties +++ b/base/business/person/target/classes/personmessages_es.properties @@ -1,12 +1,12 @@ CUST-0001=PERSONA NO DEFINIDA EN TCUSTPERSONDETAIL: PERSONCODE:{0} CUST-0002=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - SINDICADO, NO SE PUEDE REGISTRAR EL CLIENTE" -CUST-0003=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - HOM\u00D3NIMO, NO SE REGISTRO EL CLIENTE +CUST-0003=LA PERSONA SE ENCUENTRA REGISTRADA EN LA TABLA DE CONSEP CONSEP - HOM\u00d3NIMO, NO SE REGISTRO EL CLIENTE CUST-0004=El ARCHIVO NO ES EL CORRECTO - BG CUST-0005=El ARCHIVO NO ES EL CORRECTO - BG(IFIS) -CUST-0006=EXTENSI\u00D2N INCORRECTA DEL ARCHIVO -CUST-0007=LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, GIF Y PNG -CUST-0008=NO SE PUEDE CAMBIAR LA IDENTIFICACI\u00D3N YA QUE ESTA SE ENCUENTRA COMO SINDICADA +CUST-0006=EXTENSI\u00d2N INCORRECTA DEL ARCHIVO +CUST-0007=LOS TIPOS DE ARCHIVOS PERMITIDOS SON JPG, JPEG, GIF Y PNG +CUST-0008=NO SE PUEDE CAMBIAR LA IDENTIFICACI\u00d3N YA QUE ESTA SE ENCUENTRA COMO SINDICADA CUST-0009=ARCHIVO NO CUMPLE CON FORMATO REQUERIDO -CUST-0010=NO SE PUEDE ELIMINAR LA DIRECCI\u00D3N PORQUE SE ENCUENTRA ASOCIADA -CUST-0013=C\u00C9DULA NO V\u00C1LIDA -CUST-0014=RUC NO V\u00C1LIDO \ No newline at end of file +CUST-0010=NO SE PUEDE ELIMINAR LA DIRECCI\u00d3N PORQUE SE ENCUENTRA ASOCIADA +CUST-0013=C\u00c9DULA NO V\u00c1LIDA +CUST-0014=RUC NO V\u00c1LIDO \ No newline at end of file diff --git a/base/business/person/target/maven-archiver/pom.properties b/base/business/person/target/maven-archiver/pom.properties index a8ea402..d46469f 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 02 15:37:20 ECT 2022 +#Fri Nov 11 16:29:47 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 7318d9f..2a2229f 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 74418ee..e7c1bd6 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 02 15:37:24 ECT 2022 +#Fri Nov 11 16:29:51 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 00f85be..e395c16 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 d17e853..4e82ee0 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 02 15:37:26 ECT 2022 +#Fri Nov 11 16:29:54 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 3b025d0..ae5019d 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 8d8bbfe..63a134b 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 466c299..6afc1fe 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 02 15:37:17 ECT 2022 +#Fri Nov 11 16:29:44 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 cf7b4d6..c22a4e9 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 8e017d9..5a52ce4 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 02 15:37:05 ECT 2022 +#Fri Nov 11 16:29:30 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 b5382c3..2fa7dce 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 f1ff30b..ac7b627 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 02 15:37:16 ECT 2022 +#Fri Nov 11 16:29:43 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 4282790..b8ad5c9 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 901510d..b704a6c 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 02 15:36:50 ECT 2022 +#Fri Nov 11 16:29:14 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 bc1a910..441fc47 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 cb99f24..55f20f2 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 02 15:36:48 ECT 2022 +#Fri Nov 11 16:29:12 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 b7b43f6..4dea168 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 @@ -12,6 +12,14 @@ import com.fp.facade.ejb.helper.BeanHelper; import com.fp.facadeclient.ejb.FacadeBeanJsfRemote; import com.fp.persistence.commondb.PersistenceHelper; import com.fp.persistence.commondb.PersistenceManager; +import com.fp.persistence.commondb.exception.CommondbException; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.naming.NamingException; +import javax.persistence.Query; +import javax.transaction.NotSupportedException; +import javax.transaction.SystemException; +import org.hibernate.HibernateException; /** * Ejb, que actua como fachada de transacciones de consulta. @@ -59,4 +67,25 @@ public class QueryBean extends BeanHelper implements FacadeBeanJsfRemote { } } + @Override + public int executeNativeQuery(String query) { + int f = 0; + try { + EntityManager em = PersistenceManager.getInstance().createEntityManagerLocal(); + PersistenceHelper.setEntityManager(em); + PersistenceHelper.beginTransaction(); + Query q = em.createNativeQuery(query); + f = q.executeUpdate(); + PersistenceHelper.commitTransaction(); + + } catch (Throwable e) { + PersistenceHelper.rollbackTransaction(); + + Logger.getLogger(QueryBean.class.getName()).log(Level.SEVERE, null, e); + } finally{ + PersistenceHelper.closeSession(); + } + return f; + } + } diff --git a/base/facade/src/main/java/com/fp/facade/ejb/QueryWithCommitBean.java b/base/facade/src/main/java/com/fp/facade/ejb/QueryWithCommitBean.java index e40944f..2af2c2f 100644 --- a/base/facade/src/main/java/com/fp/facade/ejb/QueryWithCommitBean.java +++ b/base/facade/src/main/java/com/fp/facade/ejb/QueryWithCommitBean.java @@ -52,4 +52,9 @@ public class QueryWithCommitBean extends BeanHelper implements FacadeBeanJsfRemo } } + @Override + public int executeNativeQuery(String string) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + } diff --git a/base/facade/src/main/java/com/fp/facade/ejb/ReportBean.java b/base/facade/src/main/java/com/fp/facade/ejb/ReportBean.java index 7f26cda..1596e98 100644 --- a/base/facade/src/main/java/com/fp/facade/ejb/ReportBean.java +++ b/base/facade/src/main/java/com/fp/facade/ejb/ReportBean.java @@ -67,5 +67,10 @@ public class ReportBean extends BeanHelper implements FacadeBeanJsfRemote { } } + @Override + public int executeNativeQuery(String string) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + } diff --git a/base/facade/src/main/java/com/fp/facade/ejb/SaveBean.java b/base/facade/src/main/java/com/fp/facade/ejb/SaveBean.java index 42c1556..77e1891 100644 --- a/base/facade/src/main/java/com/fp/facade/ejb/SaveBean.java +++ b/base/facade/src/main/java/com/fp/facade/ejb/SaveBean.java @@ -12,17 +12,26 @@ import com.fp.facade.ejb.helper.BeanHelper; import com.fp.facadeclient.ejb.FacadeBeanJsfRemote; import com.fp.persistence.commondb.PersistenceHelper; import com.fp.persistence.commondb.PersistenceManager; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.persistence.Query; @Stateless(name = "savebean") @TransactionManagement(value = TransactionManagementType.BEAN) public class SaveBean extends BeanHelper implements FacadeBeanJsfRemote { - + /** * Metodo que se encarga de la ejecucion de una accion. * @param request Request con los datos necesarios para ejecutar una accion, consulta o mantenimiento. * @return Object * @throws Exception */ + + /** + * EJECUTAR QUERYS NATIVOS + */ + + public Object process(Request request) throws Throwable{ this.fillThreadFacade(request.getCompany()); Object resp = null; @@ -49,6 +58,27 @@ public class SaveBean extends BeanHelper implements FacadeBeanJsfRemote { PersistenceHelper.closeSession(); } } + + @Override + public int executeNativeQuery(String query) { + int f = 0; + try { + EntityManager em = PersistenceManager.getInstance().createEntityManagerLocal(); + PersistenceHelper.setEntityManager(em); + PersistenceHelper.beginTransaction(); + Query q = em.createNativeQuery(query); + f = q.executeUpdate(); + PersistenceHelper.commitTransaction(); + + } catch (Throwable e) { + PersistenceHelper.rollbackTransaction(); + + Logger.getLogger(QueryBean.class.getName()).log(Level.SEVERE, null, e); + } finally{ + PersistenceHelper.closeSession(); + } + return f; + } } 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 6e98d93..48d087b 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/classes/com/fp/facade/ejb/QueryWithCommitBean.class b/base/facade/target/classes/com/fp/facade/ejb/QueryWithCommitBean.class index 92e9960..71c8255 100644 Binary files a/base/facade/target/classes/com/fp/facade/ejb/QueryWithCommitBean.class and b/base/facade/target/classes/com/fp/facade/ejb/QueryWithCommitBean.class differ diff --git a/base/facade/target/classes/com/fp/facade/ejb/ReportBean.class b/base/facade/target/classes/com/fp/facade/ejb/ReportBean.class index 4fdaea7..6592cab 100644 Binary files a/base/facade/target/classes/com/fp/facade/ejb/ReportBean.class and b/base/facade/target/classes/com/fp/facade/ejb/ReportBean.class differ diff --git a/base/facade/target/classes/com/fp/facade/ejb/SaveBean.class b/base/facade/target/classes/com/fp/facade/ejb/SaveBean.class index 6af8171..b5e5ea7 100644 Binary files a/base/facade/target/classes/com/fp/facade/ejb/SaveBean.class and b/base/facade/target/classes/com/fp/facade/ejb/SaveBean.class differ diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index fe19f3a..fd3623d 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 a513bec..10d30c6 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 02 15:37:31 ECT 2022 +#Fri Nov 11 16:29:59 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facadeclient/src/main/java/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.java b/base/facadeclient/src/main/java/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.java index 1d4a7ff..836754e 100644 --- a/base/facadeclient/src/main/java/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.java +++ b/base/facadeclient/src/main/java/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.java @@ -18,6 +18,8 @@ public interface FacadeBeanJsfRemote { * @return Object * @throws Exception */ + public int executeNativeQuery(String query); + public Object process(Request request) throws Throwable; } diff --git a/base/facadeclient/target/classes/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.class b/base/facadeclient/target/classes/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.class index be91bed..7eabd64 100644 Binary files a/base/facadeclient/target/classes/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.class and b/base/facadeclient/target/classes/com/fp/facadeclient/ejb/FacadeBeanJsfRemote.class differ diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index 52fe324..b09684e 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 7b42077..9d807fe 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 02 15:37:30 ECT 2022 +#Fri Nov 11 16:29:58 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 1b09758..ff1dc33 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 184bb72..809e61b 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 02 15:36:59 ECT 2022 +#Fri Nov 11 16:29:23 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmInvoiceHistory.java b/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmInvoiceHistory.java index ff425a4..6491293 100644 --- a/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmInvoiceHistory.java +++ b/base/persistence/parmas/src/main/java/com/fp/persistence/parmas/soli/TarmInvoiceHistory.java @@ -38,53 +38,26 @@ public class TarmInvoiceHistory extends com.fp.dto.AbstractDataTransport impleme * Version de la Clase */ private static final long serialVersionUID = 1L; - /** - * Clave primaria de la Entidad TarmInvoiceHistory - */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) - @Column(name = "ID") + @Column(name = "id") private Integer pk; - /** - * Codigo usuario - */ @Basic(optional = false) - @Column(name = "USERCODE") + @Column(name = "usercode") private String usercode; - /** - * Fecha de generacion de la factura - */ - @Column(name = "REGISTRATIONDATE", nullable = true) + @Column(name = "registrationdate") private Timestamp registrationdate; - /** - * codigo de solicitud de la cual se genero la factura - */ - @Column(name = "CSOLICITUD", nullable = true) + @Column(name = "csolicitud") private String csolicitud; - /** - * Numero de solicitud ejem: SOL-OOOOOOOO - */ - @Column(name = "SOLICITUDNUMBER", nullable = true) + @Column(name = "solicitudnumber") private String solicitudnumber; - /** - * Numero de tramite ejem: TRA-OOOOOOOO - */ - @Column(name = "TRAMITENUMBER", nullable = true) + @Column(name = "tramitenumber") private String tramitenumber; - /** - * Path en donde se genero el xml - */ - @Column(name = "PATHFILE", nullable = true) + @Column(name = "pathfile") private String pathfile; - /** - * contenido del xml por seguridad ante modificacion - */ - @Column(name = "CONTENTFILE", nullable = true) + @Column(name = "contentfile") private String contentfile; - /** - * Constructor - */ public TarmInvoiceHistory() { } public TarmInvoiceHistory(Integer ppk) { @@ -189,6 +162,13 @@ public class TarmInvoiceHistory extends com.fp.dto.AbstractDataTransport impleme * * @return el hashCode la instancia */ + @Override + public int hashCode() { + int hash = 0; + hash += (pk != null ? pk.hashCode() : 0); + return hash; + } + /** public int hashCode() { if (this.hashValue == 0) { int result = 17; @@ -200,7 +180,7 @@ public class TarmInvoiceHistory extends com.fp.dto.AbstractDataTransport impleme this.hashValue = result; } return this.hashValue; - } + }*/ /** * Implementacion toString diff --git a/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmInvoiceHistory.class b/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmInvoiceHistory.class index 58b114d..9407a53 100644 Binary files a/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmInvoiceHistory.class and b/base/persistence/parmas/target/classes/com/fp/persistence/parmas/soli/TarmInvoiceHistory.class differ diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index 699ea3a..7bd2b76 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 02 15:37:15 ECT 2022 +#Fri Nov 11 16:29:42 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 abdba05..1ff4d17 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 0e9ae14..acd2051 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 02 15:36:51 ECT 2022 +#Fri Nov 11 16:29:16 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 2e793be..9696b7e 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 1ff0be9..869e1ae 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 02 15:37:01 ECT 2022 +#Fri Nov 11 16:29:26 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 51fa1a2..d7c4702 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 a76cda5..47afc82 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 02 15:37:12 ECT 2022 +#Fri Nov 11 16:29:39 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 8e29527..e7014ad 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 0bd8c92..c824a15 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 02 15:36:57 ECT 2022 +#Fri Nov 11 16:29:21 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 efb7165..d8ae889 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 ebc0cd0..1913550 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 02 15:37:10 ECT 2022 +#Fri Nov 11 16:29:36 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 10e9c68..22b0e66 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 6c7459c..c22fa27 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 02 15:37:11 ECT 2022 +#Fri Nov 11 16:29:38 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 18f0d45..a898c3e 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/src/main/java/com/fp/base/persistence/util/job/ServiceManager.java b/base/persistence/util/src/main/java/com/fp/base/persistence/util/job/ServiceManager.java index 3ca6745..0e436bd 100644 --- a/base/persistence/util/src/main/java/com/fp/base/persistence/util/job/ServiceManager.java +++ b/base/persistence/util/src/main/java/com/fp/base/persistence/util/job/ServiceManager.java @@ -31,7 +31,10 @@ public class ServiceManager { this.startByService(obj); } } catch (Exception e) { - APPLogger.getLogger().error("***********NO PUEDE INICIAR EL SERVICIO********** :"+obj.getPk()+" DEFINIDO EN TgeneServices ***********"); + APPLogger.getLogger().error( + String.format("***********NO PUEDE INICIAR EL SERVICIO********** :%s DEFINIDO EN TgeneServices ERROR: %s", + obj.getPk(),e.toString()) + ); } } } diff --git a/base/persistence/util/target/classes/com/fp/base/persistence/util/job/ServiceManager.class b/base/persistence/util/target/classes/com/fp/base/persistence/util/job/ServiceManager.class index 2b6c20b..711c944 100644 Binary files a/base/persistence/util/target/classes/com/fp/base/persistence/util/job/ServiceManager.class and b/base/persistence/util/target/classes/com/fp/base/persistence/util/job/ServiceManager.class differ diff --git a/base/persistence/util/target/maven-archiver/pom.properties b/base/persistence/util/target/maven-archiver/pom.properties index 8bf44b4..555aff0 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 02 15:37:02 ECT 2022 +#Fri Nov 11 16:29:27 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 702ba85..2f6d0d0 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 92b7cab..dc80a8b 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 02 15:37:18 ECT 2022 +#Fri Nov 11 16:29:45 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 dbdc493..2d6a763 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 675a3d2..78374a2 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 682ae09..4e5c11b 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 cf7b4d6..c22a4e9 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 9413aee..5a715aa 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 4282790..b8ad5c9 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 1b09758..ff1dc33 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 bc1a910..441fc47 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 b674f9c..2dad2c5 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 fe19f3a..fd3623d 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 52fe324..b09684e 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 b5382c3..2fa7dce 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 a6e0eec..fb6f53a 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 322cb50..dc1748a 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 abdba05..1ff4d17 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 2e793be..9696b7e 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 51fa1a2..d7c4702 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 7318d9f..2a2229f 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 8e29527..e7014ad 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 efb7165..d8ae889 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 10e9c68..22b0e66 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 00f85be..e395c16 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 dbdc493..2d6a763 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 785b95a..abd4f5a 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 702ba85..2f6d0d0 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 0f02879..b36343e 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 02 15:37:32 ECT 2022 +#Fri Nov 11 16:30:00 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear 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 522239a..6c21eef 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 @@ -62,7 +62,7 @@ - + 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 522239a..6c21eef 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml @@ -62,7 +62,7 @@ - + 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 b674f9c..2dad2c5 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 f11e3b8..f9dbe21 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 02 15:37:31 ECT 2022 +#Fri Nov 11 16:29:59 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/FacturaController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/FacturaController.java index be78321..c8c4b47 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/FacturaController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/FacturaController.java @@ -4,6 +4,7 @@ */ package com.fp.frontend.controller.armas.solicitud; +import com.fp.common.logger.APPLogger; import com.fp.dto.AbstractDataTransport; import com.fp.frontend.controller.AbstractController; import com.fp.frontend.controller.armas.parametros.CentroControlArmasController; @@ -12,8 +13,9 @@ import com.fp.frontend.controller.pcustomer.PersonDetailController; import com.fp.frontend.controller.pcustomer.PersonPhoneController; import com.fp.frontend.controller.pgeneral.gene.CityController; import com.fp.frontend.controller.pgeneral.gene.ParametersController; -import static com.fp.frontend.controller.pgeneral.gene.ParametersController.find; import com.fp.persistence.commondb.PersistenceHelper; +import com.fp.persistence.commondb.data.SessionData; +import com.fp.persistence.commondb.data.ThreadFacade; import com.fp.persistence.parmas.param.TarmCentroControl; import com.fp.persistence.parmas.param.TarmTramite; import com.fp.persistence.parmas.soli.TarmInvoiceHistory; @@ -26,23 +28,26 @@ import com.fp.persistence.pgeneral.gene.TgeneCity; import com.fp.persistence.pgeneral.gene.TgeneParameters; import com.fp.persistence.pgeneral.safe.TsafeUserDetail; import java.io.BufferedReader; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Paths; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedProperty; import javax.faces.bean.ViewScoped; import javax.faces.context.FacesContext; - +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import javax.persistence.Query; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; @@ -63,6 +68,25 @@ import org.w3c.dom.Element; public class FacturaController extends AbstractController{ private static final long serialVersionUID = -4049698904561227471L; + private EntityManagerFactory emf; + + private final void crearManager() { + try { + if (emf == null) { + Map configOverrides = new HashMap(); + configOverrides.put("hibernate.ejb.cfgfile", "hibernateFlipMapping.cfg.xml"); + emf = Persistence.createEntityManagerFactory("local2", configOverrides); + } + SessionData sessionData = new SessionData(); + sessionData.setCompany(1); + sessionData.setIsEjb(Boolean.FALSE); + ThreadFacade.setSaveRequest(sessionData); + } catch (Exception e) { + APPLogger.getLogger().error(e); + } + } + + public FacturaController() throws Exception{ super(AbstractDataTransport.class); } @@ -81,8 +105,7 @@ public class FacturaController extends AbstractController /** *Codigo de GENERACION DE XML DE FACTURAS */ - - + public void crearAgregarHijo(Document doc, Element padre, String nombreElemento, String textoElemento) { Element hijo = crearElemento(doc, nombreElemento, textoElemento); agregarHijoPadre(doc, padre, hijo); @@ -115,6 +138,7 @@ public class FacturaController extends AbstractController padre.appendChild(hijo); } + /** *ACTUALIZAR SECUENCIA DE CENTRO DE CONTROL */ @@ -123,11 +147,23 @@ public class FacturaController extends AbstractController cac.update(centroControl); cac.save(); } + /** + * Por cuestinoes de tiempo se desarrollo query nativo con entityManager, misma logica que schedulexml + */ + public void guardarAuditoria(String csoli,String user, String solicitudNumber, String tramiteNumber,String path) throws IOException, Exception{ + Query q = null; + String insert = String.format("INSERT INTO TARMINVOICEHISTORY\n" + + "(USERCODE, REGISTRATIONDATE, CSOLICITUD, SOLICITUDNUMBER, TRAMITENUMBER, PATHFILE, CONTENTFILE)\n" + + "VALUES ('%s', now(), '%s', '%s', '%s', '%s','%s')", user, csoli, solicitudNumber, tramiteNumber, path, obtenerContenidoArchivo(path)); + int ejecucion = this.callerhelper.executeNativeQuery(insert); + System.out.println("Numero de filas afectadas: "+ejecucion); + + } + /** *Buscar direccion de la persona si es la principal (Y) */ public TcustPersonAddress setDireccionPrincipal(TcustPersonAddress direccion, List lstdireccionDomicilio){ - if (lstdireccionDomicilio != null && !lstdireccionDomicilio.isEmpty()) { for (TcustPersonAddress tcustPersonAddress : lstdireccionDomicilio) { if (tcustPersonAddress.getPrincipal().equalsIgnoreCase("Y")) { @@ -205,7 +241,7 @@ public class FacturaController extends AbstractController public File sacarFactura(String codigoSolicitud, File carpetaBase, TsafeUserDetail tsafeUserDetail) throws Exception { CentroControlArmasController cac = new CentroControlArmasController(); - TgeneParameters tCustodio = find("CUSTODIOSFACTURA", "1"); + TgeneParameters tCustodio = ParametersController.find("CUSTODIOSFACTURA", "1"); String noDisponible = ""; /**SE SUELE UTILIZAR SI ES QUE SE REQUIERE UN MENSAJE EN DATOS VACIOS*/ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); @@ -219,7 +255,7 @@ public class FacturaController extends AbstractController TarmSolicitud solicitud = SolicitudController.findSolicitudxcodsolicitud(codigoSolicitud); Integer personCode = solicitud.getPersoncode(); TcustPersonDetail persona = PersonDetailController.find(personCode.toString()); - TgeneParameters parametroRUC = find("RUCCOMACO", "1"); + TgeneParameters parametroRUC = ParametersController.find("RUCCOMACO", "1"); TarmTramite tTramite = TarmTramiteController.findSimple(solicitud.getCtramite().toString()); String rucComaco = parametroRUC.getTextvalue(); crearAgregarHijo(doc, factura, "ruc", rucComaco); @@ -322,7 +358,7 @@ public class FacturaController extends AbstractController */ if (solicitudTramite.getValorcustodios() != null && solicitudTramite.getValorcustodios().doubleValue() > 0) { generarCustodio(doc, tCustodio, solicitud, solicitudTramite, impuesto, porcentajeDescuento, detalles); - + } agregarHijoPadre(doc, factura, detalles); @@ -372,7 +408,8 @@ public class FacturaController extends AbstractController transformer.transform(source, result); try { - crearAuditoria(solicitud.getPk(), tsafeUserDetail.getPk().getUsercode(), + + guardarAuditoria(solicitud.getPk(), tsafeUserDetail.getPk().getUsercode(), solicitud.getNumerosolicitud(), solicitudTramite.getNumerotramite(), archivo.getAbsolutePath()); @@ -405,11 +442,12 @@ public class FacturaController extends AbstractController tih.setContentfile(obtenerContenidoArchivo(path)); //PersistenceHelper.getEntityManager().persist(tih); System.out.println("com.fp.frontend.controller.armas.solicitud.FacturaController.crearAuditoria()<>> va a gualdal" ); - iv.update(tih); + iv.setRecord(tih); + //iv.update(tih); //PersistenceHelper.getEntityManager().crea //PersistenceHelper.save(tih); iv.save(); - System.out.println("com.fp.frontend.controller.armas.solicitud.FacturaController.crearAuditoria()<>> devio avel gualdado" ); + System.out.println("com.fp.frontend.controller.armas.solicitud.FacturaController.crearAuditoria()<>> devio avel gualdado" ); } @@ -417,8 +455,7 @@ public class FacturaController extends AbstractController try { TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); - String folderPath = find("PATHFACTURASXML", "1").getTextvalue(); - folderPath = folderPath.concat("FRONTEND").concat("/"); + String folderPath = ParametersController.find("PATHFACTURASFRONTXML", "1").getTextvalue(); File carpetaBase = new File(folderPath); carpetaBase.mkdirs(); File arch = sacarFactura(csolicitud, carpetaBase, tsafeUserDetail ); diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java index 821af76..7025a17 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java @@ -10,6 +10,7 @@ import com.fp.dto.query.DtoQuery; import com.fp.dto.save.DtoSave; import com.fp.frontend.controller.AbstractController; import com.fp.frontend.helper.MessageHelper; +import com.fp.persistence.commondb.PersistenceHelper; import com.fp.persistence.parmas.soli.TarmInvoiceHistory; import com.fp.persistence.pgeneral.gene.TgeneParameters; import java.util.ArrayList; @@ -18,6 +19,7 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; +import javax.persistence.Query; /** * @@ -55,33 +57,44 @@ public class InvoiceHistoryController extends AbstractController msave = new HashMap(); - msave.put(this.beanalias, dtosave); + msave.put(this.beanalias, dtosave); // adicionar metadata de mantenimiento para cada tabla. request.setSaveTables(msave); Response resp = this.callerhelper.executeSave(request); + + System.out.println("Response execution: "+resp); if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) == 0) { this.postCommit(resp); - //MessageHelper.setMessageInfo(resp); + MessageHelper.setMessageInfo(resp); + + System.out.println("Deberia haber guardado"); } else { - System.out.println("Error al guardar "+resp.getResponseTechnicalMessage()); - // MessageHelper.setMessageError(resp); + MessageHelper.setMessageError(resp); + throw new Exception("Error al guardar " + resp); } } catch (Throwable e) { - System.out.println("Error guardando historial de xml desde frontent: "+e.toString()); + System.out.println("Error guardar Auditoria XML: " +e.toString()); + + MessageHelper.setMessageError(e); } } + @Override public void postCommit(Response response) throws Exception { super.postCommitGeneric(response, this.beanalias); diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java index c406ab5..f2c1b35 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java @@ -63,9 +63,11 @@ import com.fp.persistence.pcustomer.gene.TcustPersonPhone; import com.fp.persistence.pgeneral.gene.TgeneCanton; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.gene.TgeneCity; +import com.fp.persistence.pgeneral.gene.TgeneParameters; import com.fp.persistence.pgeneral.gene.TgeneParroquia; import com.fp.persistence.pgeneral.gene.TgeneProvince; import com.fp.persistence.pgeneral.safe.TsafeUserDetail; +import java.math.BigDecimal; import org.openide.util.Exceptions; @ManagedBean @@ -502,13 +504,17 @@ public class ReporteConsultaSolicitudController extends private void buscarEstadoTramiteAprobado(){ Request request = callerhelper.getRequest(); TarmSolicitudTramite tst = TarmSolicitudTramiteController.findPorCSolicitud(this.solicitud.getRecord().getPk()); - if(tst !=null){ - if(tst.getEstadotramite() != null && tst.getEstadotramite().equals("APBDEP") && !request.getProfile().equals("CLIENTE")){ - this.depositoAprobado = true; - }else{ - this.depositoAprobado = false; + TgeneParameters xmlActivo = ParametersController.find("EJECUCIONXML", "1"); + if(xmlActivo!=null && xmlActivo.getNumbervalue().compareTo(BigDecimal.ONE)==0){ + if(tst !=null){ + if(tst.getEstadotramite() != null && tst.getEstadotramite().equals("APBDEP") && !request.getProfile().equals("CLIENTE")){ + this.depositoAprobado = true; + }else{ + this.depositoAprobado = false; + } } } + } private void obtenerTelefonos() { TcustPersonPhone telf = null; diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.java index 91f5781..c1f40a0 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.java @@ -221,7 +221,7 @@ public class TarmTramiteController extends AbstractController { Filter tipoTramiteFiltro = new Filter(); - tipoTramiteFiltro.setSql("t.tipotramitecodigo = 'TIPOTRAMITE' and t.tipoautorizacion = " + tipoAutorizacion); + tipoTramiteFiltro.setSql(String.format("t.tipotramitecodigo = 'TIPOTRAMITE' and t.tipoautorizacion = '%s'", tipoAutorizacion)); dto.addFiltro(tipoTramiteFiltro); diff --git a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java index 8c55cd7..930a9c8 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java @@ -218,7 +218,6 @@ public class LoginController { this.request.setChannelCode(userdetail.getChannelcode()); this.request.setLanguage(userdetail.getLanguagecode()); this.request.setCentrocontrol(userdetail.getCcentrocontrol()); - this.changepassword = userdetail.getChangepassword(); this.lprofile = ((List) userdetail.get("lprofile")); this.request.setProfile(((TsafeUserProfile) this.lprofile.get(0)).getPk().getProfilecode()); diff --git a/frontend/src/main/java/com/fp/frontend/helper/CallerHelper.java b/frontend/src/main/java/com/fp/frontend/helper/CallerHelper.java index 763454c..5e7997e 100644 --- a/frontend/src/main/java/com/fp/frontend/helper/CallerHelper.java +++ b/frontend/src/main/java/com/fp/frontend/helper/CallerHelper.java @@ -98,7 +98,15 @@ public class CallerHelper { Response resp = (Response) this.fremote.process(request); return resp; } - +/** + *Ejecutar query Nativo + */ + public int executeNativeQuery(String query) throws Exception{ + this.fremote = ServiceLocatorJsf.getInstance().getFacadeRemote("querybean"); + return this.fremote.executeNativeQuery(query); + } + + /** * Metodo que ejecuta insert, update, delete, en el core de maia. * diff --git a/frontend/src/main/resources/jasper.properties b/frontend/src/main/resources/jasper.properties index 11491cb..b91f9f6 100644 --- a/frontend/src/main/resources/jasper.properties +++ b/frontend/src/main/resources/jasper.properties @@ -1,10 +1,10 @@ #http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true #http\://172.17.26.185\:8084/jasperserver/services/repository #produccion -#jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository -#jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler +jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository +jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler #desarrollo -jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository -jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler +#jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository +#jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler jasperserver.user=jasperadmin jasperserver.password=jasperadmin \ No newline at end of file diff --git a/frontend/target/classes/.netbeans_automatic_build b/frontend/target/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class index 6197c25..f513016 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class index b72b5a9..f4e5d9b 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class index bcedc0e..44ef9a1 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class index f9be69c..214031f 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class index fa89b28..7fa8ca6 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/classes/com/fp/frontend/helper/CallerHelper.class b/frontend/target/classes/com/fp/frontend/helper/CallerHelper.class index 41f0f33..ede2427 100644 Binary files a/frontend/target/classes/com/fp/frontend/helper/CallerHelper.class and b/frontend/target/classes/com/fp/frontend/helper/CallerHelper.class differ diff --git a/frontend/target/classes/jasper.properties b/frontend/target/classes/jasper.properties index 11491cb..b91f9f6 100644 --- a/frontend/target/classes/jasper.properties +++ b/frontend/target/classes/jasper.properties @@ -1,10 +1,10 @@ #http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true #http\://172.17.26.185\:8084/jasperserver/services/repository #produccion -#jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository -#jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler +jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository +jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler #desarrollo -jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository -jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler +#jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository +#jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler jasperserver.user=jasperadmin jasperserver.password=jasperadmin \ No newline at end of file diff --git a/frontend/target/maia.war b/frontend/target/maia.war index 2d6b09c..7902516 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/FacturaController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class index 6197c25..f513016 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/FacturaController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class index b72b5a9..f4e5d9b 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class index bcedc0e..44ef9a1 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class index f9be69c..214031f 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TarmTramiteController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class index fa89b28..7fa8ca6 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/CallerHelper.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/CallerHelper.class index 41f0f33..ede2427 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/CallerHelper.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/CallerHelper.class differ diff --git a/frontend/target/maia/WEB-INF/classes/jasper.properties b/frontend/target/maia/WEB-INF/classes/jasper.properties index 11491cb..b91f9f6 100644 --- a/frontend/target/maia/WEB-INF/classes/jasper.properties +++ b/frontend/target/maia/WEB-INF/classes/jasper.properties @@ -1,10 +1,10 @@ #http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true #http\://172.17.26.185\:8084/jasperserver/services/repository #produccion -#jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository -#jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler +jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository +jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler #desarrollo -jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository -jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler +#jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository +#jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler jasperserver.user=jasperadmin jasperserver.password=jasperadmin \ No newline at end of file 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 cf7b4d6..c22a4e9 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 4282790..b8ad5c9 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 1b09758..ff1dc33 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 bc1a910..441fc47 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 52fe324..b09684e 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 b5382c3..2fa7dce 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 abdba05..1ff4d17 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 2e793be..9696b7e 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 51fa1a2..d7c4702 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 8e29527..e7014ad 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 efb7165..d8ae889 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 785b95a..abd4f5a 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 702ba85..2f6d0d0 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/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index a6dcbe8..7a53550 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Nov 02 15:37:47 ECT 2022 +#Fri Nov 11 16:30:19 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend diff --git a/frontend/target/test-classes/.netbeans_automatic_build b/frontend/target/test-classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/target/test-classes/testFactura.class b/frontend/target/test-classes/testFactura.class index bfa4219..e8e71cb 100644 Binary files a/frontend/target/test-classes/testFactura.class and b/frontend/target/test-classes/testFactura.class differ diff --git a/frontend/target/test-classes/testSuma.class b/frontend/target/test-classes/testSuma.class index c84d792..fbdffb8 100644 Binary files a/frontend/target/test-classes/testSuma.class and b/frontend/target/test-classes/testSuma.class differ diff --git a/reports-jsf.tar.gz b/reports-jsf.tar.gz new file mode 100644 index 0000000..5b9da9c Binary files /dev/null and b/reports-jsf.tar.gz differ diff --git a/reports-jsf/armas/reports/actaDevolucion.jasper b/reports-jsf/armas/reports/actaDevolucion.jasper new file mode 100644 index 0000000..f042c22 Binary files /dev/null and b/reports-jsf/armas/reports/actaDevolucion.jasper differ diff --git a/reports-jsf/armas/reports/actaDevolucion.jrxml b/reports-jsf/armas/reports/actaDevolucion.jrxml index 613171e..30f3613 100644 --- a/reports-jsf/armas/reports/actaDevolucion.jrxml +++ b/reports-jsf/armas/reports/actaDevolucion.jrxml @@ -1,608 +1,609 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="102" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center"/> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> - <textElement textAlignment="Center"/> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="102" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center"/> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> + <textElement textAlignment="Center"/> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/actaDevolucion2.jrxml b/reports-jsf/armas/reports/actaDevolucion2.jrxml index f49e3ad..9bc37c7 100644 --- a/reports-jsf/armas/reports/actaDevolucion2.jrxml +++ b/reports-jsf/armas/reports/actaDevolucion2.jrxml @@ -1,647 +1,647 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="220" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="90" y="11" width="390" height="20" forecolor="#000000" uuid="823a696d-88ab-4604-bd75-937b231627c8"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title" x="90" y="34" width="390" height="20" forecolor="#000000" uuid="ea49a697-46cc-4cf1-9a6f-c7907e4c4b34"/> - <textElement textAlignment="Center"/> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <textField> - <reportElement style="title2" x="90" y="57" width="390" height="20" uuid="d66b26e8-1729-448a-876c-807bff148791"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{nombreCentro}]]></textFieldExpression> - </textField> - <image> - <reportElement x="500" y="0" width="80" height="80" uuid="7c839f29-5ca9-46d0-b858-e8a677b8d38b"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <image> - <reportElement x="1" y="16" width="70" height="70" uuid="b711b651-f851-4e15-8a35-dcc2ac6d44fe"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <staticText> - <reportElement key="" style="title2" x="2" y="103" width="125" height="16" forecolor="#000000" uuid="cad84ec9-67d7-4eb2-99e3-aeaa84cf3ecb"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement textAlignment="Left"/> - <text><![CDATA[No.Trámite:]]></text> - </staticText> - <staticText> - <reportElement style="title2" x="2" y="121" width="125" height="16" forecolor="#000000" uuid="3f436462-919d-4075-9685-e99f147bd6d3"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement textAlignment="Left"/> - <text><![CDATA[Nombre / Razón social:]]></text> - </staticText> - <textField> - <reportElement style="normal" x="127" y="120" width="202" height="16" uuid="a17ff243-8445-427b-9e25-1a605b4ecd43"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{nombreRazon}]]></textFieldExpression> - </textField> - <textField> - <reportElement style="normal" x="127" y="102" width="202" height="16" uuid="77d268fc-b26c-4228-a893-4264c09015c7"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{numeroTramite}]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="title2" x="406" y="104" width="110" height="16" forecolor="#000000" uuid="b7d4bef0-a6ce-440c-beee-1e56a2eeb46f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement textAlignment="Left" verticalAlignment="Middle"/> - <text><![CDATA[Fecha de Expedición:]]></text> - </staticText> - <staticText> - <reportElement style="title2" x="406" y="122" width="110" height="16" forecolor="#000000" uuid="c2738bf5-8d1a-44e2-9ecc-304be282144f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement textAlignment="Left" verticalAlignment="Middle"/> - <text><![CDATA[No. Documento:]]></text> - </staticText> - <textField> - <reportElement style="normal" x="516" y="121" width="80" height="16" uuid="41ed7e32-77c6-45f9-b92e-4dcd962c470a"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{cedula}]]></textFieldExpression> - </textField> - <textField> - <reportElement style="normal" x="516" y="103" width="80" height="16" uuid="6fcf2dcd-e118-4533-80d3-ac15f2afeb33"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{lugarFecha}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement style="normal" x="2" y="162" width="578" height="16" isPrintWhenDetailOverflows="true" uuid="3e03a286-384b-4663-b905-da77e8cb8c24"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA["Dando cumplimiento a lo que establece el Art. 102 del reglamento de la Ley de Armas y previa a la presentación de los permisos"]]></textFieldExpression> - </textField> - <textField> - <reportElement style="normal" x="2" y="178" width="578" height="16" uuid="edd695f9-dbc1-4c7c-8367-85317d98f668"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA["respectivos y el recibo de decomiso, se procede a la devolución del material que a continuación se detalla:"]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="220" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="90" y="11" width="390" height="20" forecolor="#000000" uuid="823a696d-88ab-4604-bd75-937b231627c8"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title" x="90" y="34" width="390" height="20" forecolor="#000000" uuid="ea49a697-46cc-4cf1-9a6f-c7907e4c4b34"/> + <textElement textAlignment="Center"/> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <textField> + <reportElement style="title2" x="90" y="57" width="390" height="20" uuid="d66b26e8-1729-448a-876c-807bff148791"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{nombreCentro}]]></textFieldExpression> + </textField> + <image> + <reportElement x="500" y="0" width="80" height="80" uuid="7c839f29-5ca9-46d0-b858-e8a677b8d38b"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <image> + <reportElement x="1" y="16" width="70" height="70" uuid="b711b651-f851-4e15-8a35-dcc2ac6d44fe"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <staticText> + <reportElement key="" style="title2" x="2" y="103" width="125" height="16" forecolor="#000000" uuid="cad84ec9-67d7-4eb2-99e3-aeaa84cf3ecb"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <textElement textAlignment="Left"/> + <text><![CDATA[No.Trámite:]]></text> + </staticText> + <staticText> + <reportElement style="title2" x="2" y="121" width="125" height="16" forecolor="#000000" uuid="3f436462-919d-4075-9685-e99f147bd6d3"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <textElement textAlignment="Left"/> + <text><![CDATA[Nombre / Razón social:]]></text> + </staticText> + <textField> + <reportElement style="normal" x="127" y="120" width="202" height="16" uuid="a17ff243-8445-427b-9e25-1a605b4ecd43"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{nombreRazon}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="normal" x="127" y="102" width="202" height="16" uuid="77d268fc-b26c-4228-a893-4264c09015c7"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{numeroTramite}]]></textFieldExpression> + </textField> + <staticText> + <reportElement style="title2" x="406" y="104" width="110" height="16" forecolor="#000000" uuid="b7d4bef0-a6ce-440c-beee-1e56a2eeb46f"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"/> + <text><![CDATA[Fecha de Expedición:]]></text> + </staticText> + <staticText> + <reportElement style="title2" x="406" y="122" width="110" height="16" forecolor="#000000" uuid="c2738bf5-8d1a-44e2-9ecc-304be282144f"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <textElement textAlignment="Left" verticalAlignment="Middle"/> + <text><![CDATA[No. Documento:]]></text> + </staticText> + <textField> + <reportElement style="normal" x="516" y="121" width="80" height="16" uuid="41ed7e32-77c6-45f9-b92e-4dcd962c470a"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{cedula}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="normal" x="516" y="103" width="80" height="16" uuid="6fcf2dcd-e118-4533-80d3-ac15f2afeb33"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{lugarFecha}]]></textFieldExpression> + </textField> + <textField textAdjust="StretchHeight"> + <reportElement style="normal" x="2" y="162" width="578" height="16" isPrintWhenDetailOverflows="true" uuid="3e03a286-384b-4663-b905-da77e8cb8c24"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA["Dando cumplimiento a lo que establece el Art. 102 del reglamento de la Ley de Armas y previa a la presentación de los permisos"]]></textFieldExpression> + </textField> + <textField> + <reportElement style="normal" x="2" y="178" width="578" height="16" uuid="edd695f9-dbc1-4c7c-8367-85317d98f668"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA["respectivos y el recibo de decomiso, se procede a la devolución del material que a continuación se detalla:"]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/actaEntregaArmas.jrxml b/reports-jsf/armas/reports/actaEntregaArmas.jrxml index 7b3558c..c133ffe 100644 --- a/reports-jsf/armas/reports/actaEntregaArmas.jrxml +++ b/reports-jsf/armas/reports/actaEntregaArmas.jrxml @@ -1,516 +1,515 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="102" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center"> - <font fontName="SansSerif" size="14" isBold="true"/> - </textElement> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> - <textElement textAlignment="Center"> - <font fontName="SansSerif" size="14" isBold="true"/> - </textElement> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="10" y="0" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <textField> - <reportElement x="210" y="75" width="190" height="16" uuid="ea5cd989-52eb-4392-9940-c68a2a603e7a"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$P{centrocontrol}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTML paragraph

"]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="102" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center"> + <font fontName="SansSerif" size="14" isBold="true"/> + </textElement> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> + <textElement textAlignment="Center"> + <font fontName="SansSerif" size="14" isBold="true"/> + </textElement> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="10" y="0" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <textField> + <reportElement x="210" y="75" width="190" height="16" uuid="ea5cd989-52eb-4392-9940-c68a2a603e7a"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"> + <font size="12" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{centrocontrol}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTML paragraph

"]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jasper b/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jasper index a2e3fe1..844e341 100644 Binary files a/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jasper and b/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jasper differ diff --git a/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jrxml b/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jrxml index d51397a..8a6634d 100644 --- a/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jrxml +++ b/reports-jsf/armas/reports/actaEntregaRecepcionArmas.jrxml @@ -1,753 +1,754 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="129" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="122" y="22" width="419" height="18" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center"/> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title" x="122" y="41" width="419" height="18" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> - <textElement textAlignment="Center"/> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="39" y="0" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="555" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <textField isStretchWithOverflow="true"> - <reportElement style="title" x="122" y="60" width="419" height="25" uuid="ea5cd989-52eb-4392-9940-c68a2a603e7a"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement textAlignment="Center" verticalAlignment="Top"/> - <textFieldExpression><![CDATA[$P{centroControl}]]></textFieldExpression> - </textField> - <staticText> - <reportElement key="" style="title" x="122" y="87" width="419" height="18" forecolor="#000000" uuid="235fe168-45fe-4eae-ad17-e886b9a2c952"/> - <textElement textAlignment="Center"/> - <text><![CDATA[ACTA DE ENTREGA RECEPCIÓN DE ARMAS]]></text> - </staticText> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="129" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="122" y="22" width="419" height="18" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center"/> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title" x="122" y="41" width="419" height="18" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> + <textElement textAlignment="Center"/> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="39" y="0" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="555" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <textField textAdjust="StretchHeight"> + <reportElement style="title" x="122" y="60" width="419" height="25" uuid="ea5cd989-52eb-4392-9940-c68a2a603e7a"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement textAlignment="Center" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$P{centroControl}]]></textFieldExpression> + </textField> + <staticText> + <reportElement key="" style="title" x="122" y="87" width="419" height="18" forecolor="#000000" uuid="235fe168-45fe-4eae-ad17-e886b9a2c952"/> + <textElement textAlignment="Center"/> + <text><![CDATA[ACTA DE ENTREGA RECEPCIÓN DE ARMAS]]></text> + </staticText> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/actaRecepciondeArmas.jrxml b/reports-jsf/armas/reports/actaRecepciondeArmas.jrxml index 1dd8add..f13e35e 100644 --- a/reports-jsf/armas/reports/actaRecepciondeArmas.jrxml +++ b/reports-jsf/armas/reports/actaRecepciondeArmas.jrxml @@ -1,544 +1,551 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="120" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement key="" style="title1" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center"/> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title1" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> - <textElement textAlignment="Center"/> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="530" y="11" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <staticText> - <reportElement key="" style="title2" x="100" y="100" width="419" height="20" forecolor="#000000" uuid="69253d11-5c03-4784-b9e5-03354def4161"/> - <textElement textAlignment="Center"/> - <text><![CDATA[ACTA DE RECEPCIÓN DE ARMAS]]></text> - </staticText> - <textField> - <reportElement style="title2" x="93" y="80" width="419" height="16" uuid="d5cd4fae-22d5-4518-bc42-606208756fcb"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{unidadmilitar}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="120" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement key="" style="title1" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center"/> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title1" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> + <textElement textAlignment="Center"/> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="530" y="11" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <staticText> + <reportElement key="" style="title2" x="100" y="100" width="419" height="20" forecolor="#000000" uuid="69253d11-5c03-4784-b9e5-03354def4161"/> + <textElement textAlignment="Center"/> + <text><![CDATA[ACTA DE RECEPCIÓN DE ARMAS]]></text> + </staticText> + <textField> + <reportElement style="title2" x="93" y="80" width="419" height="16" uuid="d5cd4fae-22d5-4518-bc42-606208756fcb"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{unidadmilitar}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/aperturaAgenciasSucursales.jrxml b/reports-jsf/armas/reports/aperturaAgenciasSucursales.jrxml index 9786218..c1fe639 100644 --- a/reports-jsf/armas/reports/aperturaAgenciasSucursales.jrxml +++ b/reports-jsf/armas/reports/aperturaAgenciasSucursales.jrxml @@ -1,1081 +1,1080 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="86" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center"> - <font fontName="SansSerif" size="14" isBold="true"/> - </textElement> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> - <textElement textAlignment="Center"> - <font fontName="SansSerif" size="14" isBold="true"/> - </textElement> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="86" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="93" y="32" width="419" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center"> + <font fontName="SansSerif" size="14" isBold="true"/> + </textElement> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title" x="93" y="55" width="419" height="20" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"/> + <textElement textAlignment="Center"> + <font fontName="SansSerif" size="14" isBold="true"/> + </textElement> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="1" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="526" y="0" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/certificadoArmas.jrxml b/reports-jsf/armas/reports/certificadoArmas.jrxml index 12f1cdd..dcb4354 100644 --- a/reports-jsf/armas/reports/certificadoArmas.jrxml +++ b/reports-jsf/armas/reports/certificadoArmas.jrxml @@ -32,7 +32,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="28" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="28" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/controlInventario.jrxml b/reports-jsf/armas/reports/controlInventario.jrxml index 5626819..ee836ab 100644 --- a/reports-jsf/armas/reports/controlInventario.jrxml +++ b/reports-jsf/armas/reports/controlInventario.jrxml @@ -1,318 +1,317 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="116" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement style="title" x="93" y="16" width="527" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <textElement textAlignment="Center"/> - <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> - </staticText> - <staticText> - <reportElement key="" style="title1" x="93" y="36" width="527" height="18" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <textElement textAlignment="Center"/> - <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> - </staticText> - <image> - <reportElement x="28" y="16" width="65" height="82" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <staticText> - <reportElement key="" style="title2" x="93" y="68" width="527" height="16" forecolor="#000000" uuid="a056d06a-cfc1-4922-b643-c38d1a76ced3"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement textAlignment="Center"/> - <text><![CDATA[INVENTARIO DE INGRESO A BODEGA]]></text> - </staticText> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="title3" stretchType="RelativeToTallestObject" x="93" y="54" width="527" height="14" forecolor="#000000" uuid="f4e50898-607e-47f7-91c1-0475bd3f03db"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - </reportElement> - <box leftPadding="2" rightPadding="2"> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Top"> - <font size="7"/> - </textElement> - <textFieldExpression><![CDATA[$P{nombreCentroControl}]]></textFieldExpression> - </textField> - <image> - <reportElement x="620" y="1" width="90" height="106" uuid="7c474f2a-dd84-49ba-9e39-27cad34e3c89"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <textField> - <reportElement style="subtitle" x="93" y="84" width="527" height="16" uuid="bd52d05f-7aef-4dc8-a1e7-cc3628cc01b7"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <textFieldExpression><![CDATA["Fecha/Hora emisión:" + $P{fechaReporte}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="116" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement style="title" x="93" y="16" width="527" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <textElement textAlignment="Center"/> + <text><![CDATA[COMANDO CONJUNTO DE LAS FUERZAS ARMADAS]]></text> + </staticText> + <staticText> + <reportElement key="" style="title1" x="93" y="36" width="527" height="18" forecolor="#000000" uuid="98c268e9-4cb8-4184-9c02-537b79b6957c"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <textElement textAlignment="Center"/> + <text><![CDATA[DEPARTAMENTO DE CONTROL DE ARMAS]]></text> + </staticText> + <image> + <reportElement x="28" y="16" width="65" height="82" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <staticText> + <reportElement key="" style="title2" x="93" y="68" width="527" height="16" forecolor="#000000" uuid="a056d06a-cfc1-4922-b643-c38d1a76ced3"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <textElement textAlignment="Center"/> + <text><![CDATA[INVENTARIO DE INGRESO A BODEGA]]></text> + </staticText> + <textField textAdjust="StretchHeight" isBlankWhenNull="true"> + <reportElement style="title3" stretchType="RelativeToTallestObject" x="93" y="54" width="527" height="14" forecolor="#000000" uuid="f4e50898-607e-47f7-91c1-0475bd3f03db"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + </reportElement> + <box leftPadding="2" rightPadding="2"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Top"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$P{nombreCentroControl}]]></textFieldExpression> + </textField> + <image> + <reportElement x="620" y="1" width="90" height="106" uuid="7c474f2a-dd84-49ba-9e39-27cad34e3c89"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <textField> + <reportElement style="subtitle" x="93" y="84" width="527" height="16" uuid="bd52d05f-7aef-4dc8-a1e7-cc3628cc01b7"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA["Fecha/Hora emisión:" + $P{fechaReporte}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/destruccionArmas.jrxml b/reports-jsf/armas/reports/destruccionArmas.jrxml index 5e2d7b7..fbfa77b 100644 --- a/reports-jsf/armas/reports/destruccionArmas.jrxml +++ b/reports-jsf/armas/reports/destruccionArmas.jrxml @@ -52,7 +52,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="111" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <staticText> - <reportElement key="" style="title" x="165" y="32" width="450" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <text><![CDATA[SISTEMA INFORMATICO DE CONTROL DE ARMAS DEL CC.FF.AA]]></text> - </staticText> - <image> - <reportElement x="85" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> - </image> - <image> - <reportElement x="624" y="11" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> - </image> - <textField> - <reportElement style="title2" x="165" y="80" width="450" height="20" uuid="d5cd4fae-22d5-4518-bc42-606208756fcb"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="9"/> - </textElement> - <textFieldExpression><![CDATA[$P{unidadcontrolorigen}]]></textFieldExpression> - </textField> - <textField> - <reportElement style="normal" x="-180" y="-210" width="130" height="16" uuid="525561cd-4529-40bd-9afc-db95fd1d5eeb"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{usuario}]]></textFieldExpression> - </textField> - <textField> - <reportElement style="title1" x="165" y="56" width="450" height="20" uuid="a0f6e4e9-5905-472a-ab8d-3cc918299de9"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box topPadding="2"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <textFieldExpression><![CDATA[$P{centrocontrolorigen}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="111" splitType="Stretch"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <staticText> + <reportElement key="" style="title" x="165" y="32" width="450" height="20" forecolor="#000000" uuid="a5555ed3-8bce-44fd-afbb-28084239a1a1"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <text><![CDATA[SISTEMA INFORMATICO DE CONTROL DE ARMAS DEL CC.FF.AA]]></text> + </staticText> + <image> + <reportElement x="85" y="16" width="70" height="70" uuid="5c1c706c-0485-4d8f-be4c-9ad18ad76225"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoIzquierda}]]></imageExpression> + </image> + <image> + <reportElement x="624" y="11" width="80" height="80" uuid="560083e4-2ae5-4b08-9886-6b1c828f2fe1"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA[$P{pathLogoDerecha}]]></imageExpression> + </image> + <textField> + <reportElement style="title2" x="165" y="80" width="450" height="20" uuid="d5cd4fae-22d5-4518-bc42-606208756fcb"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$P{unidadcontrolorigen}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="normal" x="-180" y="-210" width="130" height="16" uuid="525561cd-4529-40bd-9afc-db95fd1d5eeb"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{usuario}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="title1" x="165" y="56" width="450" height="20" uuid="a0f6e4e9-5905-472a-ab8d-3cc918299de9"> + <property name="local_mesure_unity" value="pixel"/> + <property name="com.jaspersoft.studio.unit.y" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box topPadding="2"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{centrocontrolorigen}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reports-jsf/armas/reports/estadisticastramites.jrxml b/reports-jsf/armas/reports/estadisticastramites.jrxml index 686f215..09643b6 100644 --- a/reports-jsf/armas/reports/estadisticastramites.jrxml +++ b/reports-jsf/armas/reports/estadisticastramites.jrxml @@ -41,7 +41,7 @@ - - - - - - - - - - - - - -