chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ilosada-7570' into 1.10.x

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent dc275d0896 17c04edf6b
commit 5e49348dc2
1 changed files with 32 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 58
      main/inc/lib/statistics.lib.php

58
main/inc/lib/statistics.lib.php
Unescape View File

@ -375,53 +375,45 @@ class Statistics
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id(); $current_url_id = api_get_current_access_url_id();
$table_url = null;
$where_url = null;
$now = api_get_utc_datetime();
$where_url_last = ' WHERE login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$table_url = ", $access_url_rel_user_table"; $table_url = ", $access_url_rel_user_table";
$where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'"; $where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'";
$where_url_last = ' AND login_date > DATE_SUB(NOW(),INTERVAL 1 %s)'; $where_url_last = ' AND login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
} else {
$table_url = '';
$where_url = '';
$where_url_last = ' WHERE login_date > DATE_SUB(NOW(),INTERVAL 1 %s)';
} }
switch ($type) {
case 'month':
$months = api_get_months_long();
$period = get_lang('PeriodMonth'); $period = get_lang('PeriodMonth');
$sql = "SELECT DATE_FORMAT( login_date, '%Y-%m' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY login_date "; $periodCollection = api_get_months_long();
$sql_last_x = "SELECT DATE_FORMAT( login_date, '%Y-%m' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'YEAR')." GROUP BY stat_date ORDER BY login_date "; $sql = "SELECT DATE_FORMAT( login_date, '%Y-%m' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY login_date DESC";
break; $sql_last_x = null;
switch ($type) {
case 'hour': case 'hour':
$period = get_lang('PeriodHour'); $period = get_lang('PeriodHour');
$sql = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY stat_date "; $sql = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY stat_date ";
$sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'DAY')." GROUP BY stat_date ORDER BY stat_date "; $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'DAY')." GROUP BY stat_date ORDER BY stat_date ";
break; break;
case 'day': case 'day':
$week_days = api_get_week_days_long(); $periodCollection = api_get_week_days_long();
$period = get_lang('PeriodDay'); $period = get_lang('PeriodDay');
$sql = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) "; $sql = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
$sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) "; $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
break; break;
} }
if ($sql_last_x) {
$res_last_x = Database::query($sql_last_x); $res_last_x = Database::query($sql_last_x);
$result_last_x = array(); $result_last_x = array();
while ($obj = Database::fetch_object($res_last_x)) { while ($obj = Database::fetch_object($res_last_x)) {
$stat_date = $obj->stat_date; $stat_date = ($type === 'day') ? $periodCollection[$obj->stat_date] : $obj->stat_date;
switch ($type) {
case 'month':
$stat_date = explode('-', $stat_date);
$stat_date[1] = $months[$stat_date[1] - 1];
$stat_date = implode(' ', $stat_date);
break;
case 'day':
$stat_date = $week_days[$stat_date];
break;
}
$result_last_x[$stat_date] = $obj->number_of_logins; $result_last_x[$stat_date] = $obj->number_of_logins;
} }
Statistics::printStats(get_lang('LastLogins').' ('.$period.')', $result_last_x, true); Statistics::printStats(get_lang('LastLogins').' ('.$period.')', $result_last_x, true);
flush(); //flush web request at this point to see something already while the full data set is loading flush(); //flush web request at this point to see something already while the full data set is loading
echo '<br />'; echo '<br />';
}
$res = Database::query($sql); $res = Database::query($sql);
$result = array(); $result = array();
while ($obj = Database::fetch_object($res)) { while ($obj = Database::fetch_object($res)) {
@ -429,11 +421,11 @@ class Statistics
switch ($type) { switch ($type) {
case 'month': case 'month':
$stat_date = explode('-', $stat_date); $stat_date = explode('-', $stat_date);
$stat_date[1] = $months[$stat_date[1] - 1]; $stat_date[1] = $periodCollection[$stat_date[1] - 1];
$stat_date = implode(' ', $stat_date); $stat_date = implode(' ', $stat_date);
break; break;
case 'day': case 'day':
$stat_date = $week_days[$stat_date]; $stat_date = $periodCollection[$stat_date];
break; break;
} }
$result[$stat_date] = $obj->number_of_logins; $result[$stat_date] = $obj->number_of_logins;
@ -457,9 +449,10 @@ class Statistics
$table_url = ''; $table_url = '';
$where_url=''; $where_url='';
} }
$sql[get_lang('ThisDay')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= NOW() $where_url"; $now = api_get_utc_datetime();
$sql[get_lang('Last7days')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= NOW() $where_url"; $sql[get_lang('ThisDay')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= '$now' $where_url";
$sql[get_lang('Last31days')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 31 DAY) >= NOW() $where_url"; $sql[get_lang('Last7days')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= '$now' $where_url";
$sql[get_lang('Last31days')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 31 DAY) >= '$now' $where_url";
$sql[get_lang('Total')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE 1=1 $where_url"; $sql[get_lang('Total')] = "SELECT count(login_user_id) AS number FROM $table $table_url WHERE 1=1 $where_url";
foreach ($sql as $index => $query) { foreach ($sql as $index => $query) {
$res = Database::query($query); $res = Database::query($query);
@ -797,22 +790,23 @@ class Statistics
$table_url = ''; $table_url = '';
$where_url=''; $where_url='';
} }
$now = api_get_utc_datetime();
$sql[get_lang('ThisDay')] = $sql[get_lang('ThisDay')] =
"SELECT count(distinct(login_user_id)) AS number ". "SELECT count(distinct(login_user_id)) AS number ".
" FROM $table $table_url ". " FROM $table $table_url ".
" WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= NOW() $where_url"; " WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= '$now' $where_url";
$sql[get_lang('Last7days')] = $sql[get_lang('Last7days')] =
"SELECT count(distinct(login_user_id)) AS number ". "SELECT count(distinct(login_user_id)) AS number ".
" FROM $table $table_url ". " FROM $table $table_url ".
" WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= NOW() $where_url"; " WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= '$now' $where_url";
$sql[get_lang('Last31days')] = $sql[get_lang('Last31days')] =
"SELECT count(distinct(login_user_id)) AS number ". "SELECT count(distinct(login_user_id)) AS number ".
" FROM $table $table_url ". " FROM $table $table_url ".
" WHERE DATE_ADD(login_date, INTERVAL 31 DAY) >= NOW() $where_url"; " WHERE DATE_ADD(login_date, INTERVAL 31 DAY) >= '$now' $where_url";
$sql[sprintf(get_lang('LastXMonths'), 6)] = $sql[sprintf(get_lang('LastXMonths'), 6)] =
"SELECT count(distinct(login_user_id)) AS number ". "SELECT count(distinct(login_user_id)) AS number ".
" FROM $table $table_url ". " FROM $table $table_url ".
" WHERE DATE_ADD(login_date, INTERVAL 6 MONTH) >= NOW() $where_url"; " WHERE DATE_ADD(login_date, INTERVAL 6 MONTH) >= '$now' $where_url";
$sql[get_lang('NeverConnected')] = $sql[get_lang('NeverConnected')] =
"SELECT count(distinct(login_user_id)) AS number ". "SELECT count(distinct(login_user_id)) AS number ".
" FROM $table $table_url WHERE 1=1 $where_url"; " FROM $table $table_url WHERE 1=1 $where_url";

Write Preview
Loading…
Cancel
Save