Index: E:/workspace/mifos/test/org/mifos/application/accounts/loan/business/TestLoanBO.java =================================================================== --- E:/workspace/mifos/test/org/mifos/application/accounts/loan/business/TestLoanBO.java (revision 12312) +++ E:/workspace/mifos/test/org/mifos/application/accounts/loan/business/TestLoanBO.java (working copy) @@ -65,7 +65,6 @@ import org.mifos.application.fees.util.helpers.FeeStatus; import org.mifos.application.fund.business.FundBO; import org.mifos.application.holiday.util.helpers.TestHolidayUtils; -import org.mifos.application.master.business.CollateralTypeEntity; import org.mifos.application.master.business.CustomFieldType; import org.mifos.application.master.business.CustomFieldView; import org.mifos.application.master.business.InterestTypesEntity; @@ -779,9 +778,8 @@ loan.setGracePeriodType(gracePeriodType); loan.setCreatedBy(Short.valueOf("1")); - CollateralTypeEntity collateralType = new CollateralTypeEntity(Short - .valueOf("1")); - loan.setCollateralType(collateralType); + // Set collateral type to lookup id 109, which references the lookup value 'Type 1' + loan.setCollateralTypeId(Short.valueOf("109")); InterestTypesEntity interestTypes = new InterestTypesEntity( InterestType.FLAT); Index: E:/workspace/mifos/src/org/mifos/application/accounts/loan/struts/action/LoanAccountAction.java =================================================================== --- E:/workspace/mifos/src/org/mifos/application/accounts/loan/struts/action/LoanAccountAction.java (revision 12312) +++ E:/workspace/mifos/src/org/mifos/application/accounts/loan/struts/action/LoanAccountAction.java (working copy) @@ -55,10 +55,10 @@ import org.mifos.application.fees.business.service.FeeBusinessService; import org.mifos.application.fund.business.FundBO; import org.mifos.application.master.business.BusinessActivityEntity; -import org.mifos.application.master.business.CollateralTypeEntity; import org.mifos.application.master.business.CustomFieldDefinitionEntity; import org.mifos.application.master.business.CustomFieldType; import org.mifos.application.master.business.CustomFieldView; +import org.mifos.application.master.business.CustomValueListElement; import org.mifos.application.master.business.MasterDataEntity; import org.mifos.application.master.business.ValueListElement; import org.mifos.application.master.business.service.MasterDataService; @@ -698,10 +698,7 @@ } loan.setBusinessActivityId(loanActionForm.getBusinessActivityIdValue()); loan.setCollateralNote(loanActionForm.getCollateralNote()); - CollateralTypeEntity collateralTypeEntity = (CollateralTypeEntity) findMasterEntity( - request, MasterConstants.COLLATERAL_TYPES, loanActionForm - .getCollateralTypeIdValue()); - loan.setCollateralType(collateralTypeEntity); + loan.setCollateralTypeId(loanActionForm.getCollateralTypeIdValue()); return loan; } @@ -1153,19 +1150,8 @@ } LoanAccountActionForm loanAccountActionForm = (LoanAccountActionForm) form; - SessionUtils.removeAttribute(MasterConstants.COLLATERAL_TYPE_NAME, - request); SessionUtils.removeAttribute(MasterConstants.BUSINESS_ACTIVITIE_NAME, request); - if (loanAccountActionForm.getCollateralTypeIdValue() != null) { - CollateralTypeEntity collateralTypeEntity = (CollateralTypeEntity) findMasterEntity( - request, MasterConstants.COLLATERAL_TYPES, - loanAccountActionForm.getCollateralTypeIdValue()); - collateralTypeEntity.setLocaleId(getUserContext(request) - .getLocaleId()); - SessionUtils.setAttribute(MasterConstants.COLLATERAL_TYPE_NAME, - collateralTypeEntity.getName(), request); - } if (loanAccountActionForm.getBusinessActivityIdValue() != null) { SessionUtils.setAttribute(MasterConstants.BUSINESS_ACTIVITIE_NAME, getNameForBusinessActivityEntity(loanAccountActionForm @@ -1198,7 +1184,7 @@ loanBO.setUserContext(getUserContext(request)); setInitialObjectForAuditLogging(loanBO); - LoanAccountActionForm loanAccountActionForm = (LoanAccountActionForm) form; + LoanAccountActionForm loanAccountActionForm = (LoanAccountActionForm) form; loanBO.updateLoan(loanAccountActionForm.isInterestDedAtDisbValue(), loanAccountActionForm.getLoanAmountValue(), loanAccountActionForm.getInterestDoubleValue(), @@ -1207,10 +1193,8 @@ request).getPreferredLocale()), loanAccountActionForm .getGracePeriodDurationValue(), loanAccountActionForm .getBusinessActivityIdValue(), loanAccountActionForm - .getCollateralNote(), getCollateralTypeEntity(form, - request),loanAccountActionForm.getCustomFields()); - - + .getCollateralNote(), loanAccountActionForm.getCollateralTypeIdValue(), + loanAccountActionForm.getCustomFields()); ConfigurationPersistence configurationPersistence = new ConfigurationPersistence(); @@ -1245,27 +1229,11 @@ return mapping.findForward(ActionForwards.update_success.toString()); } - private CollateralTypeEntity getCollateralTypeEntity(ActionForm form, - HttpServletRequest request) throws Exception { - LoanAccountActionForm loanAccountActionForm = (LoanAccountActionForm) form; - if (loanAccountActionForm.getCollateralTypeIdValue() != null) { - CollateralTypeEntity collateralTypeEntity = (CollateralTypeEntity) findMasterEntity( - request, MasterConstants.COLLATERAL_TYPES, - loanAccountActionForm.getCollateralTypeIdValue()); - collateralTypeEntity.setLocaleId(getUserContext(request) - .getLocaleId()); - return collateralTypeEntity; - } - return null; - } - private void setLocaleForMasterEntities(LoanBO loanBO, Short localeId) { if (loanBO.getGracePeriodType() != null) { // Is this locale ever consulted? I don't see a place... loanBO.getGracePeriodType().setLocaleId(localeId); } - if (loanBO.getCollateralType() != null) - loanBO.getCollateralType().setLocaleId(localeId); loanBO.getInterestType().setLocaleId(localeId); loanBO.getAccountState().setLocaleId(localeId); for (AccountFlagMapping accountFlagMapping : loanBO.getAccountFlags()) { @@ -1465,10 +1433,11 @@ private void loadMasterData(HttpServletRequest request) throws Exception { - - SessionUtils.setCollectionAttribute(MasterConstants.COLLATERAL_TYPES, - getMasterEntities(CollateralTypeEntity.class, getUserContext( - request).getLocaleId()), request); + // Retrieve and set into the session all collateral types from the lookup_value_locale table associated with the current user context locale + SessionUtils.setCollectionAttribute(MasterConstants.COLLATERAL_TYPES, + new MasterPersistence().getLookUpEntity(MasterConstants.COLLATERAL_TYPES, + getUserContext(request).getLocaleId()).getCustomValueListElements(), request); + SessionUtils .setCollectionAttribute(MasterConstants.BUSINESS_ACTIVITIES, ((MasterDataService) ServiceFactory.getInstance() @@ -1556,9 +1525,8 @@ .isInterestDeductedAtDisbursement() ? "1" : "0"); loanAccountActionForm.setBusinessActivityId(getStringValue(loan .getBusinessActivityId())); - if (loan.getCollateralType() != null) - loanAccountActionForm.setCollateralTypeId(getStringValue(loan - .getCollateralType().getId())); + if (loan.getCollateralTypeId() != null) + loanAccountActionForm.setCollateralTypeId(getStringValue(loan.getCollateralTypeId())); loanAccountActionForm.setCollateralNote(loan.getCollateralNote()); loanAccountActionForm.setInterestRate(getStringValue(loan .getInterestRate())); Index: E:/workspace/mifos/src/org/mifos/application/accounts/loan/business/LoanBO.java =================================================================== --- E:/workspace/mifos/src/org/mifos/application/accounts/loan/business/LoanBO.java (revision 12312) +++ E:/workspace/mifos/src/org/mifos/application/accounts/loan/business/LoanBO.java (working copy) @@ -96,7 +96,6 @@ import org.mifos.application.fees.util.helpers.FeeStatus; import org.mifos.application.fees.util.helpers.RateAmountFlag; import org.mifos.application.fund.business.FundBO; -import org.mifos.application.master.business.CollateralTypeEntity; import org.mifos.application.master.business.CustomFieldView; import org.mifos.application.master.business.InterestTypesEntity; import org.mifos.application.master.business.PaymentTypeEntity; @@ -179,8 +178,8 @@ */ private Integer businessActivityId; - private CollateralTypeEntity collateralType; - + private Short collateralTypeId; + private String collateralNote; private Short groupFlag; @@ -546,12 +545,12 @@ this.collateralNote = collateralNote; } - public CollateralTypeEntity getCollateralType() { - return collateralType; + public Short getCollateralTypeId() { + return collateralTypeId; } - public void setCollateralType(CollateralTypeEntity collateralType) { - this.collateralType = collateralType; + public void setCollateralTypeId(Short collateralTypeId) { + this.collateralTypeId = collateralTypeId; } public GracePeriodTypeEntity getGracePeriodType() { @@ -1398,7 +1397,7 @@ Money loanAmount, Double interestRate, Short noOfInstallments, Date disbursmentDate, Short gracePeriodDuration, Integer businessActivityId, String collateralNote, - CollateralTypeEntity collateralTypeEntity, + Short collateralTypeId, List customFields) throws AccountException { if (interestDeductedAtDisbursment) { try { @@ -1423,7 +1422,7 @@ setInterestDeductedAtDisbursement(interestDeductedAtDisbursment); setBusinessActivityId(businessActivityId); setCollateralNote(collateralNote); - setCollateralType(collateralTypeEntity); + setCollateralTypeId(collateralTypeId); if (getAccountState().getId().equals( AccountState.LOAN_APPROVED.getValue()) || getAccountState().getId().equals( Index: E:/workspace/mifos/src/org/mifos/application/accounts/business/AccountBO.hbm.xml =================================================================== --- E:/workspace/mifos/src/org/mifos/application/accounts/business/AccountBO.hbm.xml (revision 12312) +++ E:/workspace/mifos/src/org/mifos/application/accounts/business/AccountBO.hbm.xml (working copy) @@ -100,6 +100,7 @@ + - - - - - - - - - - - - - \ No newline at end of file Index: E:/workspace/mifos/src/org/mifos/application/master/business/CollateralTypeEntity.java =================================================================== --- E:/workspace/mifos/src/org/mifos/application/master/business/CollateralTypeEntity.java (revision 12312) +++ E:/workspace/mifos/src/org/mifos/application/master/business/CollateralTypeEntity.java (working copy) @@ -1,11 +0,0 @@ -package org.mifos.application.master.business; - -public class CollateralTypeEntity extends MasterDataEntity { - public CollateralTypeEntity() { - super(); - } - - public CollateralTypeEntity(Short id) { - super(id); - } -} Index: E:/workspace/mifos/src/org/mifos/application/master/util/helpers/MasterConstants.java =================================================================== --- E:/workspace/mifos/src/org/mifos/application/master/util/helpers/MasterConstants.java (revision 12312) +++ E:/workspace/mifos/src/org/mifos/application/master/util/helpers/MasterConstants.java (working copy) @@ -54,7 +54,6 @@ public static final String PERSONNEL_TITLE ="PersonnelTitles"; public static final String PERSONNEL_LEVELS="PersonnelLevels"; public static final String COLLATERAL_TYPES="CollateralTypes"; - public static final String COLLATERAL_TYPE_NAME="CollateralTypeName"; public static final String INTERESTTYPES="InterestTypes"; public static final String INTERESTCALCRULE="InterestCalcRule"; public static final String GRACEPERIODTYPES="GracePeriodTypes"; Index: E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/loanaccountdetail.jsp =================================================================== --- E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/loanaccountdetail.jsp (revision 12312) +++ E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/loanaccountdetail.jsp (working copy) @@ -392,7 +392,11 @@   - + + + + +
Index: E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/editPreviewLoanAccount.jsp =================================================================== --- E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/editPreviewLoanAccount.jsp (revision 12312) +++ E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/editPreviewLoanAccount.jsp (working copy) @@ -170,7 +170,11 @@   - + + + + +
Index: E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/createloanpreview.jsp =================================================================== --- E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/createloanpreview.jsp (revision 12312) +++ E:/workspace/mifos/src/org/mifos/doc-root/application/loan/jsp/createloanpreview.jsp (working copy) @@ -337,7 +337,11 @@ -   +   + + + + Index: E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java =================================================================== --- E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java (revision 12312) +++ E:/workspace/mifos/src/org/mifos/framework/persistence/DatabaseVersionPersistence.java (working copy) @@ -30,7 +30,7 @@ public class DatabaseVersionPersistence { - public static final int APPLICATION_VERSION = 173; + public static final int APPLICATION_VERSION = 174; public static final int FIRST_NUMBERED_VERSION = 100; public static void register(Map register, Upgrade upgrade) { Index: E:/workspace/mifos/src/org/mifos/framework/util/resources/audit/ColumnMapping.xml =================================================================== --- E:/workspace/mifos/src/org/mifos/framework/util/resources/audit/ColumnMapping.xml (revision 12312) +++ E:/workspace/mifos/src/org/mifos/framework/util/resources/audit/ColumnMapping.xml (working copy) @@ -3,18 +3,12 @@ - - - - - - @@ -28,6 +22,7 @@ + Index: E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml =================================================================== --- E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml (revision 12312) +++ E:/workspace/mifos/src/org/mifos/framework/util/resources/hibernate.cfg.xml (working copy) @@ -154,7 +154,6 @@ - Index: E:/workspace/mifos/sql/upgrade_to_174.sql =================================================================== --- E:/workspace/mifos/sql/upgrade_to_174.sql (revision 0) +++ E:/workspace/mifos/sql/upgrade_to_174.sql (revision 0) @@ -0,0 +1,6 @@ + +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY LOAN_ACCOUNT_ibfk_9; + +DROP TABLE COLLATERAL_TYPE; + +UPDATE DATABASE_VERSION SET DATABASE_VERSION = 174 WHERE DATABASE_VERSION = 173; \ No newline at end of file Index: E:/workspace/mifos/sql/mifosdroptables.sql =================================================================== --- E:/workspace/mifos/sql/mifosdroptables.sql (revision 12312) +++ E:/workspace/mifos/sql/mifosdroptables.sql (working copy) @@ -283,8 +283,6 @@ DROP TABLE IF EXISTS CUSTOMER_LEVEL; -DROP TABLE IF EXISTS COLLATERAL_TYPE; - DROP TABLE IF EXISTS CATEGORY_TYPE; DROP TABLE IF EXISTS POSITION; Index: E:/workspace/mifos/sql/downgrade_from_174.sql =================================================================== --- E:/workspace/mifos/sql/downgrade_from_174.sql (revision 0) +++ E:/workspace/mifos/sql/downgrade_from_174.sql (revision 0) @@ -0,0 +1,30 @@ +CREATE TABLE COLLATERAL_TYPE ( + COLLATERAL_TYPE_ID SMALLINT NOT NULL, + LOOKUP_ID INTEGER NOT NULL, + PRIMARY KEY(COLLATERAL_TYPE_ID), + FOREIGN KEY(LOOKUP_ID) + REFERENCES LOOKUP_VALUE(LOOKUP_ID) + ON DELETE NO ACTION + ON UPDATE NO ACTION +) +ENGINE=InnoDB CHARACTER SET utf8; + +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY LOAN_ACCOUNT_ibfk_10; +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY LOAN_ACCOUNT_ibfk_11; +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY LOAN_ACCOUNT_ibfk_12; +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY fk_loan_account; +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY fk_loan_rankday; +ALTER TABLE LOAN_ACCOUNT DROP FOREIGN KEY fk_loan_monthweek; + +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT LOAN_ACCOUNT_ibfk_9 FOREIGN KEY(COLLATERAL_TYPE_ID) REFERENCES COLLATERAL_TYPE(COLLATERAL_TYPE_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT LOAN_ACCOUNT_ibfk_10 FOREIGN KEY(BUSINESS_ACTIVITIES_ID) REFERENCES LOOKUP_VALUE(LOOKUP_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT LOAN_ACCOUNT_ibfk_11 FOREIGN KEY(PRD_OFFERING_ID) REFERENCES PRD_OFFERING(PRD_OFFERING_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT LOAN_ACCOUNT_ibfk_12 FOREIGN KEY(PARENT_ACCOUNT_ID) REFERENCES ACCOUNT(ACCOUNT_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT fk_loan_account FOREIGN KEY(PARENT_ACCOUNT_ID) REFERENCES LOAN_ACCOUNT(ACCOUNT_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT fk_loan_rankday FOREIGN KEY(MONTH_RANK) REFERENCES RANK_DAYS_MASTER(RANK_DAYS_MASTER_ID); +ALTER TABLE LOAN_ACCOUNT ADD CONSTRAINT fk_loan_monthweek FOREIGN KEY(MONTH_WEEK) REFERENCES WEEK_DAYS_MASTER(WEEK_DAYS_MASTER_ID); + +INSERT INTO COLLATERAL_TYPE(COLLATERAL_TYPE_ID, LOOKUP_ID) VALUES(1, 109); +INSERT INTO COLLATERAL_TYPE(COLLATERAL_TYPE_ID, LOOKUP_ID) VALUES(2, 110); + +UPDATE DATABASE_VERSION SET DATABASE_VERSION = 173 WHERE DATABASE_VERSION = 174; \ No newline at end of file Index: E:/workspace/mifos/sql/latest-schema.sql =================================================================== --- E:/workspace/mifos/sql/latest-schema.sql (revision 12312) +++ E:/workspace/mifos/sql/latest-schema.sql (working copy) @@ -437,17 +437,6 @@ ) ENGINE=InnoDB CHARACTER SET utf8; -CREATE TABLE COLLATERAL_TYPE ( - COLLATERAL_TYPE_ID SMALLINT NOT NULL, - LOOKUP_ID INTEGER NOT NULL, - PRIMARY KEY(COLLATERAL_TYPE_ID), - FOREIGN KEY(LOOKUP_ID) - REFERENCES LOOKUP_VALUE(LOOKUP_ID) - ON DELETE NO ACTION - ON UPDATE NO ACTION -) -ENGINE=InnoDB CHARACTER SET utf8; - CREATE TABLE CUSTOMER_LEVEL ( LEVEL_ID SMALLINT NOT NULL, PARENT_LEVEL_ID SMALLINT, @@ -2308,19 +2297,15 @@ REFERENCES MEETING(MEETING_ID) ON DELETE NO ACTION ON UPDATE NO ACTION, - FOREIGN KEY(COLLATERAL_TYPE_ID) - REFERENCES COLLATERAL_TYPE(COLLATERAL_TYPE_ID) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - FOREIGN KEY(BUSINESS_ACTIVITIES_ID) + CONSTRAINT LOAN_ACCOUNT_ibfk_10 FOREIGN KEY(BUSINESS_ACTIVITIES_ID) REFERENCES LOOKUP_VALUE(LOOKUP_ID) ON DELETE NO ACTION ON UPDATE NO ACTION, - FOREIGN KEY(PRD_OFFERING_ID) + CONSTRAINT LOAN_ACCOUNT_ibfk_11 FOREIGN KEY(PRD_OFFERING_ID) REFERENCES PRD_OFFERING(PRD_OFFERING_ID) ON DELETE NO ACTION ON UPDATE NO ACTION, - FOREIGN KEY(PARENT_ACCOUNT_ID) + CONSTRAINT LOAN_ACCOUNT_ibfk_12 FOREIGN KEY(PARENT_ACCOUNT_ID) REFERENCES ACCOUNT(ACCOUNT_ID) ON DELETE NO ACTION ON UPDATE NO ACTION, Index: E:/workspace/mifos/sql/latest-data.sql =================================================================== --- E:/workspace/mifos/sql/latest-data.sql (revision 12312) +++ E:/workspace/mifos/sql/latest-data.sql (working copy) @@ -17,7 +17,7 @@ -- apply Index.sql -- apply all upgrades to date -INSERT INTO DATABASE_VERSION(DATABASE_VERSION) VALUES(173); +INSERT INTO DATABASE_VERSION(DATABASE_VERSION) VALUES(174); /* The table Currency holds configuration related items for a currency like display symbol,rounding mode etc which is to be applied on a currency -- Configuration */ /* To set the default currency, enter 1 in the default_currency field */ @@ -2808,14 +2808,6 @@ INSERT INTO LOOKUP_VALUE_LOCALE(LOOKUP_VALUE_ID,LOCALE_ID,LOOKUP_ID,LOOKUP_VALUE) VALUES(200,1,110,'Type 2'); -/* master data for table collateral_type*/ -/* The table COLLATERAL_TYPE contains the collateral types used in the system - System */ -INSERT INTO COLLATERAL_TYPE (COLLATERAL_TYPE_ID, LOOKUP_ID) -VALUES(1,109); -INSERT INTO COLLATERAL_TYPE (COLLATERAL_TYPE_ID, LOOKUP_ID) -VALUES(2,110); - - /* master data for table fee_frequency_type*/ /* The table Fee Frequency contains type of fees like periodic, one time - System */ INSERT INTO FEE_FREQUENCY_TYPE(FEE_FREQUENCY_ID,LOOKUP_ID) VALUES(1,558);