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
21a5dbdb22
Implements the possibility to ask for a scholarship for a student
2024-04-09 15:58:10 +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
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
648b73b585
Fix the implementation of externalCurriculum upload
2024-04-04 16:54:11 +02:00
8442101c40
Fixed some css
2024-04-01 11:43:42 +02:00
bce53305b3
Merge master into my branch
2024-04-01 10:40:36 +02:00
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
4a314449ad
Add the backend logic for ExternalCurriculum class (need to do one more endpoint)
2024-03-29 15:31:02 +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
94f12f0a86
Add the date and identitycard feature to inscriptionRequest
2024-03-27 16:04:55 +01:00
839ca414ce
Ajoute le détail des demandes d'inscriptions (big update)
2024-03-27 14:12:20 +01:00
eafff6ec2d
Ajoute le détail des étudiants (big update)
2024-03-25 09:57:35 +01:00
7a13d412f1
Full screen apps
Build and test backend / Build-backend (pull_request) Successful in 1m48s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-23 23:56:24 +01:00
67fa630ecf
e
2024-03-23 18:04:36 +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
9de4b06e75
Login 'fixed'
Build and test backend / Build-backend (pull_request) Successful in 2m53s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
2024-03-23 13:57:46 +01:00
123fa97611
Merge branch 'wal/front/temp' into tonitch/front/fullSpaceApp
2024-03-22 20:15:45 +01:00
1fad792be7
Just to merge
2024-03-22 20:14:20 +01:00
acd1262955
Make app use full space
Build and test backend / Build-backend (pull_request) Successful in 1m50s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-22 13:56:04 +01:00
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
3762750968
Tempo
2024-03-18 17:34:35 +01:00
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
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
0871d2971d
manage Course finished
2024-03-18 14:51:27 +01:00
753af3874e
Login and register ok and starting requests
2024-03-18 11:55:51 +01:00
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
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
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
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
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
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
8476563678
profil part3
2024-03-16 19:54:42 +01:00
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
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
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
a5807148e1
And again we continue
Build and test backend / Build-backend (pull_request) Successful in 1m59s
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 15:06:21 +01:00
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
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
e84e34d735
login
2024-03-16 12:47:49 +01:00
0b27d2e8d8
Merge branch 'master' into tonitch/front/pagesAPI
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Build and test backend / Test-backend (pull_request) Successful in 1m59s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-16 12:35:15 +01:00
ca6f676fb7
Merge pull request 'tonitch/front/manageCourses/LinkToBackend' ( #125 ) from tonitch/front/manageCourses/LinkToBackend into wal/front/listingUsers
...
Build and test backend / Build-backend (pull_request) Successful in 1m59s
Build and test backend / Test-backend (pull_request) Successful in 1m57s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 26s
Reviewed-on: #125
2024-03-16 12:26:57 +01:00
cc8530621d
Merge branch 'master' into tonitch/front/manageCourses/LinkToBackend
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 1m56s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-16 12:01:44 +01:00
41288258c9
Merge branch 'master' into wal/front/listingUsers
Build and test backend / Build-backend (pull_request) Successful in 2m1s
Build and test backend / Test-backend (pull_request) Successful in 2m2s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-16 11:56:37 +01:00
47a0c97f3d
small commit but its for the big merge+ verif psswrd and confirm in login
Build and test backend / Build-backend (pull_request) Successful in 2m1s
Build and test backend / Test-backend (pull_request) Successful in 2m1s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
2024-03-16 11:52:31 +01:00
17d0ae7ccc
Refactoring: cursus -> curriculum frontend
...
Build and test backend / Build-backend (pull_request) Successful in 2m3s
Build and test backend / Test-backend (pull_request) Successful in 1m58s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
I hope I didn't missed anything, this commit is following the previous
one in this branch
2024-03-16 10:17:04 +01:00
d5e4387303
Merge branch 'master' into wal/front/listingUsers
Build and test backend / Build-backend (pull_request) Successful in 1m59s
Build and test backend / Test-backend (pull_request) Successful in 2m0s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-15 22:49:26 +01:00
1903a6c9be
"trying functions"
Build and test backend / Build-backend (pull_request) Successful in 2m4s
Build and test backend / Test-backend (pull_request) Successful in 2m1s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 24s
2024-03-15 22:47:40 +01:00
77a170be6d
Merge branch 'master' into tonitch/front/pagesAPI
Build and test backend / Build-backend (pull_request) Successful in 2m1s
Build and test backend / Test-backend (pull_request) Successful in 1m58s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-15 22:37:37 +01:00
ae4ad036a8
Merge remote-tracking branch 'origin/master' into tonitch/front/manageCourses/LinkToBackend
2024-03-15 22:32:21 +01:00
