Commit graph

210 commits

Author SHA1 Message Date
Gabriellvl
24105004fc Merge remote-tracking branch 'origin/feat/question-routes' into feat/question-routes 2025-04-07 16:47:18 +02:00
Gabriellvl
399986f263 fix: typ fout in test 2025-04-07 16:46:57 +02:00
Lint Action
a8895cc429 style: fix linting issues met Prettier 2025-04-07 14:44:59 +00:00
Gerald Schmittinger
03fa7c7b14 fix(backend): Fouten in de testen resulterend uit de aanpassingen opgelost. 2025-04-07 15:59:07 +02:00
Gerald Schmittinger
7b79348985 fix(backend): group toch niet deel van primaire sleutel van vragen en submissions gemaakt, maar verplicht veld 2025-04-07 14:50:15 +02:00
Gabriellvl
c07db3d999 fix: lint 2025-04-07 11:53:47 +02:00
Gabriellvl
42526900d3 feat: answer tests 2025-04-07 11:46:09 +02:00
Gabriellvl
da1d502ee6 feat: question tests 2025-04-07 11:30:15 +02:00
Gabriellvl
bd75ab8af9 fix: question service + refactor loID 2025-04-06 09:45:01 +02:00
laurejablonski
438238f2bf style: lint op backend 2025-04-05 19:21:01 +02:00
laurejablonski
626af61e95 fix: zorg dat testleerkracht1 een klas heeft 2025-04-05 18:40:05 +02:00
laurejablonski
7aa4863ed6 fix: leerkacht in database via seed.ts die overeenkomt met testleerkracht1 2025-04-05 18:34:57 +02:00
laurejablonski
cfcddf0dab fix: zorg dat testleerling tussen database studenten komt en dat klassen een juist geformatteerde id hebben 2025-04-04 21:40:45 +02:00
laurejablonski
8218aae6ec fix: problee m met mergen en zorgen student Gerald in db komt bij npm run dev runnen 2025-04-04 18:18:50 +02:00
Gabriellvl
7374511e31 Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes 2025-04-03 11:00:56 +02:00
Gabriellvl
1940be31fb Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes 2025-04-03 11:00:25 +02:00
782fc2be19
fix: Cleanup
Co-authored-by: Adriaan Jacquet <adriaanjacquet@gmail.com>
2025-04-03 10:53:45 +02:00
Lint Action
80939cd93c style: fix linting issues met Prettier 2025-04-03 08:12:51 +00: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
ced27c148b
fixup! fix(backend): Restore sort 2025-04-03 07:53:05 +02:00
6d7d29ce3c
fix(backend): Restore sort 2025-04-03 07:44:22 +02:00
7e46ce9c5f
fix: Linting op Actions 2025-04-02 20:31:40 +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
2dbadc7eab
refactor(backend): Linting 2025-04-02 18:20:09 +02:00
5d312d8c29
fix(backend): Missende import 2025-04-02 17:38:37 +02:00
f07a1ec867
refactor(backend): ClassJoinRequestStatus -> common 2025-04-02 17:35:46 +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
Lint Action
b6e07d28df style: fix linting issues met Prettier 2025-04-01 22:40:33 +00:00
61f3afd9ae
Revert "refactor(common): Language"
This reverts commit bef6c6f75b.
2025-04-02 00:22:05 +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
Gabriellvl
e99df80ba0 fix: questionId map in teacher 2025-04-01 17:56:33 +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
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
Lint Action
ee5f69cbc8 style: fix linting issues met Prettier 2025-03-30 21:24:37 +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
44c242fc57 feat: (frontend) queries teacher + test controller teacher 2025-03-30 22:26:26 +02:00
Gabriellvl
dba8902eeb fix: post en put request met body ipv param 2025-03-30 21:20:44 +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