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

Remove logins report second table and query when logins are shown by month. Change order by to DESC - refs #7570

Browse Source
1.10.x
Imanol Losada 11 years ago
parent 03fba1cba4
commit dda9a38267
1 changed files with 10 additions and 19 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. 29
      main/inc/lib/statistics.lib.php

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

@ -370,8 +370,7 @@ class Statistics
case 'month': case 'month':
$months = api_get_months_long(); $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 "; $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";
$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 ";
break; break;
case 'hour': case 'hour':
$period = get_lang('PeriodHour'); $period = get_lang('PeriodHour');
@ -385,25 +384,17 @@ class Statistics
$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;
} }
$res_last_x = Database::query($sql_last_x); if ($type !== 'month') {
$result_last_x = array(); $res_last_x = Database::query($sql_last_x);
while ($obj = Database::fetch_object($res_last_x)) { $result_last_x = array();
$stat_date = $obj->stat_date; while ($obj = Database::fetch_object($res_last_x)) {
switch ($type) { $stat_date = ($type === 'day') ? $week_days[$obj->stat_date] : $obj->stat_date;
case 'month': $result_last_x[$stat_date] = $obj->number_of_logins;
$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; Statistics::print_stats(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
echo '<br />';
} }
Statistics::print_stats(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
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)) {

Write Preview
Loading…
Cancel
Save