mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-07 22:54:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change statistic average

Browse Source 
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
This commit is contained in:
Alexis Degrugillier
2014-10-09 21:44:44 -04:00
parent 99cdd2a0ad
commit eb40dbccdb
4 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/StatsDAO.php
View File

@@ -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);
}
/**

6
app/i18n/en.php
View File

@@ -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',

6
app/i18n/fr.php
View File

@@ -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',

36
app/views/stats/repartition.phtml
View File

@@ -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);}}
});