From aa570fb44d9d2128e451e5973fda9cf865a29dbd Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Tue, 1 May 2012 21:36:09 +0100
Subject: [PATCH] fix issue with redering multiple loan tabs.

---
 .../{stretchydata-0.89.js => stretchydata-0.90.js}     |  9 +++++----
 .../webapp/WEB-INF/views/client/viewClientAccount.jsp  | 10 ++++++----
 .../src/main/webapp/WEB-INF/views/common-head.jsp      |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/{stretchydata-0.89.js => stretchydata-0.90.js} (98%)

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 += '<br><span ' + headingClassStr + '><b>'
 					+ doI18N(displayAllVars.headingPrefix)
 					+ doI18N(data.names[i]) + ' - </span></b> ';
@@ -59,12 +59,13 @@
 			extraDataNamesVar += editExtraDataLink(displayAllVars.url,
 					displayAllVars.datasetType, data.names[i],
 					displayAllVars.datasetPKValue, dsnDivName);
+			
 			extraDataNamesVar += '<div id="' + dsnDivName + '">';
 			extraDataNamesVar += '</div>';
 		}
 		$('#' + 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() {
 		
 			<div id="newtabs">
 				<ul>
-					<li><a href="${clientUrl}" title="clienttab">${clientDisplayName}</a></li>
+					<li><a href="${clientUrl}" title="clienttab" class="topleveltab">${clientDisplayName}</a></li>
 				</ul>
 				<div id="clienttab">
 				</div>
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 @@
 <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/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:when test="${not empty language}">