Commit Graph

84 Commits

Author SHA1 Message Date
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 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
Maxime c0233fce57 Merge pull request 'adding compose for launching properly everything' (#151) from tonitch/compose into master
Build and test backend / Build-backend (push) Successful in 1m57s
deploy to production / deploy-frontend (push) Successful in 29s
deploy to production / deploy-backend (push) Failing after 2m24s
Build and test FrontEnd / Build-frontend (push) Successful in 27s
Reviewed-on: #151
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
2024-04-17 00:26:11 +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 05bff0fa77 Add the uninscription request submission
Build and test backend / Build-backend (pull_request) Successful in 3m38s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 27s
2024-04-14 18:29:23 +02:00
LeoMoulin 98c9d2d754 Link the ExternalCurriculum to a user after the inscription.
Build and test backend / Build-backend (pull_request) Successful in 1m31s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
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
Build and test backend / Build-backend (pull_request) Successful in 2m3s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 29s
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 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
tonitch 2b9bdf8dac fixup! show sender on message
Build and test backend / Build-backend (pull_request) Successful in 2m8s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-04-02 10:18:50 +02:00
tonitch 0e26e1a0db adding compose for launching properly everything 2024-03-30 23:23:33 +01:00
tonitch 1c61a356a4 update when message sent 2024-03-29 14:31:08 +01:00
tonitch 2bdffe6ab4 remove member of a discussion 2024-03-29 14:30:46 +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
tonitch 729d1ad504 adding members management
Build and test backend / Build-backend (pull_request) Successful in 3m35s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-03-27 23:54:59 +01:00
tonitch 1522d74ed3 messsaging on the frontend 2024-03-27 19:52:48 +01:00
LeoMoulin eafff6ec2d Ajoute le détail des étudiants (big update) 2024-03-25 09:57:35 +01:00
tonitch 914f6bdf36 fix for new discussions not appearing right away 2024-03-25 09:43:45 +01:00
tonitch 66e7fa24a1 Adding the discussion architectures and creating new discussions 2024-03-25 00:08:44 +01:00
tonitch 7b9f021c24 first version of the frontend for messages 2024-03-24 22:33:17 +01:00
tonitch 2dfa0a0ee0 base msg 2024-03-24 22:33:14 +01:00
LeoMoulin 67fa630ecf e 2024-03-23 18:04:36 +01:00
Wal 4715441afd FINAL COMMIT
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 1m58s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-18 18:47:00 +01:00
Wal 25c5c1b018 Nearly finish
Build and test backend / Build-backend (pull_request) Failing after 1m31s
Build and test backend / Test-backend (pull_request) Failing after 1m31s
Build and test FrontEnd / Build-frontend (pull_request) Failing after 20s
2024-03-18 17:28:14 +01:00
Wal c35f675a11 Manage course + delete course END
Build and test backend / Build-backend (pull_request) Successful in 2m3s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-18 15:47:04 +01:00
Wal 0871d2971d manage Course finished 2024-03-18 14:51:27 +01:00
Wal 753af3874e Login and register ok and starting requests 2024-03-18 11:55:51 +01:00
Wal 8ff29ca34e Register
Build and test backend / Build-backend (pull_request) Successful in 2m3s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Failing after 23s
2024-03-17 23:19:36 +01:00
Wal 7e7cec2f6c Merge branch 'Max/Backend/GetUserById' into wal/front/listingUsers
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-17 22:00:56 +01:00
Wal d9307753c4 trop de truc
Build and test backend / Build-backend (pull_request) Successful in 1m58s
Build and test backend / Test-backend (pull_request) Successful in 1m56s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-17 21:38:10 +01:00
Wal b2d0be014c UserList and Student List part1
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 1m56s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-17 15:59:12 +01:00
Wal b67b25b4a4 Login Finished, add curricula and apps
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 2m0s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-17 13:24:24 +01:00
Wal 5a7934b2a3 Merge branch 'master' into wal/front/listingUsers
Build and test backend / Build-backend (pull_request) Successful in 2m14s
Build and test backend / Test-backend (pull_request) Successful in 2m7s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 27s
2024-03-16 19:57:53 +01:00
Wal 36fc33c3e9 Profil part.2/?
Build and test backend / Build-backend (pull_request) Successful in 2m4s
Build and test backend / Test-backend (pull_request) Successful in 2m4s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-03-16 17:01:26 +01:00
tonitch 17ab241250 show map by role
Build and test backend / Build-backend (pull_request) Successful in 2m7s
Build and test backend / Test-backend (pull_request) Successful in 2m4s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-16 16:57:52 +01:00
Wal 36ce5a553b Profil, merge Master and corrections
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 1m59s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-03-16 15:21:10 +01:00
Wal 8d1235be92 again links
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 1m58s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-03-16 14:31:44 +01:00
tonitch 04f64f505e Indicated that you are logged by coloring the icon in orange and disconnect if clicked on it
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-16 13:56:29 +01:00
Wal e84e34d735 login 2024-03-16 12:47:49 +01:00