diff --git a/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/LoanPendingDetailBean.java b/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/LoanPendingDetailBean.java index ba9b59a..b7587ef 100644 --- a/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/LoanPendingDetailBean.java +++ b/apc-web/src/main/java/com/arrebol/apc/web/beans/admin/LoanPendingDetailBean.java @@ -1,13 +1,12 @@ /* * Arrebol Consultancy copyright. - * + * * This code belongs to Arrebol Consultancy - * its use, redistribution or modification are prohibited + * its use, redistribution or modification are prohibited * without written authorization from Arrebol Consultancy. */ package com.arrebol.apc.web.beans.admin; -import com.arrebol.apc.controller.GenericController; import com.arrebol.apc.controller.admin.CustomerController; import com.arrebol.apc.controller.admin.EndorsementController; import com.arrebol.apc.controller.admin.LoanController; @@ -38,296 +37,295 @@ import org.primefaces.event.RowEditEvent; */ @Named("loanPendingDetailManager") @ViewScoped -public class LoanPendingDetailBean extends GenericBean implements Serializable, Datatable { - - public void changeLoanType(){ - loan.setLoanType(new LoanType(typeLoanId)); - loan.setAmountToPay(loanTypeCtrl.getLoanTypeById(typeLoanId).getPaymentTotal()); - if(loanCtrl.updateLoan(loan)){ - showMessage(FacesMessage.SEVERITY_INFO, "Cambio de tipo de préstamo", "El préstamo se cambió correctamente"); - } - - } - - public void changeDateAndApprovedLoan(){ - loan.setCreatedOn(createdOn); - loan.setComments(comments); - if(loanCtrl.updateLoan(loan)){ - approvedLoan(); - } - - } - - public List getDetails(String id) { - try { - loanDetails = loanCtrl.getLoanDetailsbyId(id); +public class LoanPendingDetailBean extends GenericBean implements Serializable, Datatable { - } catch (Exception e) { - } - return null == loanDetails ? new ArrayList<>() : loanDetails; - } + public void changeLoanType() { + loan.setLoanType(new LoanType(typeLoanId)); + loan.setAmountToPay(loanTypeCtrl.getLoanTypeById(typeLoanId).getPaymentTotal()); + if (loanCtrl.updateLoan(loan)) { + showMessage(FacesMessage.SEVERITY_INFO, "Cambio de tipo de préstamo", "El préstamo se cambió correctamente"); + } - public People getCustomerDetail(String peopleId){ - return customerCtrl.findPeopleById(peopleId); - } - - public List getLoanByCustomer(String peopleId){ - return customerCtrl.findLoanByCustomer(peopleId); - } - - public List getLoanByEndorsement(String peopleId){ - return endorsementCtrl.findLoanByEndorsement(peopleId); - } - - public void rejectedLoan() { - loanCtrl.updateLoanByStatus(LoanStatus.REJECTED, loan.getId(), getLoggedUser().getUser().getId()); - loanCtrl.updateLoanByUserByStatus(LoanStatus.REJECTED, loan); - - LoanByRenovation renovation; - renovation = loanCtrl.getLoanByRenovationByIdLoanNew(loan); - if(renovation != null) - { - loanCtrl.updateLoanByRenovationByStatus(LoanRenovationStatus.REJECTED, loan, getLoggedUser().getUser().getId()); - loanCtrl.updateLoanByStatus(LoanStatus.APPROVED, renovation.getLoanOld().getId(), getLoggedUser().getUser().getId()); - loanCtrl.updateLoanByUserByStatus(LoanStatus.APPROVED, renovation.getLoanOld()); - } - - showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "El préstamo se cambió a estatus 'Rechazado' de forma correcta."); - } - - public void approvedLoan() { - loanCtrl.updateLoanByStatus(LoanStatus.TO_DELIVERY, loan.getId(), getLoggedUser().getUser().getId()); - loanCtrl.updateLoanByUserByStatus(LoanStatus.TO_DELIVERY, loan); - showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "El préstamo se cambió a estatus 'A conciliar' de forma correcta."); - } - - @Override - public void editRow(RowEditEvent event) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + } - @Override - public void onRowCancel(RowEditEvent event) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + public void changeDateAndApprovedLoan() { + loan.setCreatedOn(createdOn); + loan.setComments(comments); + if (loanCtrl.updateLoan(loan)) { + approvedLoan(); + } - @Override - public void onRowReorder(ReorderEvent event) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + } - @Override - public void addRow() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + public List getDetails(String id) { + try { + loanDetails = loanCtrl.getLoanDetailsbyId(id); - @Override - public void deleteRow() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. - } + } catch (Exception e) { + } + return null == loanDetails ? new ArrayList<>() : loanDetails; + } - public CustomerController getCustomerCtrl() { - return customerCtrl; - } + public People getCustomerDetail(String peopleId) { + return customerCtrl.findPeopleById(peopleId); + } - public void setCustomerCtrl(CustomerController customerCtrl) { - this.customerCtrl = customerCtrl; - } + public List getLoanByCustomer(String peopleId) { + return customerCtrl.findLoanByCustomer(peopleId); + } - public People getCustomer() { - return customer; - } + public List getLoanByEndorsement(String peopleId) { + return endorsementCtrl.findLoanByEndorsement(peopleId); + } - public void setCustomer(People customer) { - this.customer = customer; - } + public void rejectedLoan() { + loanCtrl.updateLoanByStatus(LoanStatus.REJECTED, loan.getId(), getLoggedUser().getUser().getId()); + loanCtrl.updateLoanByUserByStatus(LoanStatus.REJECTED, loan); - public List getLoanCustomer() { - return loanCustomer; - } + LoanByRenovation renovation; + renovation = loanCtrl.getLoanByRenovationByIdLoanNew(loan); + if (renovation != null) { + loanCtrl.updateLoanByRenovationByStatus(LoanRenovationStatus.REJECTED, loan, getLoggedUser().getUser().getId()); + loanCtrl.updateLoanByStatus(LoanStatus.APPROVED, renovation.getLoanOld().getId(), getLoggedUser().getUser().getId()); + loanCtrl.updateLoanByUserByStatus(LoanStatus.APPROVED, renovation.getLoanOld()); + } - public void setLoanCustomer(List loanCustomer) { - this.loanCustomer = loanCustomer; - } + showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "El préstamo se cambió a estatus 'Rechazado' de forma correcta."); + } - public String getCustomerId() { - return customerId; - } + public void approvedLoan() { + loanCtrl.updateLoanByStatus(LoanStatus.TO_DELIVERY, loan.getId(), getLoggedUser().getUser().getId()); + loanCtrl.updateLoanByUserByStatus(LoanStatus.TO_DELIVERY, loan); + showMessage(FacesMessage.SEVERITY_INFO, "Cambio de estatus", "El préstamo se cambió a estatus 'A conciliar' de forma correcta."); + } - public void setCustomerId(String customerId) { - this.customerId = customerId; - } + @Override + public void editRow(RowEditEvent event) { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } - public LoanController getLoanCtrl() { - return loanCtrl; - } + @Override + public void onRowCancel(RowEditEvent event) { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } - public void setLoanCtrl(LoanController loanCtrl) { - this.loanCtrl = loanCtrl; - } + @Override + public void onRowReorder(ReorderEvent event) { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } - public String getLoanId() { - return loanId; - } + @Override + public void addRow() { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } - public void setLoanId(String loanId) { - this.loanId = loanId; - } + @Override + public void deleteRow() { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } - public Loan getLoan() { - return loan; - } + public CustomerController getCustomerCtrl() { + return customerCtrl; + } - public void setLoan(Loan loan) { - this.loan = loan; - } + public void setCustomerCtrl(CustomerController customerCtrl) { + this.customerCtrl = customerCtrl; + } - public EndorsementController getEndorsementCtrl() { - return endorsementCtrl; - } + public People getCustomer() { + return customer; + } - public void setEndorsementCtrl(EndorsementController endorsementCtrl) { - this.endorsementCtrl = endorsementCtrl; - } + public void setCustomer(People customer) { + this.customer = customer; + } - public People getEndorsement() { - return endorsement; - } + public List getLoanCustomer() { + return loanCustomer; + } - public void setEndorsement(People endorsement) { - this.endorsement = endorsement; - } + public void setLoanCustomer(List loanCustomer) { + this.loanCustomer = loanCustomer; + } - public String getEndorsementId() { - return endorsementId; - } + public String getCustomerId() { + return customerId; + } - public void setEndorsementId(String endorsementId) { - this.endorsementId = endorsementId; - } + public void setCustomerId(String customerId) { + this.customerId = customerId; + } - public List getLoanEndorsement() { - return loanEndorsement; - } + public LoanController getLoanCtrl() { + return loanCtrl; + } - public void setLoanEndorsement(List loanEndorsement) { - this.loanEndorsement = loanEndorsement; - } + public void setLoanCtrl(LoanController loanCtrl) { + this.loanCtrl = loanCtrl; + } - public Loan getSelectedLoanCustomer() { - return selectedLoanCustomer; - } + public String getLoanId() { + return loanId; + } - public void setSelectedLoanCustomer(Loan selectedLoanCustomer) { - this.selectedLoanCustomer = selectedLoanCustomer; - } + public void setLoanId(String loanId) { + this.loanId = loanId; + } - public List getLoanDetails() { - return loanDetails; - } + public Loan getLoan() { + return loan; + } - public void setLoanDetails(List loanDetails) { - this.loanDetails = loanDetails; - } + public void setLoan(Loan loan) { + this.loan = loan; + } - public String getTypeLoanId() { - return typeLoanId; - } + public EndorsementController getEndorsementCtrl() { + return endorsementCtrl; + } - public void setTypeLoanId(String typeLoanId) { - this.typeLoanId = typeLoanId; - } + public void setEndorsementCtrl(EndorsementController endorsementCtrl) { + this.endorsementCtrl = endorsementCtrl; + } - public LoanTypeController getLoanTypeCtrl() { - return loanTypeCtrl; - } + public People getEndorsement() { + return endorsement; + } - public void setLoanTypeCtrl(LoanTypeController loanTypeCtrl) { - this.loanTypeCtrl = loanTypeCtrl; - } + public void setEndorsement(People endorsement) { + this.endorsement = endorsement; + } - public List getLoanType() { - return loanType; - } + public String getEndorsementId() { + return endorsementId; + } - public void setLoanType(List loanType) { - this.loanType = loanType; - } + public void setEndorsementId(String endorsementId) { + this.endorsementId = endorsementId; + } - public Date getCreatedOn() { - return createdOn; - } + public List getLoanEndorsement() { + return loanEndorsement; + } - public void setCreatedOn(Date createdOn) { - this.createdOn = createdOn; - } + public void setLoanEndorsement(List loanEndorsement) { + this.loanEndorsement = loanEndorsement; + } - public String getComments() { - return comments; - } + public Loan getSelectedLoanCustomer() { + return selectedLoanCustomer; + } - public void setComments(String comments) { - this.comments = comments; - } + public void setSelectedLoanCustomer(Loan selectedLoanCustomer) { + this.selectedLoanCustomer = selectedLoanCustomer; + } - public List getCustomers() { - return customers; - } + public List getLoanDetails() { + return loanDetails; + } - public void setCustomers(List customers) { - this.customers = customers; - } + public void setLoanDetails(List loanDetails) { + this.loanDetails = loanDetails; + } - public String getCustomerTest() { - return customerTest; - } + public String getTypeLoanId() { + return typeLoanId; + } - public void setCustomerTest(String customerTest) { - this.customerTest = customerTest; - } - - private CustomerController customerCtrl; - private LoanController loanCtrl; - private EndorsementController endorsementCtrl; - private LoanTypeController loanTypeCtrl; - - private People customer; - private Loan loan; - private People endorsement; - - private String customerId; - private String loanId; - private String endorsementId; - private String typeLoanId; - private String customerTest; - - private List loanEndorsement; - private List loanCustomer; - private Loan selectedLoanCustomer; - private List loanType; - private List customers; + public void setTypeLoanId(String typeLoanId) { + this.typeLoanId = typeLoanId; + } + + public LoanTypeController getLoanTypeCtrl() { + return loanTypeCtrl; + } + + public void setLoanTypeCtrl(LoanTypeController loanTypeCtrl) { + this.loanTypeCtrl = loanTypeCtrl; + } + + public List getLoanType() { + return loanType; + } + + public void setLoanType(List loanType) { + this.loanType = loanType; + } + + public Date getCreatedOn() { + return createdOn; + } + + public void setCreatedOn(Date createdOn) { + this.createdOn = createdOn; + } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public List getCustomers() { + return customers; + } + + public void setCustomers(List customers) { + this.customers = customers; + } + + public String getCustomerTest() { + return customerTest; + } + + public void setCustomerTest(String customerTest) { + this.customerTest = customerTest; + } + + private CustomerController customerCtrl; + private LoanController loanCtrl; + private EndorsementController endorsementCtrl; + private LoanTypeController loanTypeCtrl; + + private People customer; + private Loan loan; + private People endorsement; + + private String customerId; + private String loanId; + private String endorsementId; + private String typeLoanId; + private String customerTest; + + private List loanEndorsement; + private List loanCustomer; + private Loan selectedLoanCustomer; + private List loanType; + private List customers; + + private List loanDetails; + + private Date createdOn; + private String comments; + + @PostConstruct + public void init() { + loadBundlePropertyFile(); + customerCtrl = new CustomerController(); + loanCtrl = new LoanController(); + endorsementCtrl = new EndorsementController(); + loanTypeCtrl = new LoanTypeController(); + + setLoanId(externalContext().getRequestParameterMap().get("dtLoanPending_selection")); + loan = loanCtrl.getLoanById(getLoanId()); + customer = loan.getCustomer(); + endorsement = loan.getEndorsement(); + loanEndorsement = getLoanByEndorsement(loan.getEndorsement() != null ? loan.getEndorsement().getId() : "0"); + loanCustomer = getLoanByCustomer(loan.getCustomer() != null ? loan.getCustomer().getId() : "0"); + loanType = loanTypeCtrl.fillLoanTypeDatatable(getLoggedUser().getOffice() != null ? getLoggedUser().getOffice().getId() : "0"); + customers = customerCtrl.fillCustomersDatatable(getLoggedUser().getOffice() != null ? getLoggedUser().getOffice().getId() : "0"); + } - private List loanDetails; - - private Date createdOn; - private String comments; - - @PostConstruct - public void init() { - loadBundlePropertyFile(); - customerCtrl = new CustomerController(); - loanCtrl = new LoanController(); - endorsementCtrl = new EndorsementController(); - loanTypeCtrl = new LoanTypeController(); - - setLoanId(externalContext().getRequestParameterMap().get("form:dtLoanPending_selection")); - loan = loanCtrl.getLoanById(getLoanId()); - customer = loan.getCustomer(); - endorsement = loan.getEndorsement(); - loanEndorsement = getLoanByEndorsement(loan.getEndorsement().getId()); - loanCustomer = getLoanByCustomer(loan.getCustomer().getId()); - loanType = loanTypeCtrl.fillLoanTypeDatatable(getLoggedUser().getOffice().getId()); - customers = customerCtrl.fillCustomersDatatable(getLoggedUser().getOffice().getId()); - } - } diff --git a/apc-web/src/main/webapp/app/admin/loan/index.xhtml b/apc-web/src/main/webapp/app/admin/loan/index.xhtml index 0abd5e5..058427c 100644 --- a/apc-web/src/main/webapp/app/admin/loan/index.xhtml +++ b/apc-web/src/main/webapp/app/admin/loan/index.xhtml @@ -67,6 +67,15 @@ + + + + + - @@ -77,8 +86,7 @@ - - + @@ -102,7 +110,7 @@ required="true" requiredMessage="Es obligatorio" style="width: 100% !important;"> - +