Set group as default when number of rows is above 1000. Hide labels if series is abouve 10 on piecharts

topicus · topicus · commit 472c3c4ca73e · 2015-03-25T17:55:40.000-03:00
diff --git a/bower.json b/bower.json
@@ -30,6 +30,7 @@
     "lodash": "*",
     "recline.backend.gdocs": "https://github.com/okfn/recline.backend.gdocs.git#e81bb237759353932834a38a0ec810441e0ada10",
     "csv.js": "https://github.com/okfn/csv.js.git#976b61384a1808eb464aca5876e5ea46c98deaee",
-    "recline.view.nvd3.js": "https://github.com/NuCivic/recline.view.nvd3.js.git#removing_steps"
+    "recline.view.nvd3.js": "https://github.com/NuCivic/recline.view.nvd3.js.git#removing_steps",
+    "recline":"git@github.com:okfn/recline.git#2b7095794e6273b45b7761534d74b59e839d3c1f"
   }
 }
diff --git a/examples/index.html b/examples/index.html
@@ -35,7 +35,7 @@
   <script src="../vendor/slickgrid/plugins/slick.rowselectionmodel.js"></script>
   <script src="../vendor/slickgrid/plugins/slick.rowmovemanager.js"></script>
   <script src="../vendor/moment/moment.js"></script>
-  <script src="http://okfnlabs.org/recline/dist/recline.js"></script>
+  <script src="../vendor/recline/dist/recline.min.js"></script>
   <script src="../vendor/d3/d3.js"></script>
   <script src="../vendor/nvd3/build/nv.d3.js"></script>
 </head>
@@ -49,11 +49,10 @@
       </div>
     </div>
   </div>
-
+  <footer> <!-- Disclamer here --></footer>
   <script type="text/javascript" src="../vendor/recline.view.nvd3.js/dist/recline.view.nvd3.min.js"></script>
+  <script type="text/javascript" src="../vendor/recline.view.nvd3.js/dist/recline.view.nvd3.controls.min.js"></script>
   <script type="text/javascript" src="../src/recline.URLState.js"></script>
-  <script type="text/javascript" src="../src/recline.view.nvd3.baseControl.js"></script>
-  <script type="text/javascript" src="../src/controls.js"></script>
   <script type="text/javascript" src="../src/recline.view.nvd3.embedControl.js"></script>
   <script type="text/javascript" src="../src/MultiStageView.js"></script>
   <script type="text/javascript" src="../src/LoadDataView.js"></script>
diff --git a/examples/view.html b/examples/view.html
@@ -44,6 +44,7 @@
 <body>
   <div id="chart"></div>
   <script type="text/javascript" src="../vendor/recline.view.nvd3.js/dist/recline.view.nvd3.min.js"></script>
+  <script type="text/javascript" src="../vendor/recline.view.nvd3.js/dist/recline.view.nvd3.controls.min.js"></script>
   <script type="text/javascript" src="../src/recline.URLState.js"></script>
 </body>
 
diff --git a/examples/view.js b/examples/view.js
@@ -13,8 +13,9 @@
     state.set('height', window.innerHeight - 20);
 
     var model = new recline.Model.Dataset(state.get('model'));
+    model.queryState.attributes.size = 10000000;
     model.fetch().done(function(){
-      var chart = new recline.View.nvd3[state.get('graphType')]({
+      window.chart = new recline.View.nvd3[state.get('graphType')]({
           model: model,
           state: state,
           el: $('#chart'),
diff --git a/src/ChartOptionsView.js b/src/ChartOptionsView.js
@@ -57,6 +57,7 @@
       var self = this;
       var graphType = self.state.get('graphType');
 
+      self.state.set('group', true, {silent:true});
       self.$el.html(Mustache.render(self.template, self.state.toJSON()));
 
       // Common controls for all the charts.
diff --git a/src/LoadDataView.js b/src/LoadDataView.js
@@ -40,7 +40,7 @@
       };
       state.set('model', new recline.Model.Dataset(source));
       state.set('source', source);
-      state.get('model').queryState.attributes.size = 10000;
+      state.get('model').queryState.attributes.size = 10000000;
       state.get('model').fetch().done(function(data){
         cb(state);
       });
diff --git a/src/controls.js b/src/controls.js

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`"lodash": "*",`
`31`	`31`	`"recline.backend.gdocs": "https://github.com/okfn/recline.backend.gdocs.git#e81bb237759353932834a38a0ec810441e0ada10",`
`32`	`32`	`"csv.js": "https://github.com/okfn/csv.js.git#976b61384a1808eb464aca5876e5ea46c98deaee",`
`33`		`- "recline.view.nvd3.js": "https://github.com/NuCivic/recline.view.nvd3.js.git#removing_steps"`
	`33`	`+ "recline.view.nvd3.js": "https://github.com/NuCivic/recline.view.nvd3.js.git#removing_steps",`
	`34`	`+ "recline":"[email protected]:okfn/recline.git#2b7095794e6273b45b7761534d74b59e839d3c1f"`
`34`	`35`	`}`
`35`	`36`	`}`