Selaa lähdekoodia

Add string delimiters for averages.

Before, if the average was equal to 0, it was displayed on the graph but the label was not displayed.
Now, the label is displayed.

Conflicts:
	app/views/stats/index.phtml
Alexis Degrugillier 11 vuotta sitten
vanhempi
commit
0965aecefe
2 muutettua tiedostoa jossa 11 lisäystä ja 4 poistoa
  1. 8 1
      app/views/stats/index.phtml
  2. 3 3
      app/views/stats/repartition.phtml

+ 8 - 1
app/views/stats/index.phtml

@@ -92,7 +92,14 @@ function initStats() {
 	}
 	// Entry per day
 	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[<?php echo $this->count ?>],
+		[{
+			data: <?php echo $this->count ?>,
+			bars: {horizontal: false, show: true}
+		},{
+			data: avg,
+			lines: {show: true},
+			label: "<?php echo $this->average?>"
+		}],
 		{
 			grid: {verticalLines: false},
 			bars: {horizontal: false, show: true},

+ 3 - 3
app/views/stats/repartition.phtml

@@ -67,7 +67,7 @@ function initStats() {
 		}, {
 			data: avg_h,
 			lines: {show: true},
-			label: <?php echo $this->averageHour?>,
+			label: "<?php echo $this->averageHour?>",
 			yaxis: 2
 		}],
 		{
@@ -96,7 +96,7 @@ function initStats() {
 		}, {
 			data: avg_dow,
 			lines: {show: true},
-			label: <?php echo $this->averageDayOfWeek?>,
+			label: "<?php echo $this->averageDayOfWeek?>",
 			yaxis: 2
 		}],
 		{
@@ -126,7 +126,7 @@ function initStats() {
 		}, {
 			data: avg_m,
 			lines: {show: true},
-			label: <?php echo $this->averageMonth?>,
+			label: "<?php echo $this->averageMonth?>",
 			yaxis: 2
 		}],
 		{