Browse Source

fix x axis labels

raylu 11 years ago
parent
commit
8a80a893d5
2 changed files with 11 additions and 4 deletions
  1. 8 0
      web/static/css/stats.ccss
  2. 3 4
      web/static/js/stats.js

+ 8 - 0
web/static/css/stats.ccss

@@ -1,6 +1,14 @@
 .graph_container:
 	display: inline-block
+	margin: 10px
+	padding-bottom: 15px // for x_tick
 
 	.rickshaw_graph, .rickshaw_legend:
 		display: inline-block
 		vertical-align: middle
+
+	.rickshaw_legend:
+		width: 128px
+
+	.rickshaw_graph .x_tick .title:
+		bottom: -15px

+ 3 - 4
web/static/js/stats.js

@@ -103,15 +103,15 @@ window.addEvent('domready', function() {
 			var color = subfield_meta[1];
 			var days = Object.keys(subfields[subfield]).sort();
 			var array = [];
-			var index_start = 0;
+			var index_start = moment.utc(days[0], 'YYYY-MM-DD').unix();
 			days.each(function(day) {
 				var day_array = subfields[subfield][day];
 				if (day_array != null) {
 					array = array.append(day_array.map(function(val, i) {
-						return {'x': index_start + i * interval, 'y': val};
+						return {'x': index_start + i * interval * 60, 'y': val};
 					}));
 				}
-				index_start += 1440;
+				index_start += 1440 * 60;
 			});
 			series.push({
 				'name': field + '.' + subfield,
@@ -140,7 +140,6 @@ window.addEvent('domready', function() {
 		});
 		new Rickshaw.Graph.Axis.Time({
 			'graph': graph,
-			//'timeUnit': new Rickshaw.Fixtures.Time().unit('minute'),
 		});
 		new Rickshaw.Graph.Axis.Y.Base1024KMGTP({
 			'graph': graph,