Wal/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity
382 Commits 5 Branches 1 Tag
0c04bed7990d4994b35dc82b766536b22543239a
Commit Graph

382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tonitch 9e0db361b8 Merge pull request 'Make app use full space' (#148) from tonitch/front/fullSpaceApp into master 
Reviewed-on: PGL/Clyde#148
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
 2024-03-24 22:32:46 +01:00
Wal 7a13d412f1 Full screen apps 2024-03-23 23:56:24 +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
Wal 9de4b06e75 Login 'fixed' 2024-03-23 13:57:46 +01:00
Wal 123fa97611 Merge branch 'wal/front/temp' into tonitch/front/fullSpaceApp 2024-03-22 20:15:45 +01:00
Wal 1fad792be7 Just to merge 2024-03-22 20:14:20 +01:00
tonitch acd1262955 Make app use full space 2024-03-22 13:56:04 +01:00
tonitch 3d6941ab93 adding cdn to CI 2024-03-18 21:39:31 +01:00
tonitch de72bd800c CI fix 2024-03-18 21:13:00 +01:00
tonitch b465dcfa92 Merge pull request 'Clean le projet' (#146) from Leo/Backend/Cleaning into master 
Reviewed-on: PGL/Clyde#146
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 21:06:02 +01:00
LeoMoulin 73f3df0bc6 Clean le projet 2024-03-18 20:54:16 +01:00
tonitch 90a7b7b70e Merge pull request 'Link back and front all get' (#115) from wal/front/listingUsers into master 
Reviewed-on: PGL/Clyde#115
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
jalonA 		2024-03-18 20:20:35 +01:00
tonitch 4f002a29e1 Merge pull request 'added delete self' (#145) from Max/Backend/UserDelete into master 
Reviewed-on: PGL/Clyde#145
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 20:19:41 +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
Wal 4715441afd FINAL COMMIT 2024-03-18 18:47:00 +01:00
Wal 77ac771b8f Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 17:36:07 +01:00
Wal 3762750968 Tempo 2024-03-18 17:34:35 +01:00
Maxime a276c24f8f added delete self 2024-03-18 17:30:04 +01:00
Wal 25c5c1b018 Nearly finish 2024-03-18 17:28:14 +01:00
LeoMoulin c7f37b0854 Fix le truc de max et ajoute le test du delete 2024-03-18 15:55:38 +01:00
Wal c35f675a11 Manage course + delete course END 2024-03-18 15:47:04 +01:00
Wal a9e5e45872 Merge branch 'master' into wal/front/listingUsers 2024-03-18 14:57:49 +01:00
Wal 73d50f3f50 Merge remote-tracking branch 'refs/remotes/origin/wal/front/listingUsers' into wal/front/listingUsers 2024-03-18 14:52:29 +01:00
Wal 0871d2971d manage Course finished 2024-03-18 14:51:27 +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
tonitch a762b6875d removing cdn 2024-03-18 13:54:31 +01:00
tonitch 4e6c4ecf38 Merge pull request 'added GET /user/{id}' (#143) from Max/Backend/GetUserById into master 
Reviewed-on: PGL/Clyde#143
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
 2024-03-18 13:48:07 +01:00
tonitch ec3c912847 Merge remote-tracking branch 'origin/master' into Max/Backend/GetUserById 2024-03-18 13:45:47 +01:00
tonitch 5636d96478 Merge pull request 'Max/Backend/UserDelete' (#144) from Max/Backend/UserDelete into master 
Reviewed-on: PGL/Clyde#144
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 13:45:04 +01:00
tonitch d40ceff2ba disable test on ci, problem for later 2024-03-18 12:41:18 +01:00
Maxime fd357ba938 GET /curriculum returns user's curriculum 2024-03-18 12:15:13 +01:00
Wal 92079c5a47 Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 11:59:44 +01:00
Wal 753af3874e Login and register ok and starting requests 2024-03-18 11:55:51 +01:00