diff --git a/ear/target/maven-archiver/pom.properties b/ear/target/maven-archiver/pom.properties index dac1993..21836f6 100644 --- a/ear/target/maven-archiver/pom.properties +++ b/ear/target/maven-archiver/pom.properties @@ -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 diff --git a/ear/target/portal-ear.ear b/ear/target/portal-ear.ear index 152e097..0da60cb 100644 Binary files a/ear/target/portal-ear.ear and b/ear/target/portal-ear.ear differ diff --git a/ear/target/portal-ear/portal-ejb.jar b/ear/target/portal-ear/portal-ejb.jar index ea415f4..66ee477 100644 Binary files a/ear/target/portal-ear/portal-ejb.jar and b/ear/target/portal-ear/portal-ejb.jar differ diff --git a/ear/target/portal-ear/portal-web.war b/ear/target/portal-ear/portal-web.war index b303242..32f9f83 100644 Binary files a/ear/target/portal-ear/portal-web.war and b/ear/target/portal-ear/portal-web.war differ diff --git a/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java b/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java index bbbcb83..c22ac77 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/Tcustcompany.java @@ -2,22 +2,23 @@ package com.fp.armas.portal.model; import java.io.Serializable; import javax.persistence.*; -import java.sql.Timestamp; -import java.math.BigDecimal; -import java.util.Date; +import java.sql.Timestamp; +import java.math.BigDecimal; +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; diff --git a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java index 91dbaf6..b48bc98 100644 --- a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java +++ b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java @@ -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); } } diff --git a/ejb/src/main/resources/META-INF/ormPortal.xml b/ejb/src/main/resources/META-INF/ormPortal.xml index 4416152..b7a089b 100644 --- a/ejb/src/main/resources/META-INF/ormPortal.xml +++ b/ejb/src/main/resources/META-INF/ormPortal.xml @@ -9,19 +9,28 @@ - + - + + +
+ + + - \ No newline at end of file diff --git a/ejb/src/main/resources/META-INF/persistence.xml b/ejb/src/main/resources/META-INF/persistence.xml index 5527766..cca2c6f 100644 --- a/ejb/src/main/resources/META-INF/persistence.xml +++ b/ejb/src/main/resources/META-INF/persistence.xml @@ -10,6 +10,8 @@ java:jboss/datasources/FLIPDS1 + META-INF/ormPortal.xml + com.fp.armas.portal.model.Tgenecatalogcom.fp.armas.portal.model.Tgenecatalogdetailcom.fp.armas.portal.model.TgenecatalogdetailPK @@ -22,10 +24,19 @@ com.fp.armas.portal.model.Tgenefilecom.fp.armas.portal.model.Tgenefilesdetailcom.fp.armas.portal.model.TgenefilesdetailPK + com.fp.armas.portal.model.Tcustpersondetail + + + + + + - + + + diff --git a/ejb/target/classes/META-INF/ormPortal.xml b/ejb/target/classes/META-INF/ormPortal.xml index 55c50c5..b7a089b 100644 --- a/ejb/target/classes/META-INF/ormPortal.xml +++ b/ejb/target/classes/META-INF/ormPortal.xml @@ -9,19 +9,28 @@
- + - + + +
+ + + - \ No newline at end of file diff --git a/ejb/target/classes/META-INF/persistence.xml b/ejb/target/classes/META-INF/persistence.xml index 5527766..cca2c6f 100644 --- a/ejb/target/classes/META-INF/persistence.xml +++ b/ejb/target/classes/META-INF/persistence.xml @@ -10,6 +10,8 @@ java:jboss/datasources/FLIPDS1 + META-INF/ormPortal.xml + com.fp.armas.portal.model.Tgenecatalogcom.fp.armas.portal.model.Tgenecatalogdetailcom.fp.armas.portal.model.TgenecatalogdetailPK @@ -22,10 +24,19 @@ com.fp.armas.portal.model.Tgenefilecom.fp.armas.portal.model.Tgenefilesdetailcom.fp.armas.portal.model.TgenefilesdetailPK + com.fp.armas.portal.model.Tcustpersondetail + + + + + + - + + + diff --git a/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class b/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class index f38fdcc..8cd3554 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class and b/ejb/target/classes/com/fp/armas/portal/model/Tcustcompany.class differ diff --git a/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class b/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class index 5784656..c91e9d8 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class and b/ejb/target/classes/com/fp/armas/portal/service/RegistroBean.class differ diff --git a/ejb/target/maven-archiver/pom.properties b/ejb/target/maven-archiver/pom.properties index a0fda46..cfcb00a 100644 --- a/ejb/target/maven-archiver/pom.properties +++ b/ejb/target/maven-archiver/pom.properties @@ -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 diff --git a/ejb/target/portal-ejb.jar b/ejb/target/portal-ejb.jar index ea415f4..66ee477 100644 Binary files a/ejb/target/portal-ejb.jar and b/ejb/target/portal-ejb.jar differ diff --git a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java index 9f435c4..b2f9514 100644 --- a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java +++ b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java @@ -264,7 +264,8 @@ public class RegistroController extends BaseController implements Serializable { registroDataManager.getPersona().setIdentification(id); registroDataManager.getPersona().setIdentificationcatalog(tipoId); } - this.completaDatosPersona(personaDetalle); + + 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: diff --git a/web/src/main/webapp/pages/registro/home.xhtml b/web/src/main/webapp/pages/registro/home.xhtml index 74f6247..0094082 100644 --- a/web/src/main/webapp/pages/registro/home.xhtml +++ b/web/src/main/webapp/pages/registro/home.xhtml @@ -158,30 +158,34 @@ - - + + - + + - - - + + + + diff --git a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class index d46e5b2..790feed 100644 Binary files a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ diff --git a/web/target/maven-archiver/pom.properties b/web/target/maven-archiver/pom.properties index 974dbaf..4ce0961 100644 --- a/web/target/maven-archiver/pom.properties +++ b/web/target/maven-archiver/pom.properties @@ -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 diff --git a/web/target/portal-web.war b/web/target/portal-web.war index b303242..32f9f83 100644 Binary files a/web/target/portal-web.war and b/web/target/portal-web.war differ diff --git a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class index d46e5b2..790feed 100644 Binary files a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ diff --git a/web/target/portal-web/pages/registro/home.xhtml b/web/target/portal-web/pages/registro/home.xhtml index 74f6247..0094082 100644 --- a/web/target/portal-web/pages/registro/home.xhtml +++ b/web/target/portal-web/pages/registro/home.xhtml @@ -158,30 +158,34 @@ - - + + - + + - - - + + + +