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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
This commit is contained in:
Nicolas Le Goff
2014-12-09 13:59:29 +01:00
parent 7d0a69c7b9 3aa8107fb0
commit 9f38823f27
55 changed files with 1106 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/classes/module/report.php
View File

@@ -233,7 +233,12 @@ class module_report
/**
*
*/
<<<<<<< HEAD
protected $cor_query = [];
=======
protected $dateField = 'log.date';
protected $cor_query = array();
>>>>>>> 3.8
protected $isInformative;
/**
@@ -579,6 +584,7 @@ class module_report
return new module_report_sqlconnexion($this->app, $this);
break;
case 'download' :
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
return new module_report_sqldownload($this->app, $this);
break;
case 'question' :
@@ -778,7 +784,6 @@ class module_report
*/
protected function setConfigColumn($tab)
{
foreach ($tab as $column => $row) {
foreach ($row as $ind => $value) {
$title_text = "";
@@ -805,6 +810,18 @@ class module_report
}
}
public function setDateField($dateField)
{
$this->dateField = $dateField;
return $this;
}
public function getDateField()
{
return $this->dateField;
}
/**
* Build the final formated array which contains all the result,
* we construct the html code from this array
@@ -817,40 +834,72 @@ class module_report
*/
public function buildReport($tab = false, $groupby = false, $on = false)
{
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
if (sizeof($this->report) > 0) {
return $this->report;
}
<<<<<<< HEAD
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
$conn = $databox->get_connection();
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$conn = connection::getPDOConnection($this->app, $this->sbas_id);
>>>>>>> 3.8
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$this->buildReq($groupby, $on);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\nreq=%s\n\n", __FILE__, __LINE__, $this->req), FILE_APPEND);
try {
try {
$stmt = $conn->prepare($this->req);
$stmt->execute($this->params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
<<<<<<< HEAD
} catch (DBALException $e) {
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\ncount==%s\n\n", __FILE__, __LINE__, count($rs)), FILE_APPEND);
} catch (PDOException $e) {
>>>>>>> 3.8
echo $e->getMessage();
return;
}
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s) %s\n\n", __FILE__, __LINE__, get_class($this)), FILE_APPEND);
//set request field
$this->setChamp($rs);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
//set display
$this->setDisplay($tab, $groupby);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
//construct results
$this->buildResult($this->app, $rs);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
//calculate prev and next page
<<<<<<< HEAD
$this->calculatePages();
=======
$this->calculatePages($rs);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
>>>>>>> 3.8
//do we display navigator ?
$this->setDisplayNav();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
//assign all variables
$this->setReport();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
return $this->report;
} catch (\Exception $e) {
echo $e->getMessage();

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

@@ -43,7 +43,8 @@ class module_report_activity extends module_report
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
{
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
}
/**
@@ -84,6 +85,7 @@ class module_report_activity extends module_report
return $hours;
}
// ==================== Site activity : Site activity =====================
/**
* @desc get the site activity per hours
* @return array
@@ -99,15 +101,12 @@ class module_report_activity extends module_report
$params = array_merge([], $filter['params']);
$sql = "
SELECT tt.heures, SUM(1) AS nb
FROM (
SELECT DISTINCT(log.id), DATE_FORMAT( log.date, '%k' ) AS heures
SELECT CAST(DATE_FORMAT(log.date, '%k') AS UNSIGNED) AS heures, COUNT(id) AS nb
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] . ")
) AS tt
GROUP BY tt.heures
ORDER BY tt.heures ASC";
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
GROUP BY heures;";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
@@ -142,6 +141,7 @@ class module_report_activity extends module_report
return $this->report;
}
<<<<<<< HEAD
/**
* Get all questions by user
*
@@ -195,7 +195,10 @@ class module_report_activity extends module_report
return $this->result;
}
=======
>>>>>>> 3.8
// ================== Site activity : Top questions (le second radio ...) ================
/**
* get the most asked question
* @param array $tab config for html table
@@ -206,6 +209,7 @@ class module_report_activity extends module_report
$this->report['value'] = [];
$this->report['value2'] = [];
$this->setDateField('log_search.date');
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge([], $filter['params']);
@@ -213,19 +217,18 @@ class module_report_activity extends module_report
($no_answer) ? $this->title = $this->app->trans('report:: questions sans reponses') : $this->title = $this->app->trans('report:: questions les plus posees');
$sql = "
SELECT TRIM(tt.search) AS search, SUM(1) AS nb, ROUND(avg(tt.results)) AS nb_rep
FROM (
SELECT DISTINCT(log.id), log_search.search AS search, results
SELECT TRIM(log_search.search) AS search, COUNT(log_search.id) AS nb, ROUND(avg(results)) AS nb_rep
FROM (log_search)
INNER JOIN log FORCE INDEX (date_site) ON (log_search.log_id = log.id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] . ")
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
AND log_search.search != 'all' " .
($no_answer ? ' AND log_search.results = 0 ' : '') . "
) AS tt
GROUP BY tt.search
($no_answer ? ' AND log_search.results = 0 ' : '') . "
GROUP BY search
ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$sql .= !$no_answer ? ' LIMIT ' . $this->nb_top : '';
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
@@ -260,12 +263,14 @@ class module_report_activity extends module_report
return $this->report;
}
// =========================== not called ? =====================
/**
* @desc get all downloads from one specific user
* @param $usr user id
* @param array $config config for the html table
* @return array
*/
/*
public function getAllDownloadByUserBase($usr, $config = false)
{
$result = [];
@@ -319,7 +324,9 @@ class module_report_activity extends module_report
return $this->result;
}
*/
// ============================ Downloads : Daily ==========================
/**
* @desc get all download by base by day
* @param array $tab config for html table
@@ -327,29 +334,35 @@ class module_report_activity extends module_report
*/
public function getDownloadByBaseByDay($tab = false)
{
<<<<<<< HEAD
$this->title = $this->app->trans('report:: telechargements par jour');
=======
$this->title = _('report:: telechargements par jour');
$this->setDateField('log_docs.date');
>>>>>>> 3.8
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge([], $filter['params']);
$sql = "
SELECT tt.record_id, DATE_FORMAT(tt.the_date, GET_FORMAT(DATE, 'INTERNAL')) AS ddate, tt.final, SUM(1) AS nb
SELECT tt.record_id, tt.the_date AS ddate, tt.final, SUM(1) AS nb
FROM (
SELECT DISTINCT(log.id), log_docs.date AS the_date, log_docs.final, log_docs.record_id
FROM (log_docs)
INNER JOIN record ON (record.record_id = log_docs.record_id)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] . ")
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
AND (log_docs.action = 'download' OR log_docs.action = 'mail')
AND (log_docs.final = 'preview' OR log_docs.final = 'document')
) AS tt
LEFT JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN subdef AS s ON (s.record_id = tt.record_id)
WHERE s.name = tt.final
GROUP BY tt.final, ddate
ORDER BY tt.the_date DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -397,13 +410,28 @@ class module_report_activity extends module_report
$this->result[$nb_row]['preview'] = '<b>' . $total['tot_prev'] . '</b>';
$this->result[$nb_row]['total'] = '<b>' . $total['tot_dl'] . '</b>';
}
<<<<<<< HEAD
$this->calculatePages();
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, var_export($this->result, true)), FILE_APPEND);
foreach($this->result as $k=>$row) {
$_row = array();
foreach((array) $tab as $k2=>$f) {
$_row[$k2] = array_key_exists($k2, $row) ? $row[$k2] : '';
}
$this->result[$k] = $_row;
}
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, var_export($this->result, true)), FILE_APPEND);
$this->calculatePages($rs);
>>>>>>> 3.8
$this->setDisplayNav();
$this->setReport();
return $this->report;
}
// ==================== Connections: Per users =====================
/**
* @desc get nb connexion by user , fonction ,societe etc..
* @param array $tab config for html table
@@ -422,25 +450,21 @@ class module_report_activity extends module_report
$params = array_merge([], $filter['params']);
$this->req = "
SELECT SUM(1) AS connexion, tt.user, tt.usrid FROM (
SELECT
DISTINCT(log.id),
log." . $on . " AS " . $on . ",
log.usrid
SELECT COUNT(id) AS connexion, log.user, log.usrid
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE log.user != 'API'
AND (" . $filter['sql'] . ")
) AS tt
GROUP BY tt.usrid
AND (" . $filter['sql'] . ") AND !ISNULL(usrid)
GROUP BY usrid
ORDER BY connexion DESC ";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->req), FILE_APPEND);
$stmt = $sqlBuilder->getConnBas()->prepare($this->req);
$stmt->execute($params);
$sqlBuilder->setTotalrows($stmt->rowCount());
$stmt->closeCursor();
$this->enable_limit ? $this->req .= "LIMIT 0," . $this->nb_record : "";
$this->enable_limit ? $this->req .= " LIMIT 0," . $this->nb_record : "";
$stmt = $sqlBuilder->getConnBas()->prepare($this->req);
$stmt->execute($params);
@@ -490,8 +514,9 @@ class module_report_activity extends module_report
return $this->report;
}
// ========================= Downloads : Per users =====================
/**
* Get the deail of download by users
* Get the detail of download by users
*
* @param array $tab config for the html table
* @param String $on
@@ -505,6 +530,7 @@ class module_report_activity extends module_report
//set title
$this->title = $this->app->trans('report:: Detail des telechargements');
$this->setDateField('log_docs.date');
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge([], $filter['params']);
@@ -515,16 +541,17 @@ class module_report_activity extends module_report
SELECT DISTINCT(log.id), TRIM(" . $on . ") AS " . $on . ", log_docs.record_id, log_docs.final, log.usrid
FROM log_docs
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = log_docs.record_id)
WHERE (" . $filter['sql'] . ")
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
AND (log_docs.action = 'download' OR log_docs.action = 'mail')
) AS tt
LEFT JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN subdef FORCE INDEX (unicite) ON (tt.record_id = subdef.record_id)
WHERE subdef.name = tt.final
GROUP BY " . $on . ", usrid
ORDER BY nb DESC;";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -607,6 +634,18 @@ class module_report_activity extends module_report
$this->result[$nb_row]['poidprev'] =
'<b>' . p4string::format_octets($total['poidprev']) . '</b>';
}
foreach($this->result as $k=>$row) {
$_row = array();
foreach((array) $tab as $k2=>$f) {
$_row[$k2] = array_key_exists($k2, $row) ? $row[$k2] : '';
}
$_row['usrid'] = array_key_exists('usrid', $row) ? $row['usrid'] : '';
$this->result[$k] = $_row;
}
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s) %s\n\n", __FILE__, __LINE__, var_export($this->result, true)), FILE_APPEND);
$this->total = sizeof($this->result);
$this->calculatePages();
$this->setDisplayNav();
@@ -615,6 +654,7 @@ class module_report_activity extends module_report
return $this->report;
}
// ========================== ???????????????? ===========================
public static function topTenUser(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
@@ -627,12 +667,9 @@ class module_report_activity extends module_report
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
$params = array_merge($params, $datefilter['params']);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge($params, $collfilter['params']);
/*
$sql = "SELECT tt.usrid, tt.user, tt.final, tt.record_id, SUM(1) AS nb, SUM(size) AS poid
FROM (
SELECT DISTINCT(log.id), log.usrid, user, final, log_date.record_id
@@ -642,12 +679,27 @@ class module_report_activity extends module_report
WHERE log.site = :site_id
AND log_date.action = 'download'
AND (" . $datefilter['sql'] . ")" .
(('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '')
. "
(('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '')
. "
) AS tt
LEFT JOIN subdef AS s ON (s.record_id = tt.record_id)
WHERE s.name = tt.final
GROUP BY tt.user, tt.final";
*/
$sql = "SELECT tt.usrid, tt.user, tt.final, tt.record_id, SUM(1) AS nb, SUM(size) AS poid\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id), log.usrid, user, final, log_docs.record_id\n"
. " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_docs.log_id)\n"
. " WHERE log.site = :site_id\n"
. " AND log_docs.action = 'download'\n"
. " AND (" . $datefilter['sql'] . ")\n"
. ") AS tt\n"
. "LEFT JOIN subdef AS s ON (s.record_id = tt.record_id)\n"
. "WHERE s.name = tt.final\n"
. "GROUP BY tt.user, tt.final";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -697,8 +749,10 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activity(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$res = [];
@@ -710,6 +764,15 @@ class module_report_activity extends module_report
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$res = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.id, HOUR(tt.heures) AS heures
FROM (
@@ -717,9 +780,19 @@ class module_report_activity extends module_report
FROM log AS log_date FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "" .
(('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '')
. " AND log_date.site = :site_id
(('' !== $collfilter['sql']) ? "AND (" . $collfilter['sql'] . ")" : '')
. " AND log_date.site = :site_id
) AS tt";
*/
$sql = "SELECT tt.id, HOUR(tt.heures) AS heures\n"
. " FROM (\n"
. " SELECT DISTINCT(log_date.id), log_date.date AS heures\n"
. " FROM log AS log_date FORCE INDEX (date_site)\n"
. " WHERE " . $datefilter['sql'] . " AND !ISNULL(usrid)"
. " AND log_date.site = :site_id\n"
. " ) AS tt";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -744,6 +817,7 @@ class module_report_activity extends module_report
return $res;
}
//============================= Dashboard =========================
public static function activityDay(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
@@ -751,11 +825,16 @@ class module_report_activity extends module_report
$result = array();
$res = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
<<<<<<< HEAD
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
FROM (
@@ -763,10 +842,22 @@ class module_report_activity extends module_report
FROM log AS log_date FORCE INDEX (date_site) INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id" .
(('' !== $collfilter['sql']) ? (" AND (" . $collfilter['sql'] . ")") : '')
(('' !== $collfilter['sql']) ? (" AND (" . $collfilter['sql'] . ")") : '')
. ") AS tt
GROUP by tt.ddate
ORDER BY tt.ddate ASC";
*/
$sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n"
. " FROM (\n"
. " SELECT DISTINCT(log_date.id), DATE_FORMAT( log_date.date, '%Y-%m-%d' ) AS ddate\n"
. " FROM log AS log_date FORCE INDEX (date_site)\n"
. " WHERE " . $datefilter['sql'] . "\n"
. " AND log_date.site = :site_id AND !ISNULL(usrid)"
. ") AS tt\n"
. " GROUP by tt.ddate\n"
. " ORDER BY tt.ddate ASC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -785,8 +876,10 @@ class module_report_activity extends module_report
return $res;
}
//============================= Dashboard =========================
public static function activityQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
@@ -798,6 +891,15 @@ class module_report_activity extends module_report
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$result = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_search.date');
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.usrid, tt.user, sum(1) AS nb
FROM (
@@ -807,10 +909,23 @@ class module_report_activity extends module_report
INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id" .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. ") AS tt
GROUP BY tt.usrid
ORDER BY nb DESC";
*/
$sql = "SELECT tt.usrid, tt.user, sum(1) AS nb\n"
. " FROM (\n"
. " SELECT DISTINCT(log_date.id), log_date.usrid, log_date.user\n"
. " FROM (`log_search`)\n"
. " INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_search.log_id = log_date.id)\n"
. " WHERE " . $datefilter['sql'] . "\n"
. " AND log_date.site = :site_id"
. ") AS tt\n"
. " GROUP BY tt.usrid\n"
. " ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -826,8 +941,10 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activiteTopQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
@@ -839,6 +956,15 @@ class module_report_activity extends module_report
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$result = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_search.date');
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT TRIM(tt.search) AS question, tt.usrid, tt.user, SUM(1) AS nb
FROM (
@@ -848,10 +974,23 @@ class module_report_activity extends module_report
INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id" .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. ") AS tt
GROUP BY tt.search
ORDER BY nb DESC";
*/
$sql = "SELECT TRIM(tt.search) AS question, tt.usrid, tt.user, SUM(1) AS nb\n"
. " FROM (\n"
. " SELECT DISTINCT(log_date.id), log_search.search, log_date.usrid, log_date.user\n"
. " FROM (`log_search`)\n"
. " INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_search.log_id = log_date.id)\n"
. " WHERE " . $datefilter['sql'] . "\n"
. " AND log_date.site = :site_id"
. ") AS tt\n"
. " GROUP BY tt.search\n"
. " ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -870,17 +1009,23 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activiteTopTenSiteView(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
<<<<<<< HEAD
$params = [];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$params = array();
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.referrer, SUM(1) AS nb_view
FROM (
@@ -889,10 +1034,22 @@ class module_report_activity extends module_report
INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_view.log_id = log_date.id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "" .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. ") AS tt
GROUP BY referrer
ORDER BY nb_view DESC ";
*/
$sql = "SELECT tt.referrer, SUM(1) AS nb_view\n"
. " FROM (\n"
. " SELECT DISTINCT(log_date.id), referrer\n"
. " FROM (log_view)\n"
. " INNER JOIN log AS log_date FORCE INDEX (date_site) ON (log_view.log_id = log_date.id)\n"
. " WHERE " . $datefilter['sql']
. ") AS tt\n"
. " GROUP BY referrer\n"
. " ORDER BY nb_view DESC ";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -914,8 +1071,10 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activiteAddedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
@@ -925,6 +1084,15 @@ class module_report_activity extends module_report
$params = [];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$result = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax,'log_docs.date');
$params = array();
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
FROM (
@@ -934,10 +1102,22 @@ class module_report_activity extends module_report
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'add' " .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. "
. "
) AS tt
GROUP BY tt.ddate
ORDER BY activity ASC ";
*/
$sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id), DATE_FORMAT(log_docs.date, '%Y-%m-%d') AS ddate\n"
. " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'add'"
. " ) AS tt\n"
. " GROUP BY tt.ddate\n"
. " ORDER BY activity ASC ";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -951,8 +1131,10 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activiteEditedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
@@ -962,6 +1144,15 @@ class module_report_activity extends module_report
$params = [];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$result = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
$params = array();
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
FROM (
@@ -970,10 +1161,22 @@ class module_report_activity extends module_report
INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'edit'" .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. ") AS tt
GROUP BY tt.ddate
ORDER BY activity ASC ";
*/
$sql = "SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id), DATE_FORMAT( log_docs.date, '%Y-%m-%d') AS ddate\n"
. " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'edit'"
. ") AS tt\n"
. " GROUP BY tt.ddate\n"
. " ORDER BY activity ASC ";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
@@ -988,8 +1191,10 @@ class module_report_activity extends module_report
return $result;
}
//============================= Dashboard =========================
public static function activiteAddedTopTenUser(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
{
<<<<<<< HEAD
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
$result = [];
@@ -999,6 +1204,15 @@ class module_report_activity extends module_report
$params = [];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$conn = connection::getPDOConnection($app, $sbas_id);
$result = array();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
$params = array();
$params = array_merge($params, $datefilter['params']);
/*
>>>>>>> 3.8
$sql = "
SELECT tt.usrid, tt.user, sum( 1 ) AS nb
FROM (
@@ -1007,10 +1221,23 @@ class module_report_activity extends module_report
INNER JOIN log FORCE INDEX (date_site) ON (log_date.log_id = log.id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'" .
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
(('' !== $collfilter['sql']) ? " AND (" . $collfilter['sql'] . ")" : '')
. ") AS tt
GROUP BY tt.usrid
ORDER BY nb ASC ";
*/
$sql = ""
. " SELECT tt.usrid, tt.user, sum( 1 ) AS nb\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id), log.usrid, log.user\n"
. " FROM (log_docs)\n"
. " INNER JOIN log FORCE INDEX (date_site) ON (log_docs.log_id = log.id)\n"
. " WHERE " . $datefilter['sql'] . " AND log_docs.action = 'add'"
. ") AS tt\n"
. " GROUP BY tt.usrid\n"
. " ORDER BY nb ASC ";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);

23
lib/classes/module/report/connexion.php
View File

@@ -38,8 +38,14 @@ class module_report_connexion extends module_report
*/
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
{
<<<<<<< HEAD
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
$this->title = $this->app->trans('report::Connexions');
=======
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
$this->title = _('report::Connexions');
>>>>>>> 3.8
}
/**
@@ -139,23 +145,34 @@ class module_report_connexion extends module_report
$conn = $databox->get_connection();
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
<<<<<<< HEAD
$params = array_merge([
':site_id' => $app['conf']->get(['main', 'key'])
],
$datefilter['params'],
$collfilter['params']
=======
$params = array_merge(array(
':site_id' => $app['phraseanet.configuration']['main']['key']
),
$datefilter['params']
>>>>>>> 3.8
);
$finalfilter = $datefilter['sql'] . ' AND ';
$finalfilter .= $collfilter['sql'] . ' AND ';
$finalfilter .= 'log_date.site = :site_id';
/*
$sql = "SELECT COUNT(DISTINCT(log_date.id)) as nb
FROM log as log_date FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log_date.id = log_colls.log_id)
WHERE " . $finalfilter;
*/
$sql = "SELECT COUNT(DISTINCT(log_date.id)) as nb\n"
. " FROM log as log_date FORCE INDEX (date_site)\n"
. " WHERE " . $finalfilter . "\n";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);

2
lib/classes/module/report/dashboard/feed.php
View File

@@ -80,7 +80,6 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
} catch (\Exception $e) {
}
$tmp = new self($app, $sbasid, $sbas_coll, $dmin, $dmax);
$app['phraseanet.appbox']->set_data_to_cache($tmp, $cache_id);
@@ -138,6 +137,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$this->report['nb_dl'] = module_report_download::getNbDl(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection
);
//Get Number of connexions
$this->report['nb_conn'] = module_report_connexion::getNbConn(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection

78
lib/classes/module/report/download.php
View File

@@ -21,7 +21,6 @@ class module_report_download extends module_report
'activite' => 'log.activite',
'fonction' => 'log.fonction',
'usrid' => 'log.usrid',
'coll_id' => 'log_colls.coll_id',
'ddate' => "log_docs.date",
'id' => 'log_docs.id',
'log_id' => 'log_docs.log_id',
@@ -44,8 +43,14 @@ class module_report_download extends module_report
*/
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
{
<<<<<<< HEAD
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
$this->title = $this->app->trans('report:: telechargements');
=======
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
$this->title = _('report:: telechargements');
>>>>>>> 3.8
}
/**
@@ -55,9 +60,12 @@ class module_report_download extends module_report
*/
protected function buildReq($groupby = false, $on = false)
{
$this->setDateField('log_docs.date');
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$sql = $this->sqlBuilder('download')
->setOn($on)->setGroupBy($groupby)->buildSql();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$this->req = $sql->getSql();
$this->params = $sql->getParams();
$this->total = $sql->getTotalRows();
@@ -102,6 +110,7 @@ class module_report_download extends module_report
{
$i = 0;
$pref = parent::getPreff($app, $this->sbas_id);
//// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s) %s\n\n", __FILE__, __LINE__, var_export($rs, true)), FILE_APPEND);
foreach ($rs as $row) {
if ($this->enable_limit && ($i > $this->nb_record))
@@ -112,23 +121,28 @@ class module_report_download extends module_report
}
if (array_key_exists('record_id', $row)) {
//// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s) %s\n\n", __FILE__, __LINE__, $row['record_id']), FILE_APPEND);
try {
$record = new \record_adapter($app, $this->sbas_id, $row['record_id']);
$caption = $record->get_caption();
foreach ($pref as $field) {
//// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s) %s\n\n", __FILE__, __LINE__, $field), FILE_APPEND);
try {
$this->result[$i][$field] = $caption
->get_field($field)
->get_serialized_values();
} catch (\Exception $e) {
$this->result[$i][$field] = '';
}
}
} catch (\Exception_Record_AdapterNotFound $e) {
continue;
}
foreach ($pref as $field) {
try {
$this->result[$i][$field] = $record->get_caption()
->get_field($field)
->get_serialized_values();
} catch (\Exception $e) {
foreach ($pref as $field) {
$this->result[$i][$field] = '';
}
}
}
$i ++;
//// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
}
}
@@ -175,15 +189,20 @@ class module_report_download extends module_report
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$conn = $databox->get_connection();
<<<<<<< HEAD
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
$params = array_merge($params, $datefilter['params']);
>>>>>>> 3.8
$finalfilter = $datefilter['sql'] . ' AND ';
$finalfilter .= $collfilter['sql'] . ' AND ';
$finalfilter .= 'log.site = :site_id';
/*
$sql = '
SELECT SUM(1) AS nb
FROM (
@@ -198,6 +217,18 @@ class module_report_download extends module_report
)
) AS tt
';
*/
$sql = "SELECT SUM(1) AS nb\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id)\n"
. " FROM log FORCE INDEX (date_site)"
. " INNER JOIN log_docs"
. " WHERE " . $finalfilter . "\n"
. " AND ( log_docs.action = 'download' OR log_docs.action = 'mail' )\n"
. " ) AS tt";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -211,10 +242,16 @@ class module_report_download extends module_report
$databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
$conn = $databox->get_connection();
<<<<<<< HEAD
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
=======
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
$params = array_merge($params, $datefilter['params']);
>>>>>>> 3.8
$finalfilter = "";
$array = [
@@ -223,9 +260,8 @@ class module_report_download extends module_report
];
$finalfilter .= $datefilter['sql'] . ' AND ';
$finalfilter .= $collfilter['sql'] . ' AND ';
$finalfilter .= 'log.site = :site_id';
/*
$sql = '
SELECT tt.id, tt.name, SUM(1) AS nb
FROM (
@@ -244,6 +280,20 @@ class module_report_download extends module_report
) AS tt
GROUP BY id, name
';
*/
$sql = "SELECT tt.id, tt.name, SUM(1) AS nb\n"
. " FROM (\n"
. " SELECT DISTINCT(log.id) AS log_id, log_docs.record_id as id, subdef.name\n"
. " FROM ( log )\n"
. " INNER JOIN log_docs ON (log.id = log_docs.log_id)\n"
. " INNER JOIN subdef ON (log_docs.record_id = subdef.record_id)\n"
. " WHERE (" . $finalfilter . ")\n"
. " AND ( log_docs.action = 'download' OR log_docs.action = 'mail' )\n"
. " AND subdef.name = log_docs.final\n"
. " ) AS tt\n"
. " GROUP BY id, name\n";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);

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

@@ -48,7 +48,8 @@ class module_report_nav extends module_report
*/
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
{
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
}
private function setTotalPourcent()
@@ -60,12 +61,11 @@ class module_report_nav extends module_report
$params = array_merge([], $report_filter['params']);
$sql = '
SELECT SUM(1) AS total FROM (
SELECT DISTINCT (log.id)
SELECT COUNT(log.id) AS total
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ' . $report_filter['sql'] . ' AND nav != ""
) AS tt';
WHERE ' . $report_filter['sql'] . ' AND nav != "" AND !ISNULL(usrid)';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
@@ -112,16 +112,14 @@ class module_report_nav extends module_report
$params = array_merge([], $report_filter['params']);
$sql = '
SELECT tt.nav, SUM(1) AS nb, ROUND((SUM(1) / ' . $this->total_pourcent . ' * 100), 1) AS pourcent
FROM (
SELECT DISTINCT(log.id), nav
SELECT nav, SUM(1) AS nb, ROUND((SUM(1) / ' . $this->total_pourcent . ' * 100), 1) AS pourcent
FROM log FORCE INDEX (date_site, nav)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ' . $report_filter['sql'] . ' AND nav != ""
) AS tt
GROUP BY tt.nav
WHERE ' . $report_filter['sql'] . ' AND nav != "" AND !ISNULL(usrid)
GROUP BY nav
ORDER BY nb DESC';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$this->initialize();
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
@@ -171,16 +169,16 @@ class module_report_nav extends module_report
$params = array_merge([], $report_filter['params']);
$sql = '
SELECT tt.os, COUNT(os) AS nb, ROUND((COUNT(os)/' . $this->total_pourcent . '*100),1) AS pourcent
FROM (
SELECT DISTINCT(log.id), os
SELECT os, COUNT(os) AS nb, ROUND((COUNT(os)/' . $this->total_pourcent . '*100),1) AS pourcent
FROM log FORCE INDEX (date_site, os)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE '. $report_filter['sql'] . ' AND os != ""
) AS tt
GROUP BY tt.os
WHERE '. $report_filter['sql'] . ' AND os != "" AND !ISNULL(usrid)
GROUP BY os
ORDER BY nb DESC';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$this->initialize();
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
@@ -229,17 +227,17 @@ class module_report_nav extends module_report
$params = array_merge([], $report_filter['params']);
$sql = '
SELECT tt.res, COUNT(res) AS nb, ROUND((COUNT(res)/ ' . $this->total_pourcent . '*100),1) AS pourcent
FROM (
SELECT DISTINCT(log.id), res
SELECT res, COUNT(res) AS nb, ROUND((COUNT(res)/ ' . $this->total_pourcent . '*100),1) AS pourcent
FROM log FORCE INDEX (date_site, res)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE '. $report_filter['sql'] . ' AND res != ""
) AS tt
GROUP BY tt.res
WHERE '. $report_filter['sql'] . ' AND res != "" AND !ISNULL(usrid)
GROUP BY res
ORDER BY nb DESC
LIMIT 0, 10';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$this->initialize();
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
@@ -291,15 +289,16 @@ class module_report_nav extends module_report
$sql = "
SELECT tt.combo, COUNT( tt.combo ) AS nb, ROUND((COUNT(tt.combo)/" . $this->total_pourcent . "*100), 1) AS pourcent
FROM (
SELECT DISTINCT(log.id), CONCAT( nav, '-', os ) AS combo
SELECT CONCAT( nav, '-', os ) AS combo
FROM log FORCE INDEX (date_site, os_nav)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ". $report_filter['sql'] ." AND nav != '' AND os != ''
WHERE ". $report_filter['sql'] ." AND nav != '' AND os != '' AND !ISNULL(usrid)
) AS tt
GROUP BY tt.combo
ORDER BY nb DESC
LIMIT 0 , 10";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$this->initialize();
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
@@ -351,14 +350,12 @@ class module_report_nav extends module_report
$params = array_merge([], $report_filter['params']);
$sql = '
SELECT tt.appli
FROM (
SELECT DISTINCT(log.id), appli
SELECT appli
FROM log FORCE INDEX (date_site, appli)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ' . $report_filter['sql'] . ' AND appli != \'a:0:{}\'
) AS tt
GROUP BY tt.appli';
WHERE ' . $report_filter['sql'] . ' AND appli != \'a:0:{}\' AND !ISNULL(usrid)
GROUP BY appli';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$this->initialize();
@@ -453,7 +450,13 @@ class module_report_nav extends module_report
WHERE (id = :value)';
}
<<<<<<< HEAD
$params2 = [':value' => $val];
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$params2 = array(':value' => $val);
>>>>>>> 3.8
$stmt = $conn->prepare($sql);
$stmt->execute($params2);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -547,13 +550,14 @@ class module_report_nav extends module_report
FROM (
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 nav = :browser
AND ". $report_filter['sql'] . "
) AS tt
GROUP BY version
ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
$stmt = $conn->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);

