1
0
forked from ScoDoc/ScoDoc
Commit Graph

671 Commits

Author SHA1 Message Date
857c3007a5 sépare modèles UE et Module 2021-12-08 22:47:29 +01:00
11b3f64319 Calcul moyenne UE BUT progressif (admet modules sans notes) 2021-12-08 21:49:13 +01:00
36b432839a Calcul moyennes modules avec inscriptions partielles, ATT, EXC, ABS, mode immédiat. (+ tests unit.) 2021-12-08 14:13:18 +01:00
f40817dbf5 fix_ine_bug dans prepajury 2021-12-07 10:15:14 +01:00
5b7adf16ec fix: cas but avec modules exotiques + tableau bord si pas de coefs 2021-12-06 23:33:41 +01:00
7d5160bb83 bordereau (contrib Pascal B.). 2021-12-06 23:15:55 +01:00
065fc460cd sco_evaluations
Gestion du non-affichage de l'heure lorsqu'aucune date n'est fixée pour l'évaluation

sco_liste_notes
Generation de bordereaux de signatures pour les évaluations
- nouveau type d'export pdf (nommé "bordereau")
- ajout colonne signatures
- modification de la page evaluation_listenotes  pour intégrer le nouveau lien
2021-12-06 14:04:03 +01:00
177f23b48c json: formatte notes en txt 2021-12-06 10:57:10 +01:00
3ba30f6250 Génération bulletin BUT json 2021-12-05 20:21:51 +01:00
507ff12642 fix 2021-12-04 22:41:06 +01:00
d79f376b24 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-12-04 21:31:56 +01:00
2e1ec1c5ea Templates jinja2 pour pages ScoDoc 2021-12-04 21:06:32 +01:00
b1bc8b3f41 préparatifs/refactoring 2021-12-04 21:04:09 +01:00
540a956fae Suppression de (%(jour)s) lorsque l'évaluation n'a pas de date 2021-12-03 21:17:30 +01:00
6627a9c6b2 traitement exceptions imports xml 2021-12-03 14:13:49 +01:00
ec93a8cdbc Merge pull request 'soften xml formation element' (#191) from jmplace/ScoDoc-Lille:fix_import_xml into PNBUT
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/191
2021-12-03 11:26:17 +01:00
0a000afba4 soften xml formation element 2021-12-03 11:15:35 +01:00
4d857a1567 chargement/association ref. comp. BUT 2021-12-03 11:03:33 +01:00
9ee0acd60b Affichage des coefs de modules (avec Sébastien) 2021-12-02 21:16:14 +01:00
d2b69c2f73 Import ref. Compétences BUT (Orébut) 2021-12-02 12:08:03 +01:00
440e9157b4 Import/export xml des formations (format ScoDoc) avec coefs UE 2021-11-30 11:07:17 +01:00
5d8dad3711 Fix: codes parcours entiers 2021-11-30 10:55:44 +01:00
47e752c95c Cache coefs et poids. Check conformité PN. 2021-11-29 22:18:37 +01:00
09eb73be4a WIP: calcul moyennes UE BUT 2021-11-28 16:31:33 +01:00
47c1a75bb0 modeles 2021-11-28 10:13:18 +01:00
21fa7112c8 param checking (exceptions pour utilisateurs) 2021-11-27 18:55:47 +01:00
480af81e0d check user params (old ids) 2021-11-27 18:44:32 +01:00
5f868fd27c filtre UE sport 2021-11-26 18:13:37 +01:00
83ba9cf186 Calculs moyennes modules BUT: tests unitaires complets, corrections. 2021-11-23 21:54:54 +01:00
daa06651d5 Fix: export tables csv: force conversion des chaines 2021-11-23 15:10:34 +01:00
a83ab8f684 WIP: calcul des moyennes de modules BUT 2021-11-22 00:31:53 +01:00
3a0a2382c8 refactoring 2021-11-20 17:53:21 +01:00
504b12cadb evaluation_listenotes: petite optim 2021-11-20 17:21:51 +01:00
84f25817d1 Fix edit evaluation non APC 2021-11-18 23:54:50 +01:00
e3219a6b0c WIP: Edition formations 2021-11-18 00:24:56 +01:00
8f4299e880 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-11-17 10:29:18 +01:00
58a7508043 WIP: PN BUT 2021-11-17 10:28:51 +01:00
4d9d5293c1 Mise à jour de 'app/scodoc/sco_undo_notes.py'
Correction du SELECT pour inclure code_nip
2021-11-15 10:49:16 +01:00
14ab816bee index semestre dans les UE 2021-11-14 18:09:20 +01:00
4182fd494c Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-11-13 18:25:02 +01:00
5b534abf5f Parcours Licence ILEPS 2021-11-13 18:15:15 +01:00
f6b2297bd3 Edition coefs (nuls) + tests 2021-11-13 12:09:30 +01:00
89e7250f4a - Coef evaluations (modèles).
- Refactoring.
- Changement des noms des classes (modèles) des formations.
- Début intégration calculs BUT.
- Requiert numpy et pandas.
2021-11-12 22:17:46 +01:00
d71b399c3d Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-11-12 11:40:31 +01:00
47d728376c code cosmetic 2021-11-12 11:31:50 +01:00
ce4115eeef closes #178 (colonne NIP dans liste saisie notes) 2021-11-12 11:30:59 +01:00
0e6513e339 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-11-12 11:01:59 +01:00
c23a5abb6c fix_groups_missing_from_prepajury.xlsx 2021-11-12 09:25:47 +01:00
139eb8171a Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT
update
2021-11-10 09:38:08 +01:00
ddf3d73c92 enhance check xls upload notes 2021-11-10 09:37:45 +01:00
94325cef2c Mise à jour, re-ordonne db migrations 2021-11-09 22:39:04 +01:00
ade1b4445c Tolère parcours inconnus (pour dev avec bases du futur:) 2021-11-09 11:47:48 +01:00
7f2e87e9d0 Fix: exceptions dans formules utilisateurs 2021-11-09 11:45:51 +01:00
3bb9a5cb76 WIP: distinction SAE/ressources, poids de evals 2021-11-08 19:44:25 +01:00
a25ebe9a46 fix #22 2021-11-06 18:34:01 +01:00
ac09c104e9 fix route in import_infos_admissions 2021-11-06 17:58:11 +01:00
50115337b1 fix #175 2021-11-06 17:24:11 +01:00
f6dfa912d7 fix #159 2021-11-06 16:35:21 +01:00
f534e9757f Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into PNBUT 2021-11-03 16:25:48 +01:00
4bf983dbe4 Add unit test: test_notes_modules_att_dem (scenario "lyonnais") 2021-11-03 16:15:39 +01:00
81720facff Fix: ListeAbsEtud arg 2021-11-03 14:12:27 +01:00
518b9c049c update 2021-11-03 00:44:23 +01:00
ddcc518807 Memoize (cache) user_info 2021-11-02 23:42:46 +01:00
5002afade1 Accélère accès aux préférences 2021-11-02 15:49:12 +01:00
39a9f353d2 update 2021-11-01 17:02:24 +01:00
461f14631b fix: bcc as list in Message build 2021-10-26 19:27:51 +02:00
5268ea4f13 Detecte et supprime doublons dans les préférences 2021-10-25 15:49:56 +02:00
IDK
1be2ba1498 maj 2021-10-24 18:35:10 +02:00
66d443944a Fix: partition_rename error message 2021-10-24 18:28:01 +02:00
e8ce1e303e formation_export: n'exporte plus les UE externes 2021-10-24 11:43:53 +02:00
2fe9e5ec39 Sépare les UE externes dans la pae édition programme 2021-10-22 23:09:15 +02:00
c49aecaa2f Fix regression on ue_list 2021-10-21 06:32:03 +02:00
280f6cf1c1 Fix etud_info xml quote 2021-10-20 22:34:06 +02:00
92de66f734 Modif liens sidebar. Closes #53 2021-10-20 21:58:01 +02:00
f73e720de1 Fix: suppression de notes par un enseignant non privilégié 2021-10-20 19:11:26 +02:00
0c913dacdc Fix: ordre des partitions 2021-10-20 17:41:38 +02:00
66dbec86bf Add cli: photos-import-files 2021-10-20 16:47:41 +02:00
IDK
3878d68b38 Utilise NA pour les notes manquants (et plus NA0, ...) 2021-10-19 15:52:02 +02:00
54ed09ed08 renomme: ue_list, matiere_list 2021-10-17 23:19:26 +02:00
d69a6c283f restore date formatting at the right place 2021-10-17 20:20:31 +02:00
a909a307c0 Améliorer page infos utilisateurs 2021-10-17 11:19:01 +02:00
bb7ed682c0 Fixes #158 2021-10-16 19:31:14 +02:00
256e89605b rename some old methods 2021-10-16 19:20:36 +02:00
3c38ef4cc0 fix true_false 2021-10-16 14:30:35 +02:00
7cc9f6d1f4 clear timezone for datetime object 2021-10-16 10:25:40 +02:00
4ce50927b0 clear timezone for datetime values 2021-10-16 10:10:35 +02:00
9c50b58d5f amélioration formulaires creation/edition utilisateurs 2021-10-15 19:17:40 +02:00
93a23ff112 fix: partition_name when numeric 2021-10-15 14:31:11 +02:00
e8e3423193 Un peu de nettoyage de d'optimisation (gain ~ 30-40% sur calcul NT). 2021-10-15 14:00:51 +02:00
e243fe6bb0 installmgr url 2021-10-14 11:01:29 +02:00
46269fcebe Corrige mail envoi mot de passe utilisateur 2021-10-13 21:49:55 +02:00
a539061c1f Merge pull request 'permet de lever certaines vérifications lors de l import' (#161) from jmplace/ScoDoc-Lille:import_users_release_some_checks into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/161
2021-10-13 21:31:41 +02:00
9c528bec7f permet de lever certaines vérifications lors de l import 2021-10-13 16:32:43 +02:00
1b8186e69b améliore gestion erreur saisies de notes 2021-10-13 15:56:24 +02:00
feb57c2ac6 redirection vers all_depts apres création ; blackify 2021-10-13 15:27:19 +02:00
071c15af79 complements_import_users_from_9.0.52 2021-10-13 15:03:41 +02:00
dc26d1edea Modif mail import user. A compléter suivant la PR de JMP 2021-10-13 10:33:20 +02:00
6e1bc9665d renamed some group mgt methods 2021-10-12 16:05:50 +02:00
c1d13d6089 Python 3: n'utilise plus six. Utilise systématiquement with avec open. 2021-10-11 22:22:42 +02:00
3c5b721a3a oops: fichier oublié : fix #147 2021-10-11 16:05:23 +02:00
179442aa69 blackify 2021-10-10 21:09:27 +02:00
e6e1835cca Merge pull request 'check mail address' (#156) from jmplace/ScoDoc-Lille:email_check into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/156
2021-10-10 21:05:04 +02:00
fdd7af6a8a Améliore page erreur 403 (permission refusée) 2021-10-10 21:03:18 +02:00
7d5eff4f82 refactor check_modif_user 2021-10-10 10:52:06 +02:00
76bc957373 check mail address 2021-10-10 09:26:46 +02:00
7dda35d37e fix #153 (about link in sidebar) 2021-10-07 23:07:53 +02:00
8667bd58ba Merge pull request 'fix filename' (#151) from jmplace/ScoDoc-Lille:fix_filename_import_notes into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/151
2021-10-07 22:28:30 +02:00
52e837dc81 améliore msg err sur imports etudiants excel 2021-10-07 22:24:53 +02:00
190304043d Fix: codes sems sur page accueil 2021-10-07 22:23:49 +02:00
19586559ba fix filename 2021-10-06 13:46:29 +02:00
5ac5f5eb19 Fixes #146 2021-10-05 23:43:32 +02:00
ef6a6d6ec2 Merge pull request 'autorise les chaînes JJ/MM/AAAA comme date' (#148) from jmplace/ScoDoc-Lille:fix_date_import into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/148
2021-10-05 15:24:17 +02:00
8ab9a67fa6 autorise les chaînes JJ/MM/AAAA comme date 2021-10-05 12:09:20 +02:00
bf83d8475a fix excel export with datetime.date values (formsemestre_description with evals) 2021-10-05 05:38:55 +02:00
79b8520034 redirige les url /ScoDoc/DEPT vers /ScoDoc/DEPT/Scolarite 2021-10-04 22:30:57 +02:00
54f0b87d39 Dialogue affection groupe: template jinja2, début d'optimisation de XMLgetGroupsInPartition 2021-10-04 22:05:05 +02:00
3e1136a077 Fix: desinscription des modules d'une UE 2021-10-04 15:17:03 +02:00
0ab9a281a9 Fix regression: API billetin par code_nip 2021-10-04 15:09:19 +02:00
e32d7b1b4e Améliore message d'erreur si logo manquant dans un PDF 2021-10-04 00:22:44 +02:00
f59308b863 enregistre date dernière connexion. + fix liste users 2021-10-03 18:19:51 +02:00
dd8a07ef64 n'interroge plus le service portail qand on demande les listes avec codes 2021-10-03 17:31:03 +02:00
bc112efd76 fix typo / formsemestre_edit_uecoefs 2021-10-01 23:52:36 +02:00
1c927cb541 Merge pull request 'ameliioration placement (adapte la taille du select au contenu)' (#140) from jmplace/ScoDoc-Lille:placement_amelioration into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/140
2021-09-30 17:51:07 +02:00
814a8dbc24 Améliore qq msg d'erreur + lien formsemestre_status vers listes 2021-09-30 17:50:37 +02:00
4a3e37d371 ameliioration placement (adapte la taille du select au contenu) 2021-09-30 17:11:03 +02:00
a447c6e5f9 Fix regression: validations UE quand semestre validé 2021-09-30 14:35:21 +02:00
8463d368a1 Fix: report_debouche_date 2021-09-30 09:37:18 +02:00
1f125d3a1d fix: import etudiants hors semestre 2021-09-29 20:08:18 +02:00
dffb369bb0 form create user si pas de roles 2021-09-29 10:27:49 +02:00
5dfdf4265e autorise chiffres dans user_name 2021-09-28 16:10:27 +02:00
4728e77a7b Fix: formulaires 2021-09-28 09:14:04 +02:00
f79003186a cosmetic 2021-09-28 07:28:16 +02:00
11ef8857e2 fix urls 2021-09-28 07:27:55 +02:00
f5529ec4a6 dump fichier en erreur pour debug 2021-09-28 07:22:23 +02:00
a8198f889a améliore dialogue inscription/passage 2021-09-27 22:54:58 +02:00
651f111839 ignore inscriptions répétées 2021-09-27 22:54:23 +02:00
bf57f2bfa5 remet nom auteurs annotations étudiants 2021-09-27 17:33:44 +02:00
c7aba95015 fixes 2021-09-27 17:18:43 +02:00
f012fe6fcf FIX regression / REQUEST+formulaires / + passage étudiants 2021-09-27 16:42:14 +02:00
d577066911 Fix regressions (post ablation REQUEST) 2021-09-27 14:54:52 +02:00
b1fa9b8ef8 small fixes 2021-09-27 13:43:11 +02:00
1b89010b45 Merge pull request 'Grand nettoyage: élimination des REQUEST héritées de Zope.' (#138) from no-request into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/138
2021-09-27 10:33:36 +02:00
59e1fdc15e Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2021-09-27 10:29:11 +02:00
057832c309 Grand nettoyage: élimination des REQUEST héritées de Zope. 2021-09-27 10:20:10 +02:00
9ee7dec202 deal with binary files (zip) 2021-09-26 23:27:54 +02:00
18d6324488 ré-écriture ue_sharing_code avec SQLAlchemy 2021-09-26 11:28:13 +02:00
ce31d3148d Sépare PE dans package 'pe' et le désactive en production. 2021-09-25 23:56:17 +02:00
fa5539fd75 Améliore script import users ScoDoc7 2021-09-25 22:42:44 +02:00
ddf4bf788f Fix: synchro Apogée quand étudiants ajoutés manuellement 2021-09-25 17:33:59 +02:00
14d533b38a lien inscription ailleurs sur page etud 2021-09-25 15:12:13 +02:00
b015cf3f88 Merge pull request 'enable xml/json result as file' (#136) from jmplace/ScoDoc-Lille:export_json_xml_as_files into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/136
2021-09-25 10:46:43 +02:00
a2c16207cb Ordre boites export Apogee + fix export excel 2021-09-25 10:43:06 +02:00
00dbd25b42 enable xml/json result as file 2021-09-25 09:53:31 +02:00
4e59b9597b Merge pull request 'fix suffix processing' (#135) from jmplace/ScoDoc-Lille:fix_suffix into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/135
2021-09-25 09:21:08 +02:00
cb03cc962c Scripts save/restore 2021-09-25 09:13:39 +02:00
81df68b491 fix suffix processing 2021-09-25 09:07:05 +02:00
1741e75f72 formation_delete sans REQUESt 2021-09-24 20:35:50 +02:00
c41726c4a8 Fix: association nouvelle version 2021-09-24 20:20:45 +02:00
7879c176dd Bonus Béziers (à valider) 2021-09-24 20:19:20 +02:00
75f43bbdde élimination des qq REQUESTS et correction publication XML/XLS/JSON/... 2021-09-24 16:32:49 +02:00
0a50edc9f0 removed some useless REQUESTs 2021-09-24 12:10:53 +02:00
373feece76 fix: POST suppr. photo 2021-09-24 11:12:49 +02:00
6d1ffb122b Fix: billets d'absences (POST) 2021-09-24 01:07:00 +02:00
92c401f17c Fix #133. Image photo: enleve canal alpha avant conversion en jpeg. 2021-09-24 00:54:59 +02:00
36c7358eed Améliore message d'erreur si upload image invalide 2021-09-24 00:47:06 +02:00
9c5408f503 Fix: export tables en XML si id de colonnes numeriques 2021-09-24 00:33:18 +02:00
2add3e12cc Fix: lien validation jury 2021-09-24 00:28:09 +02:00
d0ab9dc66a Fix: remove obsolete field "debouche" from scodoc7 editor 2021-09-24 00:19:19 +02:00
beeca54a94 Fix: liens dans table liste absences 2021-09-24 00:11:56 +02:00
73cf9a6f4d Fix: evaluations à dates vides (tri) 2021-09-24 00:04:28 +02:00
845152afdd put back one empty line 2021-09-23 14:44:28 +02:00
a4d091fa2d retrait du cast int(retreive_formsemestre_from_request(...)) réalisée par la fonction 2021-09-23 14:36:47 +02:00
ffa7e07cd3 Merge branch 'master' into fix_group_selector 2021-09-23 13:44:30 +02:00
865192bc0d type hint 2021-09-23 08:15:54 +02:00
b56f205e89 fix group_selector / info_etu popup 2021-09-23 07:34:42 +02:00
eded2fffe9 enhance scu.send_file, fix some API bugs. 2021-09-21 22:19:08 +02:00
13f1539282 Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc 2021-09-21 16:51:07 +02:00
ae51e4c17a Merge pull request 'gentil message sur erreur d import esxcel' (#131) from jmplace/ScoDoc-Lille:import_excel_errmsg into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/131
2021-09-21 16:50:45 +02:00
4297d36dad gentil message sur erreur d import esxcel 2021-09-21 16:28:26 +02:00
f516ccdfe7 retire arguments REQUEST de sendResult et sendPDFFile 2021-09-21 15:53:33 +02:00
2c97349acf améliore affichage exceptions (ex: erreur inscription étudiants) 2021-09-21 15:02:22 +02:00
5dfc64a62d sco_debouche APi views return empty OK responses / removed useless REQUEST 2021-09-21 13:36:56 +02:00
985c6df3b6 empeche noms de feuilles excel invalides 2021-09-20 15:54:38 +02:00
35f23995aa fix retrait semestre d'un export Apo 2021-09-19 16:19:02 +02:00
29221666a4 Merge pull request 'patch_placement' (#127) from jmplace/ScoDoc-Lille:patch_placement into master
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/127
2021-09-19 16:14:58 +02:00
d7e6a7d714 ameliore assistance 2021-09-19 16:13:57 +02:00
179be1baa0 fix rang 1 twice in excel map 2021-09-19 09:21:37 +02:00
a5ed9b815f fix plantage si un seul groupe ; correction indentation for radio button in wtf_forms (css) 2021-09-19 09:11:11 +02:00
13c027fc19 Adapte assistance à ScoDoc 9 2021-09-18 22:00:10 +02:00
31505e1330 détails feuille placement 2021-09-18 14:21:15 +02:00
9a9dc4a483 Fix conflicts 2021-09-18 14:03:36 +02:00
7daa49f2aa Elimine les attributs de ZREQUEST, sauf forms. 2021-09-18 13:42:19 +02:00
f7961a135a finalisation 2021-09-18 11:08:04 +02:00
c955870e1e recheck 2021-09-18 10:51:19 +02:00
80f5536de5 Merge remote-tracking branch 'origin/master' into scodoc9_placement_PR
# Conflicts:
#	app/scodoc/sco_groups_view.py
#	app/scodoc/sco_placement.py
2021-09-18 10:39:53 +02:00
2519d08e40 remove breakpoints() + blackify 2021-09-18 10:11:46 +02:00
987800c30e Remplace REQUEST.URL par accès à Flask request global object 2021-09-18 10:10:02 +02:00
2a72fb881b replace send_excel_file by scu.send_file 2021-09-18 01:30:47 +02:00
87ecd09f0e fix a regression ; eliminate send_from_flask 2021-09-17 16:01:01 +02:00
6e7a104fb0 pylint corrections (suite) 2021-09-17 12:31:43 +02:00