Merge pull request #6787 from christianbeeznest/storm-22933

NicoDucou · web-flow · commit 6695e4712673 · 2025-09-22T22:29:34.000+02:00
Exercise: Fix expired attempt no longer stuck as incomplete - refs BT#22933
diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
@@ -3374,54 +3374,75 @@ public function showSimpleTimeControl($timeLeft, $url = '')
         $timeLeft = (int) $timeLeft;
 
         return "<script>
-            function openClockWarning() {
-                $('#clock_warning').dialog({
-                    modal:true,
-                    height:320,
-                    width:550,
-                    closeOnEscape: false,
-                    resizable: false,
-                    buttons: {
-                        '".addslashes(get_lang('Close'))."': function() {
-                            $('#clock_warning').dialog('close');
-                        }
-                    },
-                    close: function() {
-                        window.location.href = '$url';
-                    }
-                });
-                $('#clock_warning').dialog('open');
-                $('#counter_to_redirect').epiclock({
-                    mode: $.epiclock.modes.countdown,
-                    offset: {seconds: 5},
-                    format: 's'
-                }).bind('timer', function () {
-                    window.location.href = '$url';
-                });
-            }
+        (function ensureModalStyles() {
+            if (document.getElementById('ch-modal-styles')) return;
+            var css = `
+#clock_warning { display: none; }
+.ch-modal { position: fixed; inset: 0; z-index: 9999; display: grid; place-items: center; padding: 16px; }
+.ch-modal::before { content: ''; position: absolute; inset: 0; background: rgba(0,0,0,.3); }
+.ch-panel { position: relative; width: 100%; max-width: 520px; background: #fff; border: 1px solid #e5e7eb; border-radius: 12px; box-shadow: 0 10px 25px rgba(0,0,0,.08); padding: 16px; color:#111827; font-family: system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif; }
+.ch-close { position:absolute; right: 10px; top:10px; cursor:pointer; color:#6b7280; }
+            `;
+            var s = document.createElement('style');
+            s.id = 'ch-modal-styles';
+            s.textContent = css;
+            document.head.appendChild(s);
+        })();
+
+        function wrapClockWarning() {
+            var \$cw = \$('#clock_warning');
+            if (!\$cw.length) return \$cw;
+            // turn container into modal
+            \$cw.addClass('ch-modal');
+            // ensure inner panel
+            if (!\$cw.find('.ch-panel').length) {
+                \$cw.html('<div class=\"ch-panel\"><span class=\"mdi mdi-close ch-close\" title=\"Close\" aria-label=\"Close\"></span>' + \$cw.html() + '</div>');
+            }
+            // close button
+            \$cw.on('click', '.ch-close', function(){ closeClockWarning(); });
+            return \$cw;
+        }
+
+        function openClockWarning() {
+            var \$cw = wrapClockWarning();
+            if (!\$cw || !\$cw.length) return;
+            \$cw.show();
+
+            // countdown 5s -> redirect
+            \$('#counter_to_redirect').epiclock({
+                mode: \$.epiclock.modes.countdown,
+                offset: {seconds: 5},
+                format: 's'
+            }).bind('timer', function () {
+                window.location.href = '$url';
+            });
+        }
 