4
lib/classes/module/report/push.php
View File

@@ -54,7 +54,7 @@ class module_report_push extends module_report
protected function buildReq($groupby = false, $on = false)
{
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('push')->buildSql();
->setAction('validate')->buildSql();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
@@ -62,7 +62,7 @@ class module_report_push extends module_report
public function colFilter($field, $on = false)
{
$sqlBuilder = $this->sqlBuilder('action')->setAction('push');
$sqlBuilder = $this->sqlBuilder('action')->setAction('validate');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];

6
lib/classes/module/report/question.php
View File

@@ -39,8 +39,14 @@ class module_report_question extends module_report
*/
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
{
<<<<<<< HEAD
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
$this->title = $this->app->trans('report:: question');
=======
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
$this->title = _('report:: question');
>>>>>>> 3.8
}
/**

17
lib/classes/module/report/sqlconnexion.php
View File

@@ -27,7 +27,7 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
if ($this->groupby == false) {
$this->sql = "
SELECT
DISTINCT(log_colls.log_id),
log.id,
log.user,
log.usrid,
log.date as ddate,
@@ -40,8 +40,9 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
log.appli,
log.ip
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] .")";
WHERE (" . $filter['sql'] .") AND !ISNULL(log.usrid)";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
$stmt = $this->connbas->prepare($this->sql);
$stmt->execute($this->params);
@@ -59,12 +60,13 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
FROM (
SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . "
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] .")
) AS tt
GROUP BY " . $this->groupby. "
ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
$stmt = $this->connbas->prepare($this->sql);
$stmt->execute($this->params);
$this->total_row = $stmt->rowCount();
@@ -84,10 +86,15 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
FROM (
SELECT DISTINCT(log.id), ' . $this->getTransQuery($field) . ' AS val
FROM log FORCE INDEX (date_site)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (' . $filter['sql'] . ')
) AS tt ORDER BY val ASC';
<<<<<<< HEAD
return ['sql' => $this->sql, 'params' => $this->params];
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
return array('sql' => $this->sql, 'params' => $this->params);
>>>>>>> 3.8
}
}

62
lib/classes/module/report/sqldownload.php
View File

@@ -17,6 +17,7 @@ class module_report_sqldownload extends module_report_sql implements module_repo
public function __construct(Application $app, module_report $report)
{
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
parent::__construct($app, $report);
if ($report->isInformative()) {
$this->restrict = true;
@@ -25,12 +26,19 @@ class module_report_sqldownload extends module_report_sql implements module_repo
public function buildSql()
{
<<<<<<< HEAD
$customFieldMap = [];
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$customFieldMap = array();
>>>>>>> 3.8
$filter = $this->filter->getReportFilter() ? : ['params' => [], 'sql' => false];
$this->params = array_merge([], $filter['params']);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
if ($this->groupby == false) {
/*
$this->sql = "
SELECT DISTINCT(log.id), log.user, log.societe, log.pays, log.activite, log_colls.coll_id,
log.fonction, log.usrid, log_docs.date AS ddate, log_docs.record_id, log_docs.final, log_docs.comment
@@ -38,10 +46,20 @@ class module_report_sqldownload extends module_report_sql implements module_repo
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" .$filter['sql'] . ") AND (log_docs.action = 'download' OR log_docs.action = 'mail')";
*/
$this->sql = "
SELECT log.id, log.user, log.societe, log.pays, log.activite, record.coll_id,
log.fonction, log.usrid, log_docs.date AS ddate, log_docs.record_id, log_docs.final, log_docs.comment
FROM log_docs
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_docs.log_id)
LEFT JOIN record ON (record.record_id=log_docs.record_id)
LEFT JOIN subdef ON (log_docs.record_id = subdef.record_id)
WHERE (" .$filter['sql'] . ")
AND !ISNULL(usrid)
AND (log_docs.action = 'download' OR log_docs.action = 'mail')
AND (log_docs.final = 'preview' OR log_docs.final = 'document')";
if ($this->restrict) {
$this->sql .= ' AND (log_docs.final = "document" OR log_docs.final = "preview")';
}
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
} else {
$name = $this->groupby;
$field = $this->getTransQuery($this->groupby);
@@ -50,12 +68,12 @@ class module_report_sqldownload extends module_report_sql implements module_repo
$this->sql = '
SELECT ' . $name . ', SUM(1) AS telechargement, tt.comment, tt.size, tt.file, tt.mime, tt.final
FROM (
SELECT DISTINCT(log.id), TRIM( ' . $field . ' ) AS ' . $name . ', log_docs.comment, subdef.size, subdef.file, subdef.mime, log_docs.final
SELECT log.id, TRIM( ' . $field . ' ) AS ' . $name . ', log_docs.comment, subdef.size, subdef.file, subdef.mime, log_docs.final
FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON (log_docs.record_id = subdef.record_id)';
LEFT JOIN record ON (log_docs.record_id = record.record_id)
LEFT JOIN subdef ON (log_docs.record_id = subdef.record_id)';
$customFieldMap = [
$field => $name,
@@ -64,7 +82,12 @@ class module_report_sqldownload extends module_report_sql implements module_repo
'subdef.file' => 'tt.file',
'subdef.mime' => 'tt.mime',
'log_docs.final' => 'tt.final',
<<<<<<< HEAD
];
=======
);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
>>>>>>> 3.8
} elseif ($this->on == 'DOC') {
$this->sql = '
@@ -73,9 +96,9 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), TRIM(' . $field . ') AS ' . $name . '
FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON ( log_docs.record_id = subdef.record_id)';
LEFT JOIN record ON (log_docs.record_id = record.record_id)
LEFT JOIN subdef ON ( log_docs.record_id = subdef.record_id)';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
} else {
$this->sql = '
SELECT ' . $name . ', SUM(1) AS nombre
@@ -83,33 +106,37 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), TRIM( ' . $this->getTransQuery($this->groupby) . ') AS ' . $name . '
FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON (record.record_id = subdef.record_id)';
LEFT JOIN record ON (log_docs.record_id = record.record_id)
LEFT JOIN subdef ON (record.record_id = subdef.record_id)';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
}
$this->sql .= ' WHERE (subdef.name = log_docs.final) AND ' . $filter['sql'] . ' ';
$this->sql .= ' WHERE ' . $filter['sql'] . ' ';
$this->sql .= 'AND ( log_docs.action = \'download\' OR log_docs.action = \'mail\') ';
$this->sql .= $this->on == 'DOC' ? 'AND subdef.name = \'document\' ' : '';
$this->sql .= ') as tt';
$this->sql .= ' GROUP BY ' . $name . ' ' . ($name == 'record_id' && $this->on == 'DOC' ? ', final' : '');
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
}
$stmt = $this->connbas->prepare($this->sql);
$stmt->execute($this->params);
$this->total_row = $stmt->rowCount();
$stmt->closeCursor();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
if (count($customFieldMap) > 0) {
$this->sql .= $this->filter->getOrderFilter($customFieldMap) ? : '';
} else {
$this->sql .= $this->filter->getOrderFilter() ? : '';
$this->sql .= $this->filter->getOrderFilter() ? : '';
}
if ($this->enable_limit) {
$this->sql .= $this->filter->getLimitFilter() ? : '';
}
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
return $this;
}
@@ -124,9 +151,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), ' . $this->getTransQuery($field) . ' AS val
FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON (log_docs.record_id = subdef.record_id)
LEFT JOIN record ON (log_docs.record_id = record.record_id)
LEFT JOIN subdef ON (log_docs.record_id = subdef.record_id)
WHERE (' . $filter['sql'] . ')
AND (log_docs.action = "download" OR log_docs.action = "mail")' .
($this->on == 'DOC' ? ' AND subdef.name = "document"' : '') .

