Commit graph

176 commits

Author SHA1 Message Date
Gerald Schmittinger
620a988c6b fix(backend): Merge-conflicten opgelost & testen gerepareerd. 2025-04-09 23:59:27 +02:00
Gerald Schmittinger
d6dd7fb3bf Merge remote-tracking branch 'origin/dev' into feat/questions-answers-en-submissions-groep-specifiek-maken-#163
# Conflicts:
#	backend/src/controllers/questions.ts
#	backend/src/controllers/submissions.ts
#	backend/src/data/questions/question-repository.ts
#	backend/src/interfaces/group.ts
#	backend/src/interfaces/question.ts
#	backend/src/interfaces/submission.ts
#	backend/src/routes/submissions.ts
#	backend/src/services/groups.ts
#	backend/src/services/questions.ts
#	backend/src/services/students.ts
#	backend/src/services/submissions.ts
#	common/src/interfaces/question.ts
2025-04-09 20:25:30 +02:00
Gabriellvl
fbc77b9ad3 fix: tests 2025-04-09 12:19:41 +02:00
Gabriellvl
0a0857deb9 Merge remote-tracking branch 'origin/dev' into fix/class-join-request
# Conflicts:
#	backend/src/controllers/classes.ts
#	backend/src/data/questions/question-repository.ts
#	backend/tests/controllers/students.test.ts
#	backend/tests/controllers/teachers.test.ts
2025-04-09 12:13:42 +02:00
Gabriellvl
1405fd66d1
Merge pull request #171 from SELab-2/feat/question-routes
feat: Question en Answer routes
2025-04-09 12:04:22 +02:00
Lint Action
fc4e406845 style: fix linting issues met Prettier 2025-04-08 17:47:35 +00:00
Lint Action
8a55c0f003 style: fix linting issues met Prettier 2025-04-08 08:56:50 +00:00
Gerald Schmittinger
ba725f67b2 fix(backend): Falende testen gerepareerd. 2025-04-08 10:46:44 +02:00
laurejablonski
a5e82858ab test: alle testen slagen na aanpassen testdata 2025-04-08 10:39:22 +02:00
Gerald Schmittinger
fc675710b4 fix(backend): Falende testen gerepareerd. 2025-04-08 10:25:30 +02:00
Gerald Schmittinger
3c3a1d89c6 style(backend): Lint 2025-04-08 01:05:27 +02:00
Gerald Schmittinger
d21377cda4 feat(backend): Testen voor nieuwe functie in QuestionRepository toegevoegd. 2025-04-08 00:59:36 +02:00
Lint Action
1dce9c65c6 style: fix linting issues met Prettier 2025-04-07 22:00:34 +00:00
Gabriellvl
c7155fb438 feat: extra tests op nieuwe func student en teacher 2025-04-07 23:50:27 +02:00
Gerald Schmittinger
64fd66a1de feat(backend): Submissions kunnen nu per leerobject, assignment en optioneel groepslid opgevraagd worden 2025-04-07 21:48:28 +02:00
Gerald Schmittinger
9135b9c5b0 feat(backend): Functionaliteit toegevoegd om alle submissions zichtbaar voor een bepaalde leerling of leerkracht op te vragen. 2025-04-07 19:23:46 +02:00
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