diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 875546d1a..154891c96 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -2499,7 +2499,7 @@ GET https://DomainName/api/v1/clients/{clientId}
Example Requests:
clients
- clients?fields=displayName,officeName,joinedDate
+ clients?fields=displayName,officeName,timeline
clients?offset=10&limit=50
@@ -3486,7 +3486,7 @@ PUT centers/8
Content-Type: application/json
Request Body:
{
- "name": "First Center (No groups)",
+ "name": "First Center (No groups)"
}
@@ -5853,7 +5853,7 @@ Request Body:
"interestCalculationPeriodType": 1,
"transactionProcessingStrategyId": 1,
"expectedDisbursementDate": "10 Jun 2013",
- "submittedOnDate": "10 Jun 2013"
+ "submittedOnDate": "10 Jun 2013",
"linkAccountId" : "1"
}
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java
index aa53e669f..c038651b9 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java
@@ -43,9 +43,14 @@ public class ClientApiConstants {
public static final String hierarchyParamName = "hierarchy";
public static final String displayNameParamName = "displayName";
public static final String officeNameParamName = "officeName";
+ public static final String staffNameParamName = "staffName";
public static final String trasnferOfficeNameParamName = "transferOfficeName";
+ public static final String transferToOfficeNameParamName = "transferToOfficeName";
+ public static final String transferToOfficeIdParamName = "transferToOfficeId";
public static final String imageKeyParamName = "imageKey";
+ public static final String imageIdParamName = "imageId";
public static final String imagePresentParamName = "imagePresent";
+ public static final String timelineParamName = "timeline";
// associations related part of response
public static final String groupsParamName = "groups";
@@ -69,10 +74,10 @@ public class ClientApiConstants {
* match those of request parameters.
*/
public static final Set CLIENT_RESPONSE_DATA_PARAMETERS = new HashSet(Arrays.asList(idParamName, accountNoParamName,
- externalIdParamName, mobileNoParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
- lastnameParamName, fullnameParamName, displayNameParamName, officeIdParamName, officeNameParamName, transferOfficeIdParamName,
- trasnferOfficeNameParamName, hierarchyParamName, imageKeyParamName, imagePresentParamName, groupsParamName,
- officeOptionsParamName, staffOptionsParamName));
+ externalIdParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
+ lastnameParamName, fullnameParamName, displayNameParamName, mobileNoParamName, officeIdParamName, officeNameParamName,
+ transferToOfficeIdParamName, transferToOfficeNameParamName, hierarchyParamName, imageIdParamName, imagePresentParamName,
+ staffIdParamName, staffNameParamName, timelineParamName, groupsParamName, officeOptionsParamName, staffOptionsParamName));
public static final Set ACTIVATION_REQUEST_DATA_PARAMETERS = new HashSet(Arrays.asList(localeParamName,
dateFormatParamName, activationDateParamName));
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java
index caff2cb07..02fc6b67b 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java
@@ -261,8 +261,6 @@ public final class ClientDataValidator {
baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
}
- } else {
- baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
}
}