69
lib/classes/module/report/sqlfilter.php
View File

@@ -32,8 +32,9 @@ class module_report_sqlfilter
$this->report = $report;
}
public static function constructDateFilter($dmin, $dmax)
public static function constructDateFilter($dmin, $dmax, $dateField = 'log_date.date')
{
<<<<<<< HEAD
return [
'sql' => ($dmin && $dmax ? ' log_date.date > :date_min AND log_date.date < :date_max ' : false)
, 'params' => ($dmin && $dmax ? [':date_min' => $dmin, ':date_max' => $dmax] : [])
@@ -59,6 +60,14 @@ class module_report_sqlfilter
return $ret;
}
=======
return array(
'sql' => ($dmin && $dmax ? ' '.$dateField.' > :date_min AND '.$dateField.' < :date_max ' : false)
, 'params' => ($dmin && $dmax ? array(':date_min' => $dmin, ':date_max' => $dmax) : array())
);
}
>>>>>>> 3.8
public function getCorFilter()
{
return $this->cor_query;
@@ -66,25 +75,30 @@ class module_report_sqlfilter
public function getReportFilter()
{
$finalfilter = '';
$sql = '';
<<<<<<< HEAD
$params = [':log_site' => $this->app['conf']->get(['main', 'key'])];
=======
$params = array(':log_site' => $this->app['phraseanet.configuration']['main']['key']);
>>>>>>> 3.8
if ($this->filter['date'] && $this->filter['date']['sql'] !== '') {
$finalfilter .= $this->filter['date']['sql'] . ' AND ';
$sql .= $this->filter['date']['sql'] . ' AND ';
$params = array_merge($params, $this->filter['date']['params']);
}
if ($this->filter['user'] && $this->filter['user']['sql'] !== '') {
$finalfilter .= $this->filter['user']['sql'] . ' AND ';
$sql .= $this->filter['user']['sql'] . ' AND ';
$params = array_merge($params, $this->filter['user']['params']);
}
if ($this->filter['collection'] && $this->filter['collection']['sql'] !== '') {
$finalfilter .= $this->filter['collection']['sql'] . ' AND ';
$params = array_merge($params, $this->filter['collection']['params']);
}
$finalfilter .= ' log.site = :log_site';
<<<<<<< HEAD
return ['sql' => $finalfilter, 'params' => $params];
=======
$sql .= ' log.site = :log_site';
return array('sql' => $sql, 'params' => $params);
>>>>>>> 3.8
}
public function getGvSitFilter()
@@ -99,7 +113,12 @@ class module_report_sqlfilter
public function getUserIdFilter($id)
{
<<<<<<< HEAD
return ['sql' => "log.usrid = :usr_id_filter", 'params' => [':usr_id_filter' => $id]];
=======
return array('sql' => "log.usrid = :usr_id_filter", 'params' => array(':usr_id_filter' => $id));
// return array('sql' => "log.usrid=" . (int)$id, 'params' => array());
>>>>>>> 3.8
}
public function getDateFilter()
@@ -112,11 +131,6 @@ class module_report_sqlfilter
return $this->filter['user'];
}
public function getCollectionFilter()
{
return $this->filter['collection'];
}
public function getRecordFilter()
{
return $this->filter['record'];
@@ -139,15 +153,38 @@ class module_report_sqlfilter
private function dateFilter(module_report $report)
{
$this->filter['date'] = false;
/*
if ($report->getDmin() && $report->getDmax()) {
$this->filter['date'] = [
'sql' => ' (log.date > :date_min_f AND log.date < :date_max_f) '
<<<<<<< HEAD
, 'params' => [
':date_min_f' => $report->getDmin()
, ':date_max_f' => $report->getDmax()
]
];
=======
, 'params' => array(
':date_min_f' => $report->getDmin()
, ':date_max_f' => $report->getDmax()
)
);
>>>>>>> 3.8
}
*/
$sql = "";
if($report->getDmin()) {
$sql = $report->getDateField().">=" . $this->conn->quote($report->getDmin());
}
if($report->getDmax()) {
if($sql != "") {
$sql .= " AND ";
}
$sql .= $report->getDateField()."<=" . $this->conn->quote($report->getDmax());
}
$this->filter['date'] = array(
'sql' => $sql, 'params' => array()
);
return;
}
@@ -189,6 +226,7 @@ class module_report_sqlfilter
return;
}
<<<<<<< HEAD
private function collectionFilter(module_report $report)
{
$this->filter['collection'] = false;
@@ -218,6 +256,8 @@ class module_report_sqlfilter
return;
}
=======
>>>>>>> 3.8
private function recordFilter(module_report $report)
{
$this->filter['record'] = false;
@@ -272,7 +312,6 @@ class module_report_sqlfilter
$this->orderFilter($report);
$this->recordFilter($report);
$this->userFilter($report);
$this->collectionFilter($report);
return;
}

