[scodoc-devel] [SVN] Scolar : [1669] Fix: pas de mention si semestre non valide

eviennet at lipn.univ-paris13.fr eviennet at lipn.univ-paris13.fr
Mar 11 Juil 11:29:21 CEST 2017


Une pièce jointe HTML a été nettoyée...
URL: https://listes.univ-paris13.fr/pipermail/scodoc-devel/attachments/20170711/f7323ef2/attachment.htm 
-------------- section suivante --------------
Modified: branches/ScoDoc7/VERSION.py
===================================================================
--- branches/ScoDoc7/VERSION.py	2017-07-10 09:11:16 UTC (rev 1668)
+++ branches/ScoDoc7/VERSION.py	2017-07-11 09:29:20 UTC (rev 1669)
@@ -8,6 +8,7 @@
 SCONEWS = """
 <h4>Année 2017</h4>
 <ul>
+<li>Génération des avis de poursuite d'études</li>
 <li>Toilettage page liste programme pédagogiques</li>
 <li>Amélioration exports résultats vers Apogée</li>
 <li>Possibilité d'utilisation des adresses mail personnelles des étudiant</li>

Modified: branches/ScoDoc7/sco_bulletins.py
===================================================================
--- branches/ScoDoc7/sco_bulletins.py	2017-07-10 09:11:16 UTC (rev 1668)
+++ branches/ScoDoc7/sco_bulletins.py	2017-07-11 09:29:20 UTC (rev 1669)
@@ -175,10 +175,12 @@
     I['moy_gen'] = fmt_note(moy_gen)
     I['moy_min'] = fmt_note(nt.moy_min)
     I['moy_max'] = fmt_note(nt.moy_max)
-    if dpv and dpv['decisions'][0]['decision_sem']:
-        I['mention'] = get_mention(moy_gen)
-    else:
-        I['mention'] = ''
+    I['mention'] = ''
+    if dpv:
+        decision_sem = dpv['decisions'][0]['decision_sem']
+        if decision_sem and sco_codes_parcours.code_semestre_validant(decision_sem['code']):
+            I['mention'] = get_mention(moy_gen)
+            
     if dpv and dpv['decisions'][0]:
         I['sum_ects'] = dpv['decisions'][0]['sum_ects']
     else:

Modified: branches/ScoDoc7/sco_pvjury.py
===================================================================
--- branches/ScoDoc7/sco_pvjury.py	2017-07-10 09:11:16 UTC (rev 1668)
+++ branches/ScoDoc7/sco_pvjury.py	2017-07-11 09:29:20 UTC (rev 1669)
@@ -173,7 +173,7 @@
         sum_ects, ects_by_ue_type = _comp_sum_ects_by_ue_type(nt, d['decisions_ue'])
         d['sum_ects'] = sum_ects
         d['sum_ects_by_type'] = ects_by_ue_type
-        if d['decision_sem']:
+        if d['decision_sem'] and sco_codes_parcours.code_semestre_validant(decision_sem['code']):
             d['mention'] = get_mention(nt.get_etud_moy_gen(etudid))
         else:
             d['mention'] = ''


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