Commit graph

224 commits

Author SHA1 Message Date
Gabriellvl
2c4bc644fd fix: assignment errors en return json 2025-04-06 10:40:34 +02:00
Gabriellvl
bd75ab8af9 fix: question service + refactor loID 2025-04-06 09:45:01 +02:00
Gabriellvl
01b40992e2 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts:
#	backend/src/controllers/learning-objects.ts
2025-04-03 10:10:47 +02:00
Gabriellvl
2f595e615f fix: import in test 2025-04-03 09:59:25 +02:00
Gabriellvl
084f4fcdbd Merge remote-tracking branch 'origin/dev' into feat/user-routes
# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/controllers.ts
#	frontend/src/queries/themes.ts
2025-04-03 09:48:57 +02:00
Lint Action
9f60c43522 style: fix linting issues met Prettier 2025-04-03 05:35:57 +00:00
52bc02a9f9
Merge branch 'dev' into refactor/common 2025-04-03 07:34:47 +02:00
Gabriellvl
3c1eb82ce3 fix: merge + fixes 2025-04-02 19:48:42 +02:00
Gabriellvl
7d8a0fcbb2 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/interfaces/question.ts
#	backend/src/services/classes.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
2025-04-02 19:20:20 +02:00
9470a4ddf9
fix: Shared pkgs importeren 2025-04-02 17:32:14 +02:00
Lint Action
899af4dec5 style: fix linting issues met Prettier 2025-04-02 12:56:03 +00:00
Gabriellvl
87366b2821 Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes
# Conflicts:
#	backend/src/interfaces/answer.ts
#	backend/src/services/questions.ts
#	frontend/src/controllers/students.ts
#	frontend/src/controllers/teachers.ts
#	frontend/src/queries/students.ts
#	frontend/src/queries/teachers.ts
2025-04-02 14:54:42 +02:00
Gabriellvl
8ceed7f779 fix: merge + types frontend controller 2025-04-02 12:21:04 +02:00
Gabriellvl
4ca568e738 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes-test-interface-refactor
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/interfaces/answer.ts
#	backend/src/interfaces/question.ts
#	backend/src/interfaces/student.ts
#	backend/src/services/classes.ts
#	backend/src/services/questions.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
2025-04-02 10:16:10 +02:00
61f3afd9ae
Revert "refactor(common): Language"
This reverts commit bef6c6f75b.
2025-04-02 00:22:05 +02:00
Adriaan Jacquet
c79a295e68 feat: werken aan delete voor assignment 2025-04-01 22:57:30 +02:00
a4408b5bc0
Merge branch 'dev' into refactor/common 2025-04-01 21:38:50 +02:00
Lint Action
b9681926f8 style: fix linting issues met Prettier 2025-04-01 16:39:31 +00:00
Gabriellvl
b556516359 fix: merge + lint fixes 2025-04-01 18:38:36 +02:00
Gabriellvl
7f189188e8 Merge remote-tracking branch 'origin/dev' into feat/user-routes
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/data/classes/class-join-request-repository.ts
#	backend/src/routes/students.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
#	backend/tests/test_assets/users/students.testdata.ts
#	frontend/src/controllers/controllers.ts
#	frontend/src/queries/themes.ts
2025-04-01 18:12:15 +02:00
Lint Action
ea5cf7abf9 style: fix linting issues met Prettier 2025-04-01 15:09:28 +00:00
Adriaan Jacquet
da5cb7d02d feat: delete op class geimplementeerd 2025-04-01 17:06:26 +02:00
Adriaan Jacquet
6290d3dd9b feat: get all submissions route toegevoegd 2025-04-01 17:02:42 +02:00
Gabriellvl
912369f87e fix: student join req by class route + teacher return post put delete + status 2025-04-01 14:24:06 +02:00
Gabriellvl
c0995d3933 fix: student res code + json returns bij post, delete 2025-04-01 11:48:14 +02:00
Gerald Schmittinger
99dc346dc1 Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41
# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/base-controller.ts
2025-04-01 09:00:28 +02:00
bef6c6f75b
refactor(common): Language 2025-03-31 22:23:25 +02:00
5a90862098
refactor(common): Learning content 2025-03-31 21:55:34 +02:00
70a31a292c
refactor(common): Question 2025-03-31 21:49:58 +02:00
d6b79dcced
refactor(common): Student 2025-03-31 21:48:13 +02:00
bc8e888373
refactor(common): Submission 2025-03-31 21:46:49 +02:00
6ff29cb949
refactor(common): Teacher 2025-03-31 21:44:40 +02:00
1a0704c16f
refactor(common): Group 2025-03-31 19:10:17 +02:00
24ed39d04e
refactor(common): Class 2025-03-31 19:10:15 +02:00
757c89d841
refactor(common): Assignments 2025-03-31 19:03:13 +02:00
064810b4b8
fix: .js toevoegen aan imports 2025-03-31 11:07:13 +02:00
Lint Action
23eeb9a802 style: fix linting issues met Prettier 2025-03-30 21:29:22 +00:00
f2417e90f2
refactor(backend): Verplaats default value 2025-03-30 23:28:23 +02:00
Lint Action
ee5f69cbc8 style: fix linting issues met Prettier 2025-03-30 21:24:37 +00:00
Lint Action
3a732dbb75 style: fix linting issues met Prettier 2025-03-30 21:15:19 +00:00
Gabriellvl
82c2197950 fix: .js + sendStatusMock in backend controller 2025-03-30 22:58:08 +02:00
588c556949
Merge branch 'dev' into refactor/linting 2025-03-30 22:48:26 +02:00
Gabriellvl
5e0f284131 fix: status naar send status in controller 2025-03-30 22:24:34 +02:00
Gabriellvl
dba8902eeb fix: post en put request met body ipv param 2025-03-30 21:20:44 +02:00
Adriaan Jacquet
62711f323d feat: assignment/questions endpoint toegevoegd 2025-03-30 19:24:52 +02:00
Gerald Schmittinger
8522cde18d Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41
# Conflicts:
#	frontend/src/App.vue
#	frontend/src/components/MenuBar.vue
#	frontend/src/main.ts
2025-03-30 17:29:57 +02:00
Gabriellvl
66a65c1e67 fix: merge errors 2025-03-30 16:44:27 +02:00
Gabriellvl
7b65d2a5b8 Merge remote-tracking branch 'refs/remotes/origin/fix/databank-laat-toevoegen-van-meerdere-studenten-met-dezelfde-username-toe-#153' into feat/user-routes
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/exceptions.ts
#	backend/src/interfaces/student.ts
#	backend/src/routes/router.ts
#	backend/src/routes/students.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
#	frontend/src/controllers/controllers.ts
2025-03-30 15:41:40 +02:00
Lint Action
7ad808cf3b style: fix linting issues met Prettier 2025-03-30 12:54:22 +00:00
Gerald Schmittinger
69dd1830f5 fix(backend): Kapotte imports gerepareerd. 2025-03-30 12:27:33 +02:00