fix route to submission page + fix teacher submissions page if capaci…

…ty == 1 (#248) * finishing touches * requested change * fix reroutes submissionspage
SELab-2 · May 23, 2024 · ebc542a · ebc542a
1 parent 9c92dba
commit ebc542a
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 50 deletions.
diff --git a/frontend/src/components/submission/SubmissionTeacherCard.vue b/frontend/src/components/submission/SubmissionTeacherCard.vue
@@ -1,12 +1,15 @@
 <template>
     <v-card v-if="!isLoading" class="parent-card">
-        <v-card-title>
+        <v-card-title v-if="capacity > 1">
             {{ $t("project.group", { number: group!.num }) }}
         </v-card-title>
+        <v-card-title v-else>
+            {{ group.members[0].given_name + " " + group.members[0].surname }}
+        </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}`" class="button">
+            <v-btn :to="`/submissions/${submission.group_id}`" class="button">
                 {{ $t("project.submissions_list") }}
             </v-btn>
         </v-card-actions>
@@ -22,6 +25,7 @@ import { useGroupQuery } from "@/queries/Group";
 const props = defineProps<{
     submission: Submission;
     deadline: Date;
+    capacity: Number;
 }>();
 const { submission } = toRefs(props);
 

diff --git a/frontend/src/components/submission/SubmitForm.vue b/frontend/src/components/submission/SubmitForm.vue
@@ -55,7 +55,7 @@ async function formOnSubmit(event: SubmitEvent) {
 
     try {
         await mutateAsync(formData);
-        await router.push(`/groups/${group.value?.id}`);
+        await router.push(`/submissions/${group.value?.id}`);
     } catch (error) {
         if (error instanceof UnmetRequirementsError) {
             unmetRequirements.value = error.unmetRequirements;

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 from this group",
+        submissions_list: "All submissions from this person/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 van deze groep",
+        submissions_list: "Alle indieningen van deze persoon/groep",
         submissions_list_teacher: "Alle indieningen voor dit project",
         submissions_zip: "Download alle indieningen",
         not_found: "Geen projecten teruggevonden.",

diff --git a/frontend/src/views/GroupView.vue b/frontend/src/views/GroupView.vue
@@ -6,50 +6,52 @@
         </h1>
         <v-row v-else>
             <v-col class="col-sm-12 col-md-6 col-lg-8">
-                <h1>{{ $t("project.group", { number: group!.num }) }}</h1>
-                <h2>{{ "Project: " + project!.name }}</h2>
-                <v-card variant="flat">
-                    <v-card-item :title="$t('group.members')">
-                        <div v-if="group!.members.length" class="members">
-                            <v-row
-                                v-for="(member, index) in group!.members"
-                                :key="index"
-                                align="center"
-                            >
-                                <v-col>{{ member.given_name + " " + member.surname }}</v-col>
-                                <v-col>
-                                    <v-btn
-                                        v-if="isTeacher"
-                                        prepend-icon="mdi-close"
-                                        color="red"
-                                        variant="flat"
-                                        @click="
-                                            () =>
-                                                removeStudent({
-                                                    groupId: group!.id,
-                                                    uid: member.uid,
-                                                })
-                                        "
-                                    >
-                                        {{ $t("group.remove") }}</v-btn
-                                    >
-                                </v-col>
-                            </v-row>
-                        </div>
-                        <div v-else class="members">
-                            {{ $t("group.no_members_found") }}
-                        </div>
-                    </v-card-item>
-                    <v-card-actions>
-                        <GroupButtons
-                            :amountOfMembers="amountOfMembers"
-                            :group="group!"
-                            :project="project!"
-                            :user="user!"
-                            :isTeacher="isTeacher!"
-                        />
-                    </v-card-actions>
-                </v-card>
+                <div v-if="project!.capacity > 1">
+                    <h1>{{ $t("project.group", { number: group!.num }) }}</h1>
+                    <h2>{{ "Project: " + project!.name }}</h2>
+                    <v-card variant="flat">
+                        <v-card-item :title="$t('group.members')">
+                            <div v-if="group!.members.length" class="members">
+                                <v-row
+                                    v-for="(member, index) in group!.members"
+                                    :key="index"
+                                    align="center"
+                                >
+                                    <v-col>{{ member.given_name + " " + member.surname }}</v-col>
+                                    <v-col>
+                                        <v-btn
+                                            v-if="isTeacher"
+                                            prepend-icon="mdi-close"
+                                            color="red"
+                                            variant="flat"
+                                            @click="
+                                                () =>
+                                                    removeStudent({
+                                                        groupId: group!.id,
+                                                        uid: member.uid,
+                                                    })
+                                            "
+                                        >
+                                            {{ $t("group.remove") }}</v-btn
+                                        >
+                                    </v-col>
+                                </v-row>
+                            </div>
+                            <div v-else class="members">
+                                {{ $t("group.no_members_found") }}
+                            </div>
+                        </v-card-item>
+                        <v-card-actions>
+                            <GroupButtons
+                                :amountOfMembers="amountOfMembers"
+                                :group="group!"
+                                :project="project!"
+                                :user="user!"
+                                :isTeacher="isTeacher!"
+                            />
+                        </v-card-actions>
+                    </v-card>
+                </div>
                 <v-card variant="outlined" class="submissions">
                     <SubmissionList :groupId="groupId" />
                 </v-card>

diff --git a/frontend/src/views/SubmissionsTeacherView.vue b/frontend/src/views/SubmissionsTeacherView.vue
@@ -32,6 +32,7 @@
                         :key="submission.id"
                         :submission="submission"
                         :deadline="project.deadline"
+                        :capacity="project.capacity"
                     />
                 </v-skeleton-loader>
             </v-col>

diff --git a/frontend/tests/views/GroupView.spec.ts b/frontend/tests/views/GroupView.spec.ts
@@ -24,7 +24,7 @@ vi.mock("@/queries/Group", () => ({
 }))
 
 const testProjectQuery = {
-    data: ref({subject_id: 1, name: "testproject"}),
+    data: ref({subject_id: 1, name: "testproject", capacity: 2}),
     isLoading: ref(false),
     isError: ref(false)
 }