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

Merging Binny's code around MIFOSX-1468

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-08-06 02:37:53 -07:00
parent 0af62967a7
commit 21ce356d88
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-db/migrations/core_db/V189__added_column_joiningDate_for_staff.sql → mifosng-db/migrations/core_db/V193__added_column_joiningDate_for_staff.sql
View File
mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class StaffApiResource {
* {@link StaffData}. * {@link StaffData}.
*/ */
private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "firstname", "lastname", "displayName", private final Set<String> 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"; private final String resourceNameForPermissions = "STAFF";
mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java
+5 -7
View File
@@ -23,7 +23,6 @@ import org.joda.time.LocalDate;
import org.mifosplatform.infrastructure.core.api.JsonCommand; import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.infrastructure.core.data.EnumOptionData;
import org.mifosplatform.organisation.office.domain.Office; import org.mifosplatform.organisation.office.domain.Office;
import org.mifosplatform.portfolio.client.api.ClientApiConstants;
import org.springframework.data.jpa.domain.AbstractPersistable; import org.springframework.data.jpa.domain.AbstractPersistable;
@Entity @Entity
@@ -87,9 +86,9 @@ public class Staff extends AbstractPersistable<Long> {
final String isActiveParamName = "isActive"; final String isActiveParamName = "isActive";
final Boolean isActive = command.booleanObjectValueOfParameterNamed(isActiveParamName); final Boolean isActive = command.booleanObjectValueOfParameterNamed(isActiveParamName);
LocalDate joiningDate = null; LocalDate joiningDate = null;
final String joiningDateParamName = "joiningDate"; final String joiningDateParamName = "joiningDate";
if (command.hasParameter(joiningDateParamName)) { if (command.hasParameter(joiningDateParamName)) {
joiningDate = command.localDateValueOfParameterNamed(joiningDateParamName); joiningDate = command.localDateValueOfParameterNamed(joiningDateParamName);
@@ -103,8 +102,7 @@ public class Staff extends AbstractPersistable<Long> {
} }
private Staff(final Office staffOffice, final String firstname, final String lastname, final String externalId, final String mobileNo, private Staff(final Office staffOffice, final String firstname, final String lastname, final String externalId, final String mobileNo,
final boolean isLoanOfficer, final Boolean isActive, final boolean isLoanOfficer, final Boolean isActive, final LocalDate joiningDate) {
final LocalDate joiningDate) {
this.office = staffOffice; this.office = staffOffice;
this.firstname = StringUtils.defaultIfEmpty(firstname, null); this.firstname = StringUtils.defaultIfEmpty(firstname, null);
this.lastname = StringUtils.defaultIfEmpty(lastname, null); this.lastname = StringUtils.defaultIfEmpty(lastname, null);
@@ -189,10 +187,10 @@ public class Staff extends AbstractPersistable<Long> {
actualChanges.put(isActiveParamName, newValue); actualChanges.put(isActiveParamName, newValue);
this.active = newValue; this.active = newValue;
} }
final String joiningDateParamName = "joiningDate"; final String joiningDateParamName = "joiningDate";
if (command.isChangeInDateParameterNamed(joiningDateParamName, this.joiningDate)) { if (command.isChangeInDateParameterNamed(joiningDateParamName, this.joiningDate)) {
final String valueAsInput = command.stringValueOfParameterNamed(joiningDateParamName); final String valueAsInput = command.stringValueOfParameterNamed(joiningDateParamName);
actualChanges.put(joiningDateParamName, valueAsInput); actualChanges.put(joiningDateParamName, valueAsInput);
final LocalDate newValue = command.localDateValueOfParameterNamed(joiningDateParamName); final LocalDate newValue = command.localDateValueOfParameterNamed(joiningDateParamName);
this.joiningDate = newValue.toDate(); this.joiningDate = newValue.toDate();