diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.91.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.91.js
deleted file mode 100644
index 3afe8d2d7..000000000
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.91.js
+++ /dev/null
@@ -1,535 +0,0 @@
-(function($) {
-
- $.stretchyData = {};
-
- $.stretchyData.displayAllExtraData = function(params) {
-
- if (!(params.url)) {
- alert(doI18N("reportingInitError - url parameter"));
- return;
- }
- if (!(params.datasetType)) {
- alert(doI18N("reportingInitError - datasetType parameter"));
- return;
- }
- if (!(params.datasetPKValue)) {
- alert(doI18N("reportingInitError - datasetPKValue parameter"));
- return;
- }
- if (!(params.datasetTypeDiv)) {
- alert(doI18N("reportingInitError - datasetTypeDiv parameter"));
- return;
- }
- var headingPrefix = "";
- if (params.headingPrefix)
- headingPrefix = params.headingPrefix;
- var headingClass = "";
- if (params.headingClass)
- headingClass = params.headingClass;
- var labelClass = "";
- if (params.labelClass)
- labelClass = params.labelClass;
- var valueClass = "";
- if (params.valueClass)
- valueClass = params.valueClass;
- //displayAllExtraData(params.url, params.datasetType,
- displayAllExtraData("http://localhost:8080/mifosng-provider/", params.datasetType,
- params.datasetPKValue, params.datasetTypeDiv, headingPrefix,
- headingClass, labelClass, valueClass);
- };
-
- $.stretchyData.popupEditDialog = function(url, datasetType, datasetName,
- datasetPKValue, dsnDivName, title, width, height) {
- popupEditDialog(url, datasetType, datasetName, datasetPKValue,
- dsnDivName, title, width, height);
- };
-
- displayAllSuccessFunction = function(data, textStatus, jqXHR) {
-
- var headingClassStr = "";
- if (displayAllVars.headingClass > "")
- headingClassStr = ' class="' + displayAllVars.headingClass + '" ';
-
- var extraDataNamesVar = "";
- for ( var i in data.extraDatasetRow) {
- var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv);
- extraDataNamesVar += '
'
- + doI18N(displayAllVars.headingPrefix)
- + doI18N(data.extraDatasetRow[i].name) + ' - ';
-
- extraDataNamesVar += editExtraDataLink(displayAllVars.url,
- displayAllVars.datasetType, data.extraDatasetRow[i].name,
- displayAllVars.datasetPKValue, dsnDivName);
-
- extraDataNamesVar += '
';
- extraDataNamesVar += '
';
- }
- $('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar);
- for ( var i in data.extraDatasetRow) {
- var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv);
- viewExtraData(displayAllVars.url, displayAllVars.datasetType,
- data.extraDatasetRow[i].name, displayAllVars.datasetPKValue, dsnDivName);
- }
-
- };
-
- displayAllErrorFunction = function(jqXHR, textStatus, errorThrown) {
- alert(jqXHR.responseText);
- };
-
- function displayAllExtraData(url, datasetType, datasetPKValue,
- datasetTypeDiv, headingPrefix, headingClass, labelClass, valueClass) {
-
- displayAllVars = {
- url : url,
- datasetType : datasetType,
- datasetPKValue : datasetPKValue,
- datasetTypeDiv : datasetTypeDiv,
- headingPrefix : headingPrefix,
- headingClass : headingClass,
- labelClass : labelClass,
- valueClass : valueClass
- };
-
- displayAllUrl = url + "api/v1/extradata?type="
- + encodeURIComponent(datasetType);
- getData(displayAllUrl, displayAllSuccessFunction,
- displayAllErrorFunction);
- }
-
- function editExtraDataLink(url, datasetType, datasetName, datasetPKValue,
- dsnDivName) {
-
- var popupVar = "jQuery.stretchyData.popupEditDialog('" + url + "', '"
- + datasetType + "', '" + datasetName + "', " + datasetPKValue
- + ", '" + dsnDivName + "', '" + doI18N("Edit") + " "
- + doI18N(datasetName) + "', 900, 500)";
- var editLink = '
'
- + doI18N("Edit") + ' ';
- // alert(editLink);
- return editLink;
- }
-
- function viewExtraDataset(data, dsnDivName) {
-
- var dataLength = data.data.length;
- var extraDataViewVar = '
';
-
- var colsPerRow = 2;
- var colsPerRowCount = 0;
- var labelClassStr = "";
- var valueClassStr = "";
- if (displayAllVars.labelClass > "")
- labelClassStr = ' class="' + displayAllVars.labelClass + '" ';
- if (displayAllVars.valueClass > "")
- valueClassStr = ' class="' + displayAllVars.valueClass + '" ';
-
- for ( var i in data.columnHeaders) {
- if (!(data.columnHeaders[i].columnName == "id")) {
- colsPerRowCount += 1;
- if (colsPerRowCount > colsPerRow) {
- extraDataViewVar += ' ';
- colsPerRowCount = 1;
- }
- var colVal = "";
- if (dataLength > 0)
- colVal = data.data[0].row[i];
- if (colVal == null)
- colVal = "";
-
- if (colVal > "" && data.columnHeaders[i].columnType == "Text")
- colVal = '';
- extraDataViewVar += '' + doI18N(data.columnHeaders[i].columnName)
- + ': ' + colVal + '
';
- $('#' + dsnDivName).html(extraDataViewVar);
- // alert(dsnDivName + ": " + dsnDivName + extraDataViewVar);
- }
- ;
- viewExtraDataErrorFunction = function(jqXHR, textStatus, errorThrown) {
- alert(jqXHR.responseText);
- };
-
- function viewExtraData(url, datasetType, datasetName, datasetPKValue,
- dsnDivName) {
- var viewExtraDataUrl = url + "api/v1/extradata/" + encodeURIComponent(datasetType)
- + "/" + encodeURIComponent(datasetName) + "/"
- + encodeURIComponent(datasetPKValue);
-
- var evalViewExtraDataSuccessFunction = "var viewExtraDataSuccessFunction = function(data, textStatus, jqXHR){ viewExtraDataset(data, '"
- + dsnDivName + "'); };"
- eval(evalViewExtraDataSuccessFunction);
- getData(viewExtraDataUrl, viewExtraDataSuccessFunction,
- viewExtraDataErrorFunction);
- }
-
- popupEditErrorFunction = function(jqXHR, textStatus, errorThrown) {
- alert("error");
- handleXhrError(jqXHR, textStatus, errorThrown, "#formErrorsTemplate",
- "#formerrors");
- };
- popupEditSuccessFunction = function(data, textStatus, jqXHR) {
- currentEditPopup.dialogDiv.append(extraDataBuildTemplate(data));
- extraDataOpenDialog(currentEditPopup.url);
- extraDataFormatDates(data.columnHeaders);
- };
- function popupEditDialog(url, datasetType, datasetName, datasetPKValue,
- dsnDivName, title, width, height) {
-
- currentEditPopup = {
- dialogDiv : $("
"),
- dsnDivName : dsnDivName,
- title : title,
- width : width,
- height : height,
- datasetType : datasetType,
- datasetName : datasetName,
- datasetPKValue : datasetPKValue,
- baseUrl : url,
- url : url + "api/v1/extradata/" + encodeURIComponent(datasetType) + "/"
- + encodeURIComponent(datasetName) + "/"
- + encodeURIComponent(datasetPKValue)
- };
- getData(currentEditPopup.url, popupEditSuccessFunction,
- popupEditErrorFunction);
- }
-
- function generateDsnDivName(datasetType, i, uniqueDivid) {
- return extraDataUnderscore(datasetType) + "_" + i + "_" + extraDataUnderscore(uniqueDivid);
- }
-
- /* start of code to fill data in edit form */
-
- function extraDataUnderscore(colName) {
- return colName.replace(/ /g, "_")
- }
-
- function extraDataColDisplayHTML(colName, colType, colLength,
- colDisplayType, colAllowedValues, colVal) {
- var displayHTML = '
' + colName
- + ': ';
- var valueAttr = ""
- if (colVal != null)
- valueAttr = 'value="' + colVal.replace(/"/g, """) + '"';
- var colNameUnderscore = extraDataUnderscore(colName);
-
- switch (colType) {
- case "String":
- var colAllowedValuesLength = colAllowedValues.length;
- if (colDisplayType != "List") {
- var colSize = 40;
- if (colLength < colSize)
- colSize = colLength;
- displayHTML += ' ';
- return displayHTML;
- }
-
- function extraDataSelectTag(colName, colAllowedValues, colVal) {
-
- var selectedVal = "";
- var selectHtml = '
';
-
- if ((colVal == null) || (colVal == ""))
- selectedVal = ' selected="selected" '
- else
- selectedVal = "";
- selectHtml += '' + colAllowedValues[i] + ' ';
- }
-
- selectHtml += ' ';
- // alert(selectHtml);
- return selectHtml;
- }
-
- function extraDataBuildTemplate(data) {
-
- var dataLength = data.data.length;
- var transType = 'E';
- if (dataLength == 0)
- transType = 'A';
-
- var extraDataTemplateVar = '
';
- }
-
- function extraDataFormatDates(columnHeaders) {
-
- for ( var i in columnHeaders) {
- // alert("in loop: " +
- // extraDataUnderscore(columnHeaders[i].columnName) + " Type: " +
- // columnHeaders[i].columnType);
- switch (columnHeaders[i].columnType) {
- case "Date":
- $('#' + extraDataUnderscore(columnHeaders[i].columnName))
- .datepicker({
-
- changeMonth : true,
- changeYear : true,
- dateFormat : 'yy-mm-dd'
- });
-
- break;
- default:
- }
- }
- }
-
- $.fn.serializeObject = function()
- {
- var o = {};
- var a = this.serializeArray();
- $.each(a, function() {
- if (o[this.name] !== undefined) {
- if (!o[this.name].push) {
- o[this.name] = [o[this.name]];
- }
- o[this.name].push(this.value || '');
- } else {
- o[this.name] = this.value || '';
- }
- });
- return o;
- };
-
- function extraDataOpenDialog(url) {
-
- // var saveButton = jQuery.i18n.prop('dialog.button.save');
- // var cancelButton = jQuery.i18n.prop('dialog.button.cancel');
- var saveButton = "save";
- var cancelButton = "cancel"
-
- var buttonsOpts = {};
- buttonsOpts[saveButton] = function() {
- $('.multiSelectedItems option').each(function(i) {
- $(this).attr("selected", "selected");
- });
-
- var form_data = JSON.stringify($('#entityform').serializeObject());
- //console.log(form_data);
- var jqxhr = $.ajax({
- url : url,
- type : 'POST',
- contentType : "application/json; charset=utf-8",
- // dataType : 'jsonp',
- // crossDomain : true,
- dataType : 'json',
- data : form_data,
- success : function(data, textStatus, jqXHR) {
- currentEditPopup.dialogDiv.dialog("close");
- viewExtraData(currentEditPopup.baseUrl,
- currentEditPopup.datasetType,
- currentEditPopup.datasetName,
- currentEditPopup.datasetPKValue,
- currentEditPopup.dsnDivName)
- },
- error : function(jqXHR, textStatus, errorThrown) {
- handleXhrError(jqXHR, textStatus, errorThrown,
- "#formErrorsTemplate", "#formerrors");
- }
- });
- };
-
- buttonsOpts[cancelButton] = function() {
- $(this).dialog("close");
- };
-
- currentEditPopup.dialogDiv
- .dialog(
- {
- // title: jQuery.i18n.prop(titleCode),
- title : currentEditPopup.title,
- width : currentEditPopup.width,
- height : currentEditPopup.height,
- modal : true,
- buttons : buttonsOpts,
- close : function() {
- // if i dont do this, theres a problem with
- // errors being appended to dialog view second
- // time round
- $(this).remove();
- },
- open : function(event, ui) {
- $('.multiadd')
- .click(
- function() {
- return !$(
- '.multiNotSelectedItems option:selected')
- .remove()
- .appendTo(
- '#selectedItems');
- });
-
- $('.multiremove')
- .click(
- function() {
- return !$(
- '.multiSelectedItems option:selected')
- .remove()
- .appendTo(
- '#notSelectedItems');
- });
- }
- }).dialog('open');
- }
-
- /* end of code to fill data in edit form and display it */
-
- function getData(url, successFunction, errorFunction) {
-
- $.ajax({
- url : url,
- cache : false,
- type : 'GET',
- contentType : "application/json; charset=utf-8",
- // dataType : 'jsonp',
- // crossDomain : true,
- dataType : 'json',
- //crossDomain : false,
- success : successFunction,
- error : errorFunction
- });
- }
-
- function handleXhrError(jqXHR, textStatus, errorThrown, templateSelector,
- placeholderDiv) {
- if (jqXHR.status === 0) {
- alert('Not connect.\n Verify Network.');
- } else if (jqXHR.status == 404) {
- alert('Requested page not found. [404]');
- } else if (jqXHR.status == 500) {
- alert('Internal Server Error [500].');
- } else if (errorThrown === 'parsererror') {
- alert('Requested JSON parse failed.');
- } else if (errorThrown === 'timeout') {
- alert('Time out error.');
- } else if (errorThrown === 'abort') {
- alert('Ajax request aborted.');
- } else {
- // remove error class from all input fields
- var $inputs = $('#entityform :input');
-
- $inputs.each(function() {
- $(this).removeClass("ui-state-error");
- });
-
- $(placeholderDiv).html("");
-
- var jsonErrors = JSON.parse(jqXHR.responseText);
-
- var errorArray = new Array();
- var arrayIndex = 0;
- $.each(jsonErrors, function() {
- var fieldId = '#' + this.field;
- $(fieldId).addClass("ui-state-error");
-
- var errorObj = new Object();
- errorObj.field = this.field;
- errorObj.code = this.code;
- errorObj.message = this.code;
- errorObj.value = this.value;
-
- errorArray[arrayIndex] = errorObj;
- arrayIndex++
- });
-
- var templateArray = new Array();
- var templateErrorObj = new Object();
- templateErrorObj.title = "You have the following errors:";
- templateErrorObj.errors = errorArray;
-
- templateArray[0] = templateErrorObj;
-
- var formErrorsHtml = $(templateSelector).render(templateArray);
-
- $(placeholderDiv).append(formErrorsHtml);
- }
- }
-
- function doI18N(xlateStr, params) {
- /*
- * if (I18N_Needed == "Y") { if (highlightMissingXlations == "Y") return
- * jQuery.i18n.prop(xlateStr, params) else { var xlated =
- * jQuery.i18n.prop(xlateStr, params); if (xlated.substr(0,1) == "[" &&
- * xlated.substr(xlated.length - 1, 1) == "]") return xlated.substr(1,
- * xlated.length - 2) else return xlated; } } else { var retStr =
- * xlateStr; if (retStr == 'rpt_select_one') retStr = 'Select One'; if
- * (retStr == 'rpt_select_all') retStr = 'Select All'; return retStr; }
- */
- return xlateStr;
- }
-
-})(jQuery);
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
index 2edc7733a..561698151 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
@@ -424,7 +424,7 @@ $(document).ready(function() {
var offsetToApprovalDate = 0;
var offsetToDisbursalDate = 0;
var maxOffset = 0; // today
-
+
if (currentTabIndex < 1) {
console.log("success: client tab.");
var tableHtml = $("#clientDataTabTemplate").render(data);
@@ -436,8 +436,8 @@ $(document).ready(function() {
refreshLoanSummaryInfo();
// retrieve additional info
- var extraDataParams = {
- url: '${rootContext}',
+ var additionalFieldsParams = {
+ url: "http://localhost:8080/mifosng-provider/",
datasetType: "portfolio_client",
datasetPKValue: data.id,
datasetTypeDiv: "clientadditionaldata",
@@ -446,7 +446,7 @@ $(document).ready(function() {
labelClass: "longrowlabel",
valueClass: "rowvalue"
};
- jQuery.stretchyData.displayAllExtraData(extraDataParams);
+ jQuery.stretchyData.displayAllExtraData(additionalFieldsParams);
// bind click listeners to buttons.
$('.casflowbtn').button().click(function(e) {
@@ -489,14 +489,14 @@ $(document).ready(function() {
refreshNoteWidget();
} else {
-
+
var tableHtml = $("#loanDataTabTemplate").render(data);
var currentTab = $("#newtabs").children(".ui-tabs-panel").not(".ui-tabs-hide");
currentTab.html(tableHtml);
-
- var extraDataParams = {
- url: '${rootContext}',
+
+ var additionalFieldsParams = {
+ url: "http://localhost:8080/mifosng-provider/",
datasetType: "portfolio_loan",
datasetPKValue: data.id,
datasetTypeDiv: "loanadditionaldata" + data.id,
@@ -505,8 +505,8 @@ $(document).ready(function() {
labelClass: "longrowlabel",
valueClass: "rowvalue"
};
- jQuery.stretchyData.displayAllExtraData(extraDataParams);
-
+ jQuery.stretchyData.displayAllExtraData(additionalFieldsParams);
+
var curTabID = currentTab.prop("id")
offsetToSubmittedDate = data.maxSubmittedOnOffsetFromToday;
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp
index e99506153..4b6f022f9 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp
@@ -34,7 +34,7 @@
-
+
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
deleted file mode 100644
index 12dc5fd9b..000000000
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ExtraDataApiResource.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.mifosng.platform.api;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-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.ReadExtraDataAndReportingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-@Path("/v1/extradata")
-@Component
-@Scope("singleton")
-public class ExtraDataApiResource {
-
- private final static Logger logger = LoggerFactory.getLogger(ExtraDataApiResource.class);
-
- @Autowired
- private ReadExtraDataAndReportingService readExtraDataAndReportingService;
-
- @GET
- @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_JSON})
- public Response datasets(@Context UriInfo uriInfo) {
-
- MultivaluedMap queryParams = uriInfo.getQueryParameters();
- String type = queryParams.getFirst("type");
-
- ExtraDatasets result = this.readExtraDataAndReportingService.retrieveExtraDatasetNames(type);
- return Response.ok().entity(result).build();
- }
-
- @GET
- @Path("{datasetType}/{datasetName}/{datasetPKValue}")
- @Consumes({ 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 {
- GenericResultset result = this.readExtraDataAndReportingService.retrieveExtraData(datasetType, datasetName, datasetPKValue);
-
- return Response.ok().entity(result).build();
- } catch (InvalidSqlException e) {
- List allErrors = new ArrayList();
-
- ErrorResponse err = new ErrorResponse("extradata.invalid.sql", "sql", e.getSql());
- allErrors.add(err);
-
- throw new WebApplicationException(Response
- .status(Status.BAD_REQUEST)
- .entity(new ErrorResponseList(allErrors)).build());
- }
- }
-
- @POST
- @Path("{datasetType}/{datasetName}/{datasetPKValue}")
- @Consumes({ MediaType.APPLICATION_JSON, 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, String reqbody) {
-
- try {
-
- Map queryParams = new HashMap();
- String pValue = "";
- String pName;
- try {
- JSONObject jsonObj = new JSONObject(reqbody);
- JSONArray jsonArr = jsonObj.names();
- if (jsonArr != null) {
- for (int i = 0; i < jsonArr.length(); i++) {
- pName = (String) jsonArr.get(i);
- pValue = jsonObj.getString(pName);
- logger.info( pName + " - " + pValue);
- queryParams.put(pName, pValue);
- }
- } else {
- throw new WebApplicationException(Response
- .status(Status.BAD_REQUEST)
- .entity("JSON body empty").build());
- }
- } catch (JSONException e) {
- throw new WebApplicationException(Response
- .status(Status.BAD_REQUEST)
- .entity("JSON body is wrong").build());
- }
-
-
- this.readExtraDataAndReportingService.tempSaveExtraData(datasetType, datasetName, datasetPKValue, queryParams);
-
- EntityIdentifier entityIdentifier = new EntityIdentifier(Long.valueOf(datasetPKValue));
-
- return Response.ok().entity(entityIdentifier).build();
- } catch (InvalidSqlException e) {
- List allErrors = new ArrayList();
-
- 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