GH-533 add time of booking to sign-in sheet

Wunderbyte-GmbH · Jul 10, 2024 · a1c7b14 · a1c7b14
1 parent f4dfd51
commit a1c7b14
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/classes/signinsheet/signinsheet_generator.php b/classes/signinsheet/signinsheet_generator.php
@@ -320,7 +320,7 @@ public function download_signinsheet() {
         }
 
         $users = $DB->get_records_sql(
-                "SELECT u.id, " . $mainuserfields . $userfields .
+                "SELECT u.id, ba.timecreated as bookingtime, " . $mainuserfields . $userfields .
             " FROM {booking_answers} ba
             LEFT JOIN {user} u ON u.id = ba.userid
             WHERE ba.optionid = :optionid AND ba.waitinglist = 0 " .
@@ -511,14 +511,14 @@ function ($role) {
                         break;
                     case 'userpic':
                         $name = "";
-                        $user = singleton_service::get_instance_of_user($user->id);
-                        if (empty($user->id) || empty($user)) {
+                        $userobj = singleton_service::get_instance_of_user($user->id);
+                        if (empty($user->id) || empty($userobj)) {
                             // In case row is empty. No user given.
                             // Make sure column with is respected.
                             $w = 20;
                             break;
                         }
-                        $userpic = new user_picture($user);
+                        $userpic = new user_picture($userobj);
                         if (empty($userpic)) {
                             break;
                         }
@@ -529,7 +529,12 @@ function ($role) {
                         true, 400, '', false, false, 1, false, false, false);
                         $escape = true;
                         break;
-                    case 'indexnumber':
+                    case 'timecreated':
+                        $w = 30;
+                        $name = "";
+                        if ($user->bookingtime > 0) {
+                            $name = userdate($user->bookingtime, get_string('strftimedatetime', 'langconfig'));
+                        }
                         break;
                     case 'signinextracols1':
                     case 'signinextracols2':
@@ -919,6 +924,10 @@ private function set_table_headerrow() {
                     $w = 20;
                     $name = get_string('userpic');
                     break;
+                case 'timecreated':
+                    $w = 30;
+                    $name = get_string('bookingdate', 'mod_booking');
+                    break;
                 default:
                     $rotate = true;
                     $this->hasrotatedfields = true;

diff --git a/mod_form.php b/mod_form.php
@@ -419,6 +419,7 @@ public function definition() {
             'address' => new lang_string('address'),
             'role' => new lang_string('role'),
             'userpic' => get_string('userpic'),
+            'timecreated' => get_string('timecreated', 'mod_booking'),
         ];
 
         for ($i = 1; $i < 4; $i++) {