From 1371a3f7755d05bc042c1b50d4d34c0a760b908e Mon Sep 17 00:00:00 2001 From: ashok-conflux Date: Wed, 11 Dec 2013 16:59:05 +0530 Subject: [PATCH] added holiday status to response --- api-docs/apiLive.htm | 14 ++++++++++++-- .../holiday/api/HolidayApiConstants.java | 3 ++- .../organisation/holiday/data/HolidayData.java | 7 +++++-- .../service/HolidayReadPlatformServiceImpl.java | 7 +++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index a5bcf2e4e..fba6976dc 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -9816,7 +9816,12 @@ GET https://DomainName/api/v1/holidays?officeId=1 2013, 10, 26 - ] + ], + "status": { + "id": 100, + "code": "holidayStatusType.pending.for.activation", + "value": "Pending for activation" + } } ] @@ -9923,7 +9928,12 @@ GET https://DomainName/api/v1/holidays/{holidayId} 2013, 10, 26 - ] + ], + "status": { + "id": 100, + "code": "holidayStatusType.active", + "value": "Active" + } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java index cf506274e..1563342ee 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/api/HolidayApiConstants.java @@ -22,10 +22,11 @@ public class HolidayApiConstants { public static final String officeIdParamName = "officeId"; public static final String repaymentsRescheduledToParamName = "repaymentsRescheduledTo"; public static final String processed = "processed"; + public static final String status = "status"; public static final Set HOLIDAY_CREATE_OR_UPDATE_REQUEST_DATA_PARAMETERS = new HashSet(Arrays.asList(localeParamName, dateFormatParamName, nameParamName, fromDateParamName, toDateParamName, descriptionParamName, officesParamName, repaymentsRescheduledToParamName)); public static final Set HOLIDAY_RESPONSE_DATA_PARAMETERS = new HashSet(Arrays.asList(idParamName, nameParamName, - fromDateParamName, descriptionParamName, toDateParamName, repaymentsRescheduledToParamName, localeParamName, dateFormatParamName)); + fromDateParamName, descriptionParamName, toDateParamName, repaymentsRescheduledToParamName, localeParamName, dateFormatParamName, status)); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayData.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayData.java index f6f648326..85da5687c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/data/HolidayData.java @@ -1,6 +1,7 @@ package org.mifosplatform.organisation.holiday.data; import org.joda.time.LocalDate; +import org.mifosplatform.infrastructure.core.data.EnumOptionData; public class HolidayData { @@ -18,9 +19,11 @@ public class HolidayData { private final LocalDate repaymentsRescheduledTo; @SuppressWarnings("unused") private final Long officeId; + @SuppressWarnings("unused") + private final EnumOptionData status; public HolidayData(final Long id, final String name, final String description, final LocalDate fromDate, final LocalDate toDate, - final LocalDate repaymentsRescheduledTo) { + final LocalDate repaymentsRescheduledTo, final EnumOptionData status) { this.id = id; this.name = name; this.description = description; @@ -28,6 +31,6 @@ public class HolidayData { this.toDate = toDate; this.repaymentsRescheduledTo = repaymentsRescheduledTo; this.officeId = null; - + this.status = status; } } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayReadPlatformServiceImpl.java index 395a3228e..f8811207b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/holiday/service/HolidayReadPlatformServiceImpl.java @@ -9,6 +9,7 @@ import java.util.Collection; import java.util.Date; import org.joda.time.LocalDate; +import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.infrastructure.core.domain.JdbcSupport; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; @@ -39,7 +40,7 @@ public class HolidayReadPlatformServiceImpl implements HolidayReadPlatformServic public HolidayMapper() { final StringBuilder sqlBuilder = new StringBuilder(200); sqlBuilder.append("h.id as id, h.name as name, h.description as description, h.from_date as fromDate, h.to_date as toDate, "); - sqlBuilder.append("h.repayments_rescheduled_to as repaymentsScheduleTO "); + sqlBuilder.append("h.repayments_rescheduled_to as repaymentsScheduleTO, h.status_enum as statusEnum "); sqlBuilder.append("from m_holiday h "); this.schema = sqlBuilder.toString(); } @@ -56,8 +57,10 @@ public class HolidayReadPlatformServiceImpl implements HolidayReadPlatformServic final LocalDate fromDate = JdbcSupport.getLocalDate(rs, "fromDate"); final LocalDate toDate = JdbcSupport.getLocalDate(rs, "toDate"); final LocalDate repaymentsScheduleTO = JdbcSupport.getLocalDate(rs, "repaymentsScheduleTO"); + final Integer statusEnum = JdbcSupport.getInteger(rs, "statusEnum"); + final EnumOptionData status = HolidayEnumerations.holidayStatusType(statusEnum); - return new HolidayData(id, name, description, fromDate, toDate, repaymentsScheduleTO); + return new HolidayData(id, name, description, fromDate, toDate, repaymentsScheduleTO, status); } }