Commit Graph
50 Commits
Author SHA1 Message Date
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
Build and test backend / Build-backend (pull_request) Successful in 1m46s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-18 20:54:16 +01:00
LeoMoulin 66d090d045 Merge pull request 'Leo/Backend/UnitTest' (#138) from Leo/Backend/UnitTest into master
Build and test backend / Build-backend (push) Successful in 1m56s
deploy to production / deploy-frontend (push) Successful in 26s
deploy to production / deploy-backend (push) Failing after 2m53s
Build and test FrontEnd / Build-frontend (push) Successful in 25s
Reviewed-on: #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
Build and test backend / Build-backend (pull_request) Successful in 1m44s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-18 15:55:38 +01:00
LeoMoulin 9744bd973f Resolve conflicts and adapt tests
Build and test backend / Build-backend (pull_request) Successful in 1m49s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
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
Build and test backend / Test-backend (pull_request) Failing after 2m25s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
Build and test backend / Build-backend (pull_request) Failing after 2m27s
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
Build and test backend / Build-backend (pull_request) Failing after 3m14s
Build and test backend / Test-backend (pull_request) Failing after 2m30s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-03-17 19:06:27 +01:00
LeoMoulin 571d27c230 Add test for user patch
Build and test backend / Test-backend (pull_request) Failing after 2m22s
Build and test backend / Build-backend (pull_request) Failing after 2m24s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-17 15:53:50 +01:00
LeoMoulin 37a9eb46ae Add tests for UserController get and post
Build and test backend / Test-backend (pull_request) Failing after 2m24s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
Build and test backend / Build-backend (pull_request) Failing after 2m22s
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
Build and test backend / Build-backend (pull_request) Successful in 2m17s
Build and test backend / Test-backend (pull_request) Successful in 2m17s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-17 10:36:00 +01:00
LeoMoulin 189e664f37 Add tests for Storage system
Build and test backend / Build-backend (pull_request) Successful in 2m53s
Build and test backend / Test-backend (pull_request) Successful in 2m17s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
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
Build and test backend / Build-backend (pull_request) Successful in 2m1s
Build and test backend / Test-backend (pull_request) Successful in 1m55s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
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
Build and test backend / Build-backend (pull_request) Successful in 2m15s
Build and test backend / Test-backend (pull_request) Successful in 1m59s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-12 17:53:52 +01:00
LeoMoulin b7a574a312 Merge branch 'master' into Leo/Backend
Build and test backend / Build-backend (pull_request) Successful in 1m57s
Build and test backend / Test-backend (pull_request) Successful in 1m55s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
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.
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
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)
Build and test backend / Build-backend (push) Successful in 2m11s
Build and test backend / Test-backend (push) Successful in 1m21s
deploy to production / deploy-frontend (push) Successful in 25s
deploy to production / deploy-backend (push) Successful in 2m17s
Build and test FrontEnd / Build-frontend (push) Successful in 24s
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: #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
Build and test backend / Build-backend (pull_request) Failing after 1m36s
Build and test backend / Test-backend (pull_request) Failing after 1m35s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 20s
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
LeoMoulin 434cc8dd2b - On objectise tout
- Ajout des relation
2024-03-06 20:05:24 +01:00
LeoMoulin c27c3ac9fb - Ajout des champs password et salt dans user
Build and test backend / Build-backend (pull_request) Successful in 2m25s
Build and test backend / Test-backend (pull_request) Successful in 2m1s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
Build and test FrontEnd / Test-frontend (pull_request) Successful in 23s
- Ajout de la table token
- Ajout des foreign keys
2024-03-05 14:14:56 +01:00
LeoMoulin 684c3095eb - Changement des noms de variables
- Ajout des getters/setters appropriés
- Ajout des constructeur nécessaires
2024-03-03 17:42:26 +01:00
LeoMoulin bbe1f9767c Merge remote-tracking branch 'origin/LeoMoulin/Backend/Leo' into LeoMoulin/Backend/Leo 2024-03-03 17:05:09 +01:00
LeoMoulin 25019d8b91 Suppression de TeacherOwnerCourse.java et ajout d'un booléen Owned dans TeacherGivenCourse.java 2024-03-01 01:47:11 +01:00
LeoMoulin 69c3a3b965 Implémentation des différentes classes représentants les tables 2024-02-29 20:08:12 +01:00
LeoMoulinandtonitch 5d8c3d03c5 Extension Requests
Bon les gars je vais pas passer par 4 chemins :
Zǎoshang hǎo zhōngguó xiànzài wǒ yǒu BING CHILLING 🥶🍦 wǒ hěn xǐhuān BING CHILLING 🥶🍦 dànshì sùdù yǔ jīqíng 9 bǐ BING CHILLING 🥶🍦 sùdù yǔ jīqíng sùdù yǔ jīqíng 9 wǒ zuì xǐhuān suǒyǐ…xiànzài shì yīnyuè shíjiān zhǔnbèi 1 2 3 liǎng gè lǐbài yǐhòu sùdù yǔ jīqíng 9 ×3 bùyào wàngjì bùyào cu òguò jìdé qù diànyǐngyuàn kàn sùdù yǔ jīqíng 9 yīn wéi fēicháng hǎo diànyǐng dòngzuò fēicháng hǎo chàbùduō yīyàng BING CHILLING 🥶🍦zàijiàn 🥶🍦

Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: #4
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
Co-authored-by: LeoMoulin <leomoulin125@gmail.com>
Co-committed-by: LeoMoulin <leomoulin125@gmail.com>
2023-12-14 14:37:26 +01:00
LeoMoulin c2b6ad0693 Merge pull request 'openapi-dev' (#3) from openapi-dev into master
Reviewed-on: #3
Je suis ok les bg
2023-12-11 10:23:14 +01:00