Merge branch '148-advanced-tests' of github.com:SELab-2/UGent-1 into …

…148-advanced-tests
SELab-2 · May 22, 2024 · c2830e0 · c2830e0
2 parents af8dd23 + 246a2fc
commit c2830e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/frontend/app/[locale]/components/ListView.tsx b/frontend/app/[locale]/components/ListView.tsx
@@ -97,7 +97,10 @@ interface ListViewProps {
     search: boolean;
 }
 
-const convertDate = (date_str: string) => {
+const convertDate = (t, date_str) => {
+    if (date_str === null) {
+        return t('no_deadline');
+    }
     let date = new Date(date_str);
     date = new Date(date.getTime());
     let date_local = date.toLocaleString('en-US', {
@@ -172,7 +175,7 @@ const ListView: NextPage<ListViewProps> = ({
                     'course_students': (data) => [data.id, data.email],
                     'course_teachers': (data) => [data.id, data.email],
                     'courses': (data) => [data.course_id, data.name, data.description, data.open_course],
-                    'projects': (data) => [data.project_id, data.name, convertDate(data.deadline)],
+                    'projects': (data) => [data.project_id, data.name, convertDate(t, data.deadline)],
                     'groups': async (data) => {
                         let l = [];
                         // Iterate over the values of the object
@@ -186,8 +189,8 @@ const ListView: NextPage<ListViewProps> = ({
                         setGroupSize((await getProject(data.project_id)).group_size);
                         return [data.group_id, data.user, data.group_nr, l.join(', ')];
                     },
-                    'submissions': (data) => [data.submission_id, data.group_id, convertDate(data.timestamp), data.output_test !== undefined],
-                    'submissions_group': (data) => [data.submission_id, data.group_id, convertDate(data.timestamp), data.output_test !== undefined],
+                    'submissions': (data) => [data.submission_id, data.group_id, convertDate(t,data.timestamp), data.output_test !== undefined],
+                    'submissions_group': (data) => [data.submission_id, data.group_id, convertDate(t,data.timestamp), data.output_test !== undefined],
                     'archived_courses': (data) => [data.course_id, data.name, data.description, data.open_course],
                 };
 
@@ -499,7 +502,7 @@ const ListView: NextPage<ListViewProps> = ({
                             {rows.map((row, index) => (
                                 <StyledTableRow key={index}>
                                     {((get !== 'groups' && get !== 'projects' && get !== 'courses' && !(get === 'submissions' && !action_name) && get != 'users') &&
-                                        get !== 'course_teachers' && !(action_name && user?.role === 3 && get !== 'archived_courses') &&
+                                        get !== 'course_teachers' && !(action_name && user?.role === 3) && get !== 'archived_courses' &&
                                         <StyledTableCell>
                                             {<CheckBoxWithCustomCheck checked={false}/>}
                                         </StyledTableCell>)}

diff --git a/frontend/app/[locale]/course/archived/page.tsx b/frontend/app/[locale]/course/archived/page.tsx
@@ -12,7 +12,7 @@ const ArchivePage = async ({params: {locale}}) => {
     const {t, resources} = await initTranslations(locale, i18nNamespaces);
     const headers = [t('name'), 
     <React.Fragment key="description"><NotesIcon style={{ fontSize: '20px', verticalAlign: 'middle', marginBottom: '3px' }}/>{" " + t('description')}</React.Fragment>,
-    , t('open'), ''];
+    , t('open')];
     const headers_backend = ['name', 'description', 'open'];
 
     return (

diff --git a/frontend/locales/en/common.json b/frontend/locales/en/common.json
@@ -142,5 +142,6 @@
   "join_leave": "Join/Leave",
   "not_in_group": "Join a group to submit",
   "edit_user_details": "Edit user details",
-  "status_button_tooltip": "Required, optional or forbidden file"
+  "status_button_tooltip": "Required, optional or forbidden file",
+  "no_deadline": "No deadline"
 }
diff --git a/frontend/locales/nl/common.json b/frontend/locales/nl/common.json
@@ -145,5 +145,6 @@
   "join_leave": "Toetreden/Verlaten",
   "not_in_group": "Je kan niet indienen zonder in een groep te zitten",
   "edit_user_details": "Gebruiker bewerken",
-  "status_button_tooltip": "Verplicht, optioneel of verboden bestand"
+  "status_button_tooltip": "Verplicht, optioneel of verboden bestand",
+  "no_deadline": "Geen deadline"
 }