fix: fix error

SELab-2 · Mar 31, 2024 · 93709ed · 93709ed
1 parent 9246488
commit 93709ed
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/frontend/src/types/Assistant.ts b/frontend/src/types/Assistant.ts
@@ -1,6 +1,5 @@
 import { Course } from "./Course";
 import { Faculty } from "./Faculty";
-import { Course } from "./Course";
 import {Role, User} from '@/types/User.ts';
 
 export class Assistant extends User {
@@ -16,9 +15,9 @@ export class Assistant extends User {
         public faculties: Faculty[] = [],
         public courses: Course[] = [],
         public create_time: Date,
-        public last_login: Date |null,
+        public last_login: Date |null
     ) {
-        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login);
+        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login, courses);
     }
 
     /**

diff --git a/frontend/src/types/Student.ts b/frontend/src/types/Student.ts
@@ -20,7 +20,7 @@ export class Student extends User {
         public groups: Group[] = [],
         public faculties: Faculty[] = [],
     ) {
-        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login);
+        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login, courses);
     }
 
     /**

diff --git a/frontend/src/types/Teacher.ts b/frontend/src/types/Teacher.ts
@@ -1,6 +1,5 @@
 import { Course } from "./Course";
 import { Faculty } from "./Faculty";
-import { Course } from "./Course";
 import {Role, User} from '@/types/User.ts';
 
 export class Teacher extends User {
@@ -18,7 +17,7 @@ export class Teacher extends User {
         public create_time: Date,
         public last_login: Date |null,
     ) {
-        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login);
+        super(id, username, email, first_name, last_name, last_enrolled, is_staff, roles, faculties, create_time, last_login, courses);
     }
 
     /**

diff --git a/frontend/src/types/User.ts b/frontend/src/types/User.ts
@@ -1,3 +1,4 @@
+import { Course } from "./Course";
 import { Faculty } from "./Faculty";
 
 export type Role = 'user' | 'student' | 'assistant' | 'teacher';
@@ -14,7 +15,8 @@ export class User {
         public roles: Role[] = [],
         public faculties: Faculty[] = [],
         public create_time: Date,
-        public last_login: Date |null
+        public last_login: Date |null,
+        public courses: Course[] = []
     ) {
     }
 

diff --git a/frontend/src/views/dashboard/DashboardView.vue b/frontend/src/views/dashboard/DashboardView.vue
@@ -15,12 +15,14 @@ import ProjectCard from "@/components/projects/ProjectCard.vue";
 import {useAuthStore} from '@/store/authentication.store.ts';
 import {storeToRefs} from 'pinia';
 import { computed } from 'vue';
+import { Course } from '@/types/Course';
 
 /* Composable injections */
 const {t} = useI18n();
 
 /* Component state */
 const allProjects = ref<Project[]>([]);
+const allCourses = ref<Course[]>([]);
 const academicYears = ref<{ label: string; value: number }[]>();
 const selectedCoursesYear = ref<number>();
 const selectedProjectsYear = ref<number>();