From 64ab7a9bb13154db2af71a05082ed3ce9eb49957 Mon Sep 17 00:00:00 2001
From: Marieke <marieke.sinnaeve@ugent.be>
Date: Thu, 23 May 2024 20:35:07 +0200
Subject: [PATCH] enkele fixes

---
 .../body/projects/SubjectProjectPage.vue      | 19 ++++++++++++++++---
 .../src/components/submission/SubmitInfo.vue  |  2 +-
 frontend/src/i18n/locales/en.ts               |  1 +
 frontend/src/i18n/locales/nl.ts               |  1 +
 frontend/src/views/ProjectsView.vue           |  4 ++++
 .../views/subject/modify/PatchSubjectView.vue | 15 ++++++++-------
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/subject/subject/body/projects/SubjectProjectPage.vue b/frontend/src/components/subject/subject/body/projects/SubjectProjectPage.vue
index 1644fe41..1cb12d13 100644
--- a/frontend/src/components/subject/subject/body/projects/SubjectProjectPage.vue
+++ b/frontend/src/components/subject/subject/body/projects/SubjectProjectPage.vue
@@ -25,7 +25,7 @@
                 <h2 v-if="project.capacity > 1 && !isLoading && group !== null" class="group">
                     {{ $t("project.group", { number: group?.num }) }}
                 </h2>
-                <h2 v-else-if="!isError && project.capacity > 1" class="group">
+                <h2 v-else-if="!isError && project.capacity > 1 && !isTeacher" class="group">
                     {{ $t("project.no_group") }}
                 </h2>
                 <h2>{{ $t("subject.project.assignment") }}</h2>
@@ -72,9 +72,11 @@
 
 <script setup lang="ts">
 import type Project from "@/models/Project";
-import { ref, toRefs } from "vue";
+import { computed, ref, toRefs } from "vue";
 import { Quill } from "@vueup/vue-quill";
 import { useProjectGroupQuery } from "@/queries/Group";
+import { useCurrentUserQuery } from "@/queries/User";
+import { useSubjectInstructorsQuery } from "@/queries/Subject";
 
 const props = defineProps<{
     selectedTab: number;
@@ -91,8 +93,19 @@ const renderQuillContent = (content: string) => {
     quill.root.innerHTML = content;
     return quill.root.innerHTML;
 };
-
+const { data: user } = useCurrentUserQuery();
+const { data: instructors } = useSubjectInstructorsQuery(computed(() => project.value?.subject_id));
 const { data: group, isLoading, isError } = useProjectGroupQuery(project.value.id);
+
+const isTeacher = computed(() => {
+    if (!user.value || !instructors.value) {
+        return false;
+    }
+    return (
+        user.value.is_admin ||
+        instructors.value.some((instructor) => instructor.uid === user.value.uid)
+    );
+});
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/submission/SubmitInfo.vue b/frontend/src/components/submission/SubmitInfo.vue
index 21609d1c..bbd9bf47 100644
--- a/frontend/src/components/submission/SubmitInfo.vue
+++ b/frontend/src/components/submission/SubmitInfo.vue
@@ -19,7 +19,7 @@
                 {{ $t("submit.new_submission") }}
             </v-btn>
             <v-btn :to="`/submissions/${group?.id}`">
-                {{ $t("project.submissions_list") }}
+                {{ $t("project.submissions_all") }}
             </v-btn>
         </v-card-actions>
     </v-card>
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
index b89c05c6..44c05a66 100644
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
@@ -69,6 +69,7 @@ export default {
         capacity_group: "Capacity: ",
         edit: "Edit project",
         submissions_list: "All submissions from this person/group",
+        submissions_all: "View submissions",
         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
index 3833333a..86d44197 100644
--- a/frontend/src/i18n/locales/nl.ts
+++ b/frontend/src/i18n/locales/nl.ts
@@ -69,6 +69,7 @@ export default {
         capacity_group: "Capaciteit: ",
         edit: "Bewerk project",
         submissions_list: "Alle indieningen van deze persoon/groep",
+        submissions_all: "Indieningen bekijken",
         submissions_list_teacher: "Alle indieningen voor dit project",
         submissions_zip: "Download alle indieningen",
         not_found: "Geen projecten teruggevonden.",
diff --git a/frontend/src/views/ProjectsView.vue b/frontend/src/views/ProjectsView.vue
index 08989df8..6ad5a068 100644
--- a/frontend/src/views/ProjectsView.vue
+++ b/frontend/src/views/ProjectsView.vue
@@ -73,4 +73,8 @@ const noProjectsFound = computed(() => filteredProjects.value.length === 0);
 .projects {
     margin: 15px;
 }
+
+.project-card {
+    margin-bottom: 10px;
+}
 </style>
diff --git a/frontend/src/views/subject/modify/PatchSubjectView.vue b/frontend/src/views/subject/modify/PatchSubjectView.vue
index 592ab15a..bd045b38 100644
--- a/frontend/src/views/subject/modify/PatchSubjectView.vue
+++ b/frontend/src/views/subject/modify/PatchSubjectView.vue
@@ -5,7 +5,13 @@
 
     <v-row v-else>
         <v-col cols="1">
-            <v-btn variant="elevated" class="back-button" size="large" @click="dialog = true">
+            <v-btn
+                variant="elevated"
+                class="back-button"
+                size="large"
+                @click="dialog = true"
+                color="primary"
+            >
                 <v-icon>mdi-arrow-left</v-icon>
             </v-btn>
         </v-col>
@@ -63,7 +69,6 @@
                     >
                     </ModifySubjectBody>
                 </div>
-
                 <div class="confirm-btn-container">
                     <v-btn class="ma-2" color="grey" @click="dialog = true">
                         {{ $t("default.cancel") }}
@@ -293,11 +298,7 @@ async function handleSubmit() {
 
 <style scoped>
 .confirm-btn-container {
-    display: flex;
-    position: absolute;
-    right: 4vw;
-    bottom: 4vw;
-    margin-top: 2vh;
+    margin-top: 10px;
 }
 
 .back-button {