cambios intento casa

This commit is contained in:
Christian Ruales 2023-02-12 21:41:19 -05:00
parent 35bab8bbb8
commit 435755380d
21 changed files with 94 additions and 43 deletions

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Fri Feb 10 16:45:37 ECT 2023 #Sun Feb 12 21:25:08 ECT 2023
version=2.1 version=2.1
groupId=com.fp.armas groupId=com.fp.armas
artifactId=portal-ear artifactId=portal-ear

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2,22 +2,23 @@ package com.fp.armas.portal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* The persistent class for the TCUSTCOMPANY database table. * The persistent class for the TCUSTCOMPANY database table.
* *
*/ */
@Entity @Entity(name = "Tcustcompany")
@Table(name = "TCUSTCOMPANY")
public class Tcustcompany implements Serializable { public class Tcustcompany implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @EmbeddedId
private TcustcompanyPK id; private TcustcompanyPK id;
@Column(name = "BUSINESSCLASSCATALOG", nullable = true)
private String businessclasscatalog; private String businessclasscatalog;
private String businessclasscatalogcode; private String businessclasscatalogcode;

View File

@ -1,5 +1,6 @@
package com.fp.armas.portal.service; package com.fp.armas.portal.service;
import com.fp.armas.portal.dao.exceptions.DaoException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Calendar; import java.util.Calendar;
@ -361,7 +362,7 @@ public class RegistroBean {
this.guardaDetallesPersonaNatural(persona, adicionalPersona); this.guardaDetallesPersonaNatural(persona, adicionalPersona);
this.guardaCompania(persona, compania, foto); this.guardaCompania(persona, compania, foto);
this.guardarUsuario(persona, correoPersona); this.guardarUsuario(persona, correoPersona);
} catch (Throwable e) { } catch (DaoException | RegistroException | InterruptedException | ExecutionException e) {
throw new RegistroException(e); throw new RegistroException(e);
} }
} }

View File

@ -9,19 +9,28 @@
<table name="Tgenefilesdetail"/> <table name="Tgenefilesdetail"/>
<attributes> <attributes>
<basic name="image" access="FIELD"> <basic name="image" access="FIELD">
<column name="image" column-definition="longblob"/> <column name="image" column-definition="bytea"/>
</basic> </basic>
</attributes> </attributes>
</entity> </entity>
<entity class="com.fp.armas.portal.model.Tcustpersondetail" name="Tcustpersondetail" access="FIELD"> <!--
<entity class="Tcustpersondetail" name="Tcustpersondetail" access="FIELD">
<table name="Tcustpersondetail"/> <table name="Tcustpersondetail"/>
<attributes> <attributes>
<basic name="picture" access="FIELD"> <basic name="picture" access="FIELD">
<column name="picture" column-definition="oid"/> <column name="picture" column-definition="bytea"/>
</basic>
</attributes>
</entity>-->
<entity class="Tcustcompany" name="Tcustcompany" access="FIELD">
<table name="Tcustpersondetail"/>
<attributes>
<basic name="picture" access="FIELD">
<column name="picture" column-definition="bytea"/>
</basic> </basic>
</attributes> </attributes>
</entity> </entity>
</entity-mappings> </entity-mappings>

View File

