Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: AngelFQC

public/main/inc/ajax/statistics.ajax.php

@@ -928,10 +928,10 @@
         $rows[] = [
             get_lang('Number of users registered (new vs previous quarter)'),
             '-',
-            '+'.($countUsersPre1Quarter - $countUsersPre2Quarter),
-            '+'.($countUsersPre2Quarter - $countUsersPre3Quarter),
-            '+'.($countUsersPre3Quarter - $countUsersPre4Quarter),
             '+'.($countUsersPre4Quarter - $countUsersPre5Quarter),
+            '+'.($countUsersPre3Quarter - $countUsersPre4Quarter),
+            '+'.($countUsersPre2Quarter - $countUsersPre3Quarter),
+            '+'.($countUsersPre1Quarter - $countUsersPre2Quarter),
             '-',
             '+'.($countUsersTotal - $countUsersPre1Quarter),
         ];
@@ -1064,6 +1064,9 @@
     case 'report_quarterly_hours_of_training':
         // Close the session as we don't need it any further
         session_write_close();
+        // The maximum time spent, in number of hours, to be considered.
+        // Anything above that is considered a time registration error.
+        $maxTimeSpent = 6;
         $currentQuarterDates = getQuarterDates();
         $pre1QuarterDates = getQuarterDates(
             date_create($currentQuarterDates['quarter_start'])
@@ -1104,27 +1107,33 @@
         // Get data for the row
         $timeSpentCoursesCurrentQuarter = Tracking::getTotalTimeSpentInCourses(
             $currentQuarterDates['quarter_start'],
-            $currentQuarterDates['quarter_end']
+            $currentQuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         $timeSpentCourses1PreQuarter = Tracking::getTotalTimeSpentInCourses(
             $pre1QuarterDates['quarter_start'],
-            $pre1QuarterDates['quarter_end']
+            $pre1QuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         $timeSpentCourses2PreQuarter = Tracking::getTotalTimeSpentInCourses(
             $pre2QuarterDates['quarter_start'],
-            $pre2QuarterDates['quarter_end']
+            $pre2QuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         $timeSpentCourses3PreQuarter = Tracking::getTotalTimeSpentInCourses(
             $pre3QuarterDates['quarter_start'],
-            $pre3QuarterDates['quarter_end']
+            $pre3QuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         $timeSpentCourses4PreQuarter = Tracking::getTotalTimeSpentInCourses(
             $pre4QuarterDates['quarter_start'],
-            $pre4QuarterDates['quarter_end']
+            $pre4QuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         $timeSpentCourses5PreQuarter = Tracking::getTotalTimeSpentInCourses(
             $pre5QuarterDates['quarter_start'],
-            $pre5QuarterDates['quarter_end']
+            $pre5QuarterDates['quarter_end'],
+            $maxTimeSpent
         );
         // Calculate percent for the row
         $percentIncrementTimeSpent = api_calculate_increment_percent(

public/main/inc/lib/tracking.lib.php

@@ -8222,7 +8222,8 @@ public static function getCourseQuizLastFinalizationDate(
      */
     public static function getTotalTimeSpentInCourses(
         string $dateFrom = '',
-        string $dateUntil = ''
+        string $dateUntil = '',
+        ?int $maxTimeSpent = 6
     ): int {
         $tableTrackLogin = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
         $tableUrlRelUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -8240,12 +8241,21 @@ public static function getTotalTimeSpentInCourses(
             $dateUntil = Database::escape_string($dateUntil);
             $conditionTime = " (login_course_date >= '$dateFrom' AND logout_course_date <= '$dateUntil' ) ";
         }
-        $sql = "SELECT SUM(TIMESTAMPDIFF(HOUR, login_course_date, logout_course_date)) diff
+        $sql = "SELECT TIMESTAMPDIFF(HOUR, login_course_date, logout_course_date) diff
     	        FROM $tableTrackLogin u $tableUrl
                 WHERE $conditionTime $urlCondition";
         $rs = Database::query($sql);
-        $row = Database::fetch_array($rs, 'ASSOC');
-        $diff = $row['diff'];
+        $diff = 0;
+        if (!empty($rs)) {
+            while ($row = Database::fetch_array($rs)) {
+                // Anything above $maxTimeSpent is rounded down to $maxTimeSpent hours
+                if ($row['diff'] <= $maxTimeSpent) {
+                    $diff += $row['diff'];
+                } else {
+                    $diff += $maxTimeSpent;
+                }
+            }
+        }
         if ($diff >= 0 and !empty($diff)) {
             return $diff;
         }

public/main/lp/lp_view.php

@@ -477,7 +477,9 @@
 $template->assign('teacher_toc_buttons', $get_teacher_buttons);
 $template->assign('iframe_src', $src);
 $template->assign('navigation_bar_bottom', $navigation_bar_bottom);
-$template->assign('show_left_column', !$lp->getHideTocFrame());
+$tocHidden = (bool) $lp->getHideTocFrame();
+$template->assign('toc_hidden', (int) $tocHidden);
+$template->assign('show_left_column', $tocHidden ? 0 : 1);
 
 $showMenu = 0;
 $settings = api_get_setting('lp.lp_view_settings', true);