hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor reports into silex controllers

Browse Source 
Refactor reports into silex controllers
This commit is contained in:
Nicolas Le Goff
2013-02-13 19:03:16 +01:00
parent 0a24b6da40
commit b796e11b40
11 changed files with 2965 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/classes/module/report/nav.php
View File

@@ -415,13 +415,6 @@ class module_report_nav extends module_report
$filter_id_apbox = $filter_id_datbox = array();
$conn = $this->app['phraseanet.appbox']->get_connection();
$datefilter = array();
if ($this->dmin && $this->dmax) {
$params = array(':dmin' => $this->dmin, ':dmax' => $this->dmax);
$datefilter = "date > :dmin AND date < :dmax";
}
$this->title = sprintf(_('report:: Information sur les utilisateurs correspondant a %s'), $val);
if ($on) {
@@ -446,7 +439,7 @@ class module_report_nav extends module_report
usr_mail as mail,
adresse, tel
FROM usr
WHERE $on = :value AND (" . $filter_id_apbox . ")";
WHERE $on = :value " . (('' !== $filter_id_apbox) ? "AND (" . $filter_id_apbox . ")" : '');
} else {
$sql = '
SELECT
@@ -548,19 +541,19 @@ class module_report_nav extends module_report
_('report:: Information sur le navigateur %s'), $navigator);
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$params = array(':browser' => $navigator);
$report_filter = $filter->getReportFilter();
$params = array_merge($report_filter['params'], array(':browser' => $navigator));
$sql = "
SELECT DISTINCT(version), COUNT(version) as nb
SELECT DISTINCT(tt.version), COUNT(tt.version) as nb
FROM (
SELECT DISTINCT (log.id)
SELECT DISTINCT (log.id), version
FROM log FORCE INDEX (date_site, nav, version)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ". $report_filter['sql'] . "
WHERE nav = :browser
AND ". $report_filter['sql'] . "
) AS tt
GROUP BY tt.version
GROUP BY version
ORDER BY nb DESC";
$stmt = $conn->prepare($sql);