@ -10,6 +10,8 @@
<!-- The datasource is deployed as <EAR>/META-INF/portal-ds.xml, you <!-- The datasource is deployed as <EAR>/META-INF/portal-ds.xml, you
can find it in the source at ear/src/main/application/META-INF/portal-ds.xml --> can find it in the source at ear/src/main/application/META-INF/portal-ds.xml -->
<jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source> <jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source>
<mapping-file>META-INF/ormPortal.xml</mapping-file>
<class>com.fp.armas.portal.model.Tgenecatalog</class> <class>com.fp.armas.portal.model.Tgenecatalog</class>
<class>com.fp.armas.portal.model.Tgenecatalogdetail</class> <class>com.fp.armas.portal.model.Tgenecatalogdetail</class>
<class>com.fp.armas.portal.model.TgenecatalogdetailPK</class> <class>com.fp.armas.portal.model.TgenecatalogdetailPK</class>
@ -22,10 +24,19 @@
<class>com.fp.armas.portal.model.Tgenefile</class> <class>com.fp.armas.portal.model.Tgenefile</class>
<class>com.fp.armas.portal.model.Tgenefilesdetail</class> <class>com.fp.armas.portal.model.Tgenefilesdetail</class>
<class>com.fp.armas.portal.model.TgenefilesdetailPK</class> <class>com.fp.armas.portal.model.TgenefilesdetailPK</class>
<class>com.fp.armas.portal.model.Tcustpersondetail</class>
<properties> <properties>
<property name="hibernate.default_schema" value="comaco"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.connection.autocommit" value="false"/>
<property name="hibernate.jdbc.fetch_size" value="50"/>
<property name="hibernate.jdbc.batch_size" value="200"/>
<!-- Properties for Hibernate --> <!-- Properties for Hibernate -->
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/> <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.id.new_generator_mappings" value="false" />
<property name="hibernate.transaction.jta.platform" value = "org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
</properties> </properties>
</persistence-unit> </persistence-unit>
</persistence> </persistence>

View File

@ -9,19 +9,28 @@
<table name="Tgenefilesdetail"/> <table name="Tgenefilesdetail"/>
<attributes> <attributes>
<basic name="image" access="FIELD"> <basic name="image" access="FIELD">
<column name="image" column-definition="longblob"/> <column name="image" column-definition="bytea"/>
</basic> </basic>
</attributes> </attributes>
</entity> </entity>
<entity class="com.fp.armas.portal.model.Tcustpersondetail" name="Tcustpersondetail" access="FIELD"> <!--
<entity class="Tcustpersondetail" name="Tcustpersondetail" access="FIELD">
<table name="Tcustpersondetail"/> <table name="Tcustpersondetail"/>
<attributes> <attributes>
<basic name="picture" access="FIELD"> <basic name="picture" access="FIELD">
<column name="picture" column-definition="longblob"/> <column name="picture" column-definition="bytea"/>
</basic>
</attributes>
</entity>-->
<entity class="Tcustcompany" name="Tcustcompany" access="FIELD">
<table name="Tcustpersondetail"/>
<attributes>
<basic name="picture" access="FIELD">
<column name="picture" column-definition="bytea"/>
</basic> </basic>
</attributes> </attributes>
</entity> </entity>
</entity-mappings> </entity-mappings>

View File

@ -10,6 +10,8 @@
<!-- The datasource is deployed as <EAR>/META-INF/portal-ds.xml, you <!-- The datasource is deployed as <EAR>/META-INF/portal-ds.xml, you
can find it in the source at ear/src/main/application/META-INF/portal-ds.xml --> can find it in the source at ear/src/main/application/META-INF/portal-ds.xml -->
<jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source> <jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source>
<mapping-file>META-INF/ormPortal.xml</mapping-file>
<class>com.fp.armas.portal.model.Tgenecatalog</class> <class>com.fp.armas.portal.model.Tgenecatalog</class>
<class>com.fp.armas.portal.model.Tgenecatalogdetail</class> <class>com.fp.armas.portal.model.Tgenecatalogdetail</class>
<class>com.fp.armas.portal.model.TgenecatalogdetailPK</class> <class>com.fp.armas.portal.model.TgenecatalogdetailPK</class>
@ -22,10 +24,19 @@
<class>com.fp.armas.portal.model.Tgenefile</class> <class>com.fp.armas.portal.model.Tgenefile</class>
<class>com.fp.armas.portal.model.Tgenefilesdetail</class> <class>com.fp.armas.portal.model.Tgenefilesdetail</class>
<class>com.fp.armas.portal.model.TgenefilesdetailPK</class> <class>com.fp.armas.portal.model.TgenefilesdetailPK</class>
<class>com.fp.armas.portal.model.Tcustpersondetail</class>
<properties> <properties>
<property name="hibernate.default_schema" value="comaco"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.connection.autocommit" value="false"/>
<property name="hibernate.jdbc.fetch_size" value="50"/>
<property name="hibernate.jdbc.batch_size" value="200"/>
<!-- Properties for Hibernate --> <!-- Properties for Hibernate -->
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/> <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.id.new_generator_mappings" value="false" />
<property name="hibernate.transaction.jta.platform" value = "org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
</properties> </properties>
</persistence-unit> </persistence-unit>
</persistence> </persistence>

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Fri Feb 10 16:45:35 ECT 2023 #Sun Feb 12 21:25:06 ECT 2023
version=2.1 version=2.1
groupId=com.fp.armas groupId=com.fp.armas
artifactId=portal-ejb artifactId=portal-ejb

