CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 47 Packages Projects Releases Wiki Activity

FINERACT-668 Download bulk import templates fix

Browse Source
This commit is contained in:
ShruthiRajaram
2018-11-30 18:33:22 +05:30
parent 989e1f0402
commit ce87284f0a
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
+14 -11
View File
@@ -88,7 +88,7 @@ public abstract class AbstractWorkbookPopulator implements WorkbookPopulator {
} }
protected void writeBigDecimal(int colIndex, Row row, BigDecimal value) { protected void writeBigDecimal(int colIndex, Row row, BigDecimal value) {
row.createCell(colIndex).setCellValue(value.doubleValue()); row.createCell(colIndex).setCellValue(((value != null) ? value.doubleValue() : 0));
} }
protected void setOfficeDateLookupTable(Sheet sheet, List<OfficeData> offices, int officeNameCol, protected void setOfficeDateLookupTable(Sheet sheet, List<OfficeData> offices, int officeNameCol,
@@ -142,17 +142,20 @@ public abstract class AbstractWorkbookPopulator implements WorkbookPopulator {
} }
} }
if (groups!=null){ if (groups != null) {
for (GroupGeneralData group : groups) { for (GroupGeneralData group : groups) {
Row row = sheet.getRow(++rowIndex); Row row = sheet.getRow(++rowIndex);
if (row == null) if (row == null)
row = sheet.createRow(rowIndex); row = sheet.createRow(rowIndex);
writeString(nameCol, row, group.getName().replaceAll("[ )(] ", "_")); writeString(nameCol, row, group.getName().replaceAll("[ )(] ", "_"));
date = inputFormat.parse(group.getActivationDate().toString()); if (group.getActivationDate() != null) {
writeDate(activationDateCol, row, outputFormat.format(date), dateCellStyle,dateFormat); date = inputFormat.parse(group.getActivationDate().toString());
} writeDate(activationDateCol, row, outputFormat.format(date), dateCellStyle, dateFormat);
} }
}
}
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java
+1 -1
View File
@@ -179,7 +179,7 @@ public class FixedDepositTransactionWorkbookPopulator extends AbstractWorkbookPo
for(SavingsAccountData savingsAccount : savingsAccounts) { for(SavingsAccountData savingsAccount : savingsAccounts) {
row = savingsTransactionSheet.createRow(rowIndex++); row = savingsTransactionSheet.createRow(rowIndex++);
writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")"); writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")");
writeLong(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, Long.parseLong(savingsAccount.getAccountNo())); writeString(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, savingsAccount.getAccountNo());
writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName()); writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName());
if(savingsAccount.getMinRequiredOpeningBalance() != null) if(savingsAccount.getMinRequiredOpeningBalance() != null)
writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance()); writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance());
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class GuarantorWorkbookPopulator extends AbstractWorkbookPopulator {
row=addGuarantorSheet.getRow(rowIndex++); row=addGuarantorSheet.getRow(rowIndex++);
} }
writeString(GuarantorConstants.LOOKUP_SAVINGS_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")"); writeString(GuarantorConstants.LOOKUP_SAVINGS_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")");
writeLong(GuarantorConstants.LOOKUP_SAVINGS_ACCOUNT_NO_COL, row, Long.parseLong(savingsAccount.getAccountNo())); writeString(GuarantorConstants.LOOKUP_SAVINGS_ACCOUNT_NO_COL, row,savingsAccount.getAccountNo());
} }
} }
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class RecurringDepositTransactionWorkbookPopulator extends AbstractWorkbo
for(SavingsAccountData savingsAccount : savingsAccounts) { for(SavingsAccountData savingsAccount : savingsAccounts) {
row = savingsTransactionSheet.createRow(rowIndex++); row = savingsTransactionSheet.createRow(rowIndex++);
writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")"); writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")");
writeLong(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, Long.parseLong(savingsAccount.getAccountNo())); writeString(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, savingsAccount.getAccountNo());
writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName()); writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName());
if(savingsAccount.getMinRequiredOpeningBalance() != null) if(savingsAccount.getMinRequiredOpeningBalance() != null)
writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance()); writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance());
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class SavingsTransactionsWorkbookPopulator extends AbstractWorkbookPopula
for(SavingsAccountData savingsAccount : savingsAccounts) { for(SavingsAccountData savingsAccount : savingsAccounts) {
row = savingsTransactionSheet.createRow(rowIndex++); row = savingsTransactionSheet.createRow(rowIndex++);
writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")"); writeString(TransactionConstants.LOOKUP_CLIENT_NAME_COL, row, savingsAccount.getClientName() + "(" + savingsAccount.getClientId() + ")");
writeLong(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, Long.parseLong(savingsAccount.getAccountNo())); writeString(TransactionConstants.LOOKUP_ACCOUNT_NO_COL, row, savingsAccount.getAccountNo());
writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName()); writeString(TransactionConstants.LOOKUP_PRODUCT_COL, row, savingsAccount.getSavingsProductName());
if(savingsAccount.getMinRequiredOpeningBalance() != null) if(savingsAccount.getMinRequiredOpeningBalance() != null)
writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance()); writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance());