Solutions can be viewed on the questions summary page

Author: kreut

app/Http/Controllers/AssignmentSyncQuestionController.php

@@ -550,6 +550,7 @@ function getQuestionSummaryByAssignment(Assignment $assignment, Solution $soluti
                     'questions.technology_iframe',
                     'questions.technology',
                     'questions.title', DB::raw('questions.id AS question_id'),
+                    'questions.solution_html',
                     'learning_tree_id',
                     'learning_trees.description AS learning_tree_description')
                 ->get();
@@ -560,16 +561,19 @@ function getQuestionSummaryByAssignment(Assignment $assignment, Solution $soluti
                 $question_ids[] = $value->question_id;
             }
 
-            $assignment_solutions = $solutions->whereIn('question_id', $question_ids)
-                ->where('user_id', Auth::user()->id)
+            $solutions = DB::table('solutions')
+                ->whereIn('question_id', $question_ids)
+                ->where('user_id', $assignment->course->user_id)
                 ->get();
 
+            if ($solutions) {
+                foreach ($solutions as $key => $value) {
+                    $assignment_solutions_by_question_id[$value->question_id]['original_filename'] = $value->original_filename;
+                    $assignment_solutions_by_question_id[$value->question_id]['solution_text'] = $value->text;
+                    $assignment_solutions_by_question_id[$value->question_id]['solution_type'] = $value->type;
+                    $assignment_solutions_by_question_id[$value->question_id]['solution_file_url'] = \Storage::disk('s3')->temporaryUrl("solutions/{$assignment->course->user_id}/{$value->file}", now()->addMinutes(360));
 
-            $assignment_solutions_by_question_id = [];
-            $rows = [];
-            foreach ($assignment_solutions as $key => $value) {
-                $assignment_solutions_by_question_id[$value->question_id] = ['original_filename' => $value->original_filename,
-                    'file' => $value->file];
+                }
             }
             $h5p_questions_exists = false;
             foreach ($assignment_questions as $value) {
@@ -590,7 +594,22 @@ function getQuestionSummaryByAssignment(Assignment $assignment, Solution $soluti
                 $columns['is_auto_graded'] = $value->technology !== 'text';
                 $columns['learning_tree'] = $value->learning_tree_id !== null;
                 $columns['points'] = Helper::removeZerosAfterDecimal($value->points);
-                $columns['solution'] = $this->_getSolutionLink($assignment, $assignment_solutions_by_question_id, $value->question_id);
+
+                $columns['solution'] = $assignment_solutions_by_question_id[$value->question_id]['original_filename'] ?? false;
+
+                $columns['solution_type'] = $assignment_solutions_by_question_id[$value->question_id]['solution_type'] ?? false;
+                $columns['solution_file_url'] = $assignment_solutions_by_question_id[$value->question_id]['solution_file_url'] ?? false;
+                $columns['solution_text'] = $assignment_solutions_by_question_id[$value->question_id]['solution_text'] ?? false;
+                if ($columns['solution_file_url']) {
+                    $columns['type'] = 'q';
+                }
+                $columns['solution_html'] = $value->solution_html;
+                if ($columns['solution_html']) {
+                    $columns['solution_type'] = 'html';
+                }
+
+
+
                 $columns['order'] = $value->order;
                 $columns['question_id'] = $value->question_id;
                 $columns['technology'] = $value->technology;

resources/js/components/SolutionFileHtml.vue

@@ -1,7 +1,7 @@
 <template>
   <span>
     <b-modal
-      id="modal-show-html-solution"
+      :id="`modal-show-html-solution-${currentPage}`"
       ref="htmlModal"
       aria-label="Solution"
       ok-title="OK"
@@ -11,7 +11,7 @@
       <div v-html="questions[currentPage-1].solution_html" />
     </b-modal>
     <b-modal
-      id="modal-show-audio-solution"
+      :id="`modal-show-audio-solution-${currentPage}`"
       ref="modal"
       title="Audio Solution"
       ok-title="OK"
@@ -68,28 +68,38 @@ export default {
     assignmentName: {
       type: String,
       default: 'Assignment'
+    },
+    formatFilename: {
+      type: Boolean,
+      default: true
     }
   },
   methods: {
     openShowHTMLSolutionModal () {
-      this.$bvModal.show('modal-show-html-solution')
+      this.$bvModal.show(`modal-show-html-solution-${this.currentPage}`)
       this.$nextTick(() => {
         MathJax.Hub.Queue(['Typeset', MathJax.Hub])
-        document.getElementById('modal-show-html-solution___BV_modal_header_').style.display = 'none'
+        if (document.getElementsByClassName('modal-header').length) {
+          document.getElementsByClassName('modal-header')[0].style.display = 'none'
+        }
       })
     },
     standardizeFilename (filename) {
-      if (!filename) {
-        return ''
-      }
-      let ext = filename.slice((Math.max(0, filename.lastIndexOf('.')) || Infinity) + 1)
+      if (this.formatFilename) {
+        if (!filename) {
+          return ''
+        }
+        let ext = filename.slice((Math.max(0, filename.lastIndexOf('.')) || Infinity) + 1)
 
-      let name = this.assignmentName.replace(/[/\\?%*:|"<>]/g, '-')
-      return `${name}-${this.currentPage}.${ext}`
+        let name = this.assignmentName.replace(/[/\\?%*:|"<>]/g, '-')
+        return `${name}-${this.currentPage}.${ext}`
+      } else {
+        return filename
+      }
     },
     openShowAudioSolutionModal (event) {
       event.preventDefault()
-      this.$bvModal.show('modal-show-audio-solution')
+      this.$bvModal.show(`modal-show-audio-solution-${this.currentPage}`)
     }
   }
 }

resources/js/pages/instructors/assignment_information/questions.vue

@@ -148,7 +148,7 @@
                      :items="betaCourseApprovals"
             >
               <template v-slot:cell(title)="data">
-                <a href="#" @click="viewQuestionInModal(data.item,data.item.action)">
+                <a href="" @click.prevent="viewQuestionInModal(data.item,data.item.action)">
                   {{ data.item.title !== null ? data.item.title : 'None provided' }}
                 </a>
               </template>
@@ -250,10 +250,10 @@
                   Copy the Adapt ID
                 </b-tooltip>
                 <a :id="getTooltipTarget('copy',item.question_id)"
-                   href="#"
+                   href=""
                    class="pr-1"
                    aria-label="Copy Adapt ID"
-                   @click="doCopy(item.assignment_id_question_id)"
+                   @click.prevent="doCopy(item.assignment_id_question_id)"
                 >
                   <font-awesome-icon :icon="copyIcon"/>
                 </a>
@@ -262,7 +262,9 @@
                 {{ item.submission }}
               </td>
               <td>{{ item.points }}</td>
-              <td><span v-html="item.solution"/></td>
+              <td><SolutionFileHtml :key="item.question_id" :questions="items" :current-page="item.order"
+                                    :format-filename="false"
+              />
               <td v-if="user.role === 2">
                 <b-tooltip :target="getTooltipTarget('edit',item.question_id)"
                            delay="500"
@@ -272,9 +274,9 @@
                 </b-tooltip>
 
                 <a :id="getTooltipTarget('edit',item.question_id)"
-                   href="#"
+                   href=""
                    class="pr-1"
-                   @click="editQuestionSource(item.mind_touch_url)"
+                   @click.prevent="editQuestionSource(item.mind_touch_url)"
                 >
                   <b-icon class="text-muted" icon="pencil"/>
                 </a>
@@ -286,7 +288,7 @@
                   Remove the question from the assignment
                 </b-tooltip>
                 <a :id="getTooltipTarget('remove',item.question_id)"
-                   href="#"
+                   href=""
                    class="pr-1"
                    @click.prevent="openRemoveQuestionModal(item.question_id)"
                 >
@@ -332,7 +334,7 @@ import {
   updateLearningTreeInNonLearningTreeMessage,
   updateNonLearningTreeInLearningTreeMessage
 } from '~/helpers/AssessmentTypeWarnings'
-
+import SolutionFileHtml from '~/components/SolutionFileHtml'
 export default {
   middleware: 'auth',
   components: {
@@ -341,7 +343,8 @@ export default {
     Loading,
     draggable,
     RemoveQuestion,
-    CannotDeleteAssessmentFromBetaAssignmentModal
+    CannotDeleteAssessmentFromBetaAssignmentModal,
+    SolutionFileHtml
   },
   data: () => ({
     showRefreshStatus: false,