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

Fix tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-11-17 18:59:45 +01:00
parent eeb79cda99
commit 52b9850add
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/classes/module/report/activity.php
View File

@@ -153,8 +153,8 @@ class module_report_activity extends module_report
$this->report['value'] = array(); $this->report['value'] = array();
$this->report['value2'] = array(); $this->report['value2'] = array();
$sqlBuilder = new module_report_sql($this->app, $this);
$this->setDateField('log_search.date'); $this->setDateField('log_search.date');
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter(); $filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']); $params = array_merge(array(), $filter['params']);
@@ -466,8 +466,8 @@ class module_report_activity extends module_report
//set title //set title
$this->title = _('report:: Detail des telechargements'); $this->title = _('report:: Detail des telechargements');
$sqlBuilder = new module_report_sql($this->app, $this);
$this->setDateField('log_search.date'); $this->setDateField('log_search.date');
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter(); $filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']); $params = array_merge(array(), $filter['params']);
@@ -978,10 +978,10 @@ class module_report_activity extends module_report
*/ */
$sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n" $sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n"
. " FROM (\n" . " FROM (\n"
. " SELECT DISTINCT(log.id), DATE_FORMAT(log_date.date, '%Y-%m-%d') AS ddate\n" . " SELECT DISTINCT(log.id), DATE_FORMAT(log_docs.date, '%Y-%m-%d') AS ddate\n"
. " FROM (log_docs AS log_date)\n" . " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id)\n" . " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'" . " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'add'"
. " ) AS tt\n" . " ) AS tt\n"
. " GROUP BY tt.ddate\n" . " GROUP BY tt.ddate\n"
. " ORDER BY activity ASC "; . " ORDER BY activity ASC ";
@@ -1025,10 +1025,10 @@ class module_report_activity extends module_report
*/ */
$sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n" $sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n"
. " FROM (\n" . " FROM (\n"
. " SELECT DISTINCT(log.id), DATE_FORMAT( log_date.date, '%Y-%m-%d') AS ddate\n" . " SELECT DISTINCT(log.id), DATE_FORMAT( log_docs.date, '%Y-%m-%d') AS ddate\n"
. " FROM (log_docs AS log_date)\n" . " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id)\n" . " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_date.action = 'edit'" . " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'edit'"
. ") AS tt\n" . ") AS tt\n"
. " GROUP BY tt.ddate\n" . " GROUP BY tt.ddate\n"
. " ORDER BY activity ASC "; . " ORDER BY activity ASC ";
@@ -1075,9 +1075,9 @@ class module_report_activity extends module_report
. " SELECT tt.usrid, tt.user, sum( 1 ) AS nb\n" . " SELECT tt.usrid, tt.user, sum( 1 ) AS nb\n"
. " FROM (\n" . " FROM (\n"
. " SELECT DISTINCT(log.id), log.usrid, log.user\n" . " SELECT DISTINCT(log.id), log.usrid, log.user\n"
. " FROM (log_docs AS log_date)\n" . " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id)\n" . " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'" . " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'add'"
. ") AS tt\n" . ") AS tt\n"
. " GROUP BY tt.usrid\n" . " GROUP BY tt.usrid\n"
. " ORDER BY nb ASC "; . " ORDER BY nb ASC ";