diff --git a/sloth/app/templates/app/charts.html b/sloth/app/templates/app/charts.html index 676e526..8597c04 100644 --- a/sloth/app/templates/app/charts.html +++ b/sloth/app/templates/app/charts.html @@ -1,311 +1,432 @@ + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
- - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
- - diff --git a/sloth/core/statistics.py b/sloth/core/statistics.py index bd84d79..3d100ee 100644 --- a/sloth/core/statistics.py +++ b/sloth/core/statistics.py @@ -253,22 +253,43 @@ def normalize(self, series): )) return data - def chart(self, name='bar'): - self.metadata['template'] = 'app/charts.html'.format(name) + def chart(self, name='line'): + self.metadata['template'] = 'app/charts.html' self.metadata['chart'] = name return self + def line_chart(self): + return self.chart('line') + + def stacked_line_chart(self): + return self.chart('stacked_line') + + def area_chart(self): + return self.chart('area') + + def stacked_area_chart(self): + return self.chart('stacked_area') + + def bar_chart(self): + return self.chart('vertical_bar') + + def stacked_bar_chart(self): + return self.chart('stacked_vertical_bar') + + def horizontal_bar_chart(self): + return self.chart('horizontal_bar') + + def stacked_horizontal_bar_chart(self): + return self.chart('stacked_horizontal_bar') + def pie_chart(self): return self.chart('pie') def donut_chart(self): return self.chart('donut') - def bar_chart(self): - return self.chart('bar') - - def column_chart(self): - return self.chart('column') + def radial_chart(self): + return self.chart('radial') def nex_color(self): color = colors()[self.cursor]