diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java index ed26a7351..a06eac907 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java @@ -38,8 +38,8 @@ public final class ClientEntityConstants { public static final int REMARKS_COL = 11;// L public static final int EXTERNAL_ID_COL = 12;// M public static final int ACTIVE_COL = 13;// N - public static final int ACTIVATION_DATE_COL = 14;// O - public static final int SUBMITTED_ON_COL = 15; // P + public static final int SUBMITTED_ON_COL = 14;// O + public static final int ACTIVATION_DATE_COL = 15; // P public static final int ADDRESS_ENABLED = 16;// Q public static final int ADDRESS_TYPE_COL = 17;// R public static final int STREET_COL = 18;// S diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java index 0073e1c18..ed4a6fb7b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java @@ -31,8 +31,8 @@ public final class ClientPersonConstants { public static final int STAFF_NAME_COL = 4;// E public static final int EXTERNAL_ID_COL = 5;// F public static final int ACTIVE_COL = 6;// G - public static final int ACTIVATION_DATE_COL = 7;// H - public static final int SUBMITTED_ON_COL = 8; // I + public static final int SUBMITTED_ON_COL = 7;// H + public static final int ACTIVATION_DATE_COL = 8; // I public static final int MOBILE_NO_COL = 9;// J public static final int DOB_COL = 10;// K public static final int CLIENT_TYPE_COL = 11;// L diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java index f11e283f4..8042e5027 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java @@ -31,8 +31,8 @@ public final class GroupConstants { public static final int CENTER_NAME_COL = 3;// D public static final int EXTERNAL_ID_COL = 4;// E public static final int ACTIVE_COL = 5;// F - public static final int ACTIVATION_DATE_COL = 6;// G - public static final int SUBMITTED_ON_DATE_COL = 7;// H + public static final int SUBMITTED_ON_DATE_COL = 6;// H + public static final int ACTIVATION_DATE_COL = 7;// G public static final int MEETING_START_DATE_COL = 8;// I public static final int IS_REPEATING_COL = 9;// J public static final int FREQUENCY_COL = 10;// K diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientEntityWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientEntityWorkbookPopulator.java index 3b64a5ffe..e8219042f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientEntityWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientEntityWorkbookPopulator.java @@ -295,10 +295,9 @@ public class ClientEntityWorkbookPopulator extends AbstractWorkbookPopulator { DataValidationConstraint staffNameConstraint = validationHelper .createFormulaListConstraint("INDIRECT(CONCATENATE(\"Staff_\",$B1))"); DataValidationConstraint submittedOnDateConstraint = validationHelper - .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=$O1", null, dateFormat); - DataValidationConstraint activationDateConstraint = validationHelper.createDateConstraint( - DataValidationConstraint.OperatorType.BETWEEN, "=VLOOKUP($B1,$AJ$2:$AK" + (offices.size() + 1) + ",2,FALSE)", "=TODAY()", - dateFormat); + .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=TODAY()", null, dateFormat); + DataValidationConstraint activationDateConstraint = validationHelper + .createDateConstraint(DataValidationConstraint.OperatorType.GREATER_OR_EQUAL, "=$O1", null, dateFormat); DataValidationConstraint activeConstraint = validationHelper.createExplicitListConstraint(new String[] { "True", "False" }); DataValidationConstraint clientTypesConstraint = validationHelper.createFormulaListConstraint("ClientTypes"); DataValidationConstraint constitutionConstraint = validationHelper.createFormulaListConstraint("Constitution"); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientPersonWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientPersonWorkbookPopulator.java index 4d73d2e04..d3d43f456 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientPersonWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientPersonWorkbookPopulator.java @@ -277,10 +277,9 @@ public class ClientPersonWorkbookPopulator extends AbstractWorkbookPopulator { DataValidationConstraint staffNameConstraint = validationHelper .createFormulaListConstraint("INDIRECT(CONCATENATE(\"Staff_\",$D1))"); DataValidationConstraint submittedOnDateConstraint = validationHelper - .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=$I1", null, dateformat); - DataValidationConstraint activationDateConstraint = validationHelper.createDateConstraint( - DataValidationConstraint.OperatorType.BETWEEN, "=VLOOKUP($D1,$AJ$2:$AK" + (offices.size() + 1) + ",2,FALSE)", "=TODAY()", - dateformat); + .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=TODAY()", null, dateformat); + DataValidationConstraint activationDateConstraint = validationHelper + .createDateConstraint(DataValidationConstraint.OperatorType.GREATER_OR_EQUAL, "=$H1", null, dateformat); DataValidationConstraint dobDateConstraint = validationHelper .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=TODAY()", null, dateformat); DataValidationConstraint activeConstraint = validationHelper.createExplicitListConstraint(new String[] { "True", "False" }); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/group/GroupsWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/group/GroupsWorkbookPopulator.java index 38e9be457..338edad73 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/group/GroupsWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/group/GroupsWorkbookPopulator.java @@ -201,12 +201,11 @@ public class GroupsWorkbookPopulator extends AbstractWorkbookPopulator { DataValidationConstraint staffNameConstraint = validationHelper .createFormulaListConstraint("INDIRECT(CONCATENATE(\"Staff_\",$B1))"); DataValidationConstraint booleanConstraint = validationHelper.createExplicitListConstraint(new String[] { "True", "False" }); - DataValidationConstraint activationDateConstraint = validationHelper.createDateConstraint( - DataValidationConstraint.OperatorType.BETWEEN, "=DATEVALUE(VLOOKUP($B1,$IR$2:$IS" + (offices.size() + 1) + ",2,FALSE))", - "=TODAY()", dateFormat); + DataValidationConstraint activationDateConstraint = validationHelper + .createDateConstraint(DataValidationConstraint.OperatorType.GREATER_OR_EQUAL, "=$G1", null, dateFormat); DataValidationConstraint submittedOnDateConstraint = validationHelper - .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=$G1", null, dateFormat); + .createDateConstraint(DataValidationConstraint.OperatorType.LESS_OR_EQUAL, "=TODAY()", null, dateFormat); DataValidationConstraint meetingStartDateConstraint = validationHelper .createDateConstraint(DataValidationConstraint.OperatorType.BETWEEN, "=$G1", "=TODAY()", dateFormat); DataValidationConstraint repeatsConstraint = validationHelper.createExplicitListConstraint( diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsWorkbookPopulator.java index ac7c1570d..5e4e3df55 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsWorkbookPopulator.java @@ -131,7 +131,8 @@ public class SavingsWorkbookPopulator extends AbstractWorkbookPopulator { writeString(SavingsConstants.INTEREST_CALCULATION_COL, rowHeader, "Interest Calculated*"); writeString(SavingsConstants.INTEREST_CALCULATION_DAYS_IN_YEAR_COL, rowHeader, "# Days in Year*"); writeString(SavingsConstants.MIN_OPENING_BALANCE_COL, rowHeader, "Min Opening Balance"); - writeString(SavingsConstants.LOCKIN_PERIOD_COL, rowHeader, "Locked In For*"); + writeString(SavingsConstants.LOCKIN_PERIOD_COL, rowHeader, "Locked In For"); + writeString(SavingsConstants.LOCKIN_PERIOD_FREQUENCY_COL, rowHeader, "Locked periodod frecuency*"); writeString(SavingsConstants.APPLY_WITHDRAWAL_FEE_FOR_TRANSFERS, rowHeader, "Apply Withdrawal Fee For Transfers"); writeString(SavingsConstants.LOOKUP_CLIENT_NAME_COL, rowHeader, "Client Name");