diff --git a/mifosng-db/migrations/core_db/V189__added_column_joiningDate_for_staff.sql b/mifosng-db/migrations/core_db/V193__added_column_joiningDate_for_staff.sql similarity index 100% rename from mifosng-db/migrations/core_db/V189__added_column_joiningDate_for_staff.sql rename to mifosng-db/migrations/core_db/V193__added_column_joiningDate_for_staff.sql diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java index cb1e132ea..b4a717840 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java @@ -49,7 +49,7 @@ public class StaffApiResource { * {@link StaffData}. */ private final Set RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "firstname", "lastname", "displayName", - "officeId", "officeName", "isLoanOfficer", "externalId", "mobileNo", "allowedOffices", "isActive", "dateJoined")); + "officeId", "officeName", "isLoanOfficer", "externalId", "mobileNo", "allowedOffices", "isActive", "joiningDate")); private final String resourceNameForPermissions = "STAFF"; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java index 109c1ad71..59fb93381 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java @@ -23,7 +23,6 @@ import org.joda.time.LocalDate; import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.organisation.office.domain.Office; -import org.mifosplatform.portfolio.client.api.ClientApiConstants; import org.springframework.data.jpa.domain.AbstractPersistable; @Entity @@ -87,9 +86,9 @@ public class Staff extends AbstractPersistable { final String isActiveParamName = "isActive"; final Boolean isActive = command.booleanObjectValueOfParameterNamed(isActiveParamName); - + LocalDate joiningDate = null; - + final String joiningDateParamName = "joiningDate"; if (command.hasParameter(joiningDateParamName)) { joiningDate = command.localDateValueOfParameterNamed(joiningDateParamName); @@ -103,8 +102,7 @@ public class Staff extends AbstractPersistable { } private Staff(final Office staffOffice, final String firstname, final String lastname, final String externalId, final String mobileNo, - final boolean isLoanOfficer, final Boolean isActive, - final LocalDate joiningDate) { + final boolean isLoanOfficer, final Boolean isActive, final LocalDate joiningDate) { this.office = staffOffice; this.firstname = StringUtils.defaultIfEmpty(firstname, null); this.lastname = StringUtils.defaultIfEmpty(lastname, null); @@ -189,10 +187,10 @@ public class Staff extends AbstractPersistable { actualChanges.put(isActiveParamName, newValue); this.active = newValue; } - + final String joiningDateParamName = "joiningDate"; if (command.isChangeInDateParameterNamed(joiningDateParamName, this.joiningDate)) { - final String valueAsInput = command.stringValueOfParameterNamed(joiningDateParamName); + final String valueAsInput = command.stringValueOfParameterNamed(joiningDateParamName); actualChanges.put(joiningDateParamName, valueAsInput); final LocalDate newValue = command.localDateValueOfParameterNamed(joiningDateParamName); this.joiningDate = newValue.toDate();