From ce87284f0a8d7bf9cfcc12299b37d499aef26cd4 Mon Sep 17 00:00:00 2001 From: ShruthiRajaram Date: Fri, 30 Nov 2018 18:33:22 +0530 Subject: [PATCH] FINERACT-668 Download bulk import templates fix --- .../populator/AbstractWorkbookPopulator.java | 25 +++++++++++-------- ...edDepositTransactionWorkbookPopulator.java | 2 +- .../guarantor/GuarantorWorkbookPopulator.java | 2 +- ...ngDepositTransactionWorkbookPopulator.java | 2 +- .../SavingsTransactionsWorkbookPopulator.java | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java index d92b90337..731390bbc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java @@ -88,7 +88,7 @@ public abstract class AbstractWorkbookPopulator implements WorkbookPopulator { } 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 offices, int officeNameCol, @@ -142,17 +142,20 @@ public abstract class AbstractWorkbookPopulator implements WorkbookPopulator { } } - if (groups!=null){ - for (GroupGeneralData group : groups) { - Row row = sheet.getRow(++rowIndex); - if (row == null) - row = sheet.createRow(rowIndex); - writeString(nameCol, row, group.getName().replaceAll("[ )(] ", "_")); + if (groups != null) { + for (GroupGeneralData group : groups) { + Row row = sheet.getRow(++rowIndex); + if (row == null) + row = sheet.createRow(rowIndex); + writeString(nameCol, row, group.getName().replaceAll("[ )(] ", "_")); - date = inputFormat.parse(group.getActivationDate().toString()); - writeDate(activationDateCol, row, outputFormat.format(date), dateCellStyle,dateFormat); - } - } + if (group.getActivationDate() != null) { + date = inputFormat.parse(group.getActivationDate().toString()); + writeDate(activationDateCol, row, outputFormat.format(date), dateCellStyle, dateFormat); + } + + } + } } catch (ParseException e) { e.printStackTrace(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java index cd7dd9bd2..0b2d32419 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java @@ -179,7 +179,7 @@ public class FixedDepositTransactionWorkbookPopulator extends AbstractWorkbookPo for(SavingsAccountData savingsAccount : savingsAccounts) { row = savingsTransactionSheet.createRow(rowIndex++); 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()); if(savingsAccount.getMinRequiredOpeningBalance() != null) writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java index 912eb2b1a..945526fca 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/guarantor/GuarantorWorkbookPopulator.java @@ -131,7 +131,7 @@ public class GuarantorWorkbookPopulator extends AbstractWorkbookPopulator { row=addGuarantorSheet.getRow(rowIndex++); } 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()); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java index d462b5f65..874d1cdba 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/recurringdeposit/RecurringDepositTransactionWorkbookPopulator.java @@ -185,7 +185,7 @@ public class RecurringDepositTransactionWorkbookPopulator extends AbstractWorkbo for(SavingsAccountData savingsAccount : savingsAccounts) { row = savingsTransactionSheet.createRow(rowIndex++); 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()); if(savingsAccount.getMinRequiredOpeningBalance() != null) writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java index 2573b7106..29f195369 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java @@ -184,7 +184,7 @@ public class SavingsTransactionsWorkbookPopulator extends AbstractWorkbookPopula for(SavingsAccountData savingsAccount : savingsAccounts) { row = savingsTransactionSheet.createRow(rowIndex++); 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()); if(savingsAccount.getMinRequiredOpeningBalance() != null) writeBigDecimal(TransactionConstants.LOOKUP_OPENING_BALANCE_COL, row, savingsAccount.getMinRequiredOpeningBalance());