[scodoc-devel] [SVN] Scolar : [1739] Fix: feuille prepa jury (par JM Palussiere)

eviennet at lipn.univ-paris13.fr eviennet at lipn.univ-paris13.fr
Ven 22 Déc 20:47:50 CET 2017


Une pièce jointe HTML a été nettoyée...
URL: https://listes.univ-paris13.fr/pipermail/scodoc-devel/attachments/20171222/ee86ec7a/attachment.htm 
-------------- section suivante --------------
Modified: branches/ScoDoc7/sco_prepajury.py
===================================================================
--- branches/ScoDoc7/sco_prepajury.py	2017-12-22 15:59:20 UTC (rev 1738)
+++ branches/ScoDoc7/sco_prepajury.py	2017-12-22 19:47:50 UTC (rev 1739)
@@ -159,7 +159,7 @@
         titles.append('Proposit. %s' % sn)
     if autorisations:
         titles.append('Autorisations')
-    titles.append('Assidu')
+#    titles.append('Assidu')
     L.append(titles)
     style_bold = sco_excel.Excel_MakeStyle(bold=True)
     style_center = sco_excel.Excel_MakeStyle(halign='center')
@@ -168,13 +168,12 @@
     style_note = sco_excel.Excel_MakeStyle(halign='right')
     style_note_bold = sco_excel.Excel_MakeStyle(halign='right',bold=True)
     if prev_moy:
-        col_prev_moy = 8
-        col_prev_moy += len(ue_prev_codes) + 1
-        col_moy = col_prev_moy + len(ue_codes) + 2
-        col_abs = col_moy + 3
-    else:
-        col_moy = 9 + len(ue_codes)
-        col_abs = col_moy + 2
+        tit_prev_moy = "Moy " + sp
+        col_prev_moy = titles.index(tit_prev_moy)
+    tit_moy = "Moy " + sn
+    col_moy = titles.index(tit_moy)
+    col_abs = titles.index('Abs')
+	
     L.set_style( style_bold, li=0)
     L.set_style( style_boldcenter, li=2)
     def fmt(x):
@@ -211,8 +210,10 @@
                 co += 1
             l.append(fmt(prev_moy.get(etudid,'')))
             l.append(prev_code.get(etudid,''))
-            L.set_style(style_bold, li=i+2, co=col_prev_moy+1) # moy gen prev
-            L.set_style(style_moy,  li=i+2, co=col_prev_moy+2) # decision prev
+#            L.set_style(style_bold, li=i+2, co=col_prev_moy+1) # moy gen prev
+#            L.set_style(style_moy,  li=i+2, co=col_prev_moy+2) # decision prev
+            L.set_style(style_bold, li=i+2, co=col_prev_moy) # moy gen prev
+            L.set_style(style_moy,  li=i+2, co=col_prev_moy+1) # decision prev
             co += 2
 
         for ue_acro in ue_codes:
@@ -220,7 +221,8 @@
             L.set_style(style_note, li=i+2, co=co)
             co += 1
         l.append(fmt(moy.get(etudid,'')))
-        L.set_style(style_note_bold, li=i+2, co=col_moy+1) # moy gen
+#        L.set_style(style_note_bold, li=i+2, co=col_moy+1) # moy gen
+        L.set_style(style_note_bold, li=i+2, co=col_moy) # moy gen
         co += 1
         if moy_inter:
             l.append(fmt(moy_inter.get(etudid,'')))


Plus d'informations sur la liste de diffusion scodoc-devel