implemented page for QS_5 closes #53

socialsoftware · Jul 14, 2020 · 5e7b0bd · 5e7b0bd
1 parent 6fdf90c
commit 5e7b0bd
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 14 deletions.
diff --git a/frontend/src/models/management/Submission.ts b/frontend/src/models/management/Submission.ts
@@ -7,6 +7,7 @@ export default class Submission {
   userId: number | null = null;
   name: string | null = null;
   anonymous!: boolean;
+  argument: string | null = null;
 
   constructor(jsonObj?: Submission) {
     if (jsonObj) {
@@ -16,6 +17,7 @@ export default class Submission {
       this.userId = jsonObj.userId;
       this.name = jsonObj.name;
       this.anonymous = jsonObj.anonymous;
+      this.argument = jsonObj.argument;
     }
   }
 }
diff --git a/frontend/src/views/student/submissions/EditSubmissionDialog.vue b/frontend/src/views/student/submissions/EditSubmissionDialog.vue
@@ -33,11 +33,18 @@
                     />
                     <v-textarea
                             outline
-                            rows="10"
+                            rows="3"
                             v-model="editSubmission.question.options[index - 1].content"
                             :label="`Option ${index}`"
                     ></v-textarea>
                 </div>
+                <br><br>
+                <v-textarea
+                        outline
+                        rows="5"
+                        v-model="editSubmission.argument"
+                        label="Argument (Optional)"
+                ></v-textarea>
             </v-card-text>
 
             <v-card-actions>

diff --git a/frontend/src/views/student/submissions/ShowReviews.vue b/frontend/src/views/student/submissions/ShowReviews.vue
@@ -1,5 +1,6 @@
 <template>
     <v-container>
+        <p v-if="reviews.length === 0" style="text-align: center; color: lightgrey"> No reviews available </p>
         <v-container v-for="review in reviews" :key="review.id" class="review">
             <p>
                 {{ review.creationDate + ': ' }}

diff --git a/frontend/src/views/student/submissions/ShowSubmissionDialog.vue b/frontend/src/views/student/submissions/ShowSubmissionDialog.vue
@@ -12,9 +12,13 @@
 
             <v-card-text class="text-left">
                 <show-question :question="submission.question" />
+                <div v-if="submission.argument !== null && submission.name === $store.getters.getUser.name">
+                    <h3 style="display: inline">Argument: </h3>
+                    <p style="display: inline">{{ submission.argument }}</p>
+                </div>
             </v-card-text>
             <v-card-title>
-                <span class="headline">{{ 'Reviews History' }}</span>
+                <span class="headline">{{ 'Reviews' }}</span>
             </v-card-title>
             <div class="text-left">
                 <show-reviews

diff --git a/frontend/src/views/teacher/submissions/ShowReviews.vue b/frontend/src/views/teacher/submissions/ShowReviews.vue
@@ -1,5 +1,6 @@
 <template>
   <v-container>
+    <p v-if="reviews.length === 0" style="text-align: center; color: lightgrey"> No reviews available </p>
     <v-container v-for="review in reviews" :key="review.id" class="review">
       <p>
         {{ review.creationDate + ': ' }}
@@ -46,7 +47,6 @@ export default class ShowReviews extends Vue {
   }
 
   reviewStatus(status: string) {
-    console.log(status);
     if (status === 'AVAILABLE' || status === 'DISABLED') {
       return 'APPROVED';
     } else if (status === 'REJECTED') {

diff --git a/frontend/src/views/teacher/submissions/ShowSubmissionDialog.vue b/frontend/src/views/teacher/submissions/ShowSubmissionDialog.vue
@@ -12,9 +12,13 @@
 
       <v-card-text class="text-left">
         <show-question :question="submission.question" />
+        <div v-if="submission.argument !== null">
+          <h3 style="display: inline">Argument: </h3>
+          <p style="display: inline">{{ submission.argument }}</p>
+        </div>
       </v-card-text>
       <v-card-title>
-        <span class="headline">{{ 'Reviews History' }}</span>
+        <span class="headline">{{ 'Reviews' }}</span>
       </v-card-title>
       <div class="text-left">
         <show-reviews
@@ -23,26 +27,20 @@
           :submission="submission"
         />
       </div>
-      <v-container
-        v-if="this.status === 'SUBMITTED' || this.status === 'IN_REVIEW'"
+      <div class="text-left"
+           v-if="this.status === 'SUBMITTED' || this.status === 'IN_REVIEW'"
       >
         <v-card-title>
           <span class="headline">{{ 'New Review' }}</span>
         </v-card-title>
-        <v-card-text
-          class="text-left"
-          v-if="
-            submission.question.status === 'SUBMITTED' ||
-              submission.question.status === 'IN_REVIEW'
-          "
-        >
+        <v-card-text class="text-left">
           <v-textarea
             rows="1"
             v-model="justification"
             label="Justification"
           ></v-textarea>
         </v-card-text>
-      </v-container>
+      </div>
       <v-card-actions>
         <v-spacer />
         <v-btn

diff --git a/frontend/src/views/teacher/submissions/SubmissionView.vue b/frontend/src/views/teacher/submissions/SubmissionView.vue
@@ -5,6 +5,8 @@
       :custom-filter="customFilter"
       :items="submissions"
       :search="search"
+      :sort-by="['question.creationDate']"
+      sort-desc
       item-key="id"
       :mobile-breakpoint="0"
       :items-per-page="15"