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

fixed MIFOSX-301 to select a valid disbursement date

Browse Source
This commit is contained in:
ashok-conflux
2013-04-24 09:10:20 +05:30
parent 46c5565fb9
commit f93cf1b620
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/api/CalendarsApiResource.java
+17 -4
View File
@@ -34,6 +34,7 @@ import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
import org.mifosplatform.infrastructure.core.data.EnumOptionData;
import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer;
import org.mifosplatform.infrastructure.core.service.DateUtils;
import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
import org.mifosplatform.portfolio.calendar.data.CalendarData;
import org.mifosplatform.portfolio.calendar.domain.Calendar;
@@ -56,7 +57,7 @@ public class CalendarsApiResource {
private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "entityId", "entityType", "title",
"description", "location", "startDate", "endDate", "duration", "type", "repeating", "recurrence", "remindBy", "firstReminder",
"secondReminder", "humanReadable", "createdDate", "lastUpdatedDate", "createdByUserId", "createdByUsername",
"lastUpdatedByUserId", "lastUpdatedByUsername", "recurringDates"));
"lastUpdatedByUserId", "lastUpdatedByUsername", "recurringDates","nextTenRecurringDates"));
private final String resourceNameForPermissions = "CALENDAR";
private final PlatformSecurityContext context;
@@ -197,9 +198,21 @@ public class CalendarsApiResource {
private CalendarData handleRecurringDate(final CalendarData calendarData){
if(!calendarData.isRepeating()) return calendarData;
final Collection<LocalDate> recurringDates = CalendarHelper.getRecurringDates(calendarData.getRecurrence(), calendarData.getStartDate(), calendarData.getEndDate());
return new CalendarData(calendarData, recurringDates);
final String rrule = calendarData.getRecurrence();
final LocalDate currentDate = DateUtils.getLocalDateOfTenant();
LocalDate seedDate = calendarData.getStartDate();
LocalDate endDate = calendarData.getEndDate();
if(seedDate.isBefore(currentDate.minusYears(1))){
seedDate = currentDate.minusYears(1);
}
if(endDate == null || endDate.isAfter(currentDate.plusYears(1))){
endDate = currentDate.plusYears(1);
}
final Collection<LocalDate> recurringDates = CalendarHelper.getRecurringDates(rrule, seedDate, seedDate, endDate, -1);
final Collection<LocalDate> nextTenRecurringDates = CalendarHelper.getRecurringDates(rrule, seedDate, endDate);
return new CalendarData(calendarData, recurringDates, nextTenRecurringDates);
}
private Collection<CalendarData> handleRecurringDates(final Collection<CalendarData> calendarsData) {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/data/CalendarData.java
+5 -1
View File
@@ -35,6 +35,7 @@ public class CalendarData {
private final Integer firstReminder;
private final Integer secondReminder;
private final Collection<LocalDate> recurringDates;
private final Collection<LocalDate> nextTenRecurringDates;
private final String humanReadable;
private final LocalDate createdDate;
@@ -74,6 +75,7 @@ public class CalendarData {
this.calendarTypeOptions = null;
this.remindByOptions = null;
this.recurringDates = null;
this.nextTenRecurringDates = null;
this.humanReadable = humanReadable;
this.createdDate = createdDate;
@@ -105,6 +107,7 @@ public class CalendarData {
this.calendarTypeOptions = calendarTypeOptions;
this.remindByOptions = remindByOptions;
this.recurringDates = calendarData.recurringDates;
this.nextTenRecurringDates = calendarData.nextTenRecurringDates;
this.humanReadable = calendarData.humanReadable;
this.createdDate = calendarData.createdDate;
this.lastUpdatedDate = calendarData.lastUpdatedDate;
@@ -114,7 +117,7 @@ public class CalendarData {
this.lastUpdatedByUsername = calendarData.lastUpdatedByUsername;
}
public CalendarData(final CalendarData calendarData, final Collection<LocalDate> recurringDates) {
public CalendarData(final CalendarData calendarData, final Collection<LocalDate> recurringDates, final Collection<LocalDate> nextTenRecurringDates) {
this.id = calendarData.id;
this.entityId = calendarData.entityId;
this.entityType = calendarData.entityType;
@@ -134,6 +137,7 @@ public class CalendarData {
this.calendarTypeOptions = null;
this.remindByOptions = null;
this.recurringDates = recurringDates;
this.nextTenRecurringDates = nextTenRecurringDates;
this.humanReadable = calendarData.humanReadable;
this.createdDate = calendarData.createdDate;
this.lastUpdatedDate = calendarData.lastUpdatedDate;