Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into ScoDoc8
This commit is contained in:
commit
390141f145
@ -380,6 +380,7 @@ class ZAbsences(
|
||||
security.declareProtected(ScoView, "CountAbsJust")
|
||||
|
||||
def CountAbsJust(self, etudid, debut, fin, matin=None, moduleimpl_id=None):
|
||||
"Count just. abs"
|
||||
if matin != None:
|
||||
matin = _toboolean(matin)
|
||||
ismatin = " AND A.MATIN = %(matin)s "
|
||||
|
@ -1077,6 +1077,8 @@ class ZNotes(ObjectManager, PropertyManager, RoleManager, Item, Persistent, Impl
|
||||
)
|
||||
return formsemestre_id
|
||||
|
||||
security.declareProtected(ScoView, "formsemestre_list")
|
||||
|
||||
def formsemestre_list(
|
||||
self,
|
||||
format=None,
|
||||
|
@ -616,6 +616,7 @@ E. Viennet (Université Paris 13).</p>
|
||||
security.declareProtected("View", "standard_html_footer")
|
||||
|
||||
def standard_html_footer(self, REQUEST=None):
|
||||
"""Le pied de page HTML de la page d'accueil."""
|
||||
return """<p class="footer">
|
||||
Problème de connexion (identifiant, mot de passe): <em>contacter votre responsable ou chef de département</em>.</p>
|
||||
<p>Problèmes et suggestions sur le logiciel: <a href="mailto:%s">%s</a></p>
|
||||
|
@ -779,7 +779,7 @@ def edit_ue_set_code_apogee(context, id=None, value=None, REQUEST=None):
|
||||
|
||||
# ---- Table recap formation
|
||||
def formation_table_recap(context, formation_id, format="html", REQUEST=None):
|
||||
""""""
|
||||
"""Table recapitulant formation."""
|
||||
F = context.formation_list(args={"formation_id": formation_id})
|
||||
if not F:
|
||||
raise ScoValueError("invalid formation_id")
|
||||
|
@ -213,6 +213,8 @@ def etapes_apo_str(etapes):
|
||||
|
||||
|
||||
def do_formsemestre_edit(context, sem, cnx=None, **kw):
|
||||
"""Apply modifications to formsemestre.
|
||||
Update etapes and resps. Invalidate cache."""
|
||||
if not cnx:
|
||||
cnx = context.GetDBConnexion()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user