[#1251] Use 'data' instead of 'resource_view' in

ReclineView setup_template_variables. Add simple ReclineGraph schema (still need validators)
ckan · Nov 7, 2013 · afff845 · afff845
1 parent aa6efd5
commit afff845
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/ckanext/reclinepreview/plugin.py b/ckanext/reclinepreview/plugin.py
@@ -36,7 +36,7 @@ def can_view(self, data_dict):
 
     def setup_template_variables(self, context, data_dict):
         return {'resource_json': json.dumps(data_dict['resource']),
-                'resource_view_json': json.dumps(data_dict['resource_view'])}
+                'resource_view_json': json.dumps(data_dict['data'])}
 
     def view_template(self, context, data_dict):
         return 'recline_view.html'
@@ -61,11 +61,29 @@ class ReclineGraph(ReclineView):
     This extension views resources using a Recline graph.
     '''
 
+    graph_types = [{'value': 'lines-and-points',
+                    'text': 'Lines and points'},
+                   {'value': 'lines', 'text': 'Lines'},
+                   {'value': 'points', 'text': 'Points'},
+                   {'value': 'bars', 'text': 'Bars'},
+                   {'value': 'columns', 'text': 'Columns'}]
+
     def info(self):
+        # TODO: add validators
+        self.schema.update({
+            'graph_type': [ignore_empty],
+            'group_column': [ignore_empty],
+            'series_a': [ignore_empty]
+        })
         return {'name': 'recline_graph',
                 'title': 'Graph',
                 'schema': self.schema}
 
+    def setup_template_variables(self, context, data_dict):
+        vars = ReclineView.setup_template_variables(self, context, data_dict)
+        vars.update({'graph_types': self.graph_types})
+        return vars
+
     def form_template(self, context, data_dict):
         return 'recline_graph_form.html'
 

diff --git a/ckanext/reclinepreview/theme/templates/recline_graph_form.html b/ckanext/reclinepreview/theme/templates/recline_graph_form.html
@@ -2,3 +2,7 @@
 
 {{ form.input('offset', id='field-offset', label=_('Row offset'), placeholder=_('eg: 0'), value=data.offset, error=errors.offset, classes=['control-medium']) }}
 {{ form.input('limit', id='field-limit', label=_('Number of rows'), placeholder=_('eg: 100'), value=data.limit, error=errors.limit, classes=['control-medium']) }}
+
+{{ form.select('graph_type', label=_('Graph type'), options=graph_types, selected=data.graph_type, error=errors.graph_type) }}
+{{ form.select('group_column', label=_('Group column (Axis 1)'), options=columns, selected=data.group_column, error=errors.graph_column) }}
+{{ form.select('series_a', label=_('Series A (Axis 2)'), options=columns, selected=data.series_a, error=errors.series_a) }}