From 0907ab98d306c9ef5705c3ec75a15ffe9a2df77a Mon Sep 17 00:00:00 2001 From: Hamza Dely Date: Fri, 7 Aug 2015 02:00:09 +0200 Subject: [PATCH] =?UTF-8?q?[gestion]=20Adaptation=20de=20chambres=5Fvides?= =?UTF-8?q?=20pour=20les=20d=C3=A9m=C3=A9nagements=20par=20intranet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/chambres_vides.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gestion/chambres_vides.py b/gestion/chambres_vides.py index 369d9e9c..950623b6 100755 --- a/gestion/chambres_vides.py +++ b/gestion/chambres_vides.py @@ -54,7 +54,7 @@ def get_kickout(adh): def warn_or_delete(smtp, clandestin, fail, done): """Avertit l'adhérent ou supprime ses machines si nécessaire""" date, exchambre = get_kickout(clandestin) - + # Date de suppression prévue date_suppr = date + delai*DAY @@ -72,16 +72,28 @@ def warn_or_delete(smtp, clandestin, fail, done): mail_addr = clandestin.get_mail() if not clandestin.machines() or not mail_addr: return # Si pas de machine, on s'en fout. Si pas de mail, inutile + try: + data = { + 'dn': clandestin.dn.split(',')[0], + 'when': now.strftime('%Y/%M/%D %H:%m:%S:%s'), + 'chbre' : exchambre, + } + chbre_url = mail_module.validation_url('demenagement', data, True) + chbre_url_error = u"" + except Exception as error: + chbre_url_error = u"[[erreur de génération: %r]]" % error + chbre_url = u"" data = { "from" : RESP, "chambre" : exchambre, "jours" : (date_suppr - now).days+1, "to" : mail_addr, "adh": clandestin, + "chbre_url" : chbre_url, + "chbre_url_error" : chbre_url_error, "lang_info": "English version below", } - mail = mail_module.generate('demenagement', data) - smtp.sendmail(RESP, [mail_addr], mail.as_string()) + smtp.send_template('demenagement', data) def format_entry(m): """Renvoie une ligne de tableau, pour une machine"""