Upgrade 1-11.38

main/inc/lib/attendance.lib.php

@@ -776,6 +776,10 @@ class Attendance
             );
 
             $value['photo'] = $photo;
+            $addOfficialCode = api_get_configuration_value('attendance_add_official_code');
+            if ($addOfficialCode) {
+                $value['official_code'] = $user_data['official_code'];
+            }
             $value['firstname'] = $user_data['firstname'];
             $value['lastname'] = $user_data['lastname'];
             $value['username'] = $user_data['username'];
@@ -1321,6 +1325,7 @@ class Attendance
                 if (Database::num_rows($res) > 0) {
                     while ($row = Database::fetch_array($res)) {
                         $row['duration'] = Attendance::getAttendanceCalendarExtraFieldValue('duration', $row['calendar_id']);
+                        $row['date_time'] = api_get_local_time($row['date_time']);
                         $row['date_time'] = api_convert_and_format_date($row['date_time'], null, date_default_timezone_get());
                         $data[$user_id][] = $row;
                     }
@@ -2722,7 +2727,12 @@ class Attendance
 
         // Get data table
         $dataTable = [];
-        $headTable = ['#', get_lang('Name')];
+        $addOfficialCode = api_get_configuration_value('attendance_add_official_code');
+        if ($addOfficialCode) {
+            $headTable = ['#', get_lang('OfficialCode'), get_lang('Name')];
+        } else {
+            $headTable = ['#', get_lang('Name')];
+        }
         foreach ($calendar as $classDay) {
             $labelDuration = !empty($classDay['duration']) ? get_lang('Duration').' : '.$classDay['duration'] : '';
             $headTable[] =
@@ -2739,6 +2749,9 @@ class Attendance
                 $cols = 1;
                 $result = [];
                 $result['count'] = $count;
+                if ($addOfficialCode) {
+                    $result['official_code'] = $user['official_code'];
+                }
                 $result['full_name'] = api_get_person_name($user['firstname'], $user['lastname']);
                 foreach ($calendar as $classDay) {
                     $commentInfo = $this->getComment($user['user_id'], $classDay['id']);