diff --git a/Readme.md b/Readme.md index 1d95867..dd1b4b1 100755 --- a/Readme.md +++ b/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. diff --git a/UrbanRoast-tutorial/modules/module1/1-1/javascripts/main.js b/UrbanRoast-tutorial/modules/module1/1-1/javascripts/main.js index 6b0caec..051220c 100644 --- a/UrbanRoast-tutorial/modules/module1/1-1/javascripts/main.js +++ b/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({ }); } -}); \ No newline at end of file +} diff --git a/UrbanRoast-tutorial/modules/module1/1-1/main.html b/UrbanRoast-tutorial/modules/module1/1-1/main.html index 2debf35..cda510c 100644 --- a/UrbanRoast-tutorial/modules/module1/1-1/main.html +++ b/UrbanRoast-tutorial/modules/module1/1-1/main.html @@ -46,8 +46,8 @@ crossorigin=""> - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module1/1-2/javascripts/main.js b/UrbanRoast-tutorial/modules/module1/1-2/javascripts/main.js index f786e4a..48aed56 100644 --- a/UrbanRoast-tutorial/modules/module1/1-2/javascripts/main.js +++ b/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); -}); +} diff --git a/UrbanRoast-tutorial/modules/module1/1-2/main.html b/UrbanRoast-tutorial/modules/module1/1-2/main.html index 8893b45..0de484b 100644 --- a/UrbanRoast-tutorial/modules/module1/1-2/main.html +++ b/UrbanRoast-tutorial/modules/module1/1-2/main.html @@ -54,8 +54,8 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard1.js b/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard1.js index 5194f92..3632a48 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard1.js +++ b/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); } }); - }); -}); \ No newline at end of file + } +}); diff --git a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard2.js b/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard2.js index 4dca48c..146e244 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-dashboard2.js +++ b/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); } }); - }); -}); \ No newline at end of file + } +}); diff --git a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-main.js b/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-main.js index 8a42674..9c76ab6 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/javascripts/locations-main.js +++ b/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); -}); \ No newline at end of file +} diff --git a/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard1.html b/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard1.html index 16b8818..0bdd924 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard1.html +++ b/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard1.html @@ -181,7 +181,7 @@ - + diff --git a/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard2.html b/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard2.html index 8d185d2..5a99790 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard2.html +++ b/UrbanRoast-tutorial/modules/module1/1-3/locations-dashboard2.html @@ -185,9 +185,9 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module1/1-3/locations.html b/UrbanRoast-tutorial/modules/module1/1-3/locations.html index dfb9c62..60bbbf4 100644 --- a/UrbanRoast-tutorial/modules/module1/1-3/locations.html +++ b/UrbanRoast-tutorial/modules/module1/1-3/locations.html @@ -220,8 +220,8 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-main.js b/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-main.js index f190665..d27b2a6 100644 --- a/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-main.js +++ b/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"); -} \ No newline at end of file +} diff --git a/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-report1-main.js b/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-report1-main.js index 3d5475a..34157a9 100644 --- a/UrbanRoast-tutorial/modules/module2/2-1/javascripts/roast-report1-main.js +++ b/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); }); }); - }); -}); \ No newline at end of file + } +}); diff --git a/UrbanRoast-tutorial/modules/module2/2-1/roast-report1.html b/UrbanRoast-tutorial/modules/module2/2-1/roast-report1.html index e00c808..0b432b9 100644 --- a/UrbanRoast-tutorial/modules/module2/2-1/roast-report1.html +++ b/UrbanRoast-tutorial/modules/module2/2-1/roast-report1.html @@ -95,9 +95,9 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module2/2-1/roast.html b/UrbanRoast-tutorial/modules/module2/2-1/roast.html index 782ae16..9258951 100644 --- a/UrbanRoast-tutorial/modules/module2/2-1/roast.html +++ b/UrbanRoast-tutorial/modules/module2/2-1/roast.html @@ -124,8 +124,8 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module3/3-1/cafe-report1.html b/UrbanRoast-tutorial/modules/module3/3-1/cafe-report1.html index 4765c71..33d0d12 100644 --- a/UrbanRoast-tutorial/modules/module3/3-1/cafe-report1.html +++ b/UrbanRoast-tutorial/modules/module3/3-1/cafe-report1.html @@ -66,9 +66,9 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module3/3-1/cafe.html b/UrbanRoast-tutorial/modules/module3/3-1/cafe.html index 4eef791..d1ceb92 100644 --- a/UrbanRoast-tutorial/modules/module3/3-1/cafe.html +++ b/UrbanRoast-tutorial/modules/module3/3-1/cafe.html @@ -369,7 +369,7 @@ - + - \ No newline at end of file + diff --git a/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-main.js b/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-main.js index 403b18c..792c400 100644 --- a/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-main.js +++ b/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({ diff --git a/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-report1-main.js b/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-report1-main.js index 8fd3fc7..9684a61 100644 --- a/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-report1-main.js +++ b/UrbanRoast-tutorial/modules/module3/3-1/javascripts/cafe-report1-main.js @@ -4,12 +4,12 @@ $(document).ready(function(){ //will retrieve session and get the value; var order = JSON.parse(sessionStorage.getItem("sent")); - 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 var reportExports = v.report .exportFormats @@ -143,5 +143,5 @@ var order = JSON.parse(sessionStorage.getItem("sent")); alert(err); }); }); - }); -}); \ No newline at end of file + } +}); diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-americano.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-Americano.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-americano.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-Americano.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-blackCoffee.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-BlackCoffee.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-blackCoffee.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-BlackCoffee.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-cafeBreve.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-CafeBreve.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-cafeBreve.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-CafeBreve.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-cafeCarajillo.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-CafeCarajillo.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-cafeCarajillo.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-CafeCarajillo.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-cafeLatte.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-CafeLatte.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-cafeLatte.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-CafeLatte.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-cafeMelange.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-CafeMelange.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-cafeMelange.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-CafeMelange.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-cafeMocha.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-CafeMocha.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-cafeMocha.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-CafeMocha.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-capuccino.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-Capuccino.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-capuccino.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-Capuccino.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-eiskaffee.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-Eiskaffee.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-eiskaffee.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-Eiskaffee.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-flatWhite.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-FlatWhite.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-flatWhite.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-FlatWhite.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-galao.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-Galao.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-galao.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-Galao.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-icedCoffee.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-IcedCoffee.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-icedCoffee.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-IcedCoffee.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-irishCoffee.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-IrishCoffee.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-irishCoffee.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-IrishCoffee.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-longBlack.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-LongBlack.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-longBlack.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-LongBlack.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-macchiato.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-Macchiato.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-macchiato.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-Macchiato.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-redEye.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-RedEye.svg similarity index 100% rename from UrbanRoast-tutorial/resources/svg/cups/cup-redEye.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-RedEye.svg diff --git a/UrbanRoast-tutorial/resources/svg/cups/cup-viennaCoffee.svg b/UrbanRoast-tutorial/resources/svg/cups/cup-ViennaCoffee.svg similarity index 99% rename from UrbanRoast-tutorial/resources/svg/cups/cup-viennaCoffee.svg rename to UrbanRoast-tutorial/resources/svg/cups/cup-ViennaCoffee.svg index 173d33b..79da801 100644 --- a/UrbanRoast-tutorial/resources/svg/cups/cup-viennaCoffee.svg +++ b/UrbanRoast-tutorial/resources/svg/cups/cup-ViennaCoffee.svg @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/config/config.json b/config/config.json new file mode 100644 index 0000000..73c0b99 --- /dev/null +++ b/config/config.json @@ -0,0 +1,13 @@ +{ + "visualizeJS": "https://mobiledemo.jaspersoft.com/jasperserver-pro/client/visualize.js", + "cacheVisualizeJS": true, + "visualizeJSFromServer": "https://mobiledemo.jaspersoft.com/jasperserver-pro/client/visualize.js", + "jrsHostname": "https://mobiledemo.jaspersoft.com/jasperserver-pro", + "jrsTheme": "https://mobiledemo.jaspersoft.com", + "jrsAuth": { + "name": "jasperadmin", + "password": "jasperadmin", + "organization": "organization_1" + }, + "theme": "theme" +} diff --git a/demopack/demo_build_ui/index.html b/demopack/demo_build_ui/index.html index 5a651aa..4ad8384 100644 --- a/demopack/demo_build_ui/index.html +++ b/demopack/demo_build_ui/index.html @@ -14,7 +14,7 @@ - + @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/demopack/demo_build_ui/js/script.js b/demopack/demo_build_ui/js/script.js index a5cfa1e..6a71627 100644 --- a/demopack/demo_build_ui/js/script.js +++ b/demopack/demo_build_ui/js/script.js @@ -1,10 +1,11 @@ -visualize({ - auth: { - name: "jasperadmin", - password: "jasperadmin", - organization: "organization_1" - } -}, function (v) { +var configPath = '../../config/config.json'; +var auth = { + name: "jasperadmin", + password: "jasperadmin", + organization: "organization_1" +} +initializeVisualize(initPage, auth, configPath); +function initPage(jrsConfig, v) { //render report from provided resource var report = v.report({ @@ -42,7 +43,7 @@ visualize({ report.run(); }); -}); +} @@ -97,4 +98,4 @@ function buildParam(controls){ return param; -} \ No newline at end of file +} diff --git a/demopack/demo_create_run_report/index.html b/demopack/demo_create_run_report/index.html index 0a1fe39..86c70b3 100644 --- a/demopack/demo_create_run_report/index.html +++ b/demopack/demo_create_run_report/index.html @@ -14,7 +14,7 @@ - +