llopez
/
portal-sincoar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ear/target/maven-archiver/pom.properties
View File

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

BIN
ear/target/portal-ear.ear
View File

Binary file not shown.

BIN
ear/target/portal-ear/portal-ejb.jar
View File

Binary file not shown.

BIN
ear/target/portal-ear/portal-web.war
View File

Binary file not shown.

5
ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java
View File

@ -11,13 +11,14 @@ import java.util.Date;
* The persistent class for the TCUSTCOMPANY database table.
*
*/
@Entity
@Entity(name = "Tcustcompany")
@Table(name = "TCUSTCOMPANY")
public class Tcustcompany implements Serializable {
private static final long serialVersionUID = 1L;
@EmbeddedId
private TcustcompanyPK id;
@Column(name = "BUSINESSCLASSCATALOG", nullable = true)
private String businessclasscatalog;
private String businessclasscatalogcode;

3
ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java
View File

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

17
ejb/src/main/resources/META-INF/ormPortal.xml
View File

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

13
ejb/src/main/resources/META-INF/persistence.xml
View File

@ -10,6 +10,8 @@
<!-- 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 -->
<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.Tgenecatalogdetail</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.Tgenefilesdetail</class>
<class>com.fp.armas.portal.model.TgenefilesdetailPK</class>
<class>com.fp.armas.portal.model.Tcustpersondetail</class>
<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 -->
<property name="hibernate.show_sql" value="false" />
<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>
</persistence-unit>
</persistence>

17
ejb/target/classes/META-INF/ormPortal.xml
View File

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

13
ejb/target/classes/META-INF/persistence.xml
View File

@ -10,6 +10,8 @@
<!-- 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 -->
<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.Tgenecatalogdetail</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.Tgenefilesdetail</class>
<class>com.fp.armas.portal.model.TgenefilesdetailPK</class>
<class>com.fp.armas.portal.model.Tcustpersondetail</class>
<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 -->
<property name="hibernate.show_sql" value="false" />
<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>
</persistence-unit>
</persistence>

BIN
ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class
View File

Binary file not shown.

BIN
ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class
View File

Binary file not shown.

2
ejb/target/maven-archiver/pom.properties
View File

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

BIN
ejb/target/portal-ejb.jar
View File

Binary file not shown.

11
web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java
View File

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

20
web/src/main/webapp/pages/registro/home.xhtml
View File

@ -158,29 +158,33 @@
<p:message for="txtCelular" display="icon"/>
<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:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/>
</p:selectOneMenu>
<!--<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> -->
<p:message for="txtEstadoCivil" display="icon"/>
<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="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu>
-->
<!--
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
-->
<p:message for="selGenero" display="icon"/>
<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:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
</p:selectOneMenu>
<!-- <p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
-->
<p:message for="selProfesion" display="icon"/>
</h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura">

BIN
web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class
View File

Binary file not shown.

2
web/target/maven-archiver/pom.properties
View File

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

BIN
web/target/portal-web.war
View File

Binary file not shown.

BIN
web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class
View File

Binary file not shown.

20
web/target/portal-web/pages/registro/home.xhtml
View File

@ -158,29 +158,33 @@
<p:message for="txtCelular" display="icon"/>
<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:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/>
</p:selectOneMenu>
<!--<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/> -->
<p:message for="txtEstadoCivil" display="icon"/>
<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="#{fn:toUpperCase(msg_portal['lbl_femenino'])}" itemValue="F"/>
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu>
-->
<!--
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
-->
<p:message for="selGenero" display="icon"/>
<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:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
</p:selectOneMenu>
<!-- <p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
-->
<p:message for="selProfesion" display="icon"/>
</h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura">