app/pe/pe_tools.py

@@ -35,15 +35,13 @@ Created on Thu Sep  8 09:36:33 2016
 
 @author: barasc
 """
+from __future__ import print_function
 
 import os
 import datetime
 import re
 import unicodedata
 
-
-from flask import g
-
 import app.scodoc.sco_utils as scu
 from app import log
 from app.scodoc.sco_logos import find_logo
@@ -56,6 +54,7 @@ if not PE_DEBUG:
         # kw is ignored. log always add a newline
         log(" ".join(a))
 
+
 else:
     pe_print = print  # print function
 
@@ -207,9 +206,7 @@ def add_pe_stuff_to_zip(zipfile, ziproot):
     for name in logos_names:
         logo = find_logo(logoname=name, dept_id=g.scodoc_dept_id)
         if logo is not None:
-            add_local_file_to_zip(
+            add_local_file_to_zip(zipfile, ziproot, logo.filepath, "avis/logos/" + logo.filename)
-                zipfile, ziproot, logo.filepath, "avis/logos/" + logo.filename
-            )
 
 
 # ----------------------------------------------------------------------------------------

app/scodoc/sco_edit_ue.py

@@ -33,15 +33,13 @@ from flask import url_for, render_template
 from flask import g, request
 from flask_login import current_user
 
-from app import db
-from app import log
 from app.models import APO_CODE_STR_LEN
 from app.models import Formation, UniteEns, ModuleImpl, Module
-from app.models.formations import Matiere
 import app.scodoc.notesdb as ndb
 import app.scodoc.sco_utils as scu
 from app.scodoc.sco_utils import ModuleType
-from app.scodoc.TrivialFormulator import TrivialFormulator
+from app import log
+from app.scodoc.TrivialFormulator import TrivialFormulator, TF
 from app.scodoc.gen_tables import GenTable
 from app.scodoc.sco_permissions import Permission
 from app.scodoc.sco_exceptions import (
@@ -535,12 +533,6 @@ def ue_table(formation_id=None, semestre_idx=1, msg=""):  # was ue_list
         # pour faciliter la transition des anciens programmes non APC
         for ue in ues_obj:
             ue.guess_semestre_idx()
-        # vérifie qu'on a bien au moins une matière dans chaque UE
-        for ue in ues_obj:
-            if ue.matieres.count() < 1:
-                mat = Matiere(ue_id=ue.id)
-                db.session.add(mat)
-        db.session.commit()
     ues = [ue.to_dict() for ue in ues_obj]
     ues_externes = [ue.to_dict() for ue in ues_externes_obj]
 

app/scodoc/sco_evaluation_db.py

@@ -185,8 +185,7 @@ def _check_evaluation_args(args):
         if (jour > date_fin) or (jour < date_debut):
             raise ScoValueError(
                 "La date de l'évaluation (%s/%s/%s) n'est pas dans le semestre !"
-                % (d, m, y),
+                % (d, m, y)
-                dest_url="javascript:history.back();",
             )
     heure_debut = args.get("heure_debut", None)
     args["heure_debut"] = heure_debut

app/scodoc/sco_exceptions.py

@@ -40,7 +40,7 @@ class InvalidNoteValue(ScoException):
     pass
 
 
-# Exception qui stoque dest_url
+# Exception qui stoque dest_url, utilisee dans Zope standard_error_message
 class ScoValueError(ScoException):
     def __init__(self, msg, dest_url=None):
         super().__init__(msg)

app/scodoc/sco_formsemestre_status.py

@@ -105,10 +105,10 @@ def _build_menu_stats(formsemestre_id):
             "enabled": True,
         },
         {
-            "title": "Documents Avis Poursuite Etudes (xp)",
+            "title": "Documents Avis Poursuite Etudes",
             "endpoint": "notes.pe_view_sem_recap",
             "args": {"formsemestre_id": formsemestre_id},
-            "enabled": True,  # current_app.config["TESTING"] or current_app.config["DEBUG"],
+            "enabled": current_app.config["TESTING"] or current_app.config["DEBUG"],
         },
         {
             "title": 'Table "débouchés"',

app/scodoc/sco_moduleimpl_inscriptions.py

@@ -565,17 +565,17 @@ def do_etud_inscrit_ue(etudid, formsemestre_id, ue_id):
     cnx = ndb.GetDBConnexion()
     cursor = cnx.cursor(cursor_factory=ndb.ScoDocCursor)
     cursor.execute(
-        """SELECT mi.id 
+        """SELECT mi.moduleimpl_id 
       FROM notes_moduleimpl mi, notes_modules mod, notes_formsemestre sem
-      WHERE sem.id = %(formsemestre_id)s
+      WHERE sem.formsemestre_id = %(formsemestre_id)s
-      AND mi.formsemestre_id = sem.id
+      AND mi.formsemestre_id = sem.formsemestre_id
-      AND mod.id = mi.module_id
+      AND mod.module_id = mi.module_id
       AND mod.ue_id = %(ue_id)s
      """,
         {"formsemestre_id": formsemestre_id, "ue_id": ue_id},
     )
     res = cursor.dictfetchall()
-    for moduleimpl_id in [x["id"] for x in res]:
+    for moduleimpl_id in [x["moduleimpl_id"] for x in res]:
         sco_moduleimpl.do_moduleimpl_inscription_create(
             {"moduleimpl_id": moduleimpl_id, "etudid": etudid},
             formsemestre_id=formsemestre_id,

sco_version.py

@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.36"
+SCOVERSION = "9.1.33"
 
 SCONAME = "ScoDoc"