fix show group

SELab-2 · May 22, 2024 · 4895b32 · 4895b32
1 parent 4fd63ec
commit 4895b32
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/frontend/src/components/subject/subjectview/body/projects/SubjectProjectPage.vue b/frontend/src/components/subject/subjectview/body/projects/SubjectProjectPage.vue
@@ -22,7 +22,12 @@
                 {{ $d(project.deadline, "long") }}
             </v-card-text>
             <v-card-text>
-                <!--<h2 v-if="project.capacity > 1  && isInGroup " class="group"> {{ $t("project.group", { number: 1}) }}</h2> -->
+                <h2 v-if="project.capacity > 1 && !isLoading && group !== null" class="group">
+                    {{ $t("project.group", { number: group?.num }) }}
+                </h2>
+                <h2 v-else-if="!isError" class="group">
+                    {{ $t("project.no_group") }}
+                </h2>
                 <h2>{{ $t("subject.project.assignment") }}</h2>
                 <div
                     v-if="project.description && project.description.length <= assignmentLength"
@@ -67,15 +72,17 @@
 
 <script setup lang="ts">
 import type Project from "@/models/Project";
-import { computed, ref } from "vue";
+import { ref, toRefs } from "vue";
 import { Quill } from "@vueup/vue-quill";
-import { getUserGroups } from "@/services/group";
+import { useProjectGroupQuery } from "@/queries/Group";
 
-defineProps<{
+const props = defineProps<{
     selectedTab: number;
     project: Project;
 }>();
 
+const { project } = toRefs(props);
+
 const expanded = ref(false);
 const assignmentLength = 100;
 
@@ -85,21 +92,7 @@ const renderQuillContent = (content: string) => {
     return quill.root.innerHTML;
 };
 
-/*const { data: groups, isLoading, isError} = getUserGroups()
-
-const projectGroup = ref()
-
-const isInGroup = computed(() => {
-    if (!groups.value) return false;
-    return groups.value.some((groupelem) => {
-        if(groupelem.project_id === project.id){
-            projectGroup.value = groupelem;
-            return true;
-        }
-        return false;
-    });
-});
-*/
+const { data: group, isLoading, isError } = useProjectGroupQuery(project.value.id);
 </script>
 
 <style scoped>

diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
@@ -63,6 +63,7 @@ export default {
         group_button: "Join group",
         needhelp_button: "Need help",
         group: "Group {number}",
+        no_group: "Not yet in a group",
         assignment: "Assignment:",
         myProject: "My projects",
         capacity_group: "Capacity: ",

diff --git a/frontend/src/i18n/locales/nl.ts b/frontend/src/i18n/locales/nl.ts
@@ -63,6 +63,7 @@ export default {
         group_button: "Vind groep",
         needhelp_button: "Hulp nodig",
         group: "Groep {number}",
+        no_group: "Nog niet insgeschreven in een groep",
         assignment: "Opdracht:",
         myProject: "Mijn projecten",
         capacity_group: "Capaciteit: ",