Submissions teacher testen (#238)

* styling * styling * styling * styling * submissionslist test * meer testen * format * merge conflicts * lint + format * button verplaatsen * styling klaar * testen * fix test after dev merge * projectview test * more tests * SubmissionsTeacherView.spec.ts * button change position * format * change submissioncard * format
SELab-2 · May 22, 2024 · 7692926 · 7692926
1 parent 889e485
commit 7692926
Show file tree

Hide file tree

Showing 12 changed files with 256 additions and 158 deletions.
diff --git a/frontend/src/components/project/ProjectInfo.vue b/frontend/src/components/project/ProjectInfo.vue
@@ -28,11 +28,6 @@
                 </v-card-title>
                 <div v-html="renderQuillContent(project.description)"></div>
             </v-card-item>
-            <v-card-actions>
-                <v-btn v-if="isTeacher" :to="`/project/${project.id}/submissions`">
-                    {{ $t("project.submissions_list_teacher") }}
-                </v-btn>
-            </v-card-actions>
         </v-card>
         <SubmitInfo class="submitInfo" v-if="group" :project="project" :group="group" />
     </v-container>

diff --git a/frontend/src/components/submission/SubmissionCard.vue b/frontend/src/components/submission/SubmissionCard.vue
@@ -1,86 +1,75 @@
 <template>
     <v-divider />
     <v-card variant="flat">
-        <v-row>
-            <v-col>
-                <v-card-title>
-                    {{ $t("submission.status") }}
-                    <p
-                        v-if="new Date(submission.date) <= deadline"
-                        :class="Status[submission.status]"
-                    >
-                        {{ Status[submission.status] }}
-                    </p>
-                    <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
-                </v-card-title>
-                <v-card-subtitle>
-                    {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
-                </v-card-subtitle>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.remarks") }}
-                    </v-card-title>
-                    <v-card-text v-if="submission.remarks">
-                        {{ submission.remarks }}
-                    </v-card-text>
-                    <v-card-subtitle v-else>
-                        {{ $t("submission.remarks_empty") }}
-                    </v-card-subtitle>
-                </v-card-item>
-                <v-card-item
-                    v-if="submission.stderr || submission.stdout || submission.testresults.length"
-                >
-                    <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
-                    <v-card-text>
-                        <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
-                        <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
-                        <ul>
-                            <li v-for="result in submission.testresults" :key="result">
-                                <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
-                                <p v-else class="text-red">{{ result.value }}</p>
-                            </li>
-                        </ul>
-                    </v-card-text>
-                </v-card-item>
-            </v-col>
-            <v-col>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.files") }}
-                    </v-card-title>
-                    <v-card-subtitle>
-                        {{ $t("submission.download_info") }}
-                    </v-card-subtitle>
-                    <v-container>
-                        <v-alert
-                            v-if="isError"
-                            title="Error"
-                            color="error"
-                            :text="error!.message"
-                        ></v-alert>
-                        <v-skeleton-loader v-else :loading="isLoading" type="card">
-                            <v-col>
-                                <v-chip
-                                    class="ma-2"
-                                    v-for="(item, index) in files"
-                                    label
-                                    color="blue"
-                                    :key="item.filesortedname"
-                                    @click="() => downloadFile(index)"
-                                >
-                                    {{ item.filename }}
-                                </v-chip>
-                            </v-col>
-                        </v-skeleton-loader>
-                    </v-container>
-                    <v-card-actions>
-                        <v-btn @click="downloadAll">
-                            {{ $t("submission.download_all_files") }}
-                        </v-btn>
-                    </v-card-actions>
-                </v-card-item>
-            </v-col>
-        </v-row>
+        <v-card-title>
+            {{ $t("submission.status") }}
+            <p v-if="new Date(submission.date) <= deadline" :class="Status[submission.status]">
+                {{ Status[submission.status] }}
+            </p>
+            <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
+        </v-card-title>
+        <v-card-subtitle>
+            {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
+        </v-card-subtitle>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.remarks") }}
+            </v-card-title>
+            <v-card-text v-if="submission.remarks">
+                {{ submission.remarks }}
+            </v-card-text>
+            <v-card-subtitle v-else>
+                {{ $t("submission.remarks_empty") }}
+            </v-card-subtitle>
+        </v-card-item>
+        <v-card-item v-if="submission.stderr || submission.stdout || submission.testresults.length">
+            <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
+            <v-card-text>
+                <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
+                <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
+                <ul>
+                    <li v-for="result in submission.testresults" :key="result">
+                        <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
+                        <p v-else class="text-red">{{ result.value }}</p>
+                    </li>
+                </ul>
+            </v-card-text>
+        </v-card-item>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.files") }}
+            </v-card-title>
+            <v-card-subtitle>
+                {{ $t("submission.download_info") }}
+            </v-card-subtitle>
+            <v-container>
+                <v-alert
+                    v-if="isError"
+                    title="Error"
+                    color="error"
+                    :text="error!.message"
+                ></v-alert>
+                <v-skeleton-loader v-else :loading="isLoading" type="card">
+                    <v-col>
+                        <v-chip
+                            class="ma-2"
+                            v-for="(item, index) in files"
+                            label
+                            color="blue"
+                            :key="item.filesortedname"
+                            @click="() => downloadFile(index)"
+                        >
+                            {{ item.filename }}
+                        </v-chip>
+                    </v-col>
+                </v-skeleton-loader>
+            </v-container>
+            <v-card-actions>
+                <v-btn @click="downloadAll">
+                    {{ $t("submission.download_all_files") }}
+                </v-btn>
+            </v-card-actions>
+        </v-card-item>
     </v-card>
 </template>
 

diff --git a/frontend/src/components/submission/SubmissionTeacherCard.vue b/frontend/src/components/submission/SubmissionTeacherCard.vue
@@ -3,11 +3,10 @@
         <v-card-title>
             {{ $t("project.group", { number: submission.group_id }) }}
         </v-card-title>
-
         <SubmissionCard class="ma-3" :submission="submission" :deadline="deadline" />
-
+        <v-divider class="divider" />
         <v-card-actions>
-            <v-btn :to="`/groups/${submission.group_id}`">
+            <v-btn :to="`/groups/${submission.group_id}`" class="button">
                 {{ $t("project.submissions_list") }}
             </v-btn>
         </v-card-actions>
@@ -32,6 +31,16 @@ const { submission } = toRefs(props);
 }
 
 .parent-card {
+    background-color: rgb(var(--v-theme-background));
+    padding: 10px;
+    width: 100%;
+}
+
+.button {
     background-color: rgb(var(--v-theme-secondary));
 }
+
+.divider {
+    margin-bottom: 10px;
+}
 </style>
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
@@ -68,7 +68,7 @@ export default {
         myProject: "My projects",
         capacity_group: "Capacity: ",
         edit: "Edit project",
-        submissions_list: "All submissions",
+        submissions_list: "All submissions from this group",
         submissions_list_teacher: "All submissions for this project",
         submissions_zip: "Download all submissions",
         not_found: "No projects found.",

diff --git a/frontend/src/i18n/locales/nl.ts b/frontend/src/i18n/locales/nl.ts
@@ -68,7 +68,7 @@ export default {
         myProject: "Mijn projecten",
         capacity_group: "Capaciteit: ",
         edit: "Bewerk project",
-        submissions_list: "Alle indieningen",
+        submissions_list: "Alle indieningen van deze groep",
         submissions_list_teacher: "Alle indieningen voor dit project",
         submissions_zip: "Download alle indieningen",
         not_found: "Geen projecten teruggevonden.",

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -166,12 +166,6 @@ const router = createRouter({
             component: () => import("../views/SubjectRegisterView.vue"),
             props: (route) => ({ uuid: String(route.params.uuid) }),
         },
-        {
-            path: "/submissions/:submissionId(\\d+)",
-            name: "submission",
-            component: () => import("../views/SubmissionView.vue"),
-            props: (route) => ({ submissionId: Number(route.params.submissionId) }),
-        },
         {
             path: "/settings",
             name: "settings",

diff --git a/frontend/src/views/ProjectView.vue b/frontend/src/views/ProjectView.vue
@@ -14,6 +14,14 @@
                         :subject="subject!"
                         :user="user!"
                     />
+                    <v-btn
+                        v-if="isTeacher"
+                        :to="`/project/${project.id}/submissions`"
+                        class="allsubmissions"
+                        variant="flat"
+                    >
+                        {{ $t("project.submissions_list_teacher") }}
+                    </v-btn>
                 </v-col>
                 <v-col cols="2" class="button-container">
                     <ProjectSideBar
@@ -87,11 +95,24 @@ const isDataError = computed(
         isSubjectError.value ||
         isUserError.value
 );
+
+const isTeacher = computed(
+    () =>
+        user.value.is_teacher ||
+        user.value.is_admin ||
+        instructors.value?.some((element) => element.uid == user.value.uid)
+);
 </script>
 
 <style scoped>
 .button-container {
     margin-top: 20px;
     min-width: 200px;
 }
+
+.allsubmissions {
+    margin: 15px;
+    background-color: rgb(var(--v-theme-primary));
+    color: rgb(var(--v-theme-navtext));
+}
 </style>
diff --git a/frontend/src/views/SubmissionView.vue b/frontend/src/views/SubmissionView.vue