update for JRS 7.8.0 version

Readme.md

@@ -25,6 +25,8 @@ Getting started
 
  - You can also double check your database connection by going to the Jaspersoft Server, opening view > repository and navigating to public > samples > UrbanRoast > Data Sources. Now you can right click the "freshcoffee" data source and select edit to ensure that your Postgres username and password (default: postgres/postgres) is set. If your Postgres data port is different than the default you can change it here as well.
 
+ - If you want to setup application on local, replace all the instances of https://mobiledemo.jaspersoft.com to your own local JRS instance(e.g. http://localhost:8080 ).
+
  - You can now run any of the main module pages, for example you can open the module3 folder and run cafe.html on your server. From there you can use the top right nav in the page to run any of the three finished modules.
 
  - Keep in mind that module1 is broken up into three parts as we build, with the module 1-3 and locations.html as the finished result.

UrbanRoast-tutorial/modules/module1/1-1/javascripts/main.js

@@ -1,13 +1,9 @@
 var locations = ["5th Street Cafe","Belmont Street Cafe","Franklin Street Cafe","Main Street Roastery and Cafe"]
 var selectedLocation = [];
 
-visualize({
-    auth: {
-        name: "jasperadmin",
-        password: "jasperadmin",
-        organization: "organization_1"
-    } 
-}, function(v) {
+initializeVisualize(initPage);
+
+function initPage(jrsConfig, v) {
     var barChart = v.adhocView({
         resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Management/Net_Sales___Total_Cost_and_Gross_Profit",
         container: "#bar",
@@ -28,4 +24,4 @@ visualize({
         }); 
     }
 
-});
+}

UrbanRoast-tutorial/modules/module1/1-1/main.html

@@ -46,8 +46,8 @@
             crossorigin=""></script>
 
     <!-- Visualize.js -->
-    <script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+    <script src="../../../../mainJS/mainJS.js"></script>
     <script type="text/javascript" src="javascripts/main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module1/1-2/javascripts/main.js

@@ -1,13 +1,12 @@
 var locations = ["5th Street Cafe","Belmont Street Cafe","Franklin Street Cafe","Main Street Roastery and Cafe"]
 var selectedLocation = [];
-
-visualize({
-    auth: {
-        name: "jasperadmin",
-        password: "jasperadmin",
-        organization: "organization_1"
-    } 
-}, function(v) {
+var  auth = {
+    name: "jasperadmin",
+    password: "jasperadmin",
+    organization: "organization_1"
+}
+initializeVisualize(initPage, auth);
+function initPage(jrsConfig, v) {
     var barChart = v.adhocView({
         resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Management/Net_Sales___Total_Cost_and_Gross_Profit",
         container: "#bar",
@@ -156,5 +155,5 @@ visualize({
             clickOnMarker(locations[3])
         })
         .addTo(mymap);
-});
+}
 

UrbanRoast-tutorial/modules/module1/1-2/main.html

@@ -54,8 +54,8 @@
     <script type="text/javascript" src="../../../resources/javascripts/jQDateRangeSlider-min.js"></script>
 
     <!-- Visualize.js -->
-    <script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+    <script src="../../../../mainJS/mainJS.js"></script>
     <script type="text/javascript" src="javascripts/main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard1.js

@@ -9,13 +9,12 @@ $(document).ready(function(){
 
     //formattedDate = formatDate(selectedDate);
     //console.log("The formatted date is " + formattedDate);
-
-    visualize({
-        auth: {
-            name: "superuser",
-            password: "superuser"
-        }
-    }, function(v) {
+    var auth = {
+        name: "superuser",
+        password: "superuser"
+    }
+   initializeVisualize(initPage, auth);
+    function initPage(jrsConfig, v) {
 
         var first = v.adhocView({
             resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Management/DailyDrilldown___Sales_and_Profit",
@@ -136,5 +135,5 @@ $(document).ready(function(){
                 console.log(e);
             }
         });
-    });
-});
+    }
+});

UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard2.js

@@ -10,12 +10,12 @@ $(document).ready(function(){
 
     var location = ["5th Street Cafe"];
 
-    visualize({
-        auth: {
-            name: "superuser",
-            password: "superuser"
-        }
-    }, function(v) {
+    var auth = {
+        name: "superuser",
+        password: "superuser"
+    }
+    initializeVisualize(initPage, auth);
+    function initPage(jrsConfig, v) {
 
         var first = v.adhocView({
             resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Management/DailyDrilldown___Sales_and_Profit",
@@ -108,5 +108,5 @@ $(document).ready(function(){
                 console.log(e);
             }
         });
-    });
-});
+    }
+});

UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-main.js

@@ -7,13 +7,13 @@ maxDate = [];
 
 
 
-visualize({
-    auth: {
-        name: "jasperadmin",
-        password: "jasperadmin",
-        organization: "organization_1"
-    } 
-}, function(v) {
+var auth = {
+    name: "jasperadmin",
+    password: "jasperadmin",
+    organization: "organization_1"
+}
+initializeVisualize(initPage, auth);
+function initPage(jrsConfig , v) {
     var crosstab = v.adhocView({
         resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Management/Location_List",
         container: "#manage-view1",
@@ -234,4 +234,4 @@ visualize({
             clickOnMarker(locations[3])
         })
         .addTo(mymap);
-});
+}

UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard1.html

@@ -181,7 +181,7 @@
 <script type="text/javascript" src="../../../resources/javascripts/bootstrap.min.js"></script>
 
 <!-- Visualize.js -->
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 
 <script type="text/javascript" src="javascripts/locations-dashboard1.js"></script>    
 

UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard2.html

@@ -185,9 +185,9 @@
 <script type="text/javascript" src="../../../resources/javascripts/bootstrap.min.js"></script>
 
 <!-- Visualize.js -->
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 
 <script type="text/javascript" src="javascripts/locations-dashboard2.js"></script>
 
 </body>    
-</html>
+</html>

UrbanRoast-tutorial/modules/module1/1-3/locations.html

@@ -220,8 +220,8 @@
 <script type="text/javascript" src="../../../resources/javascripts/jQDateRangeSlider-min.js"></script>
 
 <!-- Visualize.js -->
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 <script type="text/javascript" src="javascripts/locations-main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-main.js

@@ -4,12 +4,12 @@ var avgToProfile = [];
 var avgRoasted = [];
 var avgShipped = [];
 
-visualize({
-    auth: {
-        name: "superuser",
-        password: "superuser"
-    }
-}, function(v) {
+var auth = {
+    name: "superuser",
+    password: "superuser"
+}
+initializeVisualize(initPage, auth);
+function initPage(jrsConfig, v) {
 
     var progressGauges = v.adhocView({
         resource: "/public/Samples/FreshCoffee/Ad_Hoc_Views/Roastery/Coffee_Percentages",
@@ -317,13 +317,13 @@ visualize({
             console.log(e);
         });
     }
-});
+}
 
 function renderGaugeData(data) {
     //console.log(data);
     //get the col and row count from the ad hoc view data object
     //minus 1 to account for only using 4 of the 5 columns
-    var numCol = (data.levels[0].detail.fields.length) - 1;
+    var numCol = (data.levels[1].detail.fields.length) - 1;
     var numRow = data.counts;
     var onGoal = [];
     var toProfile = [];
@@ -333,7 +333,7 @@ function renderGaugeData(data) {
     //loop through the desired columns (last 4) and push data to prepared arrays
     for (var col = 0; col < numCol; col++) {
         for (var i = 0; i < numRow; i++) {
-            eachRow = data.levelDataNodes[0].detail.data[i][col+1];
+            eachRow = data.levelDataNodes[0].all.children[0].detail.data[i][col+1];
             if (col === 0) { onGoal.push(Number(eachRow)) }
             if (col === 1) { toProfile.push(Number(eachRow)) }
             if (col === 2) { roasted.push(Number(eachRow)) }
@@ -397,4 +397,4 @@ function createInput() {
 
     sessionStorage.setItem("sent", JSON.stringify(window.recentTags));
     window.open("roast-report1.html","_self");
-}
+}

UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-report1-main.js

@@ -5,12 +5,12 @@ $(document).ready(function(){
     var selectedCoffee = JSON.parse(sessionStorage.getItem("sent"));
     //console.log(selectedCoffee);
 
-    visualize({
-        auth: {
-            name: "superuser",
-            password: "superuser"
-        }
-    }, function (v) {
+    var auth = {
+        name: "superuser",
+        password: "superuser"
+    }
+    initializeVisualize(initPage, auth);
+    function initPage(jrsConfig, v) {
         //add custom export format
         //(should throw a proper error)
         var reportExports = v.report
@@ -138,5 +138,5 @@ $(document).ready(function(){
                 .run()
                 .fail(function(err) { alert(err); });
         });
-    });
-});
+    }
+});

UrbanRoast-tutorial/modules/module2/2-1/roast-report1.html

@@ -95,9 +95,9 @@
 <script type="text/javascript" src="../../../resources/javascripts/bootstrap-multiselect.js"></script>
 
 <!-- Visualize.js -->
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 
 <script type="text/javascript" src="javascripts/roast-report1-main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module2/2-1/roast.html

@@ -124,8 +124,8 @@
 <script type="text/javascript" src="../../../resources/javascripts/taggle.min.js"></script>
 
 <!-- Visualize.js --> 
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 <script type="text/javascript" src="javascripts/roast-main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module3/3-1/cafe-report1.html

@@ -66,9 +66,9 @@
 <script type="text/javascript" src="../../../resources/javascripts/bootstrap.min.js"></script>
 
 <!-- Visualize.js -->
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 
 <script type="text/javascript" src="javascripts/cafe-report1-main.js"></script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module3/3-1/cafe.html

@@ -369,7 +369,7 @@
 <script type="text/javascript" src="../../../resources/javascripts/bootstrap-slider.min.js"></script>
 
 <!-- Visualize.js -->    
-<script type='text/javascript' src="http://localhost:8080/jasperserver-pro/client/visualize.js"></script>
+<script type="text/javascript" src="../../../../mainJS/mainJS.js"></script>
 <script src="javascripts/cafe-main.js"></script>
 
 <script>
@@ -432,4 +432,4 @@
 </script>
 
 </body>
-</html>
+</html>

UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-main.js

@@ -10,6 +10,8 @@ var pageConfig = {
     }
 };
 
+initializeVisualize(initPage);
+
 // create and initialize first selected drink object
 var drink = {
     name: 'Americano',
@@ -33,15 +35,7 @@ var order = [];
 var customName = "Custom " + drink.name;
 
 // initialize Visualize.js
-function initPage() {
-    visualize({
-        auth: {
-            name: "jasperadmin",
-            password: "jasperadmin",
-            organization: "organization_1"
-        }
-    }, function(v) {
-
+function initPage(jrsConfig, v) {
         // load the ad hoc views and report
         loadViews(v);
 
@@ -60,11 +54,8 @@ function initPage() {
                     console.log(err);
                 });
         }); 
-    });
 }
 
-initPage();
-
 function loadViews(v) {
 
     report = v.report({