mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-29 19:51:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add an average per day for the 30 day period

Browse Source
This commit is contained in:
Alexis Degrugillier
2014-09-29 18:54:03 -04:00
parent 3d288eb170
commit cd88414abc
4 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/statsController.php
View File

@@ -21,6 +21,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
Minz_View::appendScript(Minz_Url::display('/scripts/flotr2.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/flotr2.min.js')));
$this->view->repartition = $statsDAO->calculateEntryRepartition();
$this->view->count = $statsDAO->calculateEntryCount();
$this->view->average = $statsDAO->calculateEntryAverage();
$this->view->feedByCategory = $statsDAO->calculateFeedByCategory();
$this->view->entryByCategory = $statsDAO->calculateEntryByCategory();
$this->view->topFeed = $statsDAO->calculateTopFeed();

27
app/Models/StatsDAO.php
View File

@@ -79,6 +79,27 @@ SQL;
return $this->convertToSerie($count);
}
/**
* Calculates entry average per day on a 30 days period.
*
* @return integer
*/
public function calculateEntryAverage() {
$period = self::ENTRY_COUNT_PERIOD;
// Get stats per day for the last 30 days
$sql = <<<SQL
SELECT COUNT(1) / {$period} AS average
FROM {$this->prefix}entry AS e
WHERE FROM_UNIXTIME(e.date, '%Y%m%d') BETWEEN DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -{$period} DAY), '%Y%m%d') AND DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d')
SQL;
$stm = $this->bd->prepare($sql);
$stm->execute();
$res = $stm->fetch(PDO::FETCH_NAMED);
return round($res['average'], 2);
}
/**
* Initialize an array for the entry count.
*
@@ -160,7 +181,7 @@ SQL;
public function calculateEntryAveragePerFeedPerHour($feed = null) {
return $this->calculateEntryAveragePerFeedPerPeriod(1/24, $feed);
}
/**
* Calculates the average number of article per day of week per feed
*
@@ -180,10 +201,10 @@ SQL;
public function calculateEntryAveragePerFeedPerMonth($feed = null) {
return $this->calculateEntryAveragePerFeedPerPeriod(30, $feed);
}
/**
* Calculates the average number of article per feed
*
*
* @param float $period number used to divide the number of day in the period
* @param integer $feed id
* @return integer

23
app/Models/StatsDAOSQLite.php
View File

@@ -34,6 +34,29 @@ SQL;
return $this->convertToSerie($count);
}
/**
* Calculates entry average per day on a 30 days period.
*
* @return integer
*/
public function calculateEntryAverage() {
$period = self::ENTRY_COUNT_PERIOD;
// Get stats per day for the last 30 days
$sql = <<<SQL
SELECT COUNT(1) / {$period} AS average
FROM {$this->prefix}entry AS e
WHERE strftime('%Y%m%d', e.date, 'unixepoch')
BETWEEN strftime('%Y%m%d', 'now', '-{$period} days')
AND strftime('%Y%m%d', 'now', '-1 day')
SQL;
$stm = $this->bd->prepare($sql);
$stm->execute();
$res = $stm->fetch(PDO::FETCH_NAMED);
return round($res['average'], 2);
}
protected function calculateEntryRepartitionPerFeedPerPeriod($period, $feed = null) {
if ($feed) {
$restrict = "WHERE e.id_feed = {$feed}";

16
app/views/stats/index.phtml
View File

@@ -93,12 +93,22 @@ function initStats() {
return;
}
// Entry per day
var avg = [];
for (var i = -31; i <= 0; i++) {
avg.push([i, <?php echo $this->average?>]);
}
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},
xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0},
xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0, min: -30.75, max: -0.25},
yaxis: {min: 0},
mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
});