diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js index d1559eab4..fb83f2906 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js @@ -32,7 +32,8 @@ var valueClass = ""; if (params.valueClass) valueClass = params.valueClass; - displayAllExtraData(params.url, params.datasetType, + //displayAllExtraData(params.url, params.datasetType, + displayAllExtraData("http://localhost:8080/mifosng-provider/", params.datasetType, params.datasetPKValue, params.datasetTypeDiv, headingPrefix, headingClass, labelClass, valueClass); }; @@ -50,24 +51,24 @@ headingClassStr = ' class="' + displayAllVars.headingClass + '" '; var extraDataNamesVar = ""; - for ( var i in data.names) { + for ( var i in data.extraDatasetRow) { var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv); extraDataNamesVar += '
' + doI18N(displayAllVars.headingPrefix) - + doI18N(data.names[i]) + ' - '; + + doI18N(data.extraDatasetRow[i].name) + ' - '; extraDataNamesVar += editExtraDataLink(displayAllVars.url, - displayAllVars.datasetType, data.names[i], + displayAllVars.datasetType, data.extraDatasetRow[i].name, displayAllVars.datasetPKValue, dsnDivName); extraDataNamesVar += '
'; extraDataNamesVar += '
'; } $('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar); - for ( var i in data.names) { + for ( var i in data.extraDatasetRow) { var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv); viewExtraData(displayAllVars.url, displayAllVars.datasetType, - data.names[i], displayAllVars.datasetPKValue, dsnDivName); + data.extraDatasetRow[i].name, displayAllVars.datasetPKValue, dsnDivName); } }; @@ -90,7 +91,7 @@ valueClass : valueClass }; - displayAllUrl = url + "extradata/datasets/" + displayAllUrl = url + "api/v1/extradata?type=" + encodeURIComponent(datasetType); getData(displayAllUrl, displayAllSuccessFunction, displayAllErrorFunction); @@ -156,7 +157,7 @@ function viewExtraData(url, datasetType, datasetName, datasetPKValue, dsnDivName) { - var viewExtraDataUrl = url + "extradata/" + encodeURIComponent(datasetType) + var viewExtraDataUrl = url + "api/v1/extradata/" + encodeURIComponent(datasetType) + "/" + encodeURIComponent(datasetName) + "/" + encodeURIComponent(datasetPKValue); @@ -190,7 +191,7 @@ datasetName : datasetName, datasetPKValue : datasetPKValue, baseUrl : url, - url : url + "extradata/" + encodeURIComponent(datasetType) + "/" + url : url + "api/v1/extradata/" + encodeURIComponent(datasetType) + "/" + encodeURIComponent(datasetName) + "/" + encodeURIComponent(datasetPKValue) }; @@ -361,7 +362,6 @@ }); var form_data = $('#entityform').serialize(); - var jqxhr = $.ajax({ url : url, type : 'POST', diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java index d6ba604a9..b825a0afb 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java @@ -1597,10 +1597,24 @@ public class ReadPlatformServiceImpl implements ReadPlatformService { @Override public void tempSaveExtraData(String datasetType, String datasetName, String datasetPKValue, Map queryParams) { - //logger.info("SaveExtraData - DatasetType: " + datasetType - // + " DatasetName: " + datasetName + " datasetPKValue: " - // + datasetPKValue); + logger.info("SaveExtraData - DatasetType: " + datasetType + + " DatasetName: " + datasetName + " datasetPKValue: " + + datasetPKValue); + logger.info("startjpw: "); + Set keys = queryParams.keySet(); + String pValue = ""; + for (String key : keys) { + pValue = queryParams.get(key); + logger.info("jpw: " + key + " - " + pValue); + } + + logger.info("endjpw: "); + + + + + String fullDatasetName = getFullDatasetName(datasetType, datasetName); String saveSql = getSaveSql(fullDatasetName, datasetPKValue, queryParams); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ExtraDataApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ExtraDataApiResource.java index 568114341..3c9713f1d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ExtraDataApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ExtraDataApiResource.java @@ -1,16 +1,31 @@ package org.mifosng.platform.api; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; +import org.mifosng.data.EntityIdentifier; +import org.mifosng.data.ErrorResponse; +import org.mifosng.data.ErrorResponseList; import org.mifosng.data.ExtraDatasets; +import org.mifosng.data.reports.GenericResultset; +import org.mifosng.platform.InvalidSqlException; import org.mifosng.platform.ReadPlatformService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,11 +64,11 @@ public class ExtraDataApiResource { ExtraDatasets result = this.readPlatformService.retrieveExtraDatasetNames(type); return Response.ok().entity(result).build(); } - /* + @GET @Path("{datasetType}/{datasetName}/{datasetPKValue}") @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) + @Produces({ MediaType.APPLICATION_JSON}) public Response extraData(@PathParam("datasetType") final String datasetType,@PathParam("datasetName") final String datasetName, @PathParam("datasetPKValue") final String datasetPKValue, @Context UriInfo uriInfo) { try { @@ -74,12 +89,12 @@ public class ExtraDataApiResource { @POST @Path("{datasetType}/{datasetName}/{datasetPKValue}") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_XML }) + @Produces({ MediaType.APPLICATION_JSON}) public Response saveExtraData(@PathParam("datasetType") final String datasetType,@PathParam("datasetName") final String datasetName, @PathParam("datasetPKValue") final String datasetPKValue, @Context UriInfo uriInfo) { try { - + MultivaluedMap incomingParams = uriInfo.getQueryParameters(); Map queryParams = new HashMap(); @@ -102,9 +117,10 @@ public class ExtraDataApiResource { ErrorResponse err = new ErrorResponse("extradata.invalid.sql", "sql", e.getSql()); allErrors.add(err); + logger.info("way bad: " + err.toString()); throw new WebApplicationException(Response .status(Status.BAD_REQUEST) .entity(new ErrorResponseList(allErrors)).build()); } - }*/ + } } \ No newline at end of file