Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

chamilo · Feb 15, 2017 · db03661 · db03661
2 parents 7fcb14b + 9061179
commit db03661
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/main/exercise/oral_expression.class.php b/main/exercise/oral_expression.class.php
@@ -207,6 +207,7 @@ public function returnRecorder()
         $recordAudioView->assign('directory', $directory);
         $recordAudioView->assign('user_id', $this->userId);
         $recordAudioView->assign('file_name', $this->fileName);
+        $recordAudioView->assign('question_id', $this->id);
 
         $template = $recordAudioView->get_template('exercise/oral_expression.tpl');
 

diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php
@@ -359,8 +359,13 @@
                 $objQuestionTmp = Question::read($my_question_id, $course_id);
 
                 // Getting free choice data.
-                if ($objQuestionTmp->type  == FREE_ANSWER && $type == 'all') {
-                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id]: null;
+                if (
+                    ($objQuestionTmp->type  == FREE_ANSWER || $objQuestionTmp->type  == ORAL_EXPRESSION)
+                    && $type == 'all'
+                ) {
+                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id])
+                        ? $_REQUEST['free_choice'][$my_question_id]
+                        : null;
                 }
 
                 if ($type == 'all') {

diff --git a/main/template/default/exercise/oral_expression.tpl b/main/template/default/exercise/oral_expression.tpl
@@ -1,4 +1,4 @@
-<div id="record-audio-recordrtc" class="row text-center">
+<div id="record-audio-recordrtc-{{ question_id }}" class="row text-center">
     <div class="col-sm-4 col-sm-offset-4">
         <div class="form-group">
             <span class="fa fa-microphone fa-5x fa-fw" aria-hidden="true"></span>
@@ -7,38 +7,38 @@
     </div>
     <div class="col-sm-12">
         <div class="form-group">
-            <button class="btn btn-primary" type="button" id="btn-start-record">
+            <button class="btn btn-primary" type="button" id="btn-start-record-{{ question_id }}">
                 <span class="fa fa-circle fa-fw" aria-hidden="true"></span> {{ 'StartRecordingAudio'|get_lang }}
             </button>
-            <button class="btn btn-danger" type="button" id="btn-stop-record" disabled>
+            <button class="btn btn-danger" type="button" id="btn-stop-record-{{ question_id }}" disabled>
                 <span class="fa fa-square fa-fw" aria-hidden="true"></span> {{ 'StopRecordingAudio'|get_lang }}
             </button>
-            <button class="btn btn-success" type="button" id="btn-save-record" disabled>
+            <button class="btn btn-success" type="button" id="btn-save-record-{{ question_id }}" disabled>
                 <span class="fa fa-send fa-fw" aria-hidden="true"></span> {{ 'SaveRecordedAudio'|get_lang }}
             </button>
         </div>
         <div class="form-group">
-            <audio class="skip hidden center-block" controls id="record-preview"></audio>
+            <audio class="skip hidden center-block" controls id="record-preview-{{ question_id }}"></audio>
         </div>
     </div>
 </div>
 
-<div class="row" id="record-audio-wami">
+<div class="row" id="record-audio-wami-{{ question_id }}">
     <div class="col-sm-4 col-sm-offset-4 text-center">
-        <div id="record-audio-wami-container" class="wami-container"></div>
+        <div id="record-audio-wami-container-{{ question_id }}" class="wami-container"></div>
     </div>
 </div>
 
 <script>
 $(document).on('ready', function () {
     function useRecordRTC() {
-        $('#record-audio-recordrtc').show();
+        $('#record-audio-recordrtc-{{ question_id }}').show();
         var mediaConstraints = {audio: true},
                 recordRTC = null,
-                btnStart = $('#btn-start-record'),
-                btnStop = $('#btn-stop-record'),
-                btnSave = $('#btn-save-record'),
-                tagAudio = $('#record-preview');
+                btnStart = $('#btn-start-record-{{ question_id }}'),
+                btnStop = $('#btn-stop-record-{{ question_id }}'),
+                btnSave = $('#btn-save-record-{{ question_id }}'),
+                tagAudio = $('#record-preview-{{ question_id }}');
 
         btnStart.on('click', function () {
             navigator.getUserMedia = navigator.getUserMedia ||
@@ -120,17 +120,17 @@ $(document).on('ready', function () {
     }
 
     function useWami() {
-        $('#record-audio-wami').show();
+        $('#record-audio-wami-{{ question_id }}').show();
 
         Wami.setup({
-            id: "record-audio-wami-container",
+            id: "record-audio-wami-container-{{ question_id }}",
             onReady: setupGUI,
             swfUrl: '{{ _p.web_lib }}wami-recorder/Wami.swf'
         });
 
         function setupGUI() {
             var gui = new Wami.GUI({
-                    id: 'record-audio-wami-container',
+                    id: 'record-audio-wami-container-{{ question_id }}',
                     singleButton: true,
                     recordUrl: '{{ _p.web_ajax }}record_audio_wami.ajax.php?' + $.param({
                         waminame: '{{ file_name }}.wav',
@@ -146,7 +146,7 @@ $(document).on('ready', function () {
         }
     }
 
-    $('#record-audio-recordrtc, #record-audio-wami').hide();
+    $('#record-audio-recordrtc-{{ question_id }}, #record-audio-wami-{{ question_id }}').hide();
 
     var webRTCIsEnabled = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia ||
             navigator.mediaDevices.getUserMedia;