diff --git a/ZNotes.py b/ZNotes.py index b9946c86ba..b8be58c3fe 100644 --- a/ZNotes.py +++ b/ZNotes.py @@ -1616,8 +1616,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl security.declareProtected(ScoView, "view_module_abs") def view_module_abs(self, REQUEST, moduleimpl_id, format="html"): - """Visulalisation des absences a un module - """ + """Visulalisation des absences a un module""" M = self.do_moduleimpl_withmodule_list(moduleimpl_id=moduleimpl_id)[0] sem = sco_formsemestre.get_formsemestre(self, M["formsemestre_id"]) debut_sem = DateDMYtoISO(sem["date_debut"]) @@ -1903,7 +1902,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl _formsemestre_inscriptionEditor = EditableTable( "notes_formsemestre_inscription", "formsemestre_inscription_id", - ("formsemestre_inscription_id", "etudid", "formsemestre_id", "etat"), + ("formsemestre_inscription_id", "etudid", "formsemestre_id", "etat", "etape"), sortkey="formsemestre_id", ) @@ -2011,7 +2010,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl ): """desinscrit l'etudiant de ce semestre (et donc de tous les modules). A n'utiliser qu'en cas d'erreur de saisie. - S'il s'agit d'un semestre extérieur et qu'il n'y a plus d'inscrit, + S'il s'agit d'un semestre extérieur et qu'il n'y a plus d'inscrit, le semestre sera supprimé. """ sem = sco_formsemestre.get_formsemestre(self, formsemestre_id) @@ -2264,8 +2263,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl security.declareProtected(ScoEtudInscrit, "etud_desinscrit_ue") def etud_desinscrit_ue(self, etudid, formsemestre_id, ue_id, REQUEST=None): - """Desinscrit l'etudiant de tous les modules de cette UE dans ce semestre. - """ + """Desinscrit l'etudiant de tous les modules de cette UE dans ce semestre.""" sco_moduleimpl_inscriptions.do_etud_desinscrit_ue( self, etudid, formsemestre_id, ue_id, REQUEST=REQUEST ) @@ -2278,8 +2276,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl security.declareProtected(ScoEtudInscrit, "etud_inscrit_ue") def etud_inscrit_ue(self, etudid, formsemestre_id, ue_id, REQUEST=None): - """Inscrit l'etudiant de tous les modules de cette UE dans ce semestre. - """ + """Inscrit l'etudiant de tous les modules de cette UE dans ce semestre.""" sco_moduleimpl_inscriptions.do_etud_inscrit_ue( self, etudid, formsemestre_id, ue_id, REQUEST=REQUEST ) @@ -2411,8 +2408,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl REQUEST=None, **kw ): - """Create an evaluation - """ + """Create an evaluation""" args = locals() log("do_evaluation_create: args=" + str(args)) self._evaluation_check_write_access(REQUEST, moduleimpl_id=moduleimpl_id) @@ -2758,8 +2754,8 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl def can_edit_notes(self, authuser, moduleimpl_id, allow_ens=True): """True if authuser can enter or edit notes in this module. If allow_ens, grant access to all ens in this module - - Si des décisions de jury ont déjà été saisies dans ce semestre, + + Si des décisions de jury ont déjà été saisies dans ce semestre, seul le directeur des études peut saisir des notes (et il ne devrait pas). """ uid = str(authuser) @@ -3319,8 +3315,7 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl def formsemestre_validation_suppress_etud( self, formsemestre_id, etudid, REQUEST=None, dialog_confirmed=False ): - """Suppression des decisions de jury pour un etudiant. - """ + """Suppression des decisions de jury pour un etudiant.""" if not self._can_validate_sem(REQUEST, formsemestre_id): return self.confirmDialog( message="

Opération non autorisée pour %s" diff --git a/config/postupgrade-db.py b/config/postupgrade-db.py index b6d930d732..29f2c2ca60 100755 --- a/config/postupgrade-db.py +++ b/config/postupgrade-db.py @@ -18,35 +18,50 @@ E. Viennet, june 2008, sept 2013 from scodocutils import * for dept in get_depts(): - log('\nChecking database for dept %s' % dept) + log("\nChecking database for dept %s" % dept) cnx_string = None try: cnx_string = get_dept_cnx_str(dept) - cnx = psycopg2.connect( cnx_string ) + cnx = psycopg2.connect(cnx_string) except: - log('\n*** Error: departement %s not upgraded ! ***\n' % dept) - log('connexion string was "%s"' % cnx_string) + log("\n*** Error: departement %s not upgraded ! ***\n" % dept) + log('connexion string was "%s"' % cnx_string) traceback.print_exc() continue cnx.set_session(autocommit=False) cursor = cnx.cursor() # Apply upgrades: - + # SVN 564 -> 565 # add resp_can_edit to notes_formsemestre: - check_field(cnx, 'notes_formsemestre', 'resp_can_edit', - ['alter table notes_formsemestre add column resp_can_edit int default 0', - 'update notes_formsemestre set resp_can_edit=0']) + check_field( + cnx, + "notes_formsemestre", + "resp_can_edit", + [ + "alter table notes_formsemestre add column resp_can_edit int default 0", + "update notes_formsemestre set resp_can_edit=0", + ], + ) # SVN 580 -> 581 # add resp_can_change_ens to notes_formsemestre: - check_field(cnx, 'notes_formsemestre', 'resp_can_change_ens', - ['alter table notes_formsemestre add column resp_can_change_ens int default 1', - 'update notes_formsemestre set resp_can_change_ens=1']) + check_field( + cnx, + "notes_formsemestre", + "resp_can_change_ens", + [ + "alter table notes_formsemestre add column resp_can_change_ens int default 1", + "update notes_formsemestre set resp_can_change_ens=1", + ], + ) # Fix bug ayant empeche la creation de la table - check_table( cnx, 'admissions', [ - """CREATE TABLE admissions ( + check_table( + cnx, + "admissions", + [ + """CREATE TABLE admissions ( adm_id text DEFAULT notes_newid_etud('ADM'::text) NOT NULL, etudid text NOT NULL, annee integer, @@ -74,70 +89,88 @@ for dept in get_depts(): apb_groupe text, -- code du groupe APB apb_classement_gr integer default NULL -- classement (1..Ngr) par le jury dans le groupe APB ) WITH OIDS; -"""] ) - +""" + ], + ) + # SVN 651 # Nouvelles donnees d'admission - check_field(cnx, 'admissions', 'codelycee', - ['alter table admissions add column codelycee text', - ]) - check_field(cnx, 'admissions', 'codepostallycee', - ['alter table admissions add column codepostallycee text', - ]) - - # New preferences system - check_field(cnx, 'sco_prefs', 'formsemestre_id', - ["alter table sco_prefs add column pref_id text DEFAULT notes_newid('PREF'::text) UNIQUE NOT NULL", - "update sco_prefs set pref_id=oid", - "alter table sco_prefs add column formsemestre_id text default NULL", - "alter table sco_prefs drop CONSTRAINT sco_prefs_pkey", - "alter table sco_prefs add unique( name, formsemestre_id)", - # copie anciennes prefs: - "insert into sco_prefs (name, value, formsemestre_id) select 'left_margin', left_margin, formsemestre_id from notes_formsemestre_pagebulletin", - "insert into sco_prefs (name, value, formsemestre_id) select 'top_margin', top_margin, formsemestre_id from notes_formsemestre_pagebulletin", - "insert into sco_prefs (name, value, formsemestre_id) select 'right_margin', right_margin, formsemestre_id from notes_formsemestre_pagebulletin", - "insert into sco_prefs (name, value, formsemestre_id) select 'bottom_margin', bottom_margin, formsemestre_id from notes_formsemestre_pagebulletin", - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_title', title, formsemestre_id from notes_formsemestre_pagebulletin", - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_intro_mail', intro_mail, formsemestre_id from notes_formsemestre_pagebulletin", - "drop table notes_formsemestre_pagebulletin", - # anciens champs de formsemestre: - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_abs', gestion_absence, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column gestion_absence", - - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_decision', bul_show_decision, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_decision", - - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_uevalid', bul_show_uevalid, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_uevalid", - - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_codemodules', bul_show_codemodules, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_codemodules", + check_field( + cnx, + "admissions", + "codelycee", + [ + "alter table admissions add column codelycee text", + ], + ) + check_field( + cnx, + "admissions", + "codepostallycee", + [ + "alter table admissions add column codepostallycee text", + ], + ) - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_rangs', bul_show_rangs, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_rangs", - - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_ue_rangs', bul_show_ue_rangs, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_ue_rangs", - - "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_mod_rangs', bul_show_mod_rangs, formsemestre_id from notes_formsemestre", - "alter table notes_formsemestre drop column bul_show_mod_rangs", - ]) + # New preferences system + check_field( + cnx, + "sco_prefs", + "formsemestre_id", + [ + "alter table sco_prefs add column pref_id text DEFAULT notes_newid('PREF'::text) UNIQUE NOT NULL", + "update sco_prefs set pref_id=oid", + "alter table sco_prefs add column formsemestre_id text default NULL", + "alter table sco_prefs drop CONSTRAINT sco_prefs_pkey", + "alter table sco_prefs add unique( name, formsemestre_id)", + # copie anciennes prefs: + "insert into sco_prefs (name, value, formsemestre_id) select 'left_margin', left_margin, formsemestre_id from notes_formsemestre_pagebulletin", + "insert into sco_prefs (name, value, formsemestre_id) select 'top_margin', top_margin, formsemestre_id from notes_formsemestre_pagebulletin", + "insert into sco_prefs (name, value, formsemestre_id) select 'right_margin', right_margin, formsemestre_id from notes_formsemestre_pagebulletin", + "insert into sco_prefs (name, value, formsemestre_id) select 'bottom_margin', bottom_margin, formsemestre_id from notes_formsemestre_pagebulletin", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_title', title, formsemestre_id from notes_formsemestre_pagebulletin", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_intro_mail', intro_mail, formsemestre_id from notes_formsemestre_pagebulletin", + "drop table notes_formsemestre_pagebulletin", + # anciens champs de formsemestre: + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_abs', gestion_absence, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column gestion_absence", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_decision', bul_show_decision, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_decision", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_uevalid', bul_show_uevalid, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_uevalid", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_codemodules', bul_show_codemodules, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_codemodules", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_rangs', bul_show_rangs, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_rangs", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_ue_rangs', bul_show_ue_rangs, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_ue_rangs", + "insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_mod_rangs', bul_show_mod_rangs, formsemestre_id from notes_formsemestre", + "alter table notes_formsemestre drop column bul_show_mod_rangs", + ], + ) # fixed previous bug (misspelled pref) - cursor.execute("update sco_prefs set name = 'bul_show_codemodules' where name = 'bul_showcodemodules'") + cursor.execute( + "update sco_prefs set name = 'bul_show_codemodules' where name = 'bul_showcodemodules'" + ) # billets d'absences - if not sequence_exists(cnx, 'notes_idgen_billets'): - log('creating sequence notes_idgen_billets') - cursor.execute('CREATE SEQUENCE notes_idgen_billets;') - - if not function_exists(cnx, 'notes_newid_billet'): - log('creating function notes_newid_billet') - cursor.execute("""CREATE FUNCTION notes_newid_billet( text ) returns text as ' + if not sequence_exists(cnx, "notes_idgen_billets"): + log("creating sequence notes_idgen_billets") + cursor.execute("CREATE SEQUENCE notes_idgen_billets;") + + if not function_exists(cnx, "notes_newid_billet"): + log("creating function notes_newid_billet") + cursor.execute( + """CREATE FUNCTION notes_newid_billet( text ) returns text as ' select $1 || to_char( nextval(''notes_idgen_billets''), ''FM999999999'' ) as result; - ' language SQL;""") - - check_table( cnx, 'billet_absence', [ + ' language SQL;""" + ) + + check_table( + cnx, + "billet_absence", + [ """CREATE TABLE billet_absence ( billet_id text DEFAULT notes_newid_billet('B'::text) NOT NULL, etudid text NOT NULL, @@ -146,39 +179,72 @@ for dept in get_depts(): description text, -- "raison" de l'absence etat integer default 0 -- 0 new, 1 processed ) WITH OIDS; -"""] ) - +""" + ], + ) + # description absence - check_field(cnx, 'absences', 'description', - ['alter table absences add column description text' - ]) - check_field(cnx, 'absences', 'entry_date', - ['alter table absences add column entry_date timestamp with time zone DEFAULT now()' - ]) - check_field(cnx, 'billet_absence', 'entry_date', - ['alter table billet_absence add column entry_date timestamp with time zone DEFAULT now()' - ]) + check_field( + cnx, + "absences", + "description", + ["alter table absences add column description text"], + ) + check_field( + cnx, + "absences", + "entry_date", + [ + "alter table absences add column entry_date timestamp with time zone DEFAULT now()" + ], + ) + check_field( + cnx, + "billet_absence", + "entry_date", + [ + "alter table billet_absence add column entry_date timestamp with time zone DEFAULT now()" + ], + ) # Nouvelles preferences pour bulletins PDF: migre bul_show_chiefDept - cursor.execute("update sco_prefs set name = 'bul_show_sig_right' where name = 'bul_show_chiefDept'") + cursor.execute( + "update sco_prefs set name = 'bul_show_sig_right' where name = 'bul_show_chiefDept'" + ) # cursor.execute("insert into sco_prefs (name, value, formsemestre_id) select 'bul_show_sig_left', value, formsemestre_id from sco_prefs where name = 'bul_show_sig_right'") # date et lieu naissance (pour IFAG Sofia) - check_field(cnx, 'identite', 'date_naissance', - ['alter table identite add column date_naissance date', - "update identite set date_naissance=to_date(to_char( annee_naissance, 'FM9999') || '-01-01', 'YYYY-MM-DD')", - 'alter table identite drop column annee_naissance' - ]) - check_field(cnx, 'identite', 'lieu_naissance', - ['alter table identite add column lieu_naissance text' - ]) + check_field( + cnx, + "identite", + "date_naissance", + [ + "alter table identite add column date_naissance date", + "update identite set date_naissance=to_date(to_char( annee_naissance, 'FM9999') || '-01-01', 'YYYY-MM-DD')", + "alter table identite drop column annee_naissance", + ], + ) + check_field( + cnx, + "identite", + "lieu_naissance", + ["alter table identite add column lieu_naissance text"], + ) # justification billets: - check_field(cnx, 'billet_absence', 'justified', - [ 'alter table billet_absence add column justified integer default 0', - 'update billet_absence set justified=0' - ]) - + check_field( + cnx, + "billet_absence", + "justified", + [ + "alter table billet_absence add column justified integer default 0", + "update billet_absence set justified=0", + ], + ) + # ----------------------- New groups # 1- Create new tables - check_table( cnx, 'partition', [ + check_table( + cnx, + "partition", + [ """CREATE TABLE partition( partition_id text default notes_newid2('P') PRIMARY KEY, formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id), @@ -187,138 +253,286 @@ for dept in get_depts(): numero SERIAL, -- ordre de presentation UNIQUE(formsemestre_id,partition_name) ) WITH OIDS; -"""] ) - check_table( cnx, 'group_descr', [ +""" + ], + ) + check_table( + cnx, + "group_descr", + [ """CREATE TABLE group_descr ( group_id text default notes_newid2('G') PRIMARY KEY, partition_id text REFERENCES partition(partition_id), group_name text, -- "A", "C2", ... UNIQUE(partition_id, group_name) ) WITH OIDS; -"""] ) - check_table( cnx, 'group_membership', [ +""" + ], + ) + check_table( + cnx, + "group_membership", + [ """CREATE TABLE group_membership( group_membership_id text default notes_newid2('GM') PRIMARY KEY, etudid text REFERENCES identite(etudid), group_id text REFERENCES group_descr(group_id), UNIQUE(etudid, group_id) ) WITH OIDS; -"""] ) +""" + ], + ) # 2- For each sem, create 1 to 4 partitions: all, TD (if any), TP, TA # Here we have to deal with plain SQL, nasty... - if field_exists(cnx, 'notes_formsemestre_inscription', 'groupetd'): + if field_exists(cnx, "notes_formsemestre_inscription", "groupetd"): # Some very old stduents didn't have addresses: it's now mandatory - cursor.execute("insert into adresse (etudid) select etudid from identite i except select etudid from adresse") + cursor.execute( + "insert into adresse (etudid) select etudid from identite i except select etudid from adresse" + ) # cursor.execute("SELECT formsemestre_id from notes_formsemestre") - formsemestre_ids = [ x[0] for x in cursor.fetchall() ] + formsemestre_ids = [x[0] for x in cursor.fetchall()] for formsemestre_id in formsemestre_ids: # create "all" partition (with empty name) - cursor.execute("INSERT into partition (formsemestre_id, compute_ranks) VALUES (%(formsemestre_id)s, 1)", {'formsemestre_id' : formsemestre_id } ) - cursor.execute("select partition_id from partition where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "INSERT into partition (formsemestre_id, compute_ranks) VALUES (%(formsemestre_id)s, 1)", + {"formsemestre_id": formsemestre_id}, + ) + cursor.execute( + "select partition_id from partition where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) partition_id = cursor.fetchone()[0] # create group "all" (without name) - cursor.execute("INSERT into group_descr (partition_id) VALUES (%(pid)s)", { 'pid' : partition_id } ) - cursor.execute("SELECT group_id from group_descr where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "INSERT into group_descr (partition_id) VALUES (%(pid)s)", + {"pid": partition_id}, + ) + cursor.execute( + "SELECT group_id from group_descr where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) group_id = cursor.fetchone()[0] # inscrit etudiants: - cursor.execute("INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", { 'group_id' : group_id, 'formsemestre_id' : formsemestre_id } ) - + cursor.execute( + "INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", + {"group_id": group_id, "formsemestre_id": formsemestre_id}, + ) + # create TD, TP, TA - cursor.execute("SELECT distinct(groupetd) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - groupetds = [ x[0] for x in cursor.fetchall() if x[0] ] - if len(groupetds) > 1 or (len(groupetds)==1 and groupetds[0] != 'A'): + cursor.execute( + "SELECT distinct(groupetd) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + groupetds = [x[0] for x in cursor.fetchall() if x[0]] + if len(groupetds) > 1 or (len(groupetds) == 1 and groupetds[0] != "A"): # TD : create partition - cursor.execute("SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - nomgroupetd = cursor.dictfetchone()['nomgroupetd'] - if not nomgroupetd: # pas de nom ??? on invente un nom stupide et unique - nomgroupetd = 'TD_'+str(time.time()).replace('.','')[-3:] - cursor.execute("INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupetd)s)", { 'formsemestre_id' : formsemestre_id, 'nomgroupetd' : nomgroupetd } ) - cursor.execute("select partition_id from partition where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + nomgroupetd = cursor.dictfetchone()["nomgroupetd"] + if ( + not nomgroupetd + ): # pas de nom ??? on invente un nom stupide et unique + nomgroupetd = "TD_" + str(time.time()).replace(".", "")[-3:] + cursor.execute( + "INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupetd)s)", + {"formsemestre_id": formsemestre_id, "nomgroupetd": nomgroupetd}, + ) + cursor.execute( + "select partition_id from partition where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) partition_id = cursor.fetchone()[0] # create groups for groupetd in groupetds: - cursor.execute("INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", { 'pid' : partition_id, 'group_name' : groupetd } ) - cursor.execute("SELECT group_id from group_descr where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", + {"pid": partition_id, "group_name": groupetd}, + ) + cursor.execute( + "SELECT group_id from group_descr where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) group_id = cursor.fetchone()[0] # inscrit les etudiants - cursor.execute("INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupetd=%(groupetd)s", { 'group_id' : group_id, 'formsemestre_id' : formsemestre_id, 'groupetd' : groupetd } ) + cursor.execute( + "INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupetd=%(groupetd)s", + { + "group_id": group_id, + "formsemestre_id": formsemestre_id, + "groupetd": groupetd, + }, + ) # TA - cursor.execute("SELECT distinct(groupeanglais) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - groupetds = [ x[0] for x in cursor.fetchall() if x[0] ] + cursor.execute( + "SELECT distinct(groupeanglais) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + groupetds = [x[0] for x in cursor.fetchall() if x[0]] if len(groupetds) > 0: # TA : create partition - cursor.execute("SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - nomgroupetd = cursor.dictfetchone()['nomgroupeta'] - if not nomgroupetd: # pas de nom ??? on invente un nom stupide et unique - nomgroupetd = 'TA_'+str(time.time()).replace('.','')[-3:] - cursor.execute("INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupeta)s)", { 'formsemestre_id' : formsemestre_id, 'nomgroupeta' : nomgroupetd } ) - cursor.execute("select partition_id from partition where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + nomgroupetd = cursor.dictfetchone()["nomgroupeta"] + if ( + not nomgroupetd + ): # pas de nom ??? on invente un nom stupide et unique + nomgroupetd = "TA_" + str(time.time()).replace(".", "")[-3:] + cursor.execute( + "INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupeta)s)", + {"formsemestre_id": formsemestre_id, "nomgroupeta": nomgroupetd}, + ) + cursor.execute( + "select partition_id from partition where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) partition_id = cursor.fetchone()[0] # create groups for groupetd in groupetds: - cursor.execute("INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", { 'pid' : partition_id, 'group_name' : groupetd } ) - cursor.execute("SELECT group_id from group_descr where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", + {"pid": partition_id, "group_name": groupetd}, + ) + cursor.execute( + "SELECT group_id from group_descr where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) group_id = cursor.fetchone()[0] # inscrit les etudiants - cursor.execute("INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupeanglais=%(groupetd)s", { 'group_id' : group_id, 'formsemestre_id' : formsemestre_id, 'groupetd' : groupetd } ) - + cursor.execute( + "INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupeanglais=%(groupetd)s", + { + "group_id": group_id, + "formsemestre_id": formsemestre_id, + "groupetd": groupetd, + }, + ) + # TP - cursor.execute("SELECT distinct(groupetp) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - groupetds = [ x[0] for x in cursor.fetchall() if x[0] ] + cursor.execute( + "SELECT distinct(groupetp) from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + groupetds = [x[0] for x in cursor.fetchall() if x[0]] if len(groupetds) > 0: # TP : create partition - cursor.execute("SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", { 'formsemestre_id' : formsemestre_id } ) - nomgroupetd = cursor.dictfetchone()['nomgroupetp'] - if not nomgroupetd: # pas de nom ??? on invente un nom stupide et unique - nomgroupetd = 'TP_'+str(time.time()).replace('.','')[-3:] - cursor.execute("INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupeta)s)", { 'formsemestre_id' : formsemestre_id, 'nomgroupeta' : nomgroupetd } ) - cursor.execute("select partition_id from partition where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "SELECT * from notes_formsemestre where formsemestre_id=%(formsemestre_id)s", + {"formsemestre_id": formsemestre_id}, + ) + nomgroupetd = cursor.dictfetchone()["nomgroupetp"] + if ( + not nomgroupetd + ): # pas de nom ??? on invente un nom stupide et unique + nomgroupetd = "TP_" + str(time.time()).replace(".", "")[-3:] + cursor.execute( + "INSERT into partition (formsemestre_id, partition_name) VALUES (%(formsemestre_id)s,%(nomgroupeta)s)", + {"formsemestre_id": formsemestre_id, "nomgroupeta": nomgroupetd}, + ) + cursor.execute( + "select partition_id from partition where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) partition_id = cursor.fetchone()[0] # create groups for groupetd in groupetds: - cursor.execute("INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", { 'pid' : partition_id, 'group_name' : groupetd } ) - cursor.execute("SELECT group_id from group_descr where oid=%(oid)s", { 'oid' : cursor.lastoid() }) + cursor.execute( + "INSERT into group_descr (partition_id, group_name) VALUES (%(pid)s, %(group_name)s)", + {"pid": partition_id, "group_name": groupetd}, + ) + cursor.execute( + "SELECT group_id from group_descr where oid=%(oid)s", + {"oid": cursor.lastoid()}, + ) group_id = cursor.fetchone()[0] # inscrit les etudiants - cursor.execute("INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupetp=%(groupetd)s", { 'group_id' : group_id, 'formsemestre_id' : formsemestre_id, 'groupetd' : groupetd } ) + cursor.execute( + "INSERT into group_membership (etudid, group_id) SELECT etudid, %(group_id)s from notes_formsemestre_inscription where formsemestre_id=%(formsemestre_id)s and groupetp=%(groupetd)s", + { + "group_id": group_id, + "formsemestre_id": formsemestre_id, + "groupetd": groupetd, + }, + ) # 3- Suppress obsolete fields - cursor.execute( """alter table notes_formsemestre drop column nomgroupetd""" ) - cursor.execute( """alter table notes_formsemestre drop column nomgroupetp""" ) - cursor.execute( """alter table notes_formsemestre drop column nomgroupeta""" ) - - cursor.execute( """alter table notes_formsemestre_inscription drop column groupetd""" ) - cursor.execute( """alter table notes_formsemestre_inscription drop column groupetp""" ) - cursor.execute( """alter table notes_formsemestre_inscription drop column groupeanglais""" ) + cursor.execute("""alter table notes_formsemestre drop column nomgroupetd""") + cursor.execute("""alter table notes_formsemestre drop column nomgroupetp""") + cursor.execute("""alter table notes_formsemestre drop column nomgroupeta""") + + cursor.execute( + """alter table notes_formsemestre_inscription drop column groupetd""" + ) + cursor.execute( + """alter table notes_formsemestre_inscription drop column groupetp""" + ) + cursor.execute( + """alter table notes_formsemestre_inscription drop column groupeanglais""" + ) # ----------------------- /New groups # Add moy_ue to validations: - check_field(cnx, 'scolar_formsemestre_validation', 'moy_ue', - ['alter table scolar_formsemestre_validation add column moy_ue real', - ]) + check_field( + cnx, + "scolar_formsemestre_validation", + "moy_ue", + [ + "alter table scolar_formsemestre_validation add column moy_ue real", + ], + ) # Add photo_filename - check_field(cnx, 'identite', 'photo_filename', - ['alter table identite add column photo_filename text', - ]) + check_field( + cnx, + "identite", + "photo_filename", + [ + "alter table identite add column photo_filename text", + ], + ) # Add module's ECTS - check_field(cnx, 'notes_modules', 'ects', - ['alter table notes_modules add column ects real', - ]) + check_field( + cnx, + "notes_modules", + "ects", + [ + "alter table notes_modules add column ects real", + ], + ) # Add "statut" to identite (default to NULL) - check_field(cnx, 'identite', 'statut', - ['alter table identite add column statut text', - ]) + check_field( + cnx, + "identite", + "statut", + [ + "alter table identite add column statut text", + ], + ) # Add user-defined expressions - check_field(cnx, 'notes_moduleimpl', 'computation_expr', - ['alter table notes_moduleimpl add column computation_expr text']) + check_field( + cnx, + "notes_moduleimpl", + "computation_expr", + ["alter table notes_moduleimpl add column computation_expr text"], + ) # Add semestre_id to scolar_formsemestre_validation - check_field(cnx, 'scolar_formsemestre_validation', 'semestre_id', - ['alter table scolar_formsemestre_validation add column semestre_id int']) + check_field( + cnx, + "scolar_formsemestre_validation", + "semestre_id", + ["alter table scolar_formsemestre_validation add column semestre_id int"], + ) - # Add - check_table( cnx, 'absences_notifications', [ """ + # Add + check_table( + cnx, + "absences_notifications", + [ + """ CREATE TABLE absences_notifications ( etudid text NOT NULL, notification_date timestamp with time zone DEFAULT now(), @@ -326,11 +540,19 @@ for dept in get_depts(): nbabs integer, nbabsjust integer ) WITH OIDS; - """] ) + """ + ], + ) # rename old preference "send_mail_absence_to_chef" - cursor.execute("update sco_prefs set name = 'abs_notify_chief' where name = 'send_mail_absence_to_chef'") - - check_table( cnx, 'notes_formsemestre_ue_computation_expr', [ """ + cursor.execute( + "update sco_prefs set name = 'abs_notify_chief' where name = 'send_mail_absence_to_chef'" + ) + + check_table( + cnx, + "notes_formsemestre_ue_computation_expr", + [ + """ CREATE TABLE notes_formsemestre_ue_computation_expr ( notes_formsemestre_ue_computation_expr_id text default notes_newid('UEXPR') PRIMARY KEY, formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id), @@ -338,262 +560,470 @@ for dept in get_depts(): computation_expr text, -- formule de calcul moyenne UNIQUE(formsemestre_id, ue_id) ) WITH OIDS; - """] ) - + """ + ], + ) # add moduleimpl_id to absences: - check_field(cnx, 'absences', 'moduleimpl_id', - ['alter table absences add column moduleimpl_id text']) + check_field( + cnx, + "absences", + "moduleimpl_id", + ["alter table absences add column moduleimpl_id text"], + ) # add type_parcours - check_field(cnx, 'notes_formations', 'type_parcours', - ['alter table notes_formations add column type_parcours int DEFAULT 0', - 'update notes_formations set type_parcours=0 where type_parcours is NULL' - ]) - + check_field( + cnx, + "notes_formations", + "type_parcours", + [ + "alter table notes_formations add column type_parcours int DEFAULT 0", + "update notes_formations set type_parcours=0 where type_parcours is NULL", + ], + ) + # add etape_apo2 - check_field(cnx, 'notes_formsemestre', 'etape_apo2', - ['alter table notes_formsemestre add column etape_apo2 text']) + check_field( + cnx, + "notes_formsemestre", + "etape_apo2", + ["alter table notes_formsemestre add column etape_apo2 text"], + ) # add etape_apo3 - check_field(cnx, 'notes_formsemestre', 'etape_apo3', - ['alter table notes_formsemestre add column etape_apo3 text']) + check_field( + cnx, + "notes_formsemestre", + "etape_apo3", + ["alter table notes_formsemestre add column etape_apo3 text"], + ) # add etape_apo4 - check_field(cnx, 'notes_formsemestre', 'etape_apo4', - ['alter table notes_formsemestre add column etape_apo4 text']) + check_field( + cnx, + "notes_formsemestre", + "etape_apo4", + ["alter table notes_formsemestre add column etape_apo4 text"], + ) # add publish_incomplete - check_field(cnx, 'notes_evaluation', 'publish_incomplete', - ['alter table notes_evaluation add column publish_incomplete int DEFAULT 0', - 'update notes_evaluation set publish_incomplete=0 where publish_incomplete is NULL' - ]) + check_field( + cnx, + "notes_evaluation", + "publish_incomplete", + [ + "alter table notes_evaluation add column publish_incomplete int DEFAULT 0", + "update notes_evaluation set publish_incomplete=0 where publish_incomplete is NULL", + ], + ) # add ens_can_create_eval to notes_formsemestre: - check_field(cnx, 'notes_formsemestre', 'ens_can_edit_eval', - ['alter table notes_formsemestre add column ens_can_edit_eval int default 0', - 'update notes_formsemestre set ens_can_edit_eval=0']) + check_field( + cnx, + "notes_formsemestre", + "ens_can_edit_eval", + [ + "alter table notes_formsemestre add column ens_can_edit_eval int default 0", + "update notes_formsemestre set ens_can_edit_eval=0", + ], + ) # add evaluation_type - check_field(cnx, 'notes_evaluation', 'evaluation_type', - ['alter table notes_evaluation add column evaluation_type int DEFAULT 0', - 'update notes_evaluation set evaluation_type=0 where evaluation_type is NULL' - ]) - + check_field( + cnx, + "notes_evaluation", + "evaluation_type", + [ + "alter table notes_evaluation add column evaluation_type int DEFAULT 0", + "update notes_evaluation set evaluation_type=0 where evaluation_type is NULL", + ], + ) + # add partition rank on bulletins - check_field(cnx, 'partition', 'bul_show_rank', - ['alter table partition add column bul_show_rank int DEFAULT 0', - 'update partition set bul_show_rank=0 where bul_show_rank is NULL']) + check_field( + cnx, + "partition", + "bul_show_rank", + [ + "alter table partition add column bul_show_rank int DEFAULT 0", + "update partition set bul_show_rank=0 where bul_show_rank is NULL", + ], + ) # add formsemestre to abs notifications - check_field(cnx, 'absences_notifications', 'formsemestre_id', - ['alter table absences_notifications add column formsemestre_id text DEFAULT NULL', - ]) + check_field( + cnx, + "absences_notifications", + "formsemestre_id", + [ + "alter table absences_notifications add column formsemestre_id text DEFAULT NULL", + ], + ) # Add "debouche" to admission - check_field(cnx, 'admissions', 'debouche', - ['alter table admissions add column debouche text DEFAULT NULL', - # et en profite pour corrige le From par defaut des mails: - "update sco_prefs set value='noreply@univ-paris13.fr' where name='email_from_addr' and value='noreply'" - ]) + check_field( + cnx, + "admissions", + "debouche", + [ + "alter table admissions add column debouche text DEFAULT NULL", + # et en profite pour corrige le From par defaut des mails: + "update sco_prefs set value='noreply@univ-paris13.fr' where name='email_from_addr' and value='noreply'", + ], + ) # Increase semestre indices - for i in range(5,9): - cursor.execute("SELECT * from notes_semestres where semestre_id=%(i)s", { 'i' : i } ) + for i in range(5, 9): + cursor.execute( + "SELECT * from notes_semestres where semestre_id=%(i)s", {"i": i} + ) r = cursor.fetchall() if not r: log("adding semestre_id %s" % i) - cursor.execute("INSERT INTO notes_semestres (semestre_id) VALUES (%(i)s)", { 'i' : i } ) + cursor.execute( + "INSERT INTO notes_semestres (semestre_id) VALUES (%(i)s)", {"i": i} + ) # ECTS associes aux UE: - check_field(cnx, 'notes_ue', 'ects', - ['alter table notes_ue add column ects float DEFAULT NULL', - ]) + check_field( + cnx, + "notes_ue", + "ects", + [ + "alter table notes_ue add column ects float DEFAULT NULL", + ], + ) # Numeros des evaluations: - check_field(cnx, 'notes_evaluation', 'numero', - ['alter table notes_evaluation add column numero int DEFAULT 0', - ]) + check_field( + cnx, + "notes_evaluation", + "numero", + [ + "alter table notes_evaluation add column numero int DEFAULT 0", + ], + ) # add nom_usuel to identite - check_field(cnx, 'identite', 'nom_usuel', - ['alter table identite add column nom_usuel text DEFAULT NULL', - ]) + check_field( + cnx, + "identite", + "nom_usuel", + [ + "alter table identite add column nom_usuel text DEFAULT NULL", + ], + ) # add type_admission - check_field(cnx, 'admissions', 'type_admission', - ['alter table admissions add column type_admission text DEFAULT NULL', - ]) - check_field(cnx, 'admissions', 'boursier_prec', - ['alter table admissions add column boursier_prec integer default NULL', - ]) + check_field( + cnx, + "admissions", + "type_admission", + [ + "alter table admissions add column type_admission text DEFAULT NULL", + ], + ) + check_field( + cnx, + "admissions", + "boursier_prec", + [ + "alter table admissions add column boursier_prec integer default NULL", + ], + ) # add modalites formation - check_table( cnx, 'notes_form_modalites', [ - """CREATE TABLE notes_form_modalites ( + check_table( + cnx, + "notes_form_modalites", + [ + """CREATE TABLE notes_form_modalites ( form_modalite_id text default notes_newid('Md') PRIMARY KEY, modalite text, -- la clef dans notes_formsemestre titre text, -- le nom complet de la modalite pour les documents scodoc numero SERIAL -- integer, ordre de presentation );""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('', 'Autres formations');""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FI', 'Formation Initiale');""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FC', 'Formation Continue');""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FAP', 'Apprentissage');""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('DEC', 'Formation Décalées');""", - """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('LIC', 'Licence');""" - ] ) + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('', 'Autres formations');""", + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FI', 'Formation Initiale');""", + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FC', 'Formation Continue');""", + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('FAP', 'Apprentissage');""", + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('DEC', 'Formation Décalées');""", + """INSERT INTO notes_form_modalites (modalite, titre) VALUES ('LIC', 'Licence');""", + ], + ) # Add code_specialite - check_field( cnx, 'notes_formations', 'code_specialite', - [ 'alter table notes_formations add column code_specialite text default NULL', - ]) + check_field( + cnx, + "notes_formations", + "code_specialite", + [ + "alter table notes_formations add column code_specialite text default NULL", + ], + ) # Fix modules without codes - cursor.execute("UPDATE notes_modules SET code = 'M_' || coalesce(upper(substring(titre from 1 for 2)), '') || '_' || coalesce(semestre_id,'0') where code is NULL;"); - + cursor.execute( + "UPDATE notes_modules SET code = 'M_' || coalesce(upper(substring(titre from 1 for 2)), '') || '_' || coalesce(semestre_id,'0') where code is NULL;" + ) + # Add ue.is_external - check_field( cnx, 'notes_ue', 'is_external', - [ 'alter table notes_ue add column is_external integer default 0', - ]) - check_field( cnx, 'scolar_formsemestre_validation', 'is_external', - [ 'alter table scolar_formsemestre_validation add column is_external integer default 0', - ]) + check_field( + cnx, + "notes_ue", + "is_external", + [ + "alter table notes_ue add column is_external integer default 0", + ], + ) + check_field( + cnx, + "scolar_formsemestre_validation", + "is_external", + [ + "alter table scolar_formsemestre_validation add column is_external integer default 0", + ], + ) # Add codes apogee - check_field( cnx, 'notes_ue', 'code_apogee', - [ 'alter table notes_ue add column code_apogee text UNIQUE', - ]) - check_field( cnx, 'notes_modules', 'code_apogee', - [ 'alter table notes_modules add column code_apogee text UNIQUE', - ]) - check_field( cnx, 'notes_formsemestre', 'elt_sem_apo', - [ 'alter table notes_formsemestre add column elt_sem_apo text', - ]) - check_field( cnx, 'notes_formsemestre', 'elt_annee_apo', - [ 'alter table notes_formsemestre add column elt_annee_apo text', - ]) + check_field( + cnx, + "notes_ue", + "code_apogee", + [ + "alter table notes_ue add column code_apogee text UNIQUE", + ], + ) + check_field( + cnx, + "notes_modules", + "code_apogee", + [ + "alter table notes_modules add column code_apogee text UNIQUE", + ], + ) + check_field( + cnx, + "notes_formsemestre", + "elt_sem_apo", + [ + "alter table notes_formsemestre add column elt_sem_apo text", + ], + ) + check_field( + cnx, + "notes_formsemestre", + "elt_annee_apo", + [ + "alter table notes_formsemestre add column elt_annee_apo text", + ], + ) # Classement admission - check_field(cnx, 'admissions', 'classement', - ['alter table admissions add column classement integer default NULL', - ]) + check_field( + cnx, + "admissions", + "classement", + [ + "alter table admissions add column classement integer default NULL", + ], + ) # Supprime contraintes erronées sur codes Apogee: - if list_constraint( cnx, constraint_name='notes_ue_code_apogee_key' ): - log('dropping buggy constraint on notes_ue_code_apogee') - cursor.execute("alter table notes_ue drop CONSTRAINT notes_ue_code_apogee_key;") - if list_constraint( cnx, constraint_name='notes_modules_code_apogee_key' ): - log('dropping buggy constraint on notes_modules_code_apogee') - cursor.execute("alter table notes_modules drop CONSTRAINT notes_modules_code_apogee_key;") - + if list_constraint(cnx, constraint_name="notes_ue_code_apogee_key"): + log("dropping buggy constraint on notes_ue_code_apogee") + cursor.execute( + "alter table notes_ue drop CONSTRAINT notes_ue_code_apogee_key;" + ) + if list_constraint(cnx, constraint_name="notes_modules_code_apogee_key"): + log("dropping buggy constraint on notes_modules_code_apogee") + cursor.execute( + "alter table notes_modules drop CONSTRAINT notes_modules_code_apogee_key;" + ) + # SemSet: - check_table( cnx, 'notes_semset', [ - """CREATE TABLE notes_semset ( + check_table( + cnx, + "notes_semset", + [ + """CREATE TABLE notes_semset ( semset_id text default notes_newid('NSS') PRIMARY KEY, title text, annee_scolaire int default NULL, -- 2016 sem_id int default NULL -- 0, 1, 2 - ) WITH OIDS;""", ] ) - check_field(cnx, 'notes_semset', 'annee_scolaire', - ['alter table notes_semset add column annee_scolaire integer default NULL', - ]) - check_table( cnx, 'notes_semset_formsemestre', [ - """CREATE TABLE notes_semset_formsemestre ( + ) WITH OIDS;""", + ], + ) + check_field( + cnx, + "notes_semset", + "annee_scolaire", + [ + "alter table notes_semset add column annee_scolaire integer default NULL", + ], + ) + check_table( + cnx, + "notes_semset_formsemestre", + [ + """CREATE TABLE notes_semset_formsemestre ( formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id) ON DELETE CASCADE, semset_id text REFERENCES notes_semset (semset_id) ON DELETE CASCADE, PRIMARY KEY (formsemestre_id, semset_id) - ) WITH OIDS;""", ] ) + ) WITH OIDS;""", + ], + ) # ModuleTags - check_table( cnx, 'notes_tags', [ - """CREATE TABLE notes_tags ( + check_table( + cnx, + "notes_tags", + [ + """CREATE TABLE notes_tags ( tag_id text default notes_newid('TAG') PRIMARY KEY, title text UNIQUE NOT NULL - ) WITH OIDS;""", ] ) - check_table( cnx, 'notes_modules_tags', [ - """CREATE TABLE notes_modules_tags ( + ) WITH OIDS;""", + ], + ) + check_table( + cnx, + "notes_modules_tags", + [ + """CREATE TABLE notes_modules_tags ( tag_id text REFERENCES notes_tags(tag_id) ON DELETE CASCADE, module_id text REFERENCES notes_modules(module_id) ON DELETE CASCADE, PRIMARY KEY (tag_id, module_id) - ) WITH OIDS;""", ] ) - + ) WITH OIDS;""", + ], + ) + # add show_in_lists on partition - check_field(cnx, 'partition', 'show_in_lists', - ['alter table partition add column show_in_lists integer DEFAULT 1', - 'update partition set show_in_lists=1 where show_in_lists is NULL']) + check_field( + cnx, + "partition", + "show_in_lists", + [ + "alter table partition add column show_in_lists integer DEFAULT 1", + "update partition set show_in_lists=1 where show_in_lists is NULL", + ], + ) # table codes etapes apogee semestre - check_table( cnx, 'notes_formsemestre_etapes', [ - """CREATE TABLE notes_formsemestre_etapes ( + check_table( + cnx, + "notes_formsemestre_etapes", + [ + """CREATE TABLE notes_formsemestre_etapes ( formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id) ON DELETE CASCADE, etape_apo text NOT NULL ) WITH OIDS;""", - """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo FROM notes_formsemestre WHERE etape_apo is not NULL;""", - """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo2 FROM notes_formsemestre WHERE etape_apo2 is not NULL;""", - """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo3 FROM notes_formsemestre WHERE etape_apo3 is not NULL;""", - """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo4 FROM notes_formsemestre WHERE etape_apo4 is not NULL;""", - """ALTER table notes_formsemestre DROP column etape_apo;""", - """ALTER table notes_formsemestre DROP column etape_apo2;""", - """ALTER table notes_formsemestre DROP column etape_apo3;""", - """ALTER table notes_formsemestre DROP column etape_apo4;""", - ] ) + """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo FROM notes_formsemestre WHERE etape_apo is not NULL;""", + """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo2 FROM notes_formsemestre WHERE etape_apo2 is not NULL;""", + """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo3 FROM notes_formsemestre WHERE etape_apo3 is not NULL;""", + """INSERT into notes_formsemestre_etapes (formsemestre_id, etape_apo) SELECT formsemestre_id, etape_apo4 FROM notes_formsemestre WHERE etape_apo4 is not NULL;""", + """ALTER table notes_formsemestre DROP column etape_apo;""", + """ALTER table notes_formsemestre DROP column etape_apo2;""", + """ALTER table notes_formsemestre DROP column etape_apo3;""", + """ALTER table notes_formsemestre DROP column etape_apo4;""", + ], + ) # Admission APB: groupe et classement dans groupe - check_field(cnx, 'admissions', 'apb_groupe', - ['alter table admissions add column apb_groupe text default NULL', - ]) - check_field(cnx, 'admissions', 'apb_classement_gr', - ['alter table admissions add column apb_classement_gr integer default NULL', - ]) + check_field( + cnx, + "admissions", + "apb_groupe", + [ + "alter table admissions add column apb_groupe text default NULL", + ], + ) + check_field( + cnx, + "admissions", + "apb_classement_gr", + [ + "alter table admissions add column apb_classement_gr integer default NULL", + ], + ) # Adresse mail perso - check_field(cnx, 'adresse', 'emailperso', - ['alter table adresse add column emailperso text', - ]) - # Ajout de modalites supplementaires + check_field( + cnx, + "adresse", + "emailperso", + [ + "alter table adresse add column emailperso text", + ], + ) + # Ajout de modalites supplementaires cursor.execute("SELECT modalite from notes_form_modalites where modalite= 'CP'") if not len(cursor.fetchall()): log('adding modalite "CP"') - cursor.execute("INSERT INTO notes_form_modalites (modalite, titre) VALUES ('CP', 'Contrats de Professionnalisation');") + cursor.execute( + "INSERT INTO notes_form_modalites (modalite, titre) VALUES ('CP', 'Contrats de Professionnalisation');" + ) # Un index oublié sur notes_notes: - if 'notes_notes_evaluation_id_idx' not in list_table_index(cnx, 'notes_notes'): - log('creating index on notes_notes') - cursor.execute("CREATE INDEX notes_notes_evaluation_id_idx ON notes_notes (evaluation_id)") - + if "notes_notes_evaluation_id_idx" not in list_table_index(cnx, "notes_notes"): + log("creating index on notes_notes") + cursor.execute( + "CREATE INDEX notes_notes_evaluation_id_idx ON notes_notes (evaluation_id)" + ) + # boursier (ajout API nov 2017) - check_field(cnx, 'identite', 'boursier', - ['alter table identite add column boursier text' - ]) + check_field( + cnx, "identite", "boursier", ["alter table identite add column boursier text"] + ) # Suivi des anciens etudiants (debouche) # cree table suivi et recopie ancien champs debouche de la table admission - check_table( cnx, 'itemsuivi', [ - """CREATE TABLE itemsuivi ( + check_table( + cnx, + "itemsuivi", + [ + """CREATE TABLE itemsuivi ( itemsuivi_id text DEFAULT notes_newid('SUI'::text) PRIMARY KEY, etudid text NOT NULL, item_date date DEFAULT now(), situation text ) WITH OIDS;""", - - """INSERT INTO itemsuivi (etudid, situation) + """INSERT INTO itemsuivi (etudid, situation) SELECT etudid, debouche FROM admissions WHERE debouche is not null; - """ - ] ) - check_table( cnx, 'itemsuivi_tags', [ - """CREATE TABLE itemsuivi_tags ( + """, + ], + ) + check_table( + cnx, + "itemsuivi_tags", + [ + """CREATE TABLE itemsuivi_tags ( tag_id text default notes_newid('TG') PRIMARY KEY, title text UNIQUE NOT NULL ) WITH OIDS;""", - ] ) - check_table( cnx, 'itemsuivi_tags_assoc', [ - """CREATE TABLE itemsuivi_tags_assoc ( + ], + ) + check_table( + cnx, + "itemsuivi_tags_assoc", + [ + """CREATE TABLE itemsuivi_tags_assoc ( tag_id text REFERENCES itemsuivi_tags(tag_id) ON DELETE CASCADE, itemsuivi_id text REFERENCES itemsuivi(itemsuivi_id) ON DELETE CASCADE, PRIMARY KEY (tag_id, itemsuivi_id) ) WITH OIDS;""", - ] ) - + ], + ) + # Types de modules (pour malus) - check_field(cnx, 'notes_modules', 'module_type', - ['alter table notes_modules add column module_type int', - ]) + check_field( + cnx, + "notes_modules", + "module_type", + [ + "alter table notes_modules add column module_type int", + ], + ) # Responsables de semestres - check_table( cnx, 'notes_formsemestre_responsables', [ - """CREATE TABLE notes_formsemestre_responsables ( + check_table( + cnx, + "notes_formsemestre_responsables", + [ + """CREATE TABLE notes_formsemestre_responsables ( formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id) ON DELETE CASCADE, responsable_id text NOT NULL, UNIQUE(formsemestre_id, responsable_id) ) WITH OIDS;""", - """INSERT into notes_formsemestre_responsables (formsemestre_id, responsable_id) SELECT formsemestre_id, responsable_id FROM notes_formsemestre WHERE responsable_id is not NULL;""", - """ALTER table notes_formsemestre DROP column responsable_id;""", - ]) + """INSERT into notes_formsemestre_responsables (formsemestre_id, responsable_id) SELECT formsemestre_id, responsable_id FROM notes_formsemestre WHERE responsable_id is not NULL;""", + """ALTER table notes_formsemestre DROP column responsable_id;""", + ], + ) # Fonction pour anonymisation: - if not function_exists(cnx, 'random_text_md5'): - log('creating function random_text_md5') + if not function_exists(cnx, "random_text_md5"): + log("creating function random_text_md5") # inspirée par https://www.simononsoftware.com/random-string-in-postgresql/ - cursor.execute("""CREATE FUNCTION random_text_md5( integer ) returns text + cursor.execute( + """CREATE FUNCTION random_text_md5( integer ) returns text LANGUAGE SQL AS $$ select upper( substring( (SELECT string_agg(md5(random()::TEXT), '') @@ -601,48 +1031,86 @@ for dept in get_depts(): 1, CEIL($1 / 32.)::integer) ), 1, $1) ); - $$;""") + $$;""" + ) # departement naissance (ajout fev 2020) check_field( - cnx, 'identite', 'dept_naissance', - ['alter table identite add column dept_naissance text']) + cnx, + "identite", + "dept_naissance", + ["alter table identite add column dept_naissance text"], + ) # Modalite semestres exterieurs cursor.execute("SELECT modalite from notes_form_modalites where modalite= 'EXT'") if not len(cursor.fetchall()): log('adding modalite "EXT"') - cursor.execute("INSERT INTO notes_form_modalites (modalite, titre) VALUES ('EXT', 'Extérieur');") + cursor.execute( + "INSERT INTO notes_form_modalites (modalite, titre) VALUES ('EXT', 'Extérieur');" + ) # Coefficients d'UE - check_field(cnx, 'notes_ue', 'coefficient', - ["alter table notes_ue add column coefficient float", - # Initialise les coefficients égaux aux ECTS: - "update notes_ue set coefficient=ects", - # Force pref locale sur semestres existants: - """INSERT INTO sco_prefs (name, value, formsemestre_id) + check_field( + cnx, + "notes_ue", + "coefficient", + [ + "alter table notes_ue add column coefficient float", + # Initialise les coefficients égaux aux ECTS: + "update notes_ue set coefficient=ects", + # Force pref locale sur semestres existants: + """INSERT INTO sco_prefs (name, value, formsemestre_id) SELECT DISTINCT 'use_ue_coefs', '0', formsemestre_id FROM notes_formsemestre ON CONFLICT DO NOTHING - """ - ]) + """, + ], + ) + # Etape d'inscription + check_field( + cnx, + "notes_formsemestre_inscription", + "etape", + ["alter table notes_formsemestre_inscription add column etape text"], + ) # Add here actions to performs after upgrades: cnx.commit() cnx.close() # Base utilisateurs: -log('\nChecking users database') -cnx = psycopg2.connect( get_users_cnx_str() ) +log("\nChecking users database") +cnx = psycopg2.connect(get_users_cnx_str()) cursor = cnx.cursor() -check_field(cnx, 'sco_users', 'passwd_temp', - ['alter table sco_users add column passwd_temp int default 0', - 'update sco_users set passwd_temp=0' ]) -check_field(cnx, 'sco_users', 'status', - ["alter table sco_users add column status text default NULL"]) -check_field(cnx, 'sco_users', 'date_expiration', - ["alter table sco_users add column date_expiration date", - "update sco_users set status=NULL where status=''" # fix a bug in previous update... - ]) -check_field(cnx, 'sco_users', 'login_edt', - ["alter table sco_users add column login_edt text default NULL", - ]) +check_field( + cnx, + "sco_users", + "passwd_temp", + [ + "alter table sco_users add column passwd_temp int default 0", + "update sco_users set passwd_temp=0", + ], +) +check_field( + cnx, + "sco_users", + "status", + ["alter table sco_users add column status text default NULL"], +) +check_field( + cnx, + "sco_users", + "date_expiration", + [ + "alter table sco_users add column date_expiration date", + "update sco_users set status=NULL where status=''", # fix a bug in previous update... + ], +) +check_field( + cnx, + "sco_users", + "login_edt", + [ + "alter table sco_users add column login_edt text default NULL", + ], +) cnx.commit() cnx.close() diff --git a/misc/createtables.sql b/misc/createtables.sql index 8eeea15417..9196fb3e8e 100644 --- a/misc/createtables.sql +++ b/misc/createtables.sql @@ -487,6 +487,7 @@ CREATE TABLE notes_formsemestre_inscription ( etudid text REFERENCES identite(etudid), formsemestre_id text REFERENCES notes_formsemestre(formsemestre_id), etat text, -- I inscrit, D demission en cours de semestre, DEF si "defaillant" + etape text, -- etape apogee d'inscription (experimental 2020) UNIQUE(formsemestre_id, etudid) ) WITH OIDS; diff --git a/sco_formsemestre_inscriptions.py b/sco_formsemestre_inscriptions.py index a32ff254d8..0761aef10a 100644 --- a/sco_formsemestre_inscriptions.py +++ b/sco_formsemestre_inscriptions.py @@ -45,10 +45,11 @@ def do_formsemestre_inscription_with_modules( etudid, group_ids=[], etat="I", + etape=None, REQUEST=None, method="inscription_with_modules", ): - """Inscrit cet etudiant a ce semestre et TOUS ses modules STANDARDS + """Inscrit cet etudiant à ce semestre et TOUS ses modules STANDARDS (donc sauf le sport) """ # inscription au semestre @@ -258,8 +259,7 @@ def formsemestre_inscription_with_modules( def formsemestre_inscription_option(context, etudid, formsemestre_id, REQUEST=None): - """Dialogue pour (des)inscription a des modules optionnels - """ + """Dialogue pour (dés)inscription à des modules optionnels.""" sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) if sem["etat"] != "1": raise ScoValueError("Modification impossible: semestre verrouille") @@ -320,14 +320,11 @@ def formsemestre_inscription_option(context, etudid, formsemestre_id, REQUEST=No sem_origin = sco_formsemestre.get_formsemestre( context, ue_status["formsemestre_id"] ) - ue_descr += ( - ' (capitalisée le %s)' - % ( - sem_origin["formsemestre_id"], - etudid, - sem_origin["titreannee"], - DateISOtoDMY(ue_status["event_date"]), - ) + ue_descr += ' (capitalisée le %s)' % ( + sem_origin["formsemestre_id"], + etudid, + sem_origin["titreannee"], + DateISOtoDMY(ue_status["event_date"]), ) descr.append( ( diff --git a/sco_groups.py b/sco_groups.py index 73228867bc..84a98217aa 100644 --- a/sco_groups.py +++ b/sco_groups.py @@ -63,7 +63,7 @@ def checkGroupName( ): # XXX unused: now allow any string as a group or partition name "Raises exception if not a valid group name" if groupName and ( - not re.match("^\w+$", groupName) or (simplesqlquote(groupName) != groupName) + not re.match(r"^\w+$", groupName) or (simplesqlquote(groupName) != groupName) ): log("!!! invalid group name: " + groupName) raise ValueError("invalid group name: " + groupName) @@ -103,8 +103,7 @@ def get_group(context, group_id): def group_delete(context, group, force=False): - """Delete a group. - """ + """Delete a group.""" # if not group['group_name'] and not force: # raise ValueError('cannot suppress this group') # remove memberships: @@ -156,8 +155,7 @@ def get_default_partition(context, formsemestre_id): def get_formsemestre_groups(context, formsemestre_id, with_default=False): - """Returns ( partitions, { partition_id : { etudid : group } } ) - """ + """Returns ( partitions, { partition_id : { etudid : group } } ).""" partitions = get_partitions_list( context, formsemestre_id, with_default=with_default ) @@ -179,8 +177,7 @@ def get_partition_groups(context, partition): def get_default_group(context, formsemestre_id, fix_if_missing=False, REQUEST=None): - """Returns group_id for default ('tous') group - """ + """Returns group_id for default ('tous') group""" r = SimpleDictFetch( context, "SELECT gd.group_id FROM group_descr gd, partition p WHERE p.formsemestre_id=%(formsemestre_id)s AND p.partition_name is NULL AND p.partition_id = gd.partition_id", @@ -261,10 +258,8 @@ def get_group_members(context, group_id, etat=None): def get_group_infos(context, group_id, etat=None): # was _getlisteetud - """legacy code: used by group_list and trombino - """ + """legacy code: used by group_list and trombino""" cnx = context.GetDBConnexion() - cursor = cnx.cursor(cursor_factory=ScoDocCursor) group = get_group(context, group_id) sem = sco_formsemestre.get_formsemestre(context, group["formsemestre_id"]) @@ -370,8 +365,7 @@ def formsemestre_get_etud_groupnames(context, formsemestre_id, attr="group_name" def etud_add_group_infos(context, etud, sem, sep=" "): - """Add informations on partitions and group memberships to etud (a dict with an etudid) - """ + """Add informations on partitions and group memberships to etud (a dict with an etudid)""" etud[ "partitions" ] = collections.OrderedDict() # partition_id : group + partition_name @@ -553,8 +547,7 @@ def set_group(context, etudid, group_id): def change_etud_group_in_partition( context, etudid, group_id, partition=None, REQUEST=None ): - """Inscrit etud au groupe de cette partition, et le desinscrit d'autres groupes de cette partition. - """ + """Inscrit etud au groupe de cette partition, et le desinscrit d'autres groupes de cette partition.""" log("change_etud_group_in_partition: etudid=%s group_id=%s" % (etudid, group_id)) # 0- La partition @@ -700,7 +693,7 @@ def createGroup(context, partition_id, group_name="", default=False, REQUEST=Non """ partition = get_partition(context, partition_id) formsemestre_id = partition["formsemestre_id"] - if not context.Notes.can_change_groups(REQUEST, formsemestre_id): + if REQUEST and not context.Notes.can_change_groups(REQUEST, formsemestre_id): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") # if group_name: @@ -756,7 +749,7 @@ def partition_create( redirect=1, ): """Create a new partition""" - if not context.Notes.can_change_groups(REQUEST, formsemestre_id): + if REQUEST and not context.Notes.can_change_groups(REQUEST, formsemestre_id): raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") if partition_name: partition_name = partition_name.strip() @@ -800,7 +793,8 @@ def getArrowIconsTags(context, REQUEST): def editPartitionForm(context, formsemestre_id=None, REQUEST=None): """Form to create/suppress partitions""" # ad-hoc form - canedit = context.Notes.can_change_groups(REQUEST, formsemestre_id) + if not context.Notes.can_change_groups(REQUEST, formsemestre_id): + raise AccessDenied("Vous n'avez pas le droit d'effectuer cette opération !") partitions = get_partitions_list(context, formsemestre_id) arrow_up, arrow_down, arrow_none = getArrowIconsTags(context, REQUEST) suppricon = icontag( @@ -1294,6 +1288,48 @@ def get_prev_moy(context, etudid, formsemestre_id): return 0.0 +def create_etapes_partition(context, formsemestre_id, partition_name="apo_etapes"): + """Crée une partition "apo_etapes" avec un groupe par étape Apogée. + Cette partition n'est crée que si plusieurs étapes différentes existent dans ce + semestre. + Si la partition existe déjà, ses groupes sont mis à jour (les groupes devenant + vides ne sont pas supprimés). + """ + log("create_etapes_partition(%s)" % formsemestre_id) + ins = context.do_formsemestre_inscription_list( + args={"formsemestre_id": formsemestre_id} + ) + etapes = {i["etape"] for i in ins if i["etape"]} + partitions = get_partitions_list(context, formsemestre_id, with_default=False) + partition = None + for p in partitions: + if p["partition_name"] == partition_name: + partition = p + break + if len(etapes) < 2 and not partition: + return # moins de deux étapes, pas de création + if partition: + pid = partition["partition_id"] + else: + pid = partition_create( + context, formsemestre_id, partition_name=partition_name, redirect=False + ) + partition = get_partition(context, pid) + groups = get_partition_groups(context, partition) + groups_by_names = {g["group_name"]: g for g in groups} + for etape in etapes: + if not (etape in groups_by_names): + gid = createGroup(context, pid, etape) + g = get_group(context, gid) + groups_by_names[etape] = g + # Place les etudiants dans les groupes + for i in ins: + if i["etape"]: + change_etud_group_in_partition( + context, i["etudid"], groups_by_names[i["etape"]]["group_id"], partition + ) + + def do_evaluation_listeetuds_groups( context, evaluation_id, groups=None, getallstudents=False, include_dems=False ): @@ -1340,7 +1376,7 @@ def do_evaluation_listeetuds_groups( def do_evaluation_listegroupes(context, evaluation_id, include_default=False): - """Donne la liste des groupes dans lesquels figurent des etudiants inscrits + """Donne la liste des groupes dans lesquels figurent des etudiants inscrits au module/semestre auquel appartient cette evaluation. Si include_default, inclue aussi le groupe par defaut ('tous') [ group ] diff --git a/sco_groups_edit.py b/sco_groups_edit.py index 0b866c87be..4fc12b72ec 100644 --- a/sco_groups_edit.py +++ b/sco_groups_edit.py @@ -47,8 +47,6 @@ def affectGroups(context, partition_id, REQUEST=None): if not context.Notes.can_change_groups(REQUEST, formsemestre_id): raise AccessDenied("vous n'avez pas la permission d'effectuer cette opération") - sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) - H = [ context.sco_header( REQUEST, diff --git a/sco_groups_view.py b/sco_groups_view.py index 2b0d9c3f28..aef24a86ad 100644 --- a/sco_groups_view.py +++ b/sco_groups_view.py @@ -429,8 +429,12 @@ def groups_table( ): """liste etudiants inscrits dans ce semestre format: csv, json, xml, xls, allxls, xlsappel, moodlecsv, pdf - Si with_codes, ajoute 3 colonnes avec les codes etudid, NIP, INE + Si with_codes, ajoute 4 colonnes avec les codes etudid, NIP, INE et etape """ + log( + "enter groups_table %s: %s" + % (groups_infos.members[0]["nom"], groups_infos.members[0].get("etape", "-")) + ) authuser = REQUEST.AUTHENTICATED_USER with_codes = int(with_codes) @@ -784,8 +788,7 @@ def groups_table( def tab_absences_html(context, groups_infos, etat=None, REQUEST=None): - """contenu du tab "absences et feuilles diverses" - """ + """contenu du tab "absences et feuilles diverses" """ authuser = REQUEST.AUTHENTICATED_USER H = ['

'] if not groups_infos.members: @@ -841,8 +844,7 @@ def tab_absences_html(context, groups_infos, etat=None, REQUEST=None): def tab_photos_html(context, groups_infos, etat=None, REQUEST=None): - """contenu du tab "photos" - """ + """contenu du tab "photos" """ if not groups_infos.members: return '

Aucun étudiant !

' @@ -850,8 +852,7 @@ def tab_photos_html(context, groups_infos, etat=None, REQUEST=None): def form_choix_jour_saisie_hebdo(context, groups_infos, REQUEST=None): - """Formulaire choix jour semaine pour saisie. - """ + """Formulaire choix jour semaine pour saisie.""" authuser = REQUEST.AUTHENTICATED_USER if not authuser.has_permission(ScoAbsChange, context): return "" @@ -893,7 +894,7 @@ def export_groups_as_moodle_csv(context, formsemestre_id=None, REQUEST=None): jo@univ.fr,S3-A jo@univ.fr,S3-B1 if jo belongs to group A in a partition, and B1 in another one. - Caution: if groups in different partitions share the same name, there will be + Caution: if groups in different partitions share the same name, there will be duplicates... should we prefix the group names with the partition's name ? """ if not formsemestre_id: diff --git a/sco_portal_apogee.py b/sco_portal_apogee.py index 9641659eef..e1b5c1a633 100644 --- a/sco_portal_apogee.py +++ b/sco_portal_apogee.py @@ -508,7 +508,7 @@ def check_paiement_etuds(context, etuds): Seuls les etudiants avec code NIP sont renseignés. - Renseigne l'attribut booleen 'paiementinscription' dans chaque etud. + Renseigne l'attribut booleen 'paiementinscription' dans chaque etud, ainsi que l'étape. En sortie: modif les champs de chaque etud 'paiementinscription' : True, False ou None diff --git a/sco_pvjury.py b/sco_pvjury.py index 5678dd63dc..52bd8a3ef7 100644 --- a/sco_pvjury.py +++ b/sco_pvjury.py @@ -596,6 +596,8 @@ def formsemestre_pvjury_pdf( Si etudid, PV pour un seul etudiant. Sinon, tout les inscrits au groupe indiqué. """ sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) + # Mise à jour des groupes d'étapes: + sco_groups.create_etapes_partition(context, formsemestre_id) groups_infos = None if etudid: # PV pour ce seul étudiant: diff --git a/sco_report.py b/sco_report.py index 09669127fd..af9ac19677 100644 --- a/sco_report.py +++ b/sco_report.py @@ -438,7 +438,7 @@ def table_suivi_cohorte( for s in sems: ins = context.do_formsemestre_inscription_list( args={"formsemestre_id": s["formsemestre_id"]} - ) # avec dems + ) # sans dems inset = Set([i["etudid"] for i in ins]) s["members"] = orig_set.intersection(inset) nb_dipl = 0 # combien de diplomes dans ce semestre ? diff --git a/sco_synchro_etuds.py b/sco_synchro_etuds.py index 484eb258cf..0a81e3c654 100644 --- a/sco_synchro_etuds.py +++ b/sco_synchro_etuds.py @@ -597,6 +597,7 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES # Les champs suivants sont facultatifs (pas toujours renvoyés par le portail) "code_ine": etud.get("ine", "").strip(), "sexe": gender2sex(etud["gender"].strip()), + "etape": etud.get("etape", None), "email": etud.get("mail", "").strip(), "emailperso": etud.get("mailperso", "").strip(), "date_naissance": etud.get("naissance", "").strip(), @@ -619,7 +620,7 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES do_import_etud_admission(context, cnx, args["etudid"], etud) # Adresse - adresse_id = scolars.adresse_create(cnx, args) + scolars.adresse_create(cnx, args) # Inscription au semestre sco_formsemestre_inscriptions.do_formsemestre_inscription_with_modules( @@ -627,6 +628,7 @@ def do_import_etuds_from_portal(context, sem, a_importer, etudsapo_ident, REQUES sem["formsemestre_id"], args["etudid"], etat="I", + etape=args["etape"], REQUEST=REQUEST, method="synchro_apogee", ) @@ -754,6 +756,18 @@ def get_bac(etud): return serie_bac, spe_bac +def update_etape_formsemestre_inscription(context, ins, etud): + """Met à jour l'étape de l'inscription. + + Args: + ins (dict): formsemestre_inscription + etud (dict): etudiant portail Apo + """ + if etud["etape"] != ins["etape"]: + ins["etape"] = etud["etape"] + context.do_formsemestre_inscription_edit(args=ins) + + def formsemestre_import_etud_admission( context, formsemestre_id, import_identite=True, import_email=False ): @@ -797,6 +811,7 @@ def formsemestre_import_etud_admission( # pas vu dans les etudiants de l'étape, tente en individuel etud = sco_portal_apogee.get_etud_apogee(context, code_nip) if etud: + update_etape_formsemestre_inscription(context, i, etud) do_import_etud_admission( context, cnx,