set up routing and page for QS_4 closes #49

socialsoftware · Jul 4, 2020 · 57da84e · 57da84e
1 parent 08e7d5f
commit 57da84e
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 11 deletions.
diff --git a/frontend/src/components/TopBar.vue b/frontend/src/components/TopBar.vue
@@ -155,10 +155,32 @@
           </v-list>
         </v-menu>
 
-        <v-btn to="/student/submissions" v-if="isStudent && currentCourse" text dark>
-          Submissions
-          <v-icon>fas fa-user-edit</v-icon>
-        </v-btn>
+        <v-menu offset-y v-if="isStudent && currentCourse" open-on-hover>
+          <template v-slot:activator="{ on }">
+            <v-btn v-on="on" text dark>
+              Submissions
+              <v-icon>question_answer</v-icon>
+            </v-btn>
+          </template>
+          <v-list dense>
+            <v-list-item to="/student/submissions">
+              <v-list-item-action>
+                <v-icon>fas fa-user-edit</v-icon>
+              </v-list-item-action>
+              <v-list-item-content>
+                <v-list-item-title>My Submissions</v-list-item-title>
+              </v-list-item-content>
+            </v-list-item>
+            <v-list-item to="/student/all-submissions">
+              <v-list-item-action>
+                <v-icon>fas fa-users</v-icon>
+              </v-list-item-action>
+              <v-list-item-content>
+                <v-list-item-title>All Submissions</v-list-item-title>
+              </v-list-item-content>
+            </v-list-item>
+          </v-list>
+        </v-menu>
 
         <v-btn to="/student/stats" v-if="isStudent && currentCourse" text dark>
           Stats
@@ -331,19 +353,27 @@
             <v-list-item-content>Solved Quizzes</v-list-item-content>
           </v-list-item>
 
-          <v-list-item to="/student/stats">
+          <v-list-item to="/student/submissions">
             <v-list-item-action>
-              <v-icon>fas fa-user</v-icon>
+              <v-icon>fas fa-user-edit</v-icon>
             </v-list-item-action>
-            <v-list-item-content>Stats</v-list-item-content>
+            <v-list-item-content>My Submissions</v-list-item-content>
           </v-list-item>
 
-          <v-list-item to="/student/submissions">
+          <v-list-item to="/student/all-submissions">
             <v-list-item-action>
-              <v-icon>fas fa-user-edit</v-icon>
+              <v-icon>fas fa-users</v-icon>
             </v-list-item-action>
-            <v-list-item-content>Submissions</v-list-item-content>
+            <v-list-item-content>All Submissions</v-list-item-content>
           </v-list-item>
+
+          <v-list-item to="/student/stats">
+            <v-list-item-action>
+              <v-icon>fas fa-user</v-icon>
+            </v-list-item-action>
+            <v-list-item-content>Stats</v-list-item-content>
+          </v-list-item>
+
         </v-list-group>
 
         <v-list-item to="/courses" v-if="isLoggedIn && moreThanOneCourse">

diff --git a/frontend/src/router.ts b/frontend/src/router.ts
@@ -28,6 +28,7 @@ import CoursesView from '@/views/admin/Courses/CoursesView.vue';
 
 import StudentSubmissionView from '@/views/student/submissions/SubmissionView.vue'
 import TeacherSubmissionView from '@/views/teacher/submissions/SubmissionView.vue'
+import AllSubmissionsView from '@/views/student/submissions/AllSubmissionsView.vue'
 
 Vue.use(Router);
 
@@ -207,6 +208,15 @@ let router = new Router({
             title: APP_NAME + ' - Submissions',
             requiredAuth: 'Student'
           }
+        },
+        {
+          path: 'all-submissions',
+          name: 'all-submissions',
+          component: AllSubmissionsView,
+          meta: {
+            title: process.env.VUE_APP_NAME + ' - All Submissions',
+            requiredAuth: 'Student'
+          }
         }
 
       ]

diff --git a/frontend/src/services/RemoteServices.ts b/frontend/src/services/RemoteServices.ts
@@ -656,7 +656,23 @@ export default class RemoteServices {
         throw Error(await this.errorMessage(error));
       });
   }
-
+
+  static async getAllStudentSubmissions(): Promise<Submission[]> {
+    return httpClient
+      .get(
+        `/student/submission/all?executionId=${Store.getters.getCurrentCourse.courseExecutionId}`
+      )
+      .then(response => {
+        return response.data.map((submission: any) => {
+          return new Submission(submission);
+        });
+      })
+      .catch(async error => {
+        throw Error(await this.errorMessage(error));
+      });
+  }
+
+
   static async exportAll() {
     return httpClient
       .get('/admin/export', {

diff --git a/frontend/src/views/student/submissions/AllSubmissionsView.vue b/frontend/src/views/student/submissions/AllSubmissionsView.vue
@@ -0,0 +1,13 @@
+<template>
+    <h2>Testing!</h2>
+</template>
+
+<script>
+  export default {
+    name: 'AllSubmissionsView'
+  };
+</script>
+
+<style scoped>
+
+</style>