arreglo espacion en mantenimiento armas

2022-12-02 15:29:21 -05:00 · 2022-12-02 15:29:21 -05:00 · 84ffa300f1
parent bc57626e86
commit 84ffa300f1
94 changed files with 38 additions and 32 deletions
--- a/base/bpm/bpmlib/target/bpmlib-2.1.jar
+++ b/base/bpm/bpmlib/target/bpmlib-2.1.jar
--- 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
-#Fri Dec 02 15:10:43 ECT 2022
+#Fri Dec 02 15:27:32 ECT 2022
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=bpmlib
--- 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
-#Fri Dec 02 15:10:36 ECT 2022
+#Fri Dec 02 15:27:24 ECT 2022
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=simple
--- a/base/bpm/simple/target/simple-2.1.jar
+++ b/base/bpm/simple/target/simple-2.1.jar
--- a/base/business/armas/target/armas-2.1.jar
+++ b/base/business/armas/target/armas-2.1.jar
--- 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
-#Fri Dec 02 15:11:11 ECT 2022
+#Fri Dec 02 15:28:00 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=armas
--- a/base/business/general/target/general-2.1.jar
+++ b/base/business/general/target/general-2.1.jar
--- 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
-#Fri Dec 02 15:11:03 ECT 2022
+#Fri Dec 02 15:27:51 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=general
--- a/base/business/log/target/log-2.1.jar
+++ b/base/business/log/target/log-2.1.jar
--- 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
-#Fri Dec 02 15:11:06 ECT 2022
+#Fri Dec 02 15:27:53 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=log
--- 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
-#Fri Dec 02 15:10:59 ECT 2022
+#Fri Dec 02 15:27:47 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=person
--- a/base/business/person/target/person-2.1.jar
+++ b/base/business/person/target/person-2.1.jar
--- 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
-#Fri Dec 02 15:11:04 ECT 2022
+#Fri Dec 02 15:27:52 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=report
--- a/base/business/report/target/report-2.1.jar
+++ b/base/business/report/target/report-2.1.jar
--- 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
-#Fri Dec 02 15:11:07 ECT 2022
+#Fri Dec 02 15:27:55 ECT 2022
 version=2.1
 groupId=com.fp.base.business
 artifactId=viaticos
--- a/base/business/viaticos/target/viaticos-2.1.jar
+++ b/base/business/viaticos/target/viaticos-2.1.jar
--- a/base/core/alfresco-client/target/alfresco-client-2.1.jar
+++ b/base/core/alfresco-client/target/alfresco-client-2.1.jar
--- 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
-#Fri Dec 02 15:10:55 ECT 2022
+#Fri Dec 02 15:27:43 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=alfresco-client
--- a/base/core/bpm/target/bpm-2.1.jar
+++ b/base/core/bpm/target/bpm-2.1.jar
--- 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
-#Fri Dec 02 15:10:38 ECT 2022
+#Fri Dec 02 15:27:27 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=bpm
--- a/base/core/firmas/target/firmas-2.1.jar
+++ b/base/core/firmas/target/firmas-2.1.jar
--- 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
-#Fri Dec 02 15:10:54 ECT 2022
+#Fri Dec 02 15:27:42 ECT 2022
 version=2.1
 groupId=com.fp.base.core
 artifactId=firmas
--- a/base/dto/common/target/common-2.1.jar
+++ b/base/dto/common/target/common-2.1.jar
--- 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
-#Fri Dec 02 15:10:18 ECT 2022
+#Fri Dec 02 15:27:06 ECT 2022
 version=2.1
 groupId=com.fp.base.dto
 artifactId=common
--- a/base/dto/dto/target/dto-2.1.jar
+++ b/base/dto/dto/target/dto-2.1.jar
--- 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
-#Fri Dec 02 15:10:15 ECT 2022
+#Fri Dec 02 15:27:03 ECT 2022
 version=2.1
 groupId=com.fp.base.dto
 artifactId=dto
