fix: fixed some weird shizzles

backend/api/permissions/group_permissions.py

@@ -65,14 +65,7 @@ def has_object_permission(self, request: Request, view: ViewSet, group) -> bool:
 class GroupSubmissionPermission(BasePermission):
     """Permission class for submission related group endpoints"""
 
-    def has_permission(self, request: Request, view: APIView) -> bool:
-        """Check if user has permission to view a general group submission endpoint."""
-        user = request.user
-
-        # Get the individual permission clauses.
-        return request.method in SAFE_METHODS or is_teacher(user) or is_assistant(user)
-
-    def had_object_permission(self, request: Request, view: ViewSet, group: Group) -> bool:
+    def had_object_permission(self, request: Request, _: ViewSet, group: Group) -> bool:
         """Check if user has permission to view a detailed group submission endpoint"""
         user = request.user
         course = group.project.course

backend/api/views/group_view.py

@@ -70,6 +70,26 @@ def submissions(self, request, **_):
         )
         return Response(serializer.data)
 
+    @submissions.mapping.post
+    @submissions.mapping.put
+    @swagger_auto_schema(request_body=SubmissionSerializer)
+    def _add_submission(self, request: Request, **_):
+        """Add a submission to the group"""
+        group: Group = self.get_object()
+
+        # Add submission to course
+        serializer = SubmissionSerializer(
+            data=request.data, context={"group": group, "request": request}
+        )
+
+        if serializer.is_valid(raise_exception=True):
+            serializer.save(group=group)
+
+        return Response({
+            "message": gettext("group.success.submissions.add"),
+            "submission": serializer.data
+        })
+
     @students.mapping.post
     @students.mapping.put
     @swagger_auto_schema(request_body=StudentJoinGroupSerializer)
@@ -109,24 +129,4 @@ def _remove_student(self, request, **_):
 
         return Response({
             "message": gettext("group.success.students.remove"),
-        })
-
-    @submissions.mapping.post
-    @submissions.mapping.put
-    @swagger_auto_schema(request_body=SubmissionSerializer)
-    def _add_submission(self, request: Request, **_):
-        """Add a submission to the group"""
-        group: Group = self.get_object()
-
-        # Add submission to course
-        serializer = SubmissionSerializer(
-            data=request.data, context={"group": group, "request": request}
-        )
-
-        if serializer.is_valid(raise_exception=True):
-            serializer.save(group=group)
-
-        return Response({
-            "message": gettext("group.success.submissions.add"),
-            "submission": serializer.data
-        })
+        })

backend/api/views/user_view.py

@@ -84,7 +84,12 @@ def notifications(self, request: Request, pk: str):
         )
 
         # Get the notifications for the user
-        notifications = Notification.objects.filter(user=pk).order_by("-created_at")[:count]
+        notifications = Notification.objects.filter(user=pk, is_read=False).order_by("-created_at")
+
+        if 0 < notifications.count() < count:
+            notifications = list(notifications) + list(
+                Notification.objects.filter(user=pk, is_read=True).order_by("-created_at")[:count - notifications.count()]
+            )
 
         # Serialize the notifications
         serializer = NotificationSerializer(

frontend/src/assets/lang/app/en.json

@@ -19,7 +19,8 @@
                 "new": "New",
                 "title": "Notifications",
                 "markAsRead": "Mark as read",
-                "loadMore": "Load more"
+                "loadMore": "Load more",
+                "noNotifications": "No notifications available"
             }
         },
         "footer": {

frontend/src/assets/lang/app/nl.json

@@ -19,7 +19,8 @@
                 "new": "Nieuw",
                 "title": "Notificaties",
                 "markAsRead": "Markeer alles als gelezen",
-                "loadMore": "Laad meer notificaties"
+                "loadMore": "Laad meer notificaties",
+                "noNotifications": "Geen notificaties"
             }
         },
         "footer": {

frontend/src/components/courses/CourseForm.vue

@@ -31,7 +31,7 @@ const form = ref(new Course());
 const rules = computed(() => {
     return {
         name: { required: helpers.withMessage(t('validations.required'), required) },
-        faculty: { required: helpers.withMessage(t('validations.required'), required) },
+        faculty: { required: helpers.withMessage(t('validations.required'), (faculty: Faculty) => faculty.id !== '') },
         excerpt: { required: helpers.withMessage(t('validations.required'), required) },
     };
 });

frontend/src/components/notifications/NotificationsOverlay.vue

@@ -47,23 +47,21 @@ function toggleNotificationOverlay(event: Event): void {
                     <h3>{{ t('layout.header.notifications.title') }}</h3>
                     <Badge :value="notifications.length.toString()" />
                 </div>
-                <template v-if="notifications.length > 0">
-                    <NotificationsScrollPanel :notifications="notifications" />
-                    <div class="flex align-items-center gap-2 mt-4">
-                        <Button
-                            :label="t('layout.header.notifications.loadMore')"
-                            @click="notificationCount += notificationCount"
-                            link
-                        />
-                        <Button
-                            class="ml-auto"
-                            :label="t('layout.header.notifications.markAsRead')"
-                            :disabled="!hasUnreadNotifications"
-                            @click="markNotificationsAsRead"
-                            outlined
-                        />
-                    </div>
-                </template>
+                <NotificationsScrollPanel :notifications="notifications" />
+                <div class="flex align-items-center gap-2 mt-4">
+                    <Button
+                        :label="t('layout.header.notifications.loadMore')"
+                        @click="notificationCount += notificationCount"
+                        link
+                    />
+                    <Button
+                        class="ml-auto"
+                        :label="t('layout.header.notifications.markAsRead')"
+                        :disabled="!hasUnreadNotifications"
+                        @click="markNotificationsAsRead"
+                        outlined
+                    />
+                </div>
             </OverlayPanel>
         </template>
     </template>

frontend/src/components/notifications/NotificationsScrollPanel.vue

@@ -2,23 +2,32 @@
 import ScrollPanel from 'primevue/scrollpanel';
 import { type Notification } from '@/types/Notification.ts';
 import NotificationCard from '@/components/notifications/NotificationCard.vue';
+import { useI18n } from 'vue-i18n';
 
 /* Props */
 defineProps<{
     notifications: Notification[];
 }>();
+
+/* Composable injections */
+const { t } = useI18n();
 </script>
 
 <template>
     <ScrollPanel class="border-1 border-200 p-2 h-25rem">
         <!-- Notification list -->
         <div class="flex flex-column gap-3">
             <!-- Single notification -->
-            <NotificationCard
-                :notification="notification"
-                v-for="notification in notifications"
-                :key="notification.id"
-            />
+            <template v-if="notifications.length > 0">
+                <NotificationCard
+                    :notification="notification"
+                    v-for="notification in notifications"
+                    :key="notification.id"
+                />
+            </template>
+            <template v-else>
+                {{ t('layout.header.notifications.noNotifications') }}
+            </template>
         </div>
     </ScrollPanel>
 </template>