chore: merge

SELab-2 · May 23, 2024 · 8c18871 · 8c18871
1 parent 116c018
commit 8c18871
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json
@@ -97,9 +97,7 @@
                 "title": "Indieningsstructuur",
                 "placeholder": "Geef deze nieuwe map een naam",
                 "cancelSelection": "Deselecteer {0}",
-                "newFolder": "Nieuwe map",
-                "obligatedExtensions": "Verplichte extensies",
-                "blockedExtensions": "Niet toegelaten extensies"
+                "newFolder": "Nieuwe map"
             },
             "extraChecks": {
                 "title": "Automatische checks op een indiening",
@@ -241,7 +239,7 @@
             "newProject": "Nieuw project",
             "noSubmissions": "Dit project heeft geen indieningen",
             "submissions": "Groep heeft al ingediend | Groepen hebben al ingediend",
-            "groups": "Groep | Groepen",
+            "groups": "Deelnemende groep | Deelnemende groepen",
             "structureTestsFail": "Gefaalde structuurtesten",
             "extraChecksFail": "Gefaalde extra testen",
             "testsSucceed": "Geslaagde testen",

diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
@@ -75,6 +75,7 @@ onMounted(async () => {
     await getProjectByID(route.params.projectId as string);
     await getGroupByID(route.params.groupId as string);
     await getSubmissionByGroup(route.params.groupId as string);
+
     if (project.value !== null) {
         await getStructureCheckByProject(project.value.id);
     }
@@ -84,15 +85,14 @@ onMounted(async () => {
 <template>
     <BaseLayout>
         <Title> {{ t(`views.submissions.title`) }}: {{ project ? project.name : 'Loading' }} </Title>
-        <template v-if="group !== null && submissions != null">
+        <template v-if="group !== null && submissions != null && structureChecks !== null">
             <div class="grid fadein">
                 <div class="col-12 md:col-6">
                     <div class="flex-column">
                         <!-- Project info column -->
                         <!-- Submission structure -->
-                        <div v-if="structureChecks">
-                            <ProjectStructure :structure-checks="structureChecks" />
-                        </div>
+                        <ProjectStructure :structure-checks="structureChecks" />
+
                         <!-- Submission upload -->
                         <div class="py-2">
                             <h2>{{ t('views.submissions.submit') }}</h2>