Mantenimiento de armas con agregacion campo observacion al modificar y minusculas al agregar
This commit is contained in:
parent
38f93e0bf4
commit
bc57626e86
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Nov 30 16:44:14 ECT 2022
|
#Fri Dec 02 15:10:43 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
|
||||||
#Wed Nov 30 16:44:09 ECT 2022
|
#Fri Dec 02 15:10:36 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
|
||||||
#Wed Nov 30 16:44:34 ECT 2022
|
#Fri Dec 02 15:11:11 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
|
||||||
#Wed Nov 30 16:44:28 ECT 2022
|
#Fri Dec 02 15:11:03 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
|
||||||
#Wed Nov 30 16:44:30 ECT 2022
|
#Fri Dec 02 15:11:06 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
|
||||||
#Wed Nov 30 16:44:25 ECT 2022
|
#Fri Dec 02 15:10:59 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
|
||||||
#Wed Nov 30 16:44:29 ECT 2022
|
#Fri Dec 02 15:11:04 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
|
||||||
#Wed Nov 30 16:44:31 ECT 2022
|
#Fri Dec 02 15:11:07 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.
|
|
@ -2,7 +2,7 @@
|
||||||
api.user=admin
|
api.user=admin
|
||||||
api.password=admin
|
api.password=admin
|
||||||
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||||
api.url.base=http://172.17.26.91:8082/alfresco/service
|
api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||||
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
||||||
#Directorio base para las consultas
|
#Directorio base para las consultas
|
||||||
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -2,7 +2,7 @@
|
||||||
api.user=admin
|
api.user=admin
|
||||||
api.password=admin
|
api.password=admin
|
||||||
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||||
api.url.base=http://172.17.26.91:8082/alfresco/service
|
api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||||
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
||||||
#Directorio base para las consultas
|
#Directorio base para las consultas
|
||||||
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Nov 30 16:44:23 ECT 2022
|
#Fri Dec 02 15:10:55 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
|
||||||
#Wed Nov 30 16:44:11 ECT 2022
|
#Fri Dec 02 15:10:38 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
|
||||||
#Wed Nov 30 16:44:21 ECT 2022
|
#Fri Dec 02 15:10:54 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
|
||||||
#Wed Nov 30 16:43:57 ECT 2022
|
#Fri Dec 02 15:10:18 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
|
||||||
#Wed Nov 30 16:43:54 ECT 2022
|
#Fri Dec 02 15:10:15 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
|
||||||
#Wed Nov 30 16:44:36 ECT 2022
|
#Fri Dec 02 15:11:14 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
|
||||||
#Wed Nov 30 16:44:35 ECT 2022
|
#Fri Dec 02 15:11:12 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
|
||||||
#Wed Nov 30 16:44:05 ECT 2022
|
#Fri Dec 02 15:10:30 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=commondb
|
artifactId=commondb
|
||||||
|
|
|
||||||
|
|
@ -305,7 +305,10 @@ public class TarmArmas extends com.fp.dto.AbstractDataTransport implements Seria
|
||||||
|
|
||||||
@Column(name = "GENERACERTIFICADO", nullable = true)
|
@Column(name = "GENERACERTIFICADO", nullable = true)
|
||||||
private String generacertificado;
|
private String generacertificado;
|
||||||
|
|
||||||
|
@Column(name = "observacionmodificacion", nullable = true)
|
||||||
|
private String observacionmodificacion;
|
||||||
|
|
||||||
public int getValorAux() {
|
public int getValorAux() {
|
||||||
return valorAux;
|
return valorAux;
|
||||||
}
|
}
|
||||||
|
|
@ -1059,4 +1062,12 @@ public class TarmArmas extends com.fp.dto.AbstractDataTransport implements Seria
|
||||||
this.generacertificado = generacertificado;
|
this.generacertificado = generacertificado;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getObservacionmodificacion() {
|
||||||
|
return observacionmodificacion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setObservacionmodificacion(String observacionmodificacion) {
|
||||||
|
this.observacionmodificacion = observacionmodificacion;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Nov 30 16:44:20 ECT 2022
|
#Fri Dec 02 15:10:51 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
|
||||||
#Wed Nov 30 16:43:58 ECT 2022
|
#Fri Dec 02 15:10:20 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
|
||||||
#Wed Nov 30 16:44:07 ECT 2022
|
#Fri Dec 02 15:10:34 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
|
||||||
#Wed Nov 30 16:44:17 ECT 2022
|
#Fri Dec 02 15:10:48 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
|
||||||
#Wed Nov 30 16:44:03 ECT 2022
|
#Fri Dec 02 15:10:28 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
|
||||||
#Wed Nov 30 16:44:15 ECT 2022
|
#Fri Dec 02 15:10:45 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
|
||||||
#Wed Nov 30 16:44:17 ECT 2022
|
#Fri Dec 02 15:10:47 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
|
||||||
#Wed Nov 30 16:44:08 ECT 2022
|
#Fri Dec 02 15:10:35 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
|
||||||
#Wed Nov 30 16:44:24 ECT 2022
|
#Fri Dec 02 15:10:57 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
|
||||||
#Wed Nov 30 16:44:36 ECT 2022
|
#Fri Dec 02 15:11:14 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
|
||||||
#Wed Nov 30 16:44:36 ECT 2022
|
#Fri Dec 02 15:11:14 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.clients.maia
|
groupId=com.fp.clients.maia
|
||||||
artifactId=environment-eap6
|
artifactId=environment-eap6
|
||||||
|
|
|
||||||
|
|
@ -26,17 +26,14 @@ import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
||||||
import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
|
import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
|
||||||
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
||||||
import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
|
import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
|
||||||
import com.fp.persistence.pgeneral.safe.TsafeUserDetailKey;
|
|
||||||
import com.fp.persistence.pgeneral.safe.TsafeUserProfile;
|
import com.fp.persistence.pgeneral.safe.TsafeUserProfile;
|
||||||
import com.fp.persistence.pgeneral.safe.TsafeUserProfileKey;
|
|
||||||
import java.io.PrintStream;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
import javax.annotation.PreDestroy;
|
import javax.annotation.PreDestroy;
|
||||||
import javax.faces.application.Application;
|
|
||||||
import javax.faces.application.NavigationHandler;
|
import javax.faces.application.NavigationHandler;
|
||||||
import javax.faces.bean.ManagedBean;
|
import javax.faces.bean.ManagedBean;
|
||||||
import javax.faces.bean.SessionScoped;
|
import javax.faces.bean.SessionScoped;
|
||||||
|
|
|
||||||
|
|
@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad
|
||||||
lbl_peso=Peso
|
lbl_peso=Peso
|
||||||
lbl_unidadpeso=U. Medida Peso
|
lbl_unidadpeso=U. Medida Peso
|
||||||
htbl_detalledelmaterial=Detalle del Material
|
htbl_detalledelmaterial=Detalle del Material
|
||||||
|
#Observacion
|
||||||
|
lbl_observacionmodificacion=Observaci\u00f3n
|
||||||
|
|
||||||
tramite=Tr\u00e1mite
|
tramite=Tr\u00e1mite
|
||||||
lbl_dui=No. DUI
|
lbl_dui=No. DUI
|
||||||
|
|
|
||||||
|
|
@ -283,7 +283,11 @@
|
||||||
<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: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:outputText value="" />
|
<h:outputText value="" />
|
||||||
<h:outputText value="" />
|
<h:outputText value="" />
|
||||||
<h:outputText value="" />
|
<h:outputText value="" />
|
||||||
|
|
@ -304,7 +308,9 @@
|
||||||
invalidSizeMessage="#{msg_armas.lbl_mensajearchivoinvalidom} #{msg_armas.lbl_1mb}"
|
invalidSizeMessage="#{msg_armas.lbl_mensajearchivoinvalidom} #{msg_armas.lbl_1mb}"
|
||||||
fileLimitMessage="#{msg_armas['msg_error_exedeelnumero']}"
|
fileLimitMessage="#{msg_armas['msg_error_exedeelnumero']}"
|
||||||
sizeLimit="#{msg_armas.lbl_archivounmega}"
|
sizeLimit="#{msg_armas.lbl_archivounmega}"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
</h:panelGrid>
|
</h:panelGrid>
|
||||||
<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}">
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad
|
||||||
lbl_peso=Peso
|
lbl_peso=Peso
|
||||||
lbl_unidadpeso=U. Medida Peso
|
lbl_unidadpeso=U. Medida Peso
|
||||||
htbl_detalledelmaterial=Detalle del Material
|
htbl_detalledelmaterial=Detalle del Material
|
||||||
|
#Observacion
|
||||||
|
lbl_observacionmodificacion=Observaci\u00f3n
|
||||||
|
|
||||||
tramite=Tr\u00e1mite
|
tramite=Tr\u00e1mite
|
||||||
lbl_dui=No. DUI
|
lbl_dui=No. DUI
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -634,6 +634,8 @@ lbl_unidadcantidad=U. Medida Cantidad
|
||||||
lbl_peso=Peso
|
lbl_peso=Peso
|
||||||
lbl_unidadpeso=U. Medida Peso
|
lbl_unidadpeso=U. Medida Peso
|
||||||
htbl_detalledelmaterial=Detalle del Material
|
htbl_detalledelmaterial=Detalle del Material
|
||||||
|
#Observacion
|
||||||
|
lbl_observacionmodificacion=Observaci\u00f3n
|
||||||
|
|
||||||
tramite=Tr\u00e1mite
|
tramite=Tr\u00e1mite
|
||||||
lbl_dui=No. DUI
|
lbl_dui=No. DUI
|
||||||
|
|
|
||||||
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.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue