Format time with PHP - refs BT#9087

chamilo · Feb 6, 2015 · 5cfacae · jmontoyaa · Feb 9, 2015 · 5cfacae
1 parent 27da74e
commit 5cfacae
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
@@ -81,6 +81,7 @@
             $selectedFrom,
             $selectedUntil
         );
+        $formatedTime = api_format_time($totalTime);
 
         $timeReport->data[] = array(
             'session' => null,
@@ -95,7 +96,7 @@
                 'username' => $teacher['username'],
                 'completeName' => api_get_person_name($teacher['firstname'], $teacher['lastname'])
             ),
-            'totalTime' => $totalTime
+            'totalTime' => $formatedTime
         );
     }
 
@@ -113,6 +114,7 @@
                     $selectedFrom,
                     $selectedUntil
                 );
+                $formatedTime = api_format_time($totalTime);
 
                 $timeReport->data[] = array(
                     'session' => array(
@@ -130,7 +132,7 @@
                         'username' => $coach['username'],
                         'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
                     ),
-                    'totalTime' => $totalTime
+                    'totalTime' => $formatedTime
                 );
             }
         }
@@ -167,6 +169,7 @@
                     $selectedFrom,
                     $selectedUntil
                 );
+                $formatedTime = api_format_time($totalTime);
 
                 $timeReport->data[] = array(
                     'session' => $sessionData,
@@ -178,7 +181,7 @@
                         'username' => $coach['username'],
                         'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
                     ),
-                    'totalTime' => $totalTime
+                    'totalTime' => $formatedTime
                 );
             }
         }
@@ -213,6 +216,7 @@
                 $selectedFrom,
                 $selectedUntil
             );
+            $formatedTime = api_format_time($totalTime);
 
             $timeReport->data[] = array(
                 'session' => null,
@@ -221,7 +225,7 @@
                     'name' => $courseInfo['title']
                 ),
                 'coach' => $teacherData,
-                'totalTime' => $totalTime
+                'totalTime' => $formatedTime
             );
         }
     }
@@ -244,6 +248,7 @@
             $selectedFrom,
             $selectedUntil
         );
+        $formatedTime = api_format_time($totalTime);
 
         $timeReport->data[] = array(
             'session' => $sessionData,
@@ -252,7 +257,7 @@
                 'name' => $courseInfo['title']
             ),
             'coach' => $teacherData,
-            'totalTime' => $totalTime
+            'totalTime' => $formatedTime
         );
     }
 }

diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
@@ -7513,3 +7513,25 @@ function api_site_use_cookie_warning_cookie_exist()
 {
     return isset($_COOKIE['ChamiloUsesCookies']);
 }
+
+/**
+ * Given a number of seconds, format the time to show hours, minutes and seconds
+ * @param int $time The time in seconds
+ * @param string $originFormat Optional. PHP o JS
+ * @return string (00h00'00")
+ */
+function api_format_time($time, $originFormat = 'php')
+{
+    $h = get_lang('h');
+    $hours = $time / 3600;
+    $mins = ($time % 3600) / 60;
+    $secs = ($time % 60);
+
+    if ($originFormat == 'js') {
+        $scormTime = trim(sprintf("%02d : %02d : %02d", $hours, $mins, $secs));
+    } else {
+        $scormTime = trim(sprintf("%02d$h%02d'%02d\"", $hours, $mins, $secs));
+    }
+
+    return $scormTime;
+}
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
@@ -5007,13 +5007,13 @@ public static function getUsersByOfficialCode($officialCode)
     }
 
     /**
-     * Calc the expended time (hh::mm:ss) by a user in a course
+     * Calc the expended time (in seconds) by a user in a course
      * @param int $userId The user id
      * @param string $courseCode The course id
      * @param int $sessionId Optional. The session id
      * @param string $from Optional. From date
      * @param string $until Optional. Until date
-     * @return string The time
+     * @return int The time
      */
     public static function getExpendedTimeInCourses($userId, $courseCode, $sessionId = 0, $from = '', $until = '')
     {
@@ -5034,18 +5034,18 @@ public static function getExpendedTimeInCourses($userId, $courseCode, $sessionId
         }
 
         $trackResult = Database::select(
-            'SEC_TO_TIME(SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date))) as total_time',
+            'SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as total_time',
             $trackCourseAccessTable,
             array(
                 'where' => $whereConditions
             ), 'first'
         );
 
         if ($trackResult != false) {
-            return $trackResult['total_time'] ? $trackResult['total_time'] : '00:00:00';
+            return $trackResult['total_time'] ? $trackResult['total_time'] : 0;
         }
 
-        return '00:00:00';
+        return 0;
     }
 
 }