Commit Graph

294 Commits

Author SHA1 Message Date
69fb4e881e Add the Teacher approval for reregister requests 2024-04-19 15:53:31 +02:00
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
a9e52d34d4 Start the rework of externalCurriculum interface
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m59s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-04-18 21:35:50 +02:00
3f4f6ed49a added List researches Backend 2024-04-18 18:34:52 +02:00
da2c0f472d added BibTex File Type 2024-04-18 14:39:57 +02:00
8a5a26e2ab Add the management of changeCurriculum requests 2024-04-18 14:09:06 +02:00
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
8724748642 Merge branch 'master' into Leo/masterRegNo
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m23s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-04-18 10:30:01 +02:00
47f1bffb24 backend fixed Patch Research 2024-04-17 23:00:00 +02:00
f19236b3f7 Avoid password leakage
Some checks failed
Build and test backend / Build-backend (push) Successful in 1m27s
deploy to production / deploy-frontend (push) Successful in 28s
deploy to production / deploy-backend (push) Failing after 2m10s
Build and test FrontEnd / Build-frontend (push) Successful in 26s
The password should never be parsed to json ever so can be safely
ignored.
2024-04-17 21:44:30 +02:00
a27cf63daf Add the post feature for differents types of changeCurriculumRequest 2024-04-17 21:42:33 +02:00
8fa29460ef
base
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m53s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 29s
2024-04-17 21:41:29 +02:00
1be7b4cdbe Add the unregistration of a specific cursus only 2024-04-17 13:57:52 +02:00
e303048f7e backend add ManageResearcherProfile 2024-04-17 13:32:46 +02:00
6116cbdaa4 added distinct languages to SQL query 2024-04-17 12:41:58 +02:00
bdfa2e6389 backend returns views 2024-04-17 12:41:36 +02:00
d4c442c64a added ResearchProfile to Apps (to be changed) 2024-04-17 12:40:52 +02:00
94be706226
Merge remote-tracking branch 'origin/master' into tonitch/feat/notifications 2024-04-17 12:37:44 +02:00
24f82812f4 added views to research DTO 2024-04-17 12:22:45 +02:00
881b30e5c9
indev 2024-04-17 12:00:52 +02:00
058c53dbbc Add the actual in UserCurriculum
Rework the unregister procedure
Add ChangeCurriculumRequest
Add the changeCurriculumRequest submit
2024-04-17 11:55:56 +02:00
caa39696d2 Rework the profile page
Add the accept/refuse for unreg request
2024-04-17 08:53:28 +02:00
b9d7950e12 Merge branch 'master' into Leo/masterRegNo
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m43s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 27s
2024-04-17 07:52:58 +02:00
f269e24bb4 Merge remote-tracking branch 'origin/master' 2024-04-17 00:32:39 +02:00
7a05fc1316 fixed spelling mistake 2024-04-17 00:26:56 +02:00
c0233fce57 Merge pull request 'adding compose for launching properly everything' (#151) from tonitch/compose into master
Some checks failed
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
821377a72f added addview and download PDF 2024-04-17 00:09:30 +02:00
a2be04bfb3 link backend Post Patch Delete Lesson 2024-04-16 22:03:48 +02:00
87b02af68e added stats SQL queries 2024-04-16 11:54:11 +02:00
63d0087d0c junction front - back 2024-04-15 23:35:05 +02:00
451944e4fb Implements the RegNo feature
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m50s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 29s
2024-04-15 20:57:29 +02:00
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
a89d1b192c Add the gestion of scholarshipRequest (accept and refuse and select the amount) 2024-04-15 16:17:27 +02:00
eacdf8d47a stats Service and endpoint
todo: statsRepository
2024-04-14 23:29:51 +02:00
05bff0fa77 Add the uninscription request submission
All checks were successful
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
9112004326 Schedule management 2024-04-14 13:52:09 +02:00
1498cfa11e added comments and fixed logic issue 2024-04-14 12:34:04 +02:00
98c9d2d754 Link the ExternalCurriculum to a user after the inscription.
All checks were successful
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
17cb969160 added all endPoints 2024-04-12 01:56:18 +02:00
8ebedec689 Fix fews things and rename the inscription app to managerequests also sort the files
All checks were successful
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
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
adaa828810 Filter and lists 2024-04-11 15:47:56 +02:00
4720669c2c added EndPoints and Mock 2024-04-11 12:29:03 +02:00
5e9eccc4f6 Researches EndPoints 2024-04-11 00:24:40 +02:00
34c0a2bfe8 Merge remote-tracking branch 'origin/master' into Leo/InscriptionDesEtudiants
# Conflicts:
#	frontend/src/rest/apps.js
2024-04-10 23:28:00 +02:00
706481ed1a Fix and simplifie the post and get for externalCurriculum 2024-04-10 23:09:38 +02:00
0c04bed799 this is a test dw 2024-04-10 22:00:08 +02:00
95ef4023d6 change schedule Curriculum and own schedule 2024-04-10 20:22:07 +02:00
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
8650482d11 changed "article" to "research"
to be more more general
2024-04-10 11:50:17 +02:00
783cd8fa9f added comments in entities 2024-04-10 01:14:34 +02:00
40186f9898 changed button colors 2024-04-10 01:14:14 +02:00
106bf96a98
responses and general modifications 2024-04-09 23:41:43 +02:00
b7a729c899 added extention entities 2024-04-09 19:52:31 +02:00
dad6953f99 Merge remote-tracking branch 'origin/master' 2024-04-09 17:59:54 +02:00
7b0d76dae8
Merge remote-tracking branch 'origin/master' into forum 2024-04-09 17:28:59 +02:00
61e269eb27
Linking front for forum creation 2024-04-09 17:27:26 +02:00
21a5dbdb22 Implements the possibility to ask for a scholarship for a student 2024-04-09 15:58:10 +02:00
142ea996d8 link front and back part 1 2024-04-09 14:01:23 +02:00
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
194b14f02b Implements the backend logic for the minerval gestion 2024-04-08 10:18:28 +02:00
5f483216b9
indev 2024-04-08 10:02:03 +02:00
5a4d066c45
Forum and topic getter and creator endpoints 2024-04-07 18:16:05 +02:00
f9bcff6d4f
Avoid password leakage
The password should never be parsed to json ever so can be safely
ignored.
2024-04-07 14:46:14 +02:00
aa3e1cb868 backend Schedule 2024-04-07 14:33:51 +02:00
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
5bb7606721
signing and commenting
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m21s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-04-05 12:54:51 +02:00
648b73b585 Fix the implementation of externalCurriculum upload 2024-04-04 16:54:11 +02:00
cb750b8505
Database creation (Tables) 2024-04-02 21:40:52 +02:00
7ca5c34afe
adding timestamp
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m9s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-04-02 11:08:58 +02:00
cb36aa8a30
Fixing file locations
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m33s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 29s
2024-04-01 22:49:24 +02:00
2b9493422d setup grid to display courses 2024-04-01 16:51:18 +02:00
bce53305b3 Merge master into my branch 2024-04-01 10:40:36 +02:00
0e26e1a0db adding compose for launching properly everything 2024-03-30 23:23:33 +01:00
4a314449ad Add the backend logic for ExternalCurriculum class (need to do one more endpoint) 2024-03-29 15:31:02 +01:00
2bdffe6ab4
remove member of a discussion 2024-03-29 14:30:46 +01:00
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
729d1ad504
adding members management
All checks were successful
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
b4499e04c7
Managing the message with backend
Using DTO to change the way discussions and message are sent to the
client
2024-03-27 19:50:52 +01:00
94f12f0a86 Add the date and identitycard feature to inscriptionRequest 2024-03-27 16:04:55 +01:00
eafff6ec2d Ajoute le détail des étudiants (big update) 2024-03-25 09:57:35 +01:00
66e7fa24a1
Adding the discussion architectures and creating new discussions 2024-03-25 00:08:44 +01:00
972d08a54d added temporary fix to docker issue 2024-03-24 13:37:27 +01:00
db895a6091 added temporary fix to docker issue 2024-03-23 14:38:26 +01:00
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
3d6941ab93
adding cdn to CI
All checks were successful
Build and test backend / Build-backend (push) Successful in 1m57s
Build and test FrontEnd / Build-frontend (push) Successful in 23s
deploy to production / deploy-frontend (push) Successful in 27s
deploy to production / deploy-backend (push) Successful in 1m29s
2024-03-18 21:39:31 +01:00
73f3df0bc6 Clean le projet
All checks were successful
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
90a7b7b70e Merge pull request 'Link back and front all get' (#115) from wal/front/listingUsers into master
Some checks failed
Build and test backend / Build-backend (push) Successful in 1m53s
deploy to production / deploy-frontend (push) Successful in 25s
deploy to production / deploy-backend (push) Failing after 2m48s
Build and test FrontEnd / Build-frontend (push) Successful in 24s
Reviewed-on: #115
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
2024-03-18 20:20:35 +01:00
4f002a29e1 Merge pull request 'added delete self' (#145) from Max/Backend/UserDelete into master
Some checks failed
deploy to production / deploy-frontend (push) Waiting to run
deploy to production / deploy-backend (push) Waiting to run
Build and test FrontEnd / Build-frontend (push) Waiting to run
Build and test backend / Build-backend (push) Has been cancelled
Reviewed-on: #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
4715441afd FINAL COMMIT
All checks were successful
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
77ac771b8f Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers
Some checks failed
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) Successful in 23s
2024-03-18 17:36:07 +01:00
a276c24f8f added delete self
All checks were successful
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 25s
2024-03-18 17:30:04 +01:00
25c5c1b018 Nearly finish
Some checks failed
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
c7f37b0854 Fix le truc de max et ajoute le test du delete
All checks were successful
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
a9e5e45872 Merge branch 'master' into wal/front/listingUsers
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m5s
Build and test backend / Test-backend (pull_request) Successful in 2m1s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-18 14:57:49 +01:00
73d50f3f50 Merge remote-tracking branch 'refs/remotes/origin/wal/front/listingUsers' into wal/front/listingUsers
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 1m59s
Build and test backend / Test-backend (pull_request) Successful in 2m2s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-03-18 14:52:29 +01:00
0871d2971d manage Course finished 2024-03-18 14:51:27 +01:00
9744bd973f Resolve conflicts and adapt tests
All checks were successful
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
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
a762b6875d
removing cdn
Some checks failed
Build and test backend / Build-backend (pull_request) Failing after 1m34s
Build and test backend / Test-backend (pull_request) Failing after 1m32s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-18 13:54:31 +01:00