i18n

SELab-2 · May 21, 2024 · 27716b4 · 27716b4
1 parent b31a114
commit 27716b4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 72 deletions.
diff --git a/frontend/src/components/subject/modify/extra/ModifySubjectDialog.vue b/frontend/src/components/subject/modify/extra/ModifySubjectDialog.vue
diff --git a/frontend/src/components/subject/modify/extra/ModifySubjectSnackBar.vue b/frontend/src/components/subject/modify/extra/ModifySubjectSnackBar.vue
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
@@ -164,6 +164,11 @@ export default {
         email_invalid: "Provided email is invalid",
     },
 
+    patch_subject: {
+        cancel_dialog: "Cancel editing subject?",
+        edit_subject: "Edit subject",
+    },
+
     group: {
         not_found: "Group not found",
         not_found2: "No groups found",

diff --git a/frontend/src/i18n/locales/nl.ts b/frontend/src/i18n/locales/nl.ts
@@ -165,6 +165,11 @@ export default {
         email_invalid: "Ingevoerde email is ongeldig",
     },
 
+    patch_subject: {
+        cancel_dialog: "Wijzigingen annuleren?",
+        edit_subject: "Wijzig vak",
+    },
+
     group: {
         not_found: "Groep niet gevonden",
         not_found2: "Geen groepen teruggevonden",

diff --git a/frontend/src/views/subject/modify/CreateSubjectView.vue b/frontend/src/views/subject/modify/CreateSubjectView.vue
@@ -15,12 +15,22 @@
                     {{ $t("create_subject.error_snackbar") }}
                 </v-snackbar>
 
-                <ModifySubjectDialog
-                    dialog="dialog"
-                    @update:dialog="dialog = $event"
-                    @confirm-button-clicked="router.push({ name: 'subjects' })"
-                ></ModifySubjectDialog>
-
+                <v-dialog v-model="dialog" max-width="290" persistent>
+                    <v-card>
+                        <v-card-title class="headline">
+                            {{ $t("create_subject.cancel_dialog") }}
+                        </v-card-title>
+                        <v-card-actions>
+                            <v-spacer></v-spacer>
+                            <v-btn color="blue darken-1" @click="dialog = false">
+                                {{ $t("default.no_capital") }}
+                            </v-btn>
+                            <v-btn color="blue darken-1" @click="router.push({ name: 'subjects' })">
+                                {{ $t("default.yes_capital") }}
+                            </v-btn>
+                        </v-card-actions>
+                    </v-card>
+                </v-dialog>
                 <div class="flex-container">
                     <ModifySubjectHeaderContainer
                         :title="$t('create_subject.new_subject')"
@@ -60,16 +70,15 @@
 </template>
 
 <script setup lang="ts">
-import {computed, ref} from "vue";
+import { computed, ref } from "vue";
 import useAcademicYear from "@/composables/useAcademicYear";
-import {useCreateSubjectInstructorMutation, useCreateSubjectMutation} from "@/queries/Subject";
+import { useCreateSubjectInstructorMutation, useCreateSubjectMutation } from "@/queries/Subject";
 import type SubjectForm from "@/models/Subject";
 import type User from "@/models/User";
-import {useCurrentUserQuery} from "@/queries/User";
+import { useCurrentUserQuery } from "@/queries/User";
 import ModifySubjectHeaderContainer from "@/components/subject/modify/header/ModifySubjectHeaderContainer.vue";
 import ModifySubjectBody from "@/components/subject/modify/body/ModifySubjectBody.vue";
-import {useRouter} from "vue-router";
-import ModifySubjectDialog from "@/components/subject/modify/extra/ModifySubjectDialog.vue";
+import { useRouter } from "vue-router";
 
 const snackbar = ref(false);
 const dialog = ref(false);
@@ -82,7 +91,7 @@ const instructors = ref<User[]>([]);
 const currentUserAsInstructor = ref(true);
 const subjectId = ref<number | undefined>(undefined);
 
-const {data: currentUser, isLoading, isError} = useCurrentUserQuery();
+const { data: currentUser, isLoading, isError } = useCurrentUserQuery();
 const createSubjectMutation = useCreateSubjectMutation();
 const createSubjectInstructorMutation = useCreateSubjectInstructorMutation();
 
@@ -173,7 +182,7 @@ async function handleSubmit() {
             });
         }
 
-        await router.push({name: "subject", params: {subjectId: subjectId.value}});
+        await router.push({ name: "subject", params: { subjectId: subjectId.value } });
     } catch (error) {
         console.error("Error during subject creation:", error);
     }

diff --git a/frontend/src/views/subject/modify/PatchSubjectView.vue b/frontend/src/views/subject/modify/PatchSubjectView.vue
@@ -18,22 +18,22 @@
                 <v-dialog v-model="dialog" max-width="290" persistent>
                     <v-card>
                         <v-card-title class="headline">
-                            {{ $t("create_subject.cancel_dialog") }}
+                            {{ $t("patch_subject.cancel_dialog") }}
                         </v-card-title>
                         <v-card-actions>
                             <v-spacer></v-spacer>
                             <v-btn color="blue darken-1" @click="dialog = false">
                                 {{ $t("default.no_capital") }}
                             </v-btn>
-                            <v-btn color="blue darken-1" @click="router.push({ name: 'subjects' })">
+                            <v-btn color="blue darken-1" @click="router.push({ name: 'subject' , params: {subjectId: subjectId}})">
                                 {{ $t("default.yes_capital") }}
                             </v-btn>
                         </v-card-actions>
                     </v-card>
                 </v-dialog>
                 <div class="flex-container">
                     <ModifySubjectHeaderContainer
-                        title="Edit Subject"
+                        :title="$t('patch_subject.edit_subject')"
                         :image-path="`https://www.ugent.be/img/dcom/faciliteiten/ufo-logo.png`"
                         :subject-name="subject!.name"
                         :academic-year="subject!.academic_year"