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

FINERACT-2202: Bulk import fix (#4650)

Browse Source 
Co-authored-by: danielales2541 <danielalejandrolara573@gmail.com>
This commit is contained in:
RamsesCamacho1171
2025-05-09 12:07:27 -06:00
committed by GitHub
co-authored by danielales2541
parent fad9d3e4eb
commit f2efad40a6
7 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java
+2 -2
View File
@@ -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
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java
+2 -2
View File
@@ -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
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java
+2 -2
View File
@@ -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
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientEntityWorkbookPopulator.java
+3 -4
View File
@@ -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");
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/client/ClientPersonWorkbookPopulator.java
+3 -4
View File
@@ -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" });
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/group/GroupsWorkbookPopulator.java
+3 -4
View File
@@ -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(
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsWorkbookPopulator.java
+2 -1
View File
@@ -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");