--- a/base/facade/target/facade-2.1.jar
+++ b/base/facade/target/facade-2.1.jar
--- a/base/facade/target/maven-archiver/pom.properties
+++ b/base/facade/target/maven-archiver/pom.properties
@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Dec 02 15:11:14 ECT 2022
+#Fri Dec 02 15:28:03 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facade
--- a/base/facadeclient/target/facadeclient-2.1.jar
+++ b/base/facadeclient/target/facadeclient-2.1.jar
--- a/base/facadeclient/target/maven-archiver/pom.properties
+++ b/base/facadeclient/target/maven-archiver/pom.properties
@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Dec 02 15:11:12 ECT 2022
+#Fri Dec 02 15:28:01 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facadeclient
--- a/base/persistence/commondb/target/commondb-2.1.jar
+++ b/base/persistence/commondb/target/commondb-2.1.jar
--- 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
-#Fri Dec 02 15:10:30 ECT 2022
+#Fri Dec 02 15:27:18 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=commondb
--- 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
-#Fri Dec 02 15:10:51 ECT 2022
+#Fri Dec 02 15:27:40 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=parmas
--- a/base/persistence/parmas/target/parmas-2.1.jar
+++ b/base/persistence/parmas/target/parmas-2.1.jar
--- 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
-#Fri Dec 02 15:10:20 ECT 2022
+#Fri Dec 02 15:27:09 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pbpm
--- a/base/persistence/pbpm/target/pbpm-2.1.jar
+++ b/base/persistence/pbpm/target/pbpm-2.1.jar
--- 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
-#Fri Dec 02 15:10:34 ECT 2022
+#Fri Dec 02 15:27:22 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pcustomer
--- a/base/persistence/pcustomer/target/pcustomer-2.1.jar
+++ b/base/persistence/pcustomer/target/pcustomer-2.1.jar
--- 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
-#Fri Dec 02 15:10:48 ECT 2022
+#Fri Dec 02 15:27:36 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pfirmas
--- a/base/persistence/pfirmas/target/pfirmas-2.1.jar
+++ b/base/persistence/pfirmas/target/pfirmas-2.1.jar
--- 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
-#Fri Dec 02 15:10:28 ECT 2022
+#Fri Dec 02 15:27:16 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pgeneral
--- a/base/persistence/pgeneral/target/pgeneral-2.1.jar
+++ b/base/persistence/pgeneral/target/pgeneral-2.1.jar
--- 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
-#Fri Dec 02 15:10:45 ECT 2022
+#Fri Dec 02 15:27:33 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=plog
--- a/base/persistence/plog/target/plog-2.1.jar
+++ b/base/persistence/plog/target/plog-2.1.jar
--- 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
-#Fri Dec 02 15:10:47 ECT 2022
+#Fri Dec 02 15:27:35 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pviaticos
--- a/base/persistence/pviaticos/target/pviaticos-2.1.jar
+++ b/base/persistence/pviaticos/target/pviaticos-2.1.jar
--- 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
-#Fri Dec 02 15:10:35 ECT 2022
+#Fri Dec 02 15:27:23 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=util
--- a/base/persistence/util/target/util-2.1.jar
+++ b/base/persistence/util/target/util-2.1.jar
--- a/base/sessionbeans/target/maven-archiver/pom.properties
+++ b/base/sessionbeans/target/maven-archiver/pom.properties
@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Dec 02 15:10:57 ECT 2022
+#Fri Dec 02 15:27:45 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=sessionbeans
--- a/base/sessionbeans/target/sessionbeans-2.1.jar
+++ b/base/sessionbeans/target/sessionbeans-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1.ear
+++ b/clients/comaco/ear/target/maiaear-2.1.ear
--- a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar
--- a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar
--- 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
--- a/clients/comaco/ear/target/maiaear-2.1/facade.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/facade.jar
--- a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar
--- a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar
--- a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar
--- a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar
+++ b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar
--- 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
-#Fri Dec 02 15:11:14 ECT 2022
+#Fri Dec 02 15:28:03 ECT 2022
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=maiaear
--- a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar
+++ b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar
--- 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
-#Fri Dec 02 15:11:14 ECT 2022
+#Fri Dec 02 15:28:03 ECT 2022
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=environment-eap6
--- a/frontend/src/main/webapp/pages/armas/armas.xhtml
+++ b/frontend/src/main/webapp/pages/armas/armas.xhtml
@ -283,10 +283,13 @@
 									<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
 									<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
 									<h:outputText value="" />
+                                                                        <h:outputText value="" />
+									<h:outputText value="" />
                                                                        
                                                                        <p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
-                                                                        <p:inputTextarea id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
-									<h:outputText rendered="#{!armasController.record.isnew}" value="" />
+                                                                        <h:panelGrid columns="1" rendered="#{!armasController.record.isnew}">
+                                                                            <p:inputTextarea id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
+                                                                        </h:panelGrid>
                                                                        
 									<h:outputText value="" />
 									<h:outputText value="" />
--- a/frontend/target/maia.war
+++ b/frontend/target/maia.war
--- a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/common-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/common-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar
--- a/frontend/target/maia/WEB-INF/lib/util-2.1.jar
+++ b/frontend/target/maia/WEB-INF/lib/util-2.1.jar
--- a/frontend/target/maia/pages/armas/armas.xhtml
+++ b/frontend/target/maia/pages/armas/armas.xhtml
@ -283,10 +283,13 @@
 									<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
 									<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
 									<h:outputText value="" />
+                                                                        <h:outputText value="" />
+									<h:outputText value="" />
                                                                        
                                                                        <p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
-                                                                        <p:inputTextarea id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
-									<h:outputText rendered="#{!armasController.record.isnew}" value="" />
+                                                                        <h:panelGrid columns="1" rendered="#{!armasController.record.isnew}">
+                                                                            <p:inputTextarea id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
+                                                                        </h:panelGrid>
                                                                        
 									<h:outputText value="" />
 									<h:outputText value="" />
--- a/frontend/target/maven-archiver/pom.properties
+++ b/frontend/target/maven-archiver/pom.properties
@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Dec 02 15:11:30 ECT 2022
+#Fri Dec 02 15:28:23 ECT 2022
 version=2.1
 groupId=com.fp
 artifactId=frontend