extra validatie

SELab-2 · May 23, 2024 · 7c96de6 · 7c96de6
1 parent a51235c
commit 7c96de6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
@@ -97,6 +97,9 @@ export default {
         testfiles: "Testfiles",
         requirements_disclaimer: "For info on the usage of requirements please visit our",
         to_project: "To Project",
+        titlereq: "Project title is required.",
+        date_check: "Deadline or publish date cannot be in the past. Please correct the dates.",
+        publish_check: "Publish date must be before or on the deadline. Please correct the dates.",
     },
     navigation: {
         home: "Home",

diff --git a/frontend/src/i18n/locales/nl.ts b/frontend/src/i18n/locales/nl.ts
@@ -99,6 +99,9 @@ export default {
         testfiles: "Testbestanden",
         requirements_disclaimer: "Voor info over het gebruik van bestandsvereisten, bezoek onze ",
         to_project: "Naar project",
+        titlereq: "Project titel is verplicht.",
+        date_check: "Deadline of publiceerdatum kan niet in het verleden liggen.",
+        publish_check: "Publiceerdatum moet voor de deadline liggen.",
     },
     navigation: {
         home: "Hoofdscherm",

diff --git a/frontend/src/views/CreateProjectView.vue b/frontend/src/views/CreateProjectView.vue
@@ -15,6 +15,7 @@
                         :label="$t('project.assignment')"
                         required
                         :placeholder="$t('submit.create_title_tip')"
+                        :rules="titleRules"
                     />
                     <v-select
                         v-if="!isEditMode"
@@ -297,6 +298,17 @@ function setErrorAlert(message) {
 }
 
 async function submitForm() {
+    if (
+        isDateInPast(deadline.value) ||
+        (enrollDeadline.value && isDateInPast(enrollDeadline.value))
+    ) {
+        setErrorAlert(t("project.date_check"));
+        return;
+    }
+    if (!isPublishDateValid(publishDate.value, deadline.value)) {
+        setErrorAlert(t("project.publish_check"));
+        return;
+    }
     const projectData = formatProjectData();
     try {
         if (isEditMode.value) {
@@ -431,6 +443,17 @@ function divideStudentsIntoGroups(students: User[], capacity: number) {
 
     return groups;
 }
+
+function isDateInPast(date) {
+    const now = new Date();
+    return new Date(date) < now;
+}
+
+function isPublishDateValid(publishDate, deadline) {
+    return new Date(publishDate) <= new Date(deadline);
+}
+
+const titleRules = computed(() => [(v) => !!v.trim() || t("project.titlereq")]);
 </script>
 
 <style>