13
lib/classes/module/report/sqlquestion.php
View File

@@ -25,11 +25,12 @@ class module_report_sqlquestion extends module_report_sql implements module_repo
$this->params = array_merge([], $filter['params']);
if ($this->groupby == false) {
$this->sql ="
SELECT DISTINCT(log.id), log_search.date ddate, log_search.search, log.usrid, log.user, log.pays, log.societe, log.activite, log.fonction
$this->sql =" SELECT log.id, log_search.date ddate, log_search.search, log.usrid, log.user, log.pays, log.societe, log.activite, log.fonction
FROM log_search
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_search.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id) WHERE (" . $filter['sql'] .")";
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_search.log_id) AND !ISNULL(usrid)
WHERE (" . $filter['sql'] .")";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
$stmt = $this->connbas->prepare($this->sql);
$stmt->execute($this->params);
@@ -48,12 +49,13 @@ class module_report_sqlquestion extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . "
FROM (`log_search`)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_search.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] .")
) AS tt
GROUP BY " . $this->groupby ."
ORDER BY nb DESC";
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
$stmt = $this->connbas->prepare($this->sql);
$stmt->execute($this->params);
$this->total_row = $stmt->rowCount();
@@ -74,7 +76,6 @@ class module_report_sqlquestion extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), " . $this->getTransQuery($field) . " AS val
FROM (`log_search`)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = log_search.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (" . $filter['sql'] . ")
) as tt
ORDER BY tt.val ASC";

4
lib/classes/module/report/validate.php
View File

@@ -54,7 +54,7 @@ class module_report_validate extends module_report
protected function buildReq($groupby = false, $on = false)
{
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('validate')->buildSql();
->setAction('push')->buildSql();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
@@ -62,7 +62,7 @@ class module_report_validate extends module_report
public function colFilter($field, $on = false)
{
$sqlBuilder = $this->sqlBuilder('action')->setAction('validate');
$sqlBuilder = $this->sqlBuilder('action')->setAction('push');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];