Commit Graph

2071 Commits

Author SHA1 Message Date
58d84da254 API: /formsemestre/<int:formsemestre_id>/decisions_jury 2022-08-03 13:32:59 +02:00
cdf17873b0 Merge pull request 'update partition editor suite à update API' (#468) from jmplace/ScoDoc-Lille:update_partition_editor into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/468
2022-08-03 09:15:38 +02:00
Jean-Marie PLACE
ddf281f394 update partition editor suite à update API 2022-08-03 09:09:17 +02:00
9b0dec8675 Fixes #466 2022-08-02 17:13:13 +02:00
90811fdc0e Merge pull request 'replace ["partition_name"] by .partition_name' (#467) from jmplace/ScoDoc-Lille:fix_order_partition_not_subscritable into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/467
2022-08-02 16:37:17 +02:00
Jean-Marie PLACE
b0ebdf2fb9 replace ["partition_name"] by .partition_name 2022-08-02 16:32:31 +02:00
1b3bf87617 API: test partitions. Fix #465. 2022-08-02 16:21:41 +02:00
4a3ceb291a API : resultat formsemestre_order_partitions 2022-08-02 16:10:09 +02:00
1f4cb5700e group: "group_name" 2022-08-02 09:48:11 +02:00
bfec7b7a6d renomme /billets_absence/add en /billets_absence/create 2022-08-02 08:48:08 +02:00
338e2a1c3f Preferences vides si pas de département 2022-08-01 21:43:04 +02:00
9a2c3b8174 Billets absences: nouvelle API + modernisation code 2022-08-01 21:42:19 +02:00
fd06d8428a Export datetime en JSON: conversionn systématique en ISO 8601 2022-08-01 17:50:51 +02:00
bd718d456d API: modif résultat de /etudiant(s) 2022-07-31 21:44:39 +02:00
a27fb9f3ef Close #464 2022-07-31 20:42:38 +02:00
a5a168666f Modif route /moduleimpl/<int:moduleimpl_id>/evaluations 2022-07-30 08:23:22 +02:00
6306e8ca26 API: diverses corrections, tests unitaires (sauf absences et logos). 2022-07-29 16:19:40 +02:00
87278587f9 Transforme permission APIView en ScoView et APIEditGroups en ScoEtudChangeGroups 2022-07-28 21:20:46 +02:00
f0c1a7e81f Bug checkbox 2022-07-27 21:58:50 +02:00
d818602084 Fix: API partitions/order, groups/order, group/set_etudiant 2022-07-27 17:42:58 +02:00
3dfe15ee17 Tri partitions et groupes 2022-07-27 17:20:43 +02:00
ee93cf1e9b Fix: API partitions/order 2022-07-27 16:19:38 +02:00
1796279d8a partition_editor: routes API 2022-07-27 16:11:20 +02:00
dcd7cf78fd Modification contrôle d'accès. Routes API basic+token. Revision routes API. 2022-07-27 16:03:14 +02:00
c9a6fe0743 Merge pull request 'Partition editor : corrections bugs' (#461) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/461
2022-07-26 17:49:06 +02:00
888d7cd6aa Secure Back Redirects on login form 2022-07-26 16:05:30 +02:00
c2baf1b6a7 Partition editor : corrections bugs 2022-07-26 11:14:36 +02:00
b61338be8f Merge pull request 'Edition partition - fin pour tests' (#460) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/460
2022-07-26 09:03:21 +02:00
6632fce008 Fix: scodoc_dept : API 2022-07-26 09:00:48 +02:00
14a8800197 Edition partition - fin pour tests 2022-07-26 00:38:46 +02:00
b15f755fcd Partition editor : live update 2022-07-25 22:17:46 +02:00
59d6205777 API: ajout /group/<int:group_id>/remove_etudiant/<int:etudid> + cache invals 2022-07-25 08:46:24 +02:00
692c5b0369 API: erreurs sans abort() + fix ok:true 2022-07-25 07:07:45 +02:00
26454de0c4 API: Fix /api/group/edit 2022-07-25 06:53:35 +02:00
53cf6fa2c6 Merge pull request 'Interface modification' (#457) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/457
2022-07-24 22:06:46 +02:00
f16f344720 Ordre des groupes et partitions (API) 2022-07-24 22:04:37 +02:00
6a3c9a613e Interface modification 2022-07-24 21:52:26 +02:00
936fe3d716 API: /etudiants/courants avec restriction aux départements 2022-07-24 15:51:13 +02:00
0535d99456 Affichage des rôles 2022-07-24 07:14:31 +02:00
a3fc5b0def Améliorations partition éditor 2022-07-24 00:18:32 +02:00
1aaee35d64 API: ajout /partition/<int:partition_id>/remove_etudiant/<int:etudid> 2022-07-23 15:29:12 +02:00
02fee61aa5 partition_editor V1 beta 2022-07-23 15:14:39 +02:00
e1d3144af9 Partition editor V1 beta 2022-07-23 11:17:29 +02:00
149522bcd3 API: Modification structure partitions/groupes 2022-07-23 09:07:53 +02:00
c3952c1118 API: modif /formsemestre/resultat: nombres ne chaines, respect JSON sans NaN 2022-07-23 08:46:00 +02:00
9bd2290076 API: fix /formsemestre/<int:formsemestre_id>/etat_evals et /formsemestre/<int:formsemestre_id> 2022-07-22 21:22:06 +02:00
2f5a786b2d Place pour le futur éditeur de partitions 2022-07-22 17:37:01 +02:00
adc086f83c Merge branch 'new_api_leonard' of https://scodoc.org/git/viennet/ScoDoc 2022-07-22 16:49:50 +02:00
aa1ec6fd8e API: modification pour accès via cookie web 2022-07-22 16:39:21 +02:00
cfd4448ca5 API: /formsemestre/<int:formsemestre_id>/resultats 2022-07-21 16:46:07 +02:00
d36a2950d3 API: fix /formsemestre/<int:formsemestre_id>/programme 2022-07-21 14:44:19 +02:00
72e69960a4 API: fix /formsemestre/<int:formsemestre_id>/programme 2022-07-21 14:21:06 +02:00
8330ce66ca API: accès aux départements 2022-07-21 09:59:54 +02:00
847e275b26 API: /formsemestres/query 2022-07-21 08:53:44 +02:00
312d0c1917 API: group/partition: log + 1 bug 2022-07-20 22:33:41 +02:00
48990f5012 API: group create 2022-07-20 22:03:29 +02:00
3a7879c8aa Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-20 18:24:24 +02:00
25957e04fa suppression contact, ajout opérations historique, correctifs 2022-07-20 18:24:15 +02:00
4cb2db61bc WIP: API group/partition 2022-07-20 16:12:20 +02:00
b53958c777 WIP: API edition partitions 2022-07-20 15:07:31 +02:00
98cb7bae37 WIP: API edition groupes/partitions 2022-07-20 09:50:02 +02:00
866da5b83d Nouvelle API: Groupes/Partitions: accès en lecture 2022-07-20 08:19:24 +02:00
b6de8f8631 Supprime set_groups (mal spécifiée) 2022-07-20 06:23:42 +02:00
ca1fe679db WIP: new API revue et corrigée (en cours) 2022-07-19 22:17:10 +02:00
455ce295d8 Merge branch 'new_api' of https://scodoc.org/git/leonard.montalbano/ScoDoc into new_api_leonard 2022-07-19 10:38:08 +02:00
e7db835c4b Modif fiche etudiant: affichage ECTS validés. Close #434 2022-07-19 10:28:50 +02:00
157423edaf Fix: assure que le code enregistré est toujours dans le menu (utile pour les ADM sur UE < 10). 2022-07-18 22:17:27 +02:00
1967273220 Calcul ECTS/parcours. Fix #437 2022-07-18 17:48:10 +02:00
6eef66e482 Fix: étapes apo création formsemestre 2022-07-17 20:09:42 +02:00
6d905882d6 Fix: erreur si suppression de maquette inexistante 2022-07-17 17:26:56 +02:00
4658de8c2f Jury BUT: contenu archive PV 2022-07-17 15:15:24 +02:00
98c94bbcac Bonus Lyon, version 2022. Close #442 2022-07-17 08:56:46 +02:00
2e2b761391 Bonus Caen-Normandie (version à valider) 2022-07-17 08:28:05 +02:00
a864989d05 Bul. BUT: reformat css + taille font décision. 2022-07-16 14:53:52 +02:00
b8bb61ef42 Bulletins: champs situation avec code année et autorisations 2022-07-16 09:39:46 +02:00
57223fa21d Edition prog. BUT: Mise à jour menus niveaux comp. Front de #445. 2022-07-14 22:20:24 +02:00
Jean-Marie PLACE
fae9ce4e5d fix null resilution bug 2022-07-14 09:50:15 +02:00
2861c2ee87 Jury BUT: Autorise ADM sur les RCUE compensés 2022-07-13 19:34:46 +02:00
fb9571dde2 Clonage formations. Close #444 2022-07-13 19:23:55 +02:00
48e31b5f39 Modernisation suppressions UE et formations 2022-07-13 18:52:07 +02:00
9480e15b83 Merge branch 'entreprises' of https://scodoc.org/git/viennet/ScoDoc 2022-07-13 17:13:55 +02:00
ea73c050e6 siret unique 2022-07-13 16:53:54 +02:00
0175b3e4d4 comment 2022-07-13 15:21:31 +02:00
9073983162 Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-13 12:18:47 +02:00
999b0487c7 ajout siret provisoire, changement formulaire 2022-07-13 12:14:00 +02:00
9d72954cc1 Bulletins: vérification plus stricte des arguments 2022-07-13 12:03:53 +02:00
4921d45129 Fix: PV jury / cas rare sans décision d'année 2022-07-13 11:30:01 +02:00
f4514ad4ea ajout siret provisoire 2022-07-12 10:32:23 +02:00
34c58cf8ca ue_table: ffiche code Apo des UE BUT 2022-07-11 22:07:47 +02:00
009de7a4ab 2 minor bugs 2022-07-11 21:39:30 +02:00
45a2fa174c Fiix UE edit. Close #439 2022-07-11 21:39:08 +02:00
9898ae5310 correction creation offre 2022-07-11 20:38:30 +02:00
0d8e7f4268 Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-11 20:17:49 +02:00
3a31317e48 correction modèle 2022-07-11 20:17:34 +02:00
b34484784a Corrections diverses du code bulletins 2022-07-11 18:33:48 +02:00
45d3106272 comments 2022-07-11 18:31:58 +02:00
60f5bdfc60 Validations auto classic et BUT: accélération via DeferredSemCacheManager. 2022-07-11 18:28:58 +02:00
b698196a09 DeferredSemCacheManager réentrant 2022-07-11 18:22:05 +02:00
a1f772b22e Jury BUT: invalidation cache semestre 2022-07-11 18:18:48 +02:00
2bfbaa3a2a Réduit niveau log: INFO 2022-07-11 18:17:39 +02:00
75a1ec78fb Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2022-07-11 17:17:01 +02:00
6a41469cb8 Merge pull request 'Ajout décisions UE' (#440) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/440
2022-07-11 17:16:50 +02:00
865c3b0414 Affichage codes jury recap. en BUT: montre code UE au lieu de sem. + fix id formsemestres UE cap. 2022-07-11 17:15:36 +02:00
8b2a5fe949 Ajout décisions UE 2022-07-11 17:02:17 +02:00
51076574ee refactoring routes 2022-07-11 16:06:38 +02:00
leonard_montalbano
4b00a5c8ff fix diffs avec origin master 2022-07-11 13:39:50 +02:00
leonard_montalbano
c021572a1a Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into new_api 2022-07-11 12:48:55 +02:00
6d881915bd Fix: association parcours (restriction au dept.) 2022-07-10 12:08:22 +02:00
51178795e2 Améliore messages erreur bulletins pdf 2022-07-09 22:40:46 +02:00
d5ff4f79a8 Fix: jury BUT: UE CMP et ADJ affichées comme validées 2022-07-09 13:32:14 +02:00
2fcb397f9b Merge pull request 'Bug relevé "masquer rang"' (#438) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/438
2022-07-09 13:31:28 +02:00
f1bbf4bfb4 Bug relevé "masquer rang" 2022-07-09 13:29:30 +02:00
1148bf59eb Améliore édition programme BUT: choix niveaux compétence / UE 2022-07-09 12:55:23 +02:00
5bc4b47e1e Lettres de décisions jury BUT 2022-07-08 23:58:27 +02:00
781744a8fa refactoring, page erreur (bp entreprises) 2022-07-08 18:56:27 +02:00
bf27fcbdc6 Bulletins et PV: champs décisions jury BUT 2022-07-08 18:09:45 +02:00
leonard_montalbano
0db3acf271 fix des diff avec le master 2022-07-08 15:11:45 +02:00
leonard_montalbano
8b3c0ea414 Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into new_api 2022-07-08 15:06:04 +02:00
8e463e5971 Missing import in sco_excel 2022-07-08 06:32:43 +02:00
543c3759d9 refactoring et préparatifs pour lettres individuelles BUT 2022-07-07 23:34:14 +02:00
206825c42c Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into situation_but 2022-07-07 22:30:05 +02:00
5806cd29a7 Fix: API /formsemestres_courants 2022-07-07 22:29:27 +02:00
c9f399d9f7 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into situation_but 2022-07-07 17:23:17 +02:00
11f6492965 Merge branch 'entreprises' of https://scodoc.org/git/viennet/ScoDoc 2022-07-07 16:40:22 +02:00
81e7914620 Refactoring: cursus Classic/ECTS/BUT 2022-07-07 16:24:52 +02:00
f2f3fd0660 correction sco_excel 2022-07-07 15:30:50 +02:00
989930e4ce Merge branch 'new_api' of https://scodoc.org/git/leonard.montalbano/ScoDoc into new_api 2022-07-07 14:48:19 +02:00
1fd296179d fix des conflits 2022-07-07 14:47:06 +02:00
0140c404ea Merge branch 'entreprises' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-07 14:46:41 +02:00
a297126c1c Supprimer 'app/static/links/9.3.15' 2022-07-07 14:32:41 +02:00
d1250555b9 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2022-07-07 12:01:16 +02:00
d8ff5152d1 Amélioration sco_excel 2022-07-07 11:59:47 +02:00
48912032c4 Amélioration sco_excel 2022-07-07 11:56:18 +02:00
89a64d92d3 Merge pull request 'Correction bug : "Faire figurer les décisions sur les bulletins"' (#436) from lehmann/ScoDoc-Front:master into master
Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/436
2022-07-06 23:28:20 +02:00
f9b4a582f5 Correction bug : "Faire figurer les décisions sur les bulletins" 2022-07-06 21:17:39 +02:00
ec987ad8fa ajout file d'ariane 2022-07-06 20:37:20 +02:00
17b73936de Merge branch 'entreprises' of https://scodoc.org/git/arthur.zhu/ScoDoc into entreprises 2022-07-06 17:35:42 +02:00
97b5ab8179 Page saisie jury: affiche version classique ou BUT 2022-07-06 00:19:02 +02:00
c9aa55979b Misc fixes. Suppr. validations BUT. 2022-07-06 00:05:14 +02:00
83ddd2bf03 Bul. DUT/ classic JSON: champ 'publie' 2022-07-05 20:40:21 +02:00
312faf74fb Fix: publication bulletin 2022-07-05 20:37:38 +02:00
9474d420df fix problème symlinks 2022-07-05 16:09:26 +02:00
428cc61527 Décisions RCUE relevé 2022-07-05 15:46:17 +02:00
aa97a10bf8 Ajout d'informations sur l'arrêté BUT 2022-07-05 11:41:58 +02:00
512b38665f Jury BUT: traitement des DEF et DEM. Close #426 2022-07-04 23:50:55 +02:00
9f7d6a3020 lié migrations appli relations entreprises 2022-07-04 21:12:56 +02:00
9d26c3126a Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into entreprises 2022-07-04 20:45:58 +02:00
fa358c2da4 Fix: import users vide 2022-07-04 17:23:51 +02:00
b6052bf75f merge 2022-07-04 17:16:54 +02:00
9bf05dd9cd Edit coef : correction flotants + somme ne prend plus en compte les bonus 2022-07-04 16:42:10 +02:00
3e62d9b425 Edit coef : correction nombres flotant & somme sans bonus 2022-07-04 16:38:26 +02:00
7e642317d3 cosmetic 2022-07-03 22:45:56 +02:00
d65a30a9e9 Tableaux recap: sauvegarde état. Close #414 2022-07-03 16:14:03 +02:00
c1f7bcdb92 Clé tri étudiants: laisse espaces internes 2022-07-03 11:30:07 +02:00
962015563a Fix: bug calcul année but 2022-07-03 08:38:12 +02:00
835234779f annotations 2022-07-03 08:31:01 +02:00
0bf636814d Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2022-07-02 11:17:15 +02:00
c5c7e9135b quelques annotations 2022-07-02 11:17:04 +02:00
Jean-Marie PLACE
bc11f97354 fix logoname with dot problem 2022-07-02 10:53:56 +02:00
720e891f23 Optimisation apo_semset_maq_status 2022-07-02 00:00:29 +02:00
d23649d725 Améliore PV jury BUT: col. UEs, largeurs en excel, divers. 2022-07-01 22:29:31 +02:00
dbf562b701 Export table tcue: close #421 2022-07-01 16:34:36 +02:00
5a8add1aac Fix: calcul malus sur données vides 2022-07-01 09:48:08 +02:00
bf8614a386 Tri PV jury BUT 2022-07-01 00:15:55 +02:00
e8e27dd964 PV jury annuel BUT 2022-06-30 23:49:39 +02:00
372a6e6ed6 Pas de décision de sem. affichée en BUT: ficheEtud et bul. json 2022-06-30 20:43:09 +02:00
8310d20a77 doc 2022-06-30 20:20:36 +02:00
266d5c1472 BUT : ajout code ATJ sur année, UEs, RCUEs 2022-06-30 20:13:30 +02:00
36cef70c46 Fusion + suppr. symlink 2022-06-30 19:54:50 +02:00
e3bfbf1e40 Relevé : code + explications - décision année jury 2022-06-30 17:43:23 +02:00
92bd46d1d5 0 à la place de - si 0 ECTS 2022-06-30 16:54:06 +02:00
9c81715139 Bul. BUT JSON: decisions jury selon option "Faire figurer les décisions sur les bulletins" 2022-06-30 15:43:48 +02:00
b9694b21b9 Fix: code RED. Close #416 2022-06-30 15:32:22 +02:00
33b5621af7 Fix: calcul du malus BUT par UE. Close #417 2022-06-30 15:25:58 +02:00
c0c78074b2 Fix: calcul du malus BUT par UE. Close #417 2022-06-30 15:11:30 +02:00
9f46849729 Fix: API formsemestre 2022-06-30 13:34:40 +02:00
7645247357 Jury BUT: garde fou si mix classic/BUT... 2022-06-30 09:37:41 +02:00
e9c5914a9f Fix: bulletins Qlio mails 2022-06-30 09:31:05 +02:00
0330544a0b Fix:archives (again...) 2022-06-30 09:27:46 +02:00
0fe89b0501 Fix: fiche etud BUT 2022-06-30 08:59:19 +02:00
f08c741734 Fix: archivage PV (encoding) 2022-06-29 23:03:53 +02:00
d227264283 Liens navigation sur saise jury BUT 2022-06-29 22:53:56 +02:00
63f024152a Oups: fichier oublié 2022-06-29 21:16:49 +02:00
01f3766082 css tableau résultats jury BUT 2022-06-29 19:54:22 +02:00
2e8b529801 css tableau résultats jury BUT 2022-06-29 19:38:39 +02:00
fd21172398 Export décisions jury BUT dans bulletins JSON 2022-06-29 19:25:08 +02:00
16b3221daa Refactoring / année BUT sur fiche étudiant (montage provoisoire) 2022-06-29 18:16:37 +02:00
b0e78b67ea WIP: amelioration form jury BUT 2022-06-29 16:30:01 +02:00
581131f54f Affichage code jury sem. sur table recap classic en mode jury. Close #409 2022-06-29 14:42:52 +02:00
dbb1264863 Fix: AP formsemestre avec parcours 2022-06-29 13:56:36 +02:00
081ad0d5e9 Fix: suppression anciennes UE avec formules 2022-06-29 13:41:22 +02:00
72144a4952 Minor bugs (edit_ue) 2022-06-29 09:08:31 +02:00
leonard_montalbano
3297819892 gestion d'erreurs pour la route formsemestre_apo 2022-06-28 16:02:15 +02:00
a02437323b Jury BUT: cas ou une UE sans niveau a été ajoutée au programme 2022-06-28 11:18:12 +02:00
a204e67efc Bonus La Roche-sur-Yon 2022-06-27 22:22:38 +02:00
860f5b9ad5 Modif exception _formsemestre_enrich 2022-06-27 22:12:57 +02:00
6ffa4b8d7a Fix: contrainte SQL unicite réf. comp. 2022-06-27 20:25:58 +02:00
4e02928c04 Fix: bug suppression d'un groupe 2022-06-27 19:49:29 +02:00
e8c8815b24 Jury BUT: cosmetic tableau jury (v2) 2022-06-27 19:47:41 +02:00
aa138133dc Fix: archivage PV: bug encoding 2022-06-27 19:20:26 +02:00