Merge pull request #7125 from christianbeeznest/ofaj-23118

Exercise: Fix per-attempt audio feedback loading - refs BT#23118

Author: NicoDucou

public/main/inc/ajax/record_audio_rtc.ajax.php

@@ -44,18 +44,25 @@
         break;
 
     case Asset::EXERCISE_FEEDBACK:
+        /** @var TrackEExercise|null $exeAttempt */
+        $exeAttempt = Container::getTrackEExerciseRepository()->find($trackExerciseId);
+
+        if (null === $exeAttempt) {
+            exit;
+        }
+
+        // Make feedback asset unique per attempt + question (not only per question)
+        $assetTitle = sprintf('feedback_%d_%d', $questionId, $trackExerciseId);
         $asset = (new Asset())
             ->setCategory(Asset::EXERCISE_FEEDBACK)
-            ->setTitle("feedback_$questionId")
+            ->setTitle($assetTitle)
         ;
 
         $asset = $assetRepo->createFromRequest($asset, $_FILES['audio_blob']);
 
         $attemptFeedback = (new AttemptFeedback())
             ->setAsset($asset);
 
-        /** @var TrackEExercise $exeAttempt */
-        $exeAttempt = Container::getTrackEExerciseRepository()->find($trackExerciseId);
         $attempt = $exeAttempt->getAttemptByQuestionId($questionId);
 
         if (null === $attempt) {

public/main/inc/lib/exercise.lib.php

@@ -5593,7 +5593,7 @@ public static function getOralFileAudio(int $trackExerciseId, int $questionId, b
      */
     public static function getOralFeedbackAudio(int $attemptId, int $questionId): string
     {
-        /** @var TrackEExercise $tExercise */
+        /** @var TrackEExercise|null $tExercise */
         $tExercise = Container::getTrackEExerciseRepository()->find($attemptId);
 
         if (null === $tExercise) {
@@ -5606,23 +5606,45 @@ public static function getOralFeedbackAudio(int $attemptId, int $questionId): st
             return '';
         }
 
-        $assetRepo = Container::getAssetRepository();
-        $html = '';
+        $feedbacks = $qAttempt->getAttemptFeedbacks();
 
-        // Keep only the latest audio feedback to avoid duplicated players
-        foreach ($qAttempt->getAttemptFeedbacks() as $attemptFeedback) {
-            $html = Display::tag(
-                'audio',
-                '',
-                [
-                    'src' => $assetRepo->getAssetUrl($attemptFeedback->getAsset()),
-                    'controls' => '',
-                ]
+        if ($feedbacks->isEmpty()) {
+            return '';
+        }
 
-            );
+        $latestFeedback = null;
+
+        foreach ($feedbacks as $feedback) {
+            // Skip feedbacks without asset, just in case
+            if (null === $feedback->getAsset()) {
+                continue;
+            }
+
+            if (null === $latestFeedback) {
+                $latestFeedback = $feedback;
+                continue;
+            }
+
+            // Choose the feedback with the latest createdAt
+            if ($feedback->getCreatedAt() > $latestFeedback->getCreatedAt()) {
+                $latestFeedback = $feedback;
+            }
         }
 
-        return $html;
+        if (null === $latestFeedback) {
+            return '';
+        }
+
+        $assetRepo = Container::getAssetRepository();
+
+        return Display::tag(
+            'audio',
+            '',
+            [
+                'src' => $assetRepo->getAssetUrl($latestFeedback->getAsset()),
+                'controls' => '',
+            ]
+        );
     }
 
     public static function getUploadAnswerFiles(int $trackExerciseId, int $questionId, bool $returnUrls = false)