Merge pull request #258 from SELab-2/calendar-view-improvements

Calendar view improvements

frontend/package.json

@@ -24,7 +24,7 @@
         "msw": "^2.2.13",
         "pinia": "^2.1.7",
         "primeflex": "^3.3.1",
-        "primeicons": "^6.0.1",
+        "primeicons": "^7.0.0",
         "primevue": "^3.50.0",
         "vue": "^3.4.18",
         "vue-i18n": "^9.10.2",

frontend/src/assets/lang/nl.json

@@ -4,6 +4,7 @@
             "logo": "Logo van de Universiteit Gent",
             "login": "Login",
             "view": "Bekijken als {0}",
+            "user": "Ingelogd als {0}",
             "navigation": {
                 "dashboard": "Dashboard",
                 "calendar": "Kalender",
@@ -37,7 +38,8 @@
             }
         },
         "calendar": {
-            "title": "Kalender"
+            "title": "Kalender",
+            "noProjects": "Geen projecten op geselecteerde datum."
         },
         "projects": {
             "deadline": "Deadline",

frontend/src/components/layout/Header.vue

@@ -40,7 +40,7 @@ const items = computed(() => [
         route: 'courses',
     },
     {
-        icon: 'file-plus',
+        icon: 'bookmark',
         label: t('layout.header.navigation.projects'),
         route: 'projects',
     },
@@ -59,16 +59,18 @@ const items = computed(() => [
                 </div>
                 <div class="text-right ml-auto text-sm flex flex-column align-items-end gap-3">
                     <div class="flex align-items-center gap-3">
-                        <!-- Role selector -->
-                        <RoleSelector v-if="user !== null && user.roles.length > 1" />
+                        <template v-if="user !== null && user.hasMultipleRoles()">
+                            <!-- Role selector -->
+                            <RoleSelector />
+                        </template>
                         <!-- Language selector -->
                         <LanguageSelector />
                     </div>
                     <div>
                         <!-- User information -->
-                        <template v-if="isAuthenticated && user">
+                        <template v-if="user !== null">
                             <RouterLink :to="{ name: 'logout' }" class="text-white">
-                                Ingelogd als {{ user.getFullName() }}
+                                {{ t('layout.header.user', [user.getFullName()]) }}
                             </RouterLink>
                         </template>
                         <!-- Login button -->

frontend/src/composables/filters/filter.ts

@@ -1,15 +1,43 @@
 import { type Ref, ref } from 'vue';
 import { type Filter } from '@/types/filter/Filter.ts';
+import { watchDebounced } from '@vueuse/core';
+import { useRoute, useRouter } from 'vue-router';
 
 export interface FilterState {
     filter: Ref<Filter>;
+    onFilter: (callback: () => Promise<void>) => void;
 }
 
 export function useFilter(initial: Filter): FilterState {
     /* State */
     const filter = ref<Filter>(initial);
+    const { query } = useRoute();
+    const { push } = useRouter();
+
+    /**
+     * On filter callback
+     *
+     * @param callback
+     */
+    function onFilter(callback: () => Promise<void>): void {
+        watchDebounced(
+            filter,
+            async () => {
+                await push({
+                    query: {
+                        ...query,
+                        ...filter.value,
+                    },
+                });
+
+                await callback();
+            },
+            { debounce: 500, immediate: true, deep: true },
+        );
+    }
 
     return {
         filter,
+        onFilter,
     };
 }

frontend/src/composables/filters/paginator.ts

@@ -6,6 +6,7 @@ export interface PaginatorState {
     pageSize: Ref<number>;
     first: Ref<number>;
     paginate: (newFirst: number) => Promise<void>;
+    onPaginate: (callback: () => Promise<void>) => void;
 }
 
 export function usePaginator(initialPage: number = 1, initialPageSize: number = 20): PaginatorState {
@@ -54,10 +55,22 @@ export function usePaginator(initialPage: number = 1, initialPageSize: number =
         });
     }
 
+    /**
+     * On paginate callback
+     *
+     * @param callback
+     */
+    function onPaginate(callback: () => Promise<void>): void {
+        watch(page, async () => {
+            await callback();
+        });
+    }
+
     return {
         page,
         pageSize,
         first,
         paginate,
+        onPaginate,
     };
 }

frontend/src/types/filter/Filter.ts

@@ -1,10 +1,49 @@
-export const COURSE_FILTER = {
-    search: '',
-    faculties: [],
-    years: [],
-};
+import { type LocationQuery } from 'vue-router';
+
+export type CourseFilter = {
+    faculties: string[];
+    years: string[];
+} & Filter;
 
 export interface Filter {
     search: string;
-    [key: string]: any;
+    [key: string]: string | string[];
+}
+
+/**
+ * Get the course filters from the query.
+ *
+ * @param query
+ */
+export function getCourseFilters(query: LocationQuery): CourseFilter {
+    const filters: CourseFilter = {
+        search: query.search?.toString() ?? '',
+        faculties: [],
+        years: [],
+    };
+
+    if (query.faculties !== undefined) {
+        filters.faculties = getQueryList(query.faculties as string | string[]);
+    }
+
+    if (query.years !== undefined) {
+        filters.years = getQueryList(query.years as string | string[]);
+    }
+
+    return filters;
+}
+
+/**
+ * Get the query list.
+ *
+ * @param query
+ */
+function getQueryList(query: string | string[] | undefined): string[] {
+    if (query === undefined) return [];
+
+    if (Array.isArray(query)) {
+        return query;
+    }
+
+    return [query?.toString()];
 }

frontend/src/types/users/User.ts

@@ -88,6 +88,24 @@ export class User {
         return this.isStudent() || this.isAssistant() || this.isTeacher();
     }
 
+    /**
+     * Check if the user has a role.
+     *
+     * @param roles
+     */
+    public hasRoles(...roles: Role[]): boolean {
+        return roles.every((role) => this.roles.includes(role));
+    }
+
+    /**
+     *  Check if the user has multiple roles.
+     *
+     *  @returns boolean
+     */
+    public hasMultipleRoles(): boolean {
+        return this.roles.length > 1;
+    }
+
     /**
      * Convert a user object to a user instance.
      *