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

fix issue with redering multiple loan tabs.

Browse Source
This commit is contained in:
Keith Woodlock
2012-05-01 21:36:09 +01:00
parent d3d40cabe0
commit aa570fb44d
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.89.js → mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.90.js
+5 -4
View File
@@ -51,7 +51,7 @@
var extraDataNamesVar = ""; var extraDataNamesVar = "";
for ( var i in data.names) { for ( var i in data.names) {
var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i); var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv);
extraDataNamesVar += '<br><span ' + headingClassStr + '><b>' extraDataNamesVar += '<br><span ' + headingClassStr + '><b>'
+ doI18N(displayAllVars.headingPrefix) + doI18N(displayAllVars.headingPrefix)
+ doI18N(data.names[i]) + ' - </span></b> '; + doI18N(data.names[i]) + ' - </span></b> ';
@@ -59,12 +59,13 @@
extraDataNamesVar += editExtraDataLink(displayAllVars.url, extraDataNamesVar += editExtraDataLink(displayAllVars.url,
displayAllVars.datasetType, data.names[i], displayAllVars.datasetType, data.names[i],
displayAllVars.datasetPKValue, dsnDivName); displayAllVars.datasetPKValue, dsnDivName);
extraDataNamesVar += '<div id="' + dsnDivName + '">'; extraDataNamesVar += '<div id="' + dsnDivName + '">';
extraDataNamesVar += '</div>'; extraDataNamesVar += '</div>';
} }
$('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar); $('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar);
for ( var i in data.names) { 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, viewExtraData(displayAllVars.url, displayAllVars.datasetType,
data.names[i], displayAllVars.datasetPKValue, dsnDivName); data.names[i], displayAllVars.datasetPKValue, dsnDivName);
} }
@@ -197,8 +198,8 @@
popupEditErrorFunction); popupEditErrorFunction);
} }
function generateDsnDivName(datasetType, i) { function generateDsnDivName(datasetType, i, uniqueDivid) {
return extraDataUnderscore(datasetType) + "_" + i; return extraDataUnderscore(datasetType) + "_" + i + "_" + extraDataUnderscore(uniqueDivid);
} }
/* start of code to fill data in edit form */ /* start of code to fill data in edit form */
mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
+6 -4
View File
@@ -369,6 +369,8 @@ $(document).ready(function() {
var $newtabs = $("#newtabs").tabs({ var $newtabs = $("#newtabs").tabs({
"add": function( event, ui ) { "add": function( event, ui ) {
console.log(ui);
//alert("adding new tab: " + ui.panel.id + " :" + ui.tab.className);
$newtabs.tabs('select', '#' + ui.panel.id); $newtabs.tabs('select', '#' + ui.panel.id);
}, },
"ajaxOptions": { "ajaxOptions": {
@@ -454,8 +456,8 @@ $(document).ready(function() {
var tableHtml = $("#loanDataTabTemplate").render(data); var tableHtml = $("#loanDataTabTemplate").render(data);
var curTab = $('#newtabs .ui-tabs-panel:not(.ui-tabs-hide)'); var currentTab = $("#newtabs").children(".ui-tabs-panel").not(".ui-tabs-hide");
curTab.html(tableHtml); currentTab.html(tableHtml);
var extraDataParams = { var extraDataParams = {
url: '${rootContext}', url: '${rootContext}',
@@ -469,7 +471,7 @@ $(document).ready(function() {
}; };
jQuery.stretchyData.displayAllExtraData(extraDataParams); jQuery.stretchyData.displayAllExtraData(extraDataParams);
var curTabID = curTab.prop("id") var curTabID = currentTab.prop("id")
offsetToSubmittedDate = data.maxSubmittedOnOffsetFromToday; offsetToSubmittedDate = data.maxSubmittedOnOffsetFromToday;
offsetToApprovalDate = data.maxApprovedOnOffsetFromToday; offsetToApprovalDate = data.maxApprovedOnOffsetFromToday;
@@ -702,7 +704,7 @@ $(document).ready(function() {
<div id="newtabs"> <div id="newtabs">
<ul> <ul>
<li><a href="${clientUrl}" title="clienttab">${clientDisplayName}</a></li> <li><a href="${clientUrl}" title="clienttab" class="topleveltab">${clientDisplayName}</a></li>
</ul> </ul>
<div id="clienttab"> <div id="clienttab">
</div> </div>
mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp
+1 -1
View File
@@ -34,7 +34,7 @@
<script type="text/javascript" src="${resValue}/libs/jquery.views.js"></script> <script type="text/javascript" src="${resValue}/libs/jquery.views.js"></script>
<script type="text/javascript" src="${resValue}/libs/jquery.observable.min.js"></script> <script type="text/javascript" src="${resValue}/libs/jquery.observable.min.js"></script>
<script type="text/javascript" src="${resValue}/libs/globalize/globalize.js"></script> <script type="text/javascript" src="${resValue}/libs/globalize/globalize.js"></script>
<script type="text/javascript" src="${resValue}/stretchydata-0.89.js"></script> <script type="text/javascript" src="${resValue}/stretchydata-0.90.js"></script>
<c:choose> <c:choose>
<c:when test="${not empty language}"> <c:when test="${not empty language}">