Maxime/Clyde
1
0 Fork 0
forked from PGL/Clyde
Code Pull Requests Activity
632 Commits 5 Branches 1 Tag
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LeoMoulin 1ed61c8c7b Merge pull request 'Fixing tests and tokenService' (#184) from f into master 
Reviewed-on: PGL/Clyde#184
 2024-04-22 20:44:53 +02:00
LeoMoulin 59c82d7482 Merge branch 'master' into f 2024-04-22 20:37:59 +02:00
LeoMoulin 772fa09e28 Fixing tests and tokenService 2024-04-22 20:35:30 +02:00
LeoMoulin 672fcd099f Merge pull request 'Fixing stuffs' (#183) from e into master 
Reviewed-on: PGL/Clyde#183
 2024-04-22 18:50:33 +02:00
LeoMoulin 3198a7ade0 Merge branch 'master' into e 2024-04-22 18:27:51 +02:00
LeoMoulin 5516f75346 Fixing stuffs 2024-04-22 18:27:06 +02:00
LeoMoulin 47eb98da57 Merge pull request 'Cleaning backend' (#181) from e into master 
Reviewed-on: PGL/Clyde#181
 2024-04-22 13:08:35 +02:00
LeoMoulin eafcf6b265 Cleaning backend 2024-04-22 13:06:33 +02:00
LeoMoulin 490bf403f0 Merge pull request 'Add the regNo in profile and aboutStudent' (#178) from regNoFix into master 
Reviewed-on: PGL/Clyde#178
 2024-04-22 09:52:56 +02:00
LeoMoulin c61a092809 Add the regNo in profile and aboutStudent 2024-04-22 09:39:48 +02:00
LeoMoulin bd3b03dfea Merge pull request 'ok last one I promise' (#175) from prank into master 
Reviewed-on: PGL/Clyde#175
 2024-04-22 00:55:40 +02:00
LeoMoulin b38b1ab6b8 Merge branch 'master' into prank 2024-04-22 00:51:58 +02:00
LeoMoulin 6e0a9a46e5 ok last one I promise 2024-04-22 00:50:44 +02:00
LeoMoulin 2d8fcb4712 Merge pull request 'Fixing some little bugs and details' (#174) from last into master 
Reviewed-on: PGL/Clyde#174
 2024-04-22 00:42:56 +02:00
LeoMoulin fcb48ac71a Fixing some little bugs and details 2024-04-22 00:39:17 +02:00
LeoMoulin 32810a9b01 Merge pull request 'oof' (#171) from oof into master 
Reviewed-on: PGL/Clyde#171
 2024-04-21 23:09:52 +02:00
LeoMoulin 217ad7f0d1 oof 2024-04-21 23:07:04 +02:00
LeoMoulin 2d20b45c3a Merge pull request 'Better login' (#170) from betterlogin into master 
Reviewed-on: PGL/Clyde#170
 2024-04-21 22:35:20 +02:00
LeoMoulin 9cbdaac09d Better login 2024-04-21 22:31:56 +02:00
LeoMoulin b52c50fd76 Merge pull request 'Final commit of the extension' (#167) from Inscription into master 
Reviewed-on: PGL/Clyde#167
 2024-04-21 18:48:56 +02:00
LeoMoulin 9a5115f7fe Final commit of the extension 2024-04-21 18:24:58 +02:00
LeoMoulin 846cdedc4b Merge pull request 'Translation of the student inscription extension and profile' (#166) from StudentInscription into master 
Reviewed-on: PGL/Clyde#166
 2024-04-21 03:14:54 +02:00
LeoMoulin 881c935c00 Merge branch 'master' into StudentInscription 2024-04-21 03:10:49 +02:00
LeoMoulin e8bf0d953d Translation of the student inscription extension and profile 2024-04-21 03:08:27 +02:00
LeoMoulin 8097f5314f Merge pull request 'Implement an endpoint to get all the courses of an user' (#165) from CoursesEndpoint into master 
Reviewed-on: PGL/Clyde#165
 2024-04-20 23:32:03 +02:00
LeoMoulin 1e2efac5bc Implement an endpoint to get all the courses of an user 2024-04-20 23:29:22 +02:00
LeoMoulin 892d4f0651 Merge pull request 'Leo/InscriptionDesEtudiants' (#164) from Leo/InscriptionDesEtudiants into master 
Reviewed-on: PGL/Clyde#164
 2024-04-20 21:21:13 +02:00
LeoMoulin 9e45e6a9c9 Merge branch 'master' into Leo/InscriptionDesEtudiants 2024-04-20 21:18:49 +02:00
LeoMoulin ef03a6bdca Reworking, patching and cleaning the extension 2024-04-20 21:12:17 +02:00
LeoMoulin e8917cd69e Small changes 2024-04-20 13:17:32 +02:00
LeoMoulin cdc3772384 Small changes 2024-04-20 12:42:41 +02:00
LeoMoulin c15ddccbb0 Merge pull request 'Leo/InscriptionDesEtudiants' (#163) from Leo/InscriptionDesEtudiants into master 
Reviewed-on: PGL/Clyde#163
 2024-04-19 20:44:55 +02:00
LeoMoulin 211bf77322 Merge pull request 'master' (#162) from master into Leo/InscriptionDesEtudiants 
Reviewed-on: PGL/Clyde#162
 2024-04-19 20:40:58 +02:00
LeoMoulin 92cdeaebba Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiants 2024-04-19 19:25:42 +02:00
LeoMoulin 4e14370d4f Add the exemptions gestion and improve the navigation between requests 2024-04-19 19:25:28 +02:00
LeoMoulin 69fb4e881e Add the Teacher approval for reregister requests 2024-04-19 15:53:31 +02:00
LeoMoulin 25575fa4e0 Implements some files uploading in the inscription form and change inscriptionRequest and Curriculum for the cursus acceptance attestation feature 2024-04-19 12:26:48 +02:00
LeoMoulin 5a57fc78f3 Generalize the ExternalCurriculumList interface so it fits for inscriptionRequest, Studentlist, and inscriptionform 2024-04-19 09:31:55 +02:00
LeoMoulin 70a8e98a0e Merge pull request 'Leo/InscriptionDesEtudiant' (#161) from Leo/InscriptionDesEtudiant into master 
Reviewed-on: PGL/Clyde#161
 2024-04-18 21:43:47 +02:00
LeoMoulin a9e52d34d4 Start the rework of externalCurriculum interface 2024-04-18 21:35:50 +02:00
LeoMoulin 8a5a26e2ab Add the management of changeCurriculum requests 2024-04-18 14:09:06 +02:00
LeoMoulin c9556e1eea Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiant 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
#	backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
#	backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
 2024-04-18 10:46:45 +02:00
LeoMoulin 78507f798f Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiant 2024-04-18 10:36:09 +02:00
LeoMoulin f9b12a5061 Merge pull request 'Implements the RegNo feature' (#158) from Leo/masterRegNo into master 
Reviewed-on: PGL/Clyde#158
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-04-18 10:32:24 +02:00
LeoMoulin 8724748642 Merge branch 'master' into Leo/masterRegNo 2024-04-18 10:30:01 +02:00
LeoMoulin a27cf63daf Add the post feature for differents types of changeCurriculumRequest 2024-04-17 21:42:33 +02:00
LeoMoulin 1be7b4cdbe Add the unregistration of a specific cursus only 2024-04-17 13:57:52 +02:00
LeoMoulin 058c53dbbc Add the actual in UserCurriculum 
Rework the unregister procedure
Add ChangeCurriculumRequest
Add the changeCurriculumRequest submit
 2024-04-17 11:55:56 +02:00
LeoMoulin caa39696d2 Rework the profile page 
Add the accept/refuse for unreg request
 2024-04-17 08:53:28 +02:00
LeoMoulin b9d7950e12 Merge branch 'master' into Leo/masterRegNo 2024-04-17 07:52:58 +02:00
LeoMoulin 451944e4fb Implements the RegNo feature 2024-04-15 20:57:29 +02:00
LeoMoulin c434b28fe3 Add the display for unregister requests 
Rename all ocurrences of uninscription
to unregister
Rework the uninscriptionRequest so we have an history and it doesn't take an user so better security
 2024-04-15 20:13:01 +02:00
LeoMoulin a89d1b192c Add the gestion of scholarshipRequest (accept and refuse and select the amount) 2024-04-15 16:17:27 +02:00
LeoMoulin 61eac8959a Merge pull request 'Leo/InscriptionDesEtudiants' (#156) from Leo/InscriptionDesEtudiants into master 
Reviewed-on: PGL/Clyde#156
 2024-04-14 19:49:15 +02:00
LeoMoulin 05bff0fa77 Add the uninscription request submission 2024-04-14 18:29:23 +02:00
LeoMoulin 98c9d2d754 Link the ExternalCurriculum to a user after the inscription. 
Add the ExternalCurriculum lists in AboutStudent.vue
 2024-04-12 09:28:56 +02:00
LeoMoulin 8ebedec689 Fix fews things and rename the inscription app to managerequests also sort the files 2024-04-11 21:06:57 +02:00
LeoMoulin 4199663d64 Huge commit 
- Rework the inscription requests system so that it considers the equivalence systems and the impact of the teacher in the inscription procedure.
 2024-04-11 16:45:48 +02:00
LeoMoulin 34c0a2bfe8 Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiants 
# Conflicts:
#	frontend/src/rest/apps.js
 2024-04-10 23:28:00 +02:00
LeoMoulin 706481ed1a Fix and simplifie the post and get for externalCurriculum 2024-04-10 23:09:38 +02:00
LeoMoulin 0c04bed799 this is a test dw 2024-04-10 22:00:08 +02:00
LeoMoulin 9d0b3da9d3 Implements the backend and frontend methods to get some scholarshipRequests and exemptionsRequest 
Extends the inscription.vue so that it also list scholarship and exemptions requests (not only inscription) this vue should be renamed later. Also implements some filters and parameters to select the data displayed in the list.
 2024-04-10 14:40:41 +02:00
LeoMoulin 21a5dbdb22 Implements the possibility to ask for a scholarship for a student 2024-04-09 15:58:10 +02:00
LeoMoulin e6e147af26 Implements the school fees gestion for a student and a payment table containing a history of all the financial transactions of the system 2024-04-08 14:50:37 +02:00
LeoMoulin 194b14f02b Implements the backend logic for the minerval gestion 2024-04-08 10:18:28 +02:00
LeoMoulin 3c721de18b Big commit: 
make some changes to profile to provide an interface for a student to manage his courses.

implements the submission of exemptions request
 2024-04-06 16:12:11 +02:00
LeoMoulin 648b73b585 Fix the implementation of externalCurriculum upload 2024-04-04 16:54:11 +02:00
LeoMoulin 8442101c40 Fixed some css 2024-04-01 11:43:42 +02:00
LeoMoulin bce53305b3 Merge master into my branch 2024-04-01 10:40:36 +02:00
LeoMoulin 47e4fb2f8c Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiants 
# Conflicts:
#	frontend/src/Apps/Inscription.vue
#	frontend/src/Apps/Login.vue
#	frontend/src/Apps/Profil.vue
#	frontend/src/Apps/StudentsList.vue
 2024-04-01 10:30:29 +02:00
LeoMoulin 4a314449ad Add the backend logic for ExternalCurriculum class (need to do one more endpoint) 2024-03-29 15:31:02 +01:00
LeoMoulin a3c9d6a7c0 Fix the profilepicture url issue (it wasn't sent to the db) 
add a prototype of a more generic uploadfile function in uploads.js

makes the distinction between a master cursus and a bachelor cursus in display
 2024-03-29 10:55:59 +01:00
LeoMoulin 94f12f0a86 Add the date and identitycard feature to inscriptionRequest 2024-03-27 16:04:55 +01:00
LeoMoulin 839ca414ce Ajoute le détail des demandes d'inscriptions (big update) 2024-03-27 14:12:20 +01:00
LeoMoulin eafff6ec2d Ajoute le détail des étudiants (big update) 2024-03-25 09:57:35 +01:00
LeoMoulin 67fa630ecf e 2024-03-23 18:04:36 +01:00
LeoMoulin ad0e7b3e35 - Ajoute un champ year dans UserCurriculum pour différencier les anciers cursus de l'actuel pour l'étudiant 
- Ajoute la table ExemptionsRequest
- Ajoute la table ScholarshipRequest
- Ajoute la table UninscriptionRequest
 2024-03-23 14:08:03 +01:00
LeoMoulin 73f3df0bc6 Clean le projet 2024-03-18 20:54:16 +01:00
LeoMoulin 66d090d045 Merge pull request 'Leo/Backend/UnitTest' (#138) from Leo/Backend/UnitTest into master 
Reviewed-on: PGL/Clyde#138
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
 2024-03-18 19:21:54 +01:00
LeoMoulin c7f37b0854 Fix le truc de max et ajoute le test du delete 2024-03-18 15:55:38 +01:00
LeoMoulin 9744bd973f Resolve conflicts and adapt tests 2024-03-18 14:29:30 +01:00
LeoMoulin ecaa0af24a Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
#	backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
 2024-03-18 13:55:45 +01:00
LeoMoulin f2b80ba89f Resolve conflicts and resolve condition bug in isNotSecretaryOrAdmin 2024-03-17 19:17:38 +01:00
LeoMoulin 114116b97c Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
 2024-03-17 19:14:25 +01:00
LeoMoulin 924faca13f Add testing for file uploading and correct minors bugs in service 2024-03-17 19:06:27 +01:00
LeoMoulin 571d27c230 Add test for user patch 2024-03-17 15:53:50 +01:00
LeoMoulin 37a9eb46ae Add tests for UserController get and post 2024-03-17 15:42:43 +01:00
LeoMoulin bfc4f6567b Merge remote-tracking branch 'origin/Leo/Backend/UnitTest' into Leo/Backend/UnitTest 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
 2024-03-17 15:40:45 +01:00
LeoMoulin d423a57fa0 Add tests for UserController get and post 2024-03-17 15:40:14 +01:00
LeoMoulin 008af10d0e Merge branch 'master' into Leo/Backend/UnitTest 2024-03-17 10:36:00 +01:00
LeoMoulin 189e664f37 Add tests for Storage system 2024-03-15 18:49:41 +01:00
LeoMoulin c8b7930a8e Setup unit tests and implements test for the token limit and trivial tests for userRepository 2024-03-15 11:20:23 +01:00
LeoMoulin 2a58c335f2 Apply les trucs de l'exception 2024-03-13 15:48:28 +01:00
LeoMoulin 66282bce9f Create new constructor for ReinscriptionRequest so you don't have to worry about the type of the request 2024-03-12 17:53:52 +01:00
LeoMoulin b7a574a312 Merge branch 'master' into Leo/Backend 2024-03-12 11:17:14 +01:00
LeoMoulin 8fbfb36958 Remove the bad link between users and file. Add a delete function for storageFile entities and clean things. 2024-03-12 10:48:13 +01:00
LeoMoulin ab91a39a63 Create exception for file deletion. 
Add user/inscriptionrequest connection to StorageFile entity.
Create a prototype of the delete for file function
 2024-03-11 20:23:45 +01:00
LeoMoulinandtonitch d4c48ee9f1 Leo/Backend (#82) 
Ce merge enverra dans main : le timeout des token, la limite de 5 token par user, les nouvelles tables pour les demandes d'inscriptions

Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: PGL/Clyde#82
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Co-authored-by: LeoMoulin <leomoulin125@gmail.com>
Co-committed-by: LeoMoulin <leomoulin125@gmail.com>
 2024-03-11 19:16:19 +01:00
LeoMoulin 3b31fa794f Merge branch 'Leo/Backend' into Max/Backend/loginApi 2024-03-07 20:53:33 +01:00
LeoMoulin c33b73a114 - Ajout de "l'url" de l'image dans User 2024-03-07 19:12:48 +01:00