Fix error when exercise has no answers and time expired

Fix redirect in overview.php see BT#18534
chamilo · Mar 10, 2021 · 74f7e92 · 74f7e92
1 parent 793dce3
commit 74f7e92
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
@@ -3517,7 +3517,7 @@ function onExpiredTimeExercise() {
      *
      * @return string
      */
-    public function showTimeControlJS($timeLeft)
+    public function showTimeControlJS($timeLeft, $redirectToExerciseSubmit = false)
     {
         $timeLeft = (int) $timeLeft;
         $script = 'redirectExerciseToResult();';
@@ -3528,6 +3528,13 @@ public function showTimeControlJS($timeLeft)
                 $(\'[name="save_now"]\').trigger(\'click\');';
         }
 
+        $exerciseSubmitRedirect = '';
+        if ($redirectToExerciseSubmit) {
+            $url = api_get_path(WEB_CODE_PATH).
+                'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$this->id;
+            $exerciseSubmitRedirect = "window.location = '$url'";
+        }
+
         return "<script>
             function openClockWarning() {
                 $('#clock_warning').dialog({
@@ -3560,6 +3567,7 @@ function send_form() {
                 if ($('#exercise_form').length) {
                     $script
                 } else {
+                    $exerciseSubmitRedirect
                     // In exercise_reminder.php
                     final_submit();
                 }

diff --git a/main/exercise/overview.php b/main/exercise/overview.php
@@ -69,7 +69,7 @@
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.epiclock.min.js');
     $htmlHeadXtra[] = api_get_js('epiclock/renderers/minute/epiclock.minute.js');
-    $htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left);
+    $htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left, true);
 }
 
 if (!in_array($origin, ['learnpath', 'embeddable', 'mobileapp'])) {

diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php
@@ -559,23 +559,43 @@
             error_log('Starting questions loop in save_exercise_by_now');
         }
 
-        // Check we have at least one non-empty answer in the array
-        // provided by the user's click on the "Finish test" button.
+        $now = time();
         if ('all' === $type) {
+            // Check we have at least one non-empty answer in the array
+            // provided by the user's click on the "Finish test" button.
             $atLeastOneAnswer = false;
             foreach ($question_list as $my_question_id) {
                 if (!empty($choice[$my_question_id])) {
                     $atLeastOneAnswer = true;
                     break;
                 }
             }
+
             if (!$atLeastOneAnswer) {
+                // Check if time is over.
+                if ($objExercise->expired_time != 0) {
+                    $clockExpiredTime = ExerciseLib::get_session_time_control_key(
+                        $objExercise->id,
+                        $learnpath_id,
+                        $learnpath_item_id
+                    );
+                    if (!empty($clockExpiredTime)) {
+                        $timeLeft = api_strtotime($clockExpiredTime, 'UTC') - $now;
+                        if ($timeLeft <= 0) {
+                            // There's no time, but still no answers ...
+                            echo json_encode(['ok' => true, 'savedAnswerMessage' => '']);
+                            exit;
+                        }
+                    }
+                }
+
                 error_log(
                     'In '.__FILE__.'::action save_exercise_by_now,'.
                     ' from user '.api_get_user_id().
                     ' for track_e_exercises.exe_id = '.$exeId.
                     ', we received an empty set of answers.'.
-                    'Preventing submission to avoid overwriting w/ null.');
+                    'Preventing submission to avoid overwriting w/ null.'
+                );
                 echo json_encode(['error' => true]);
                 exit;
             }
@@ -728,7 +748,6 @@
             }
 
             $duration = 0;
-            $now = time();
             if ($type === 'all') {
                 $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exeId);
             }