Prefill the visualisation field on module type select

fill with {} for now
alphagov · Apr 17, 2015 · fddfd59 · fddfd59
1 parent a6e3991
commit fddfd59
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 51 deletions.
diff --git a/application/static/javascripts/edit_dashboard.js b/application/static/javascripts/edit_dashboard.js
@@ -4,13 +4,16 @@
     $('.js-module-type-selector').on('change', function () {
       var type = $(this).find('[value="' + $(this).val() + '"]').text(),
         $queryParams = $(this).closest('.module').find('.js-query-parameters');
+        $visualisationParams = $(this).closest('.module').find('.js-visualisation-parameters');
 
       $.getJSON('/static/json/' + type + '.json')
         .done(function (data) {
-          $queryParams.val(JSON.stringify(data, null, '\t'));
+          $queryParams.val(JSON.stringify(data['query'], null, '\t'));
+          $visualisationParams.val(JSON.stringify(data['visualisation'], null, '\t'));
         })
         .fail(function() {
           $queryParams.val('{}');
+          $visualisationParams.val('{}');
         });
     });
   }

diff --git a/application/static/json/applications.json b/application/static/json/applications.json
@@ -1 +1,5 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
+
diff --git a/application/static/json/bar_chart_with_number.json b/application/static/json/bar_chart_with_number.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/column.json b/application/static/json/column.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/completion_rate.json b/application/static/json/completion_rate.json
@@ -1,10 +1,14 @@
 {
-  "duration": 52,
-  "collect": [
-    "count:sum"
-  ],
-  "group_by": [
-    "channel"
-  ],
-  "period": "week"
+  "query": {
+    "duration": 52,
+    "collect": [
+      "count:sum"
+    ],
+    "group_by": [
+      "channel"
+    ],
+    "period": "week"
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/completion_table.json b/application/static/json/completion_table.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/grouped_timeseries.json b/application/static/json/grouped_timeseries.json
@@ -1,10 +1,14 @@
 {
-  "duration": 52,
-  "collect": [
-    "count:sum"
-  ],
-  "group_by": [
-    "channel"
-  ],
-  "period": "week"
+  "query": {
+    "duration": 52,
+    "collect": [
+      "count:sum"
+    ],
+    "group_by": [
+      "channel"
+    ],
+    "period": "week"
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/headline_figure.json b/application/static/json/headline_figure.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/journey.json b/application/static/json/journey.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/kpi.json b/application/static/json/kpi.json
@@ -1,7 +1,11 @@
-{
-  "sort_by": "_timestamp:descending",
-  "filter_by": [
-    "service_id:<service-id>",
-    "type:seasonally-adjusted"
-  ]
+{  
+  "query": {
+    "sort_by": "_timestamp:descending",
+    "filter_by": [
+      "service_id:<service-id>",
+      "type:seasonally-adjusted"
+    ]
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/list.json b/application/static/json/list.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/realtime.json b/application/static/json/realtime.json
@@ -1,4 +1,8 @@
-{
-  "limit": 722,
-  "sort_by": "_timestamp:descending"
+{  
+  "query": {
+    "limit": 722,
+    "sort_by": "_timestamp:descending"
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/section.json b/application/static/json/section.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/single_timeseries.json b/application/static/json/single_timeseries.json
@@ -1,13 +1,17 @@
-{
-  "duration": 52,
-  "collect": [
-    "avgSessionDuration:sum"
-  ],
-  "group_by": [
-    "stage"
-  ],
-  "period": "week",
-  "filter_by": [
-    "stage:thank-you"
-  ]
+{  
+  "query": {
+    "duration": 52,
+    "collect": [
+      "avgSessionDuration:sum"
+    ],
+    "group_by": [
+      "stage"
+    ],
+    "period": "week",
+    "filter_by": [
+      "stage:thank-you"
+    ]
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/tab.json b/application/static/json/tab.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/static/json/table.json b/application/static/json/table.json
@@ -1,3 +1,7 @@
 {
-  "start_at": "2015-01-01T00:00:00Z"
+  "query": {
+    "start_at": "2015-01-01T00:00:00Z"
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/user_satisfaction.json b/application/static/json/user_satisfaction.json
@@ -1,3 +1,7 @@
 {
-  "sort_by": "_timestamp:ascending"
+  "query": {
+    "sort_by": "_timestamp:ascending"
+  },
+  "visualisation" : {
+  }
 }
diff --git a/application/static/json/user_satisfaction_graph.json b/application/static/json/user_satisfaction_graph.json
@@ -1 +1,4 @@
-{}
+{
+  'query': {},
+  'visualisation': {}
+}
diff --git a/application/templates/dashboards/create.html b/application/templates/dashboards/create.html
@@ -266,7 +266,7 @@ <h2>Modules</h2>
             <div class="form-group">
               {{ module.options.label(class='col-sm-2 control-label') }}
               <div class="col-sm-10">
-                {{ module.options(class='form-control json-field') }}
+                {{ module.options(class='form-control json-field js-visualisation-parameters') }}
                 <p class="help-block">Adjust how the visualisation looks. Settings must be <a href="http://jsonlint.com/" target="_blank">valid JSON</a></p>
               </div>
             </div>