You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/02/17 09:40:39 UTC
incubator-fineract git commit: FINERACT-311 - Issue With 'Payment Due
On Non Working Days
Repository: incubator-fineract
Updated Branches:
refs/heads/develop b6f423077 -> c6da909d6
FINERACT-311 - Issue With 'Payment Due On Non Working Days
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/c6da909d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/c6da909d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/c6da909d
Branch: refs/heads/develop
Commit: c6da909d615df4c9c13f96c6bdd04f01c35b46bc
Parents: b6f4230
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Tue Feb 7 15:09:49 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Tue Feb 7 15:09:49 2017 +0530
----------------------------------------------------------------------
.../workingdays/data/WorkingDaysData.java | 15 ++++++++++-----
.../WorkingDaysReadPlatformServiceImpl.java | 19 +++++++++++++------
2 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/c6da909d/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
index 72fd6d0..d859603 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
@@ -24,18 +24,14 @@ import java.util.Collection;
public class WorkingDaysData {
- @SuppressWarnings("unused")
private final Long id;
- @SuppressWarnings("unused")
+
private final String recurrence;
- @SuppressWarnings("unused")
private final EnumOptionData repaymentRescheduleType;
- @SuppressWarnings("unused")
private final Boolean extendTermForDailyRepayments;
- @SuppressWarnings("unused")
private final Boolean extendTermForRepaymentsOnHolidays;
// template date
@@ -60,4 +56,13 @@ public class WorkingDaysData {
this.extendTermForDailyRepayments = extendTermForDailyRepayments;
this.extendTermForRepaymentsOnHolidays = extendTermForRepaymentsOnHolidays;
}
+
+ public WorkingDaysData(WorkingDaysData data, Collection<EnumOptionData> repaymentRescheduleOptions) {
+ this.id = data.id;
+ this.recurrence = data.recurrence;
+ this.repaymentRescheduleType = data.repaymentRescheduleType;
+ this.repaymentRescheduleOptions = repaymentRescheduleOptions;
+ this.extendTermForDailyRepayments = data.extendTermForDailyRepayments;
+ this.extendTermForRepaymentsOnHolidays = data.extendTermForRepaymentsOnHolidays;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/c6da909d/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
index 8c4153c..e5085e0 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
@@ -79,10 +79,13 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
@Override
public WorkingDaysData retrieve() {
+ //Check whether template is enabled or not?
try {
final WorkingDaysMapper rm = new WorkingDaysMapper();
final String sql = " select " + rm.schema();
- return this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
+ WorkingDaysData data = this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
+ Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions() ;
+ return new WorkingDaysData(data, repaymentRescheduleOptions) ;
} catch (final EmptyResultDataAccessException e) {
throw new WorkingDaysNotFoundException();
}
@@ -90,11 +93,15 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
@Override
public WorkingDaysData repaymentRescheduleType() {
- Collection<EnumOptionData> repaymentRescheduleOptions = Arrays.asList(
- WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
- WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
- WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
- WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
+ Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions();
return new WorkingDaysData(null, null, null, repaymentRescheduleOptions, null, null);
}
+
+ private Collection<EnumOptionData> repaymentRescheduleTypeOptions() {
+ return Arrays.asList(
+ WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
+ WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
+ WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
+ WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
+ }
}