diff --git a/printing/templates/proprio b/printing/templates/proprio index b7bfc51..66d2fca 100644 --- a/printing/templates/proprio +++ b/printing/templates/proprio @@ -10,9 +10,6 @@ {{"Mail de secours : "|coul('gras')}}{{o.mailExt|join(', ')}} {% endif %} {% block proprio %}{% endblock %} -{% if brassage %} -{{"Brassage : "|coul('gras')}}{{brassage}} -{% endif %} {% include 'blacklists' %} {{machines}} diff --git a/printing/templates/templates.py b/printing/templates/templates.py index 64a6268..30b8252 100644 --- a/printing/templates/templates.py +++ b/printing/templates/templates.py @@ -33,9 +33,10 @@ def try_import(lib): lib = None return lib - def prise_etat(chbre): """Récupère l'état d'une prise""" + if chbre in ["????", "EXT"]: + return style(u"Aucune adresse connue", "violet") bat = chbre[0].lower() chbre = chbre[1:] prise = gestion.annuaires_pg.chbre_prises(batiment=bat, chambre=chbre) @@ -277,8 +278,6 @@ def proprio(proprio, params): cetud = style(u"Pas de carte d'étudiant") params["cetud"] = cetud params['etat_administratif']=etat_administratif - if proprio["chbre"][0].value not in ["????", "EXT"]: - params['brassage'] = style("Cr@ns", "bleu")# if gestion.annuaires_pg.is_crans(proprio["chbre"][0].value[0], proprio["chbre"][0].value[1:]) else style("CROUS", "jaune") try: if proprio.machines():