[mac_prises] Oups.
This commit is contained in:
parent
9b8bf60a0a
commit
d91798fb06
1 changed files with 10 additions and 1 deletions
|
@ -122,8 +122,11 @@ def summary():
|
||||||
liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil']))
|
liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil']))
|
||||||
else:
|
else:
|
||||||
liste_triee[entry['mac']][entry['type']][chbres] = []
|
liste_triee[entry['mac']][entry['type']][chbres] = []
|
||||||
|
liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil']))
|
||||||
else:
|
else:
|
||||||
liste_triee[entry['mac']][entry['type']] = {}
|
liste_triee[entry['mac']][entry['type']] = {}
|
||||||
|
liste_triee[entry['mac']][entry['type']][chbres] = []
|
||||||
|
liste_triee[entry['mac']][entry['type']][chbres].append((entry['date'], entry['rapport'], entry['seuil']))
|
||||||
|
|
||||||
for mac, ltype in liste_triee.items():
|
for mac, ltype in liste_triee.items():
|
||||||
data = []
|
data = []
|
||||||
|
@ -138,7 +141,10 @@ def summary():
|
||||||
data += [[dtype, ", ".join(list(chbres)), donnee[0], donnee[1], donnee[2]] for donnee in dataframe]
|
data += [[dtype, ", ".join(list(chbres)), donnee[0], donnee[1], donnee[2]] for donnee in dataframe]
|
||||||
output += u'Sur le relevé %s, la mac est apparue %s fois. Elle est apparue dans les chambres suivantes : %s.\n' % (dtype, number, ", ".join(list(chambres)))
|
output += u'Sur le relevé %s, la mac est apparue %s fois. Elle est apparue dans les chambres suivantes : %s.\n' % (dtype, number, ", ".join(list(chambres)))
|
||||||
output += u'Consulter les logs (en PJ) pour plus d\'informations.\n\n'
|
output += u'Consulter les logs (en PJ) pour plus d\'informations.\n\n'
|
||||||
|
try:
|
||||||
maxlen = max([len(a[1]) for a in data]) + 4
|
maxlen = max([len(a[1]) for a in data]) + 4
|
||||||
|
except ValueError:
|
||||||
|
maxlen = 4
|
||||||
titres = (u'relevé', u'chambres', u'date', u'rapport', u'seuil')
|
titres = (u'relevé', u'chambres', u'date', u'rapport', u'seuil')
|
||||||
alignements = ('c', 'c', 'c', 'c', 'c')
|
alignements = ('c', 'c', 'c', 'c', 'c')
|
||||||
largeurs = (12, maxlen, 20, 10, 10)
|
largeurs = (12, maxlen, 20, 10, 10)
|
||||||
|
@ -215,6 +221,9 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
Logs = Logs.encode('UTF-8')
|
Logs = Logs.encode('UTF-8')
|
||||||
output = output.encode('UTF-8')
|
output = output.encode('UTF-8')
|
||||||
|
if "--debug" in sys.argv or "debug" in sys.argv:
|
||||||
|
print output
|
||||||
|
sys.exit(0)
|
||||||
message = """From: %(from)s
|
message = """From: %(from)s
|
||||||
To: %(to)s
|
To: %(to)s
|
||||||
Subject: Résumé quotidien : mac_prises.
|
Subject: Résumé quotidien : mac_prises.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue