Commit Graph

1879 Commits

Author SHA1 Message Date
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