-            function onExpiredTimeExercise() {
-                $('#wrapper-clock').hide();
-                $('#expired-message-id').show();
-                // Fixes bug #5263
-                $('#num_current_id').attr('value', '".$this->selectNbrQuestions()."');
-                openClockWarning();
-            }
-
-			$(function() {
-				// time in seconds when using minutes there are some seconds lost
-                var time_left = parseInt(".$timeLeft.");
-                $('#exercise_clock_warning').epiclock({
-                    mode: $.epiclock.modes.countdown,
-                    offset: {seconds: time_left},
-                    format: 'x:i:s',
-                    renderer: 'minute'
-                }).bind('timer', function () {
-                    onExpiredTimeExercise();
-                });
-	       		$('#submit_save').click(function () {});
-	        });
-	    </script>";
+        function closeClockWarning() {
+            \$('#clock_warning').hide();
+            window.location.href = '$url';
+        }
+
+        function onExpiredTimeExercise() {
+            \$('#wrapper-clock').hide();
+            \$('#expired-message-id').show();
+            \$('#num_current_id').attr('value', '".$this->selectNbrQuestions()."');
+            openClockWarning();
+        }
+
+        \$(function() {
+            var time_left = parseInt(".$timeLeft.");
+            \$('#exercise_clock_warning').epiclock({
+                mode: \$.epiclock.modes.countdown,
+                offset: {seconds: time_left},
+                format: 'x:i:s',
+                renderer: 'minute'
+            }).bind('timer', function () {
+                onExpiredTimeExercise();
+            });
+            \$('#submit_save').click(function () {});
+        });
+    </script>";
     }
 
     /**
@@ -3439,8 +3460,7 @@ public function showTimeControlJS($timeLeft, $redirectToUrl = '')
         if (ALL_ON_ONE_PAGE == $this->type) {
             $script = "save_now_all('validate');";
         } elseif (ONE_PER_PAGE == $this->type) {
-            $script = 'window.quizTimeEnding = true;
-                $(\'[name="save_now"]\').trigger(\'click\');';
+            $script = 'window.quizTimeEnding = true; $(\'[name=\"save_now\"]\').trigger(\'click\');';
         }
 
         $exerciseSubmitRedirect = '';
@@ -3449,65 +3469,81 @@ public function showTimeControlJS($timeLeft, $redirectToUrl = '')
         }
 
         return "<script>
-            function openClockWarning() {
-                $('#clock_warning').dialog({
-                    modal:true,
-                    height:320,
-                    width:550,
-                    closeOnEscape: false,
-                    resizable: false,
-                    buttons: {
-                        '".addslashes(get_lang('End test'))."': function() {
-                            $('#clock_warning').dialog('close');
-                        }
-                    },
-                    close: function() {
-                        send_form();
-                    }
-                });
+        (function ensureModalStyles() {
+            if (document.getElementById('ch-modal-styles')) return;
+            var css = `
+#clock_warning { display: none; }
+.ch-modal { position: fixed; inset: 0; z-index: 9999; display: grid; place-items: center; padding: 16px; }
+.ch-modal::before { content: ''; position: absolute; inset: 0; background: rgba(0,0,0,.3); }
+.ch-panel { position: relative; width: 100%; max-width: 520px; background: #fff; border: 1px solid #e5e7eb; border-radius: 12px; box-shadow: 0 10px 25px rgba(0,0,0,.08); padding: 16px; color:#111827; font-family: system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif; }
+.ch-close { position:absolute; right: 10px; top:10px; cursor:pointer; color:#6b7280; }
+            `;
+            var s = document.createElement('style');
+            s.id = 'ch-modal-styles';
+            s.textContent = css;
+            document.head.appendChild(s);
+        })();
+
+        function wrapClockWarning() {
+            var \$cw = \$('#clock_warning');
+            if (!\$cw.length) return \$cw;
+            \$cw.addClass('ch-modal');
+            if (!\$cw.find('.ch-panel').length) {
+                \$cw.html('<div class=\"ch-panel\"><span class=\"mdi mdi-close ch-close\" title=\"Close\" aria-label=\"Close\"></span>' + \$cw.html() + '</div>');
+            }
+            \$cw.on('click', '.ch-close', function(){ closeClockWarning(); });
+            return \$cw;
+        }
+
+        function openClockWarning() {
+            var \$cw = wrapClockWarning();
+            if (!\$cw || !\$cw.length) return;
+            \$cw.show();
+
+            \$('#counter_to_redirect').epiclock({
+                mode: \$.epiclock.modes.countdown,
+                offset: {seconds: 5},
+                format: 's'
+            }).bind('timer', function () {
+                send_form();
+            });
+        }
 
-                $('#clock_warning').dialog('open');
-                $('#counter_to_redirect').epiclock({
-                    mode: $.epiclock.modes.countdown,
-                    offset: {seconds: 5},
-                    format: 's'
-                }).bind('timer', function () {
-                    send_form();
-                });
-            }
+        function closeClockWarning() {
+            \$('#clock_warning').hide();
+            send_form();
+        }
 
-            function send_form() {
-                if ($('#exercise_form').length) {
-                    $script
-                } else {
-                    $exerciseSubmitRedirect
-                    // In exercise_reminder.php
-                    final_submit();
-                }
+        function send_form() {
+            if (\$('#exercise_form').length) {
+                $script
+            } else {
+                $exerciseSubmitRedirect
+                // In exercise_reminder.php
+                final_submit();
             }
+        }
 
-            function onExpiredTimeExercise() {
-                $('#wrapper-clock').hide();
-                $('#expired-message-id').show();
-                // Fixes bug #5263
-                $('#num_current_id').attr('value', '".$this->selectNbrQuestions()."');
-                openClockWarning();
-            }
-
-			$(function() {
-				// time in seconds when using minutes there are some seconds lost
-                var time_left = parseInt(".$timeLeft.");
-                $('#exercise_clock_warning').epiclock({
-                    mode: $.epiclock.modes.countdown,
-                    offset: {seconds: time_left},
-                    format: 'x:C:s',
-                    renderer: 'minute'
-                }).bind('timer', function () {
-                    onExpiredTimeExercise();
-                });
-	       		$('#submit_save').click(function () {});
-	        });
-	    </script>";
+        function onExpiredTimeExercise() {
+            \$('#wrapper-clock').hide();
+            \$('#expired-message-id').show();
+            \$('#num_current_id').attr('value', '".$this->selectNbrQuestions()."');
+            openClockWarning();
+        }
+
+        \$(function() {
+            var time_left = parseInt(".$timeLeft.");
+            \$('#exercise_clock_warning').epiclock({
+                mode: \$.epiclock.modes.countdown,
+                offset: {seconds: time_left},
+                format: 'x:C:s',
+                renderer: 'minute'
+            }).bind('timer', function () {
+                onExpiredTimeExercise();
+            });
+            \$('#submit_save').click(function () {});
+        });
+    </script>";
     }
 
     /**
diff --git a/public/main/exercise/exercise_submit.php b/public/main/exercise/exercise_submit.php
@@ -628,6 +628,23 @@
 if ($time_control) {
     //Sends the exercise form when the expired time is finished.
     $htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left);
+    if (isset($exe_id) && $time_left <= 0) {
+        Database::query("
+        UPDATE " . Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . "
+        SET status = 'completed',
+            exe_date = FROM_UNIXTIME(LEAST(UNIX_TIMESTAMP('" . Database::escape_string($clock_expired_time) . "'), UNIX_TIMESTAMP()))
+        WHERE exe_id = " . (int) $exe_id . "
+          AND status = 'incomplete'
+    ");
+
+        $resultUrl = 'exercise_result.php?' . api_get_cidreq()
+            . "&exe_id=$exe_id"
+            . "&learnpath_id=$learnpath_id"
+            . "&learnpath_item_id=$learnpath_item_id"
+            . "&learnpath_item_view_id=$learnpath_item_view_id";
+        header('Location: ' . $resultUrl);
+        exit;
+    }
 }
 
 //in LP's is enabled the "remember question" feature?
diff --git a/public/main/exercise/overview.php b/public/main/exercise/overview.php
@@ -69,7 +69,7 @@
 $htmlHeadXtra[] = api_get_build_js('legacy_exercise.js');
 if ($time_control) {
     // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s', 'UTC') - time());
+    $time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
     /*$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
@@ -144,6 +144,17 @@
     0
 );
 
+if ($time_control && !empty($exercise_stat_info['exe_id']) && !empty($clock_expired_time)) {
+    $time_left_check = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
+    if ($time_left_check <= 0) {
+        $result_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?'
+            . api_get_cidreq()
+            . '&show_headers=1&'
+            . http_build_query(['id' => $exercise_stat_info['exe_id']]);
+        api_location($result_url);
+    }
+}
+
 //1. Check if this is a new attempt or a previous
 $label = get_lang('Start test');
 if ($time_control && !empty($clock_expired_time) || isset($exercise_stat_info['exe_id'])) {
@@ -434,7 +445,7 @@
 }
 
 if ($time_control) {
-    $html .= $objExercise->returnTimeLeftDiv();
+   // $html .= $objExercise->returnTimeLeftDiv();
 }
 
 $html .= $message;
diff --git a/public/main/exercise/result.php b/public/main/exercise/result.php
@@ -68,6 +68,23 @@
     }
 }
 
+if (!empty($objExercise->expired_time)) {
+    $status          = $track_exercise_info['status'] ?? '';
+    $expiredAt       = $track_exercise_info['expired_time_control'] ?? null;
+    if ($status === 'incomplete' && !empty($expiredAt)) {
+        $timeLeft = api_strtotime($expiredAt, 'UTC') - time();
+        if ($timeLeft <= 0) {
+            Database::query("
+                UPDATE " . Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . "
+                SET status = 'completed',
+                    exe_date = FROM_UNIXTIME(LEAST(UNIX_TIMESTAMP('" . Database::escape_string($expiredAt) . "'), UNIX_TIMESTAMP()))
+                WHERE exe_id = " . $id . " AND status = 'incomplete'
+            ");
+            $track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($id);
+        }
+    }
+}
+
 $allowSignature = false;
 if ($student_id === $current_user_id && ExerciseSignaturePlugin::exerciseHasSignatureActivated($objExercise)) {
     // Check if signature exists.
diff --git a/public/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php
@@ -825,17 +825,19 @@ public static function addEvent(
      */
     public static function getLastAttemptDateOfExercise(int $exeId): string
     {
-        $track_attempts = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-        $sql = "SELECT max(tms) as last_attempt_date
-                FROM $track_attempts
-                WHERE exe_id = $exeId";
-        $rs_last_attempt = Database::query($sql);
-        if (0 == Database::num_rows($rs_last_attempt)) {
+        $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+
+        $sql = "SELECT MAX(tms) AS last_attempt_date FROM $table WHERE exe_id = $exeId";
+        $res = Database::query($sql);
+
+        if (!$res) {
             return '';
         }
-        $row_last_attempt = Database::fetch_array($rs_last_attempt);
 
-        return $row_last_attempt['last_attempt_date']; //Get the date of last attempt
+        $row = Database::fetch_array($res) ?: [];
+        $val = $row['last_attempt_date'] ?? null;
+
+        return $val !== null ? (string) $val : '';
     }
 
     /**
diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
