revisiting the report widget. make it at least semi-operational

before work begins on a real first release.

Author: tmcgee

config/report.js

@@ -1,22 +1,19 @@
 define([
-    'esri/urlUtils',
-    'esri/layers/ImageParameters'
-], function (urlUtils, ImageParameters) {
+    'esri/urlUtils'
+], function (urlUtils) {
 
     urlUtils.addProxyRule({
-        urlPrefix: 'http://gis.scwa.ca.gov',
+        urlPrefix: 'http://server.domain',
         proxyUrl: '/proxy/proxy.ashx'
     });
 
-    var imageParameters = new ImageParameters();
-    imageParameters.format = 'png32';
-
     return {
         isDebug: true,
 
         mapOptions: {
-            basemap: 'streets',
+            basemap: 'hybrid',
             center: [-122.6314, 38.2658],
+            // center: [-122.431297, 37.773972],
             zoom: 19,
             sliderStyle: 'small'
         },
@@ -35,33 +32,7 @@ define([
         },
         collapseButtonsPane: 'center', //center or outer
 
-        operationalLayers: [
-            {
-                type: 'dynamic',
-                url: 'https://xara1-4.cityofpetaluma.net/arcgis/rest/services/BaseMaps/Basemap_WM_CL/MapServer',
-                title: 'Basemap',
-                options: {
-                    id: 'countyBasemap',
-                    opacity: 1,
-                    visible: true,
-                    imageParameters: imageParameters
-                }
-            },
-            {
-                type: 'dynamic',
-                url: 'https://xara1-4.cityofpetaluma.net/arcgis/rest/services/BaseMaps/Parcels_Public/MapServer',
-                title: 'Parcels',
-                options: {
-                    id: 'countParcels',
-                    opacity: 0.7,
-                    visible: true,
-                    imageParameters: imageParameters
-                },
-                identifyLayerInfos: {
-                    layerIds: [0]
-                }
-            }
-        ],
+        operationalLayers: [],
 
         widgets: {
             growler: {

config/reportWidget.js

@@ -6,12 +6,11 @@ define([
         map: true,
 
         /*
-            printTaskURL must be on the same same as application
+            printTaskURL must be on the same server as application
             or the server must be configured for CORS
             or you can use a proxy
         */
-        printTaskURL: 'http://gis.scwa.ca.gov/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task',
-        //'https://utility.arcgisonline.com/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task',
+        printTaskURL: 'https://utility.arcgisonline.com/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task',
 
         startup: function () {
             topic.publish('reportWidget/createReport');
@@ -81,7 +80,7 @@ define([
                     }
                 },
                 copyright: {
-                    text: 'Copyright 2015, City of Petaluma California',
+                    text: 'Copyright 2016, City of Petaluma California',
                     left: 575, // just inside the right margin
                     align: 'right',
                     font: {
@@ -101,15 +100,6 @@ define([
                 preserveScale: true,
                 border: true
             },
-            images: [
-                {
-                    top: 15,
-                    left: 15,
-                    width: 50,
-                    height: 50,
-                    url: '/proxy/proxy.ashx?https://xara1-4.cityofpetaluma.net/jsviewers/maplibrary/images/Petaluma1858verC2_graybg.bmp'
-                }
-            ],
             text: [],
             lines: [],
             shapes: [],

widgets/Report.js

@@ -60,16 +60,16 @@ define([
         addjsPDFModules: function () {
             var modules = [
                 // load the autotable plugin
-                'https//cdnjs.cloudflare.com/ajax/libs/jspdf-autotable/2.0.16/jspdf.plugin.autotable.js'
+                'https://cdnjs.cloudflare.com/ajax/libs/jspdf-autotable/2.0.16/jspdf.plugin.autotable.js'
             ];
 
             switch (this.reportLayout.output.type) {
             case 'blob':
             case 'bloburi':
             case 'bloburl':
             case 'save':
-                modules.push('https//cdn.rawgit.com/eligrey/Blob.js/master/Blob.js');
-                modules.push('https//cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js');
+                modules.push('https://cdn.rawgit.com/eligrey/Blob.js/master/Blob.js');
+                modules.push('https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js');
                 break;
             default:
             }
@@ -611,7 +611,7 @@ define([
 
         getProxiedUrl: function (url) {
             var proxyRule = urlUtils.getProxyRule(url);
-            if (proxyRule.proxyUrl) {
+            if (proxyRule && proxyRule.proxyUrl) {
                 return proxyRule.proxyUrl + '?' + url;
             }
             return url;