Binary file not shown.

View File

@ -264,7 +264,8 @@ public class RegistroController extends BaseController implements Serializable {
registroDataManager.getPersona().setIdentification(id); registroDataManager.getPersona().setIdentification(id);
registroDataManager.getPersona().setIdentificationcatalog(tipoId); registroDataManager.getPersona().setIdentificationcatalog(tipoId);
} }
this.completaDatosPersona(personaDetalle);
this.completaDatosPersona(personaDetalle);
cambiaPais(); cambiaPais();
} }
@ -278,7 +279,7 @@ public class RegistroController extends BaseController implements Serializable {
if(personaDetalle != null){ if(personaDetalle != null){
registroDataManager.setPersona(personaDetalle); registroDataManager.setPersona(personaDetalle);
} }
registroDataManager.setCedulaSnap(new Cedula()); //registroDataManager.setCedulaSnap(new Cedula());
switch (registroDataManager.getPersona().getIdentification().length()) { switch (registroDataManager.getPersona().getIdentification().length()) {
case 10:{ case 10:{
@ -303,23 +304,23 @@ public class RegistroController extends BaseController implements Serializable {
contribuyente.setListaBlanca(new ListaBlanca()); contribuyente.setListaBlanca(new ListaBlanca());
contribuyente.setTipoContribuyente(new TipoContribuyente()); contribuyente.setTipoContribuyente(new TipoContribuyente());
contribuyente.setUbicacionGeografica(new UbicacionGeografica()); contribuyente.setUbicacionGeografica(new UbicacionGeografica());
contribuyente.setCodEstado("ACT"); //contribuyente.setCodEstado("ACT");
} }
//contribuyente = contribuyente == null ? new ContribuyenteCompleto() : contribuyente; //contribuyente = contribuyente == null ? new ContribuyenteCompleto() : contribuyente;
/**
if(!contribuyente.getCodEstado().equals("ACT")){ if(!contribuyente.getCodEstado().equals("ACT")){
FacesUtil.getInstancia().messageError("El RUC INGRESADO NO ESTA ACTIVO"); FacesUtil.getInstancia().messageError("El RUC INGRESADO NO ESTA ACTIVO");
FacesContext.getCurrentInstance().getExternalContext().getFlash().setKeepMessages(Boolean.TRUE); FacesContext.getCurrentInstance().getExternalContext().getFlash().setKeepMessages(Boolean.TRUE);
// FacesUtil.getInstancia().eliminaBeanSesion("registroDataManager"); // FacesUtil.getInstancia().eliminaBeanSesion("registroDataManager");
isEnableSave=Boolean.FALSE; isEnableSave=Boolean.FALSE;
return; return;
} } */
completaDatosCompania(registroDataManager.getPersona()); completaDatosCompania(registroDataManager.getPersona());
completaDatosSnap(contribuyente); completaDatosSnap(contribuyente);
registroDataManager.setRucSnap(contribuyente); registroDataManager.setRucSnap(contribuyente);
//registroDataManager.setCedulaSnap(null); registroDataManager.setCedulaSnap(null);
} }
break; break;
default: default:

View File

@ -158,30 +158,34 @@
<p:message for="txtCelular" display="icon"/> <p:message for="txtCelular" display="icon"/>
<p:outputLabel for="txtEstadoCivil" value="#{msg_portal['lbl_estado_civil']}" style="width:150px;display: block;"/> <p:outputLabel for="txtEstadoCivil" value="#{msg_portal['lbl_estado_civil']}" style="width:150px;display: block;"/>
<!-- <p:selectOneMenu id="txtEstadoCivil" value="#{registroDataManager.adicionalPersona.maritalstatuscatalog}"> <p:selectOneMenu id="txtEstadoCivil" value="#{registroDataManager.adicionalPersona.maritalstatuscatalog}">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/> <f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> --> </p:selectOneMenu>
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> <!--<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> -->
<p:message for="txtEstadoCivil" display="icon"/> <p:message for="txtEstadoCivil" display="icon"/>
<p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/> <p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/>
<!-- <p:selectOneMenu id="selGenero" value="#{registroDataManager.adicionalPersona.gender}"> <p:selectOneMenu id="selGenero" value="#{registroDataManager.adicionalPersona.gender}">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/> <f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/> <f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu> </p:selectOneMenu>
-->
<!--
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/> <p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
-->
<p:message for="selGenero" display="icon"/> <p:message for="selGenero" display="icon"/>
<p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" /> <p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" />
<!-- <p:selectOneMenu id="selProfesion" value="#{registroDataManager.adicionalPersona.professioncatalog}" onkeyup="comaco.upperText(event, this);"> <p:selectOneMenu id="selProfesion" value="#{registroDataManager.adicionalPersona.professioncatalog}" onkeyup="comaco.upperText(event, this);">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/> <f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> --> </p:selectOneMenu>
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
<p:message for="selProfesion" display="icon"/> <!-- <p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
-->
<p:message for="selProfesion" display="icon"/>
</h:panelGrid> </h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura"> <h:panelGroup layout="block" id="pnlestatura">
<h:panelGrid columns="3" style="width:308px" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog != 'RUC'}"> <h:panelGrid columns="3" style="width:308px" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog != 'RUC'}">

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Fri Feb 10 16:45:36 ECT 2023 #Sun Feb 12 21:25:07 ECT 2023
version=2.1 version=2.1
groupId=com.fp.armas groupId=com.fp.armas
artifactId=portal-web artifactId=portal-web

Binary file not shown.

View File

@ -158,30 +158,34 @@
<p:message for="txtCelular" display="icon"/> <p:message for="txtCelular" display="icon"/>
<p:outputLabel for="txtEstadoCivil" value="#{msg_portal['lbl_estado_civil']}" style="width:150px;display: block;"/> <p:outputLabel for="txtEstadoCivil" value="#{msg_portal['lbl_estado_civil']}" style="width:150px;display: block;"/>
<!-- <p:selectOneMenu id="txtEstadoCivil" value="#{registroDataManager.adicionalPersona.maritalstatuscatalog}"> <p:selectOneMenu id="txtEstadoCivil" value="#{registroDataManager.adicionalPersona.maritalstatuscatalog}">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/> <f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> --> </p:selectOneMenu>
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> <!--<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> -->
<p:message for="txtEstadoCivil" display="icon"/> <p:message for="txtEstadoCivil" display="icon"/>
<p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/> <p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/>
<!-- <p:selectOneMenu id="selGenero" value="#{registroDataManager.adicionalPersona.gender}"> <p:selectOneMenu id="selGenero" value="#{registroDataManager.adicionalPersona.gender}">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/> <f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/> <f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu> </p:selectOneMenu>
-->
<!--
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/> <p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
-->
<p:message for="selGenero" display="icon"/> <p:message for="selGenero" display="icon"/>
<p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" /> <p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" />
<!-- <p:selectOneMenu id="selProfesion" value="#{registroDataManager.adicionalPersona.professioncatalog}" onkeyup="comaco.upperText(event, this);"> <p:selectOneMenu id="selProfesion" value="#{registroDataManager.adicionalPersona.professioncatalog}" onkeyup="comaco.upperText(event, this);">
<f:selectItem itemLabel="" itemValue="#{null}"/> <f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/> <f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> --> </p:selectOneMenu>
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
<p:message for="selProfesion" display="icon"/> <!-- <p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
-->
<p:message for="selProfesion" display="icon"/>
</h:panelGrid> </h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura"> <h:panelGroup layout="block" id="pnlestatura">
<h:panelGrid columns="3" style="width:308px" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog != 'RUC'}"> <h:panelGrid columns="3" style="width:308px" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog != 'RUC'}">