Change statistic average

I was using the stats and it feels that the stat average was useless in that form since the line is always at the same position no matter what is the value.
So I deleted that line and added the average in the title. It is way more useful this way.

I updated some translations both on i18n files and on http://i18n.freshrss.org

4 files changed, 10 insertions, 40 deletions

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 99d4e2148..283d5dcb1 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -237,7 +237,7 @@ SQL;
 			$interval_in_days = $period;
 		}
 
-		return round($res['count'] / ($interval_in_days / $period), 2);
+		return $res['count'] / ($interval_in_days / $period);
 	}
 
 	/**
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 9e968998a..ebc25ba0c 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -398,9 +398,9 @@
   'stats_entry_count' => 'Entry count',
   'stats_entry_per_category' => 'Entries per category',
   'stats_entry_per_day' => 'Entries per day (last 30 days)',
-  'stats_entry_per_day_of_week' => 'Per day of week',
-  'stats_entry_per_hour' => 'Per hour',
-  'stats_entry_per_month' => 'Per month',
+  'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+  'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
+  'stats_entry_per_month' => 'Per month (average: %.2f messages)',
   'stats_entry_repartition' => 'Entries repartition',
   'stats_feed_per_category' => 'Feeds per category',
   'stats_idle' => 'Idle feeds',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 072094026..220f8b12d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -398,9 +398,9 @@
   'stats_entry_count' => 'Nombre d’articles',
   'stats_entry_per_category' => 'Articles par catégorie',
   'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
-  'stats_entry_per_day_of_week' => 'Par jour de la semaine',
-  'stats_entry_per_hour' => 'Par heure',
-  'stats_entry_per_month' => 'Par mois',
+  'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+  'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+  'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
   'stats_entry_repartition' => 'Répartition des articles',
   'stats_feed_per_category' => 'Flux par catégorie',
   'stats_idle' => 'Flux inactifs',
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index a181ae251..670714707 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -30,17 +30,17 @@
 	<?php }?>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_hour'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_hour', $this->averageHour); ?></h2>
 		<div id="statsEntryPerHour" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_per_day_of_week'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
 		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_month'); ?></h2>
+		<h2><?php echo _t('stats_entry_per_month', $this->averageMonth); ?></h2>
 		<div id="statsEntryPerMonth" style="height: 300px"></div>
 	</div>
 </div>
@@ -56,19 +56,10 @@ function initStats() {
 		return;
 	}
 	// Entry per hour
-	var avg_h = [];
-	for (var i = -1; i <= 24; i++) {
-		avg_h.push([i, <?php echo $this->averageHour?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerHour'),
 		[{
 			data: <?php echo $this->repartitionHour ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_h,
-			lines: {show: true},
-			label: "<?php echo $this->averageHour?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -81,23 +72,13 @@ function initStats() {
 				max: 23.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});
 	// Entry per day of week
-	var avg_dow = [];
-	for (var i = -1; i <= 7; i++) {
-		avg_dow.push([i, <?php echo $this->averageDayOfWeek?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
 		[{
 			data: <?php echo $this->repartitionDayOfWeek ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_dow,
-			lines: {show: true},
-			label: "<?php echo $this->averageDayOfWeek?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -111,23 +92,13 @@ function initStats() {
 				max: 6.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});
 	// Entry per month
-	var avg_m = [];
-	for (var i = 0; i <= 13; i++) {
-		avg_m.push([i, <?php echo $this->averageMonth?>]);
-	}
 	Flotr.draw(document.getElementById('statsEntryPerMonth'),
 		[{
 			data: <?php echo $this->repartitionMonth ?>,
 			bars: {horizontal: false, show: true}
-		}, {
-			data: avg_m,
-			lines: {show: true},
-			label: "<?php echo $this->averageMonth?>",
-			yaxis: 2
 		}],
 		{
 			grid: {verticalLines: false},
@@ -141,7 +112,6 @@ function initStats() {
 				max: 12.9,
 				tickDecimals: 0},
 			yaxis: {min: 0},
-			y2axis: {showLabels: false},
 			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
 		});