diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.89.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js
similarity index 98%
rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.89.js
rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js
index 49a7daa1d..d1559eab4 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.89.js
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js
@@ -51,7 +51,7 @@
var extraDataNamesVar = "";
for ( var i in data.names) {
- var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i);
+ var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv);
extraDataNamesVar += '
'
+ doI18N(displayAllVars.headingPrefix)
+ doI18N(data.names[i]) + ' - ';
@@ -59,12 +59,13 @@
extraDataNamesVar += editExtraDataLink(displayAllVars.url,
displayAllVars.datasetType, data.names[i],
displayAllVars.datasetPKValue, dsnDivName);
+
extraDataNamesVar += '
';
extraDataNamesVar += '
';
}
$('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar);
for ( var i in data.names) {
- var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i);
+ var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv);
viewExtraData(displayAllVars.url, displayAllVars.datasetType,
data.names[i], displayAllVars.datasetPKValue, dsnDivName);
}
@@ -197,8 +198,8 @@
popupEditErrorFunction);
}
- function generateDsnDivName(datasetType, i) {
- return extraDataUnderscore(datasetType) + "_" + i;
+ function generateDsnDivName(datasetType, i, uniqueDivid) {
+ return extraDataUnderscore(datasetType) + "_" + i + "_" + extraDataUnderscore(uniqueDivid);
}
/* start of code to fill data in edit form */
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 62cb6d902..d0a17d058 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
@@ -369,6 +369,8 @@ $(document).ready(function() {
var $newtabs = $("#newtabs").tabs({
"add": function( event, ui ) {
+ console.log(ui);
+ //alert("adding new tab: " + ui.panel.id + " :" + ui.tab.className);
$newtabs.tabs('select', '#' + ui.panel.id);
},
"ajaxOptions": {
@@ -454,8 +456,8 @@ $(document).ready(function() {
var tableHtml = $("#loanDataTabTemplate").render(data);
- var curTab = $('#newtabs .ui-tabs-panel:not(.ui-tabs-hide)');
- curTab.html(tableHtml);
+ var currentTab = $("#newtabs").children(".ui-tabs-panel").not(".ui-tabs-hide");
+ currentTab.html(tableHtml);
var extraDataParams = {
url: '${rootContext}',
@@ -469,7 +471,7 @@ $(document).ready(function() {
};
jQuery.stretchyData.displayAllExtraData(extraDataParams);
- var curTabID = curTab.prop("id")
+ var curTabID = currentTab.prop("id")
offsetToSubmittedDate = data.maxSubmittedOnOffsetFromToday;
offsetToApprovalDate = data.maxApprovedOnOffsetFromToday;
@@ -702,7 +704,7 @@ $(document).ready(function() {
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 40ced4415..d8fa30f5f 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 @@
-
+