From 581611d7d2b1725f1537a922b3190411893d4e48 Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Thu, 5 Jul 2012 18:03:45 +1000
Subject: [PATCH] wip javascript

---
 tempjpwNow/IndivLendHome.html                  | 12 +++++++++---
 tempjpwNow/resources/jsrenderExtra.js          | 18 ++++++++++++++++++
 ...ting-0.987.js => stretchyreporting-0.99.js} |  9 ---------
 3 files changed, 27 insertions(+), 12 deletions(-)
 rename tempjpwNow/resources/stretchyreporting/{stretchyreporting-0.987.js => stretchyreporting-0.99.js} (99%)

diff --git a/tempjpwNow/IndivLendHome.html b/tempjpwNow/IndivLendHome.html
index 414b8f84d..b5c8d2232 100644
--- a/tempjpwNow/IndivLendHome.html
+++ b/tempjpwNow/IndivLendHome.html
@@ -29,8 +29,11 @@
 <script type="text/javascript" src="resources/libs/globalize/globalize.js"></script>
 <script type="text/javascript" src="resources/stretchydata-0.95.js"></script>
 
-<script type="text/javascript" src="resources/stretchyreporting/stretchyreporting-0.987.js"></script>
+<script type="text/javascript" src="resources/stretchyreporting/stretchyreporting-0.99.js"></script>
 <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript">
+	google.load("visualization", "1", {packages:["corechart"]});
+</script>
 
 
 </head>
@@ -1378,7 +1381,7 @@
 		</div>
 		
 		<div class="multiselectwidget">
-			<label for="permissions"><spring:message code="form.label.role.selected.permissions"/></label>
+			<label for="permissions">{{=$ctx.doI18N("form.label.role.selected.permissions")}}</label>
 			<select id="permissions" name="permissions" title="" class="multiselectwidget multiSelectedItems" multiple="multiple" style="width:450px;height:125px;">
 			{{#each selectedPermissions}}
 				<option value="{{=id}}" title="{{=description}}">{{=name}}</option>
@@ -1461,7 +1464,10 @@
 <script>
 $(document).ready(function() {
 
-	baseApiUrl = "https://localhost:8443/mifosng-provider/api/v1/";
+	//baseApiUrl = "https://localhost:8443/mifosng-provider/api/v1/";
+	baseApiUrl = "https://ec2-46-137-62-163.eu-west-1.compute.amazonaws.com:8443/mifosng-provider/api/v1/";
+	if (QueryParameters["baseApiUrl"]) baseApiUrl = QueryParameters["baseApiUrl"];
+
 
     	// default to 'en' culture - no need to import extra javascript files for globalize.js or datapicker
     	Globalize.culture('en');
diff --git a/tempjpwNow/resources/jsrenderExtra.js b/tempjpwNow/resources/jsrenderExtra.js
index 5c528afaf..18e55bb9a 100644
--- a/tempjpwNow/resources/jsrenderExtra.js
+++ b/tempjpwNow/resources/jsrenderExtra.js
@@ -1,3 +1,21 @@
+QueryParameters = (function()
+{
+    var result = {};
+
+    if (window.location.search)
+    {
+        // split up the query string and store in an associative array
+        var params = window.location.search.slice(1).split("&");
+        for (var i = 0; i < params.length; i++)
+        {
+            var tmp = params[i].split("=");
+            result[tmp[0]] = unescape(tmp[1]);
+        }
+    }
+
+    return result;
+}());
+
 
 saveSuccessFunctionReloadClient =  function(data, textStatus, jqXHR) {
 						  	$("#dialog-form").dialog("close");
diff --git a/tempjpwNow/resources/stretchyreporting/stretchyreporting-0.987.js b/tempjpwNow/resources/stretchyreporting/stretchyreporting-0.99.js
similarity index 99%
rename from tempjpwNow/resources/stretchyreporting/stretchyreporting-0.987.js
rename to tempjpwNow/resources/stretchyreporting/stretchyreporting-0.99.js
index ab0f9aa11..5a2959769 100644
--- a/tempjpwNow/resources/stretchyreporting/stretchyreporting-0.987.js
+++ b/tempjpwNow/resources/stretchyreporting/stretchyreporting-0.99.js
@@ -139,8 +139,6 @@ function initialiseReporting(params) {
 		showMsg("OAuth params were not passed");
 	}
  	
-	googleLoaded = false;
-
 	reportListing = [];
 	listOfParameters = [];
 
@@ -762,13 +760,6 @@ return 'var selectSuccess = function(data, textStatus,jqXHR){' +
 
 function createChart(theData) {
 
-	if (googleLoaded == false) 
-	{
-		google.load("visualization", "1", {packages:["corechart"]});
-		googleLoaded = true;
-	}
-
-
 	RData = new google.visualization.DataTable();
       RData.addColumn('string', dataTableDef.aoColumns[0].sTitle);
       RData.addColumn('number', dataTableDef.aoColumns[1].sTitle);