tratando de arreglar estilo de observacion y subida de documento
This commit is contained in:
parent
84ffa300f1
commit
b7cc728219
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:32 ECT 2022
|
#Tue Dec 06 15:51:46 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.bpm
|
groupId=com.fp.base.bpm
|
||||||
artifactId=bpmlib
|
artifactId=bpmlib
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:24 ECT 2022
|
#Tue Dec 06 15:51:39 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.bpm
|
groupId=com.fp.base.bpm
|
||||||
artifactId=simple
|
artifactId=simple
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:00 ECT 2022
|
#Tue Dec 06 15:52:13 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=armas
|
artifactId=armas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:51 ECT 2022
|
#Tue Dec 06 15:52:05 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=general
|
artifactId=general
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:53 ECT 2022
|
#Tue Dec 06 15:52:07 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=log
|
artifactId=log
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:47 ECT 2022
|
#Tue Dec 06 15:52:01 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=person
|
artifactId=person
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:52 ECT 2022
|
#Tue Dec 06 15:52:06 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=report
|
artifactId=report
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:55 ECT 2022
|
#Tue Dec 06 15:52:09 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=viaticos
|
artifactId=viaticos
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:43 ECT 2022
|
#Tue Dec 06 15:51:57 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=alfresco-client
|
artifactId=alfresco-client
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:27 ECT 2022
|
#Tue Dec 06 15:51:41 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=bpm
|
artifactId=bpm
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:42 ECT 2022
|
#Tue Dec 06 15:51:56 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=firmas
|
artifactId=firmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:06 ECT 2022
|
#Tue Dec 06 15:51:23 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.dto
|
groupId=com.fp.base.dto
|
||||||
artifactId=common
|
artifactId=common
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:03 ECT 2022
|
#Tue Dec 06 15:51:20 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.dto
|
groupId=com.fp.base.dto
|
||||||
artifactId=dto
|
artifactId=dto
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:03 ECT 2022
|
#Tue Dec 06 15:52:15 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=facade
|
artifactId=facade
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:01 ECT 2022
|
#Tue Dec 06 15:52:14 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=facadeclient
|
artifactId=facadeclient
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:18 ECT 2022
|
#Tue Dec 06 15:51:33 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=commondb
|
artifactId=commondb
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:40 ECT 2022
|
#Tue Dec 06 15:51:54 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=parmas
|
artifactId=parmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:09 ECT 2022
|
#Tue Dec 06 15:51:25 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pbpm
|
artifactId=pbpm
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:22 ECT 2022
|
#Tue Dec 06 15:51:37 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pcustomer
|
artifactId=pcustomer
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:36 ECT 2022
|
#Tue Dec 06 15:51:50 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pfirmas
|
artifactId=pfirmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:16 ECT 2022
|
#Tue Dec 06 15:51:31 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pgeneral
|
artifactId=pgeneral
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:33 ECT 2022
|
#Tue Dec 06 15:51:47 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=plog
|
artifactId=plog
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:35 ECT 2022
|
#Tue Dec 06 15:51:49 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pviaticos
|
artifactId=pviaticos
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:23 ECT 2022
|
#Tue Dec 06 15:51:38 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=util
|
artifactId=util
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:27:45 ECT 2022
|
#Tue Dec 06 15:51:59 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=sessionbeans
|
artifactId=sessionbeans
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:03 ECT 2022
|
#Tue Dec 06 15:52:15 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.clients.maia
|
groupId=com.fp.clients.maia
|
||||||
artifactId=maiaear
|
artifactId=maiaear
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:03 ECT 2022
|
#Tue Dec 06 15:52:15 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.clients.maia
|
groupId=com.fp.clients.maia
|
||||||
artifactId=environment-eap6
|
artifactId=environment-eap6
|
||||||
|
|
|
||||||
|
|
@ -282,25 +282,17 @@
|
||||||
|
|
||||||
<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
|
<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
|
||||||
<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
|
<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
|
||||||
<h:outputText value="" />
|
</h:panelGrid>
|
||||||
<h:outputText value="" />
|
<h:panelGrid columns="4" style="width:100%;" >
|
||||||
<h:outputText value="" />
|
<p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
|
||||||
|
<p:inputTextarea style="width: 100%" id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
|
||||||
|
|
||||||
<p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
|
|
||||||
<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="" />
|
|
||||||
<h:outputText value="" />
|
|
||||||
|
|
||||||
<!-- documento 3 espacios-->
|
<!-- documento 3 espacios-->
|
||||||
<p:outputLabel for="fileUploadCmpt" value="Documento:"
|
<p:outputLabel for="fileUploadCmpt" value="Documento:"
|
||||||
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}"/>
|
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}"/>
|
||||||
<h:panelGrid columns="1" rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
<h:panelGrid columns="1" rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
||||||
<h:outputText value="#{msg_armas['msg_tamano_archivo_requisitos_jpg_png_1']}" style="color:blue;font-weight: bold;"/>
|
<h:outputText value="#{msg_armas['msg_tamano_archivo_requisitos_jpg_png_1']}" style="color:blue;font-weight: bold;"/>
|
||||||
<p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
|
<p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
|
||||||
allowTypes="/(\.|\/)(pdf|jpeg|jpg|png)$/" description="Seleccionar documento"
|
allowTypes="/(\.|\/)(pdf|jpeg|jpg|png)$/" description="Seleccionar documento"
|
||||||
fileLimit="1"
|
fileLimit="1"
|
||||||
required="true"
|
required="true"
|
||||||
|
|
@ -314,7 +306,12 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
</h:panelGrid>
|
</h:panelGrid>
|
||||||
|
</h:panelGrid>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</h:panelGroup>
|
||||||
<h:panelGrid id="descFileUpload" columns="1" style="width:100%;"
|
<h:panelGrid id="descFileUpload" columns="1" style="width:100%;"
|
||||||
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
||||||
<p:outputLabel value="#{armasController.recorteNombre(armasController.uploadedFile.fileName)}" rendered="#{armasController.uploadedFile != null}"/>
|
<p:outputLabel value="#{armasController.recorteNombre(armasController.uploadedFile.fileName)}" rendered="#{armasController.uploadedFile != null}"/>
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -282,25 +282,17 @@
|
||||||
|
|
||||||
<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
|
<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
|
||||||
<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
|
<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
|
||||||
<h:outputText value="" />
|
</h:panelGrid>
|
||||||
<h:outputText value="" />
|
<h:panelGrid columns="4" style="width:100%;" >
|
||||||
<h:outputText value="" />
|
<p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
|
||||||
|
<p:inputTextarea style="width: 100%" id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
|
||||||
|
|
||||||
<p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
|
|
||||||
<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="" />
|
|
||||||
<h:outputText value="" />
|
|
||||||
|
|
||||||
<!-- documento 3 espacios-->
|
<!-- documento 3 espacios-->
|
||||||
<p:outputLabel for="fileUploadCmpt" value="Documento:"
|
<p:outputLabel for="fileUploadCmpt" value="Documento:"
|
||||||
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}"/>
|
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}"/>
|
||||||
<h:panelGrid columns="1" rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
<h:panelGrid columns="1" rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
||||||
<h:outputText value="#{msg_armas['msg_tamano_archivo_requisitos_jpg_png_1']}" style="color:blue;font-weight: bold;"/>
|
<h:outputText value="#{msg_armas['msg_tamano_archivo_requisitos_jpg_png_1']}" style="color:blue;font-weight: bold;"/>
|
||||||
<p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
|
<p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
|
||||||
allowTypes="/(\.|\/)(pdf|jpeg|jpg|png)$/" description="Seleccionar documento"
|
allowTypes="/(\.|\/)(pdf|jpeg|jpg|png)$/" description="Seleccionar documento"
|
||||||
fileLimit="1"
|
fileLimit="1"
|
||||||
required="true"
|
required="true"
|
||||||
|
|
@ -314,7 +306,12 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
</h:panelGrid>
|
</h:panelGrid>
|
||||||
|
</h:panelGrid>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</h:panelGroup>
|
||||||
<h:panelGrid id="descFileUpload" columns="1" style="width:100%;"
|
<h:panelGrid id="descFileUpload" columns="1" style="width:100%;"
|
||||||
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
|
||||||
<p:outputLabel value="#{armasController.recorteNombre(armasController.uploadedFile.fileName)}" rendered="#{armasController.uploadedFile != null}"/>
|
<p:outputLabel value="#{armasController.recorteNombre(armasController.uploadedFile.fileName)}" rendered="#{armasController.uploadedFile != null}"/>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Dec 02 15:28:23 ECT 2022
|
#Tue Dec 06 15:52:35 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp
|
groupId=com.fp
|
||||||
artifactId=frontend
|
artifactId=frontend
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue