diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index b78b42b3..ca3fe0ba 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -213,13 +213,14 @@ for elupload, eltype, elid in uploadeurs: fichier = strftime('%Y-%m-%d-%H-%M') + '-' + proprio.Nom().lower().replace(' ','-') # création du fichier tex + format_date = '%A %d %B %Y' template = file(dossier + 'deconnexion_upload.tex').read() template = template.replace('~prenom~',proprio.prenom().encode('iso8859-15')) template = template.replace('~nom~',proprio.nom().encode('iso8859-15')) template = template.replace('~chambre~',proprio.chbre().encode('iso8859-15')) template = template.replace('~mail~',proprio.email().encode('iso8859-15')) - template = template.replace('~debut~',proprio.prenom().encode('iso8859-15')) - template = template.replace('~fin~',proprio.prenom().encode('iso8859-15')) + template = template.replace('~debut~',strftime(format_date,localtime())) + template = template.replace('~fin~',strftime(format_date,localtime(time()+15*86400))) historique = [ bl.encode('iso-8859-15').split(',') for bl in proprio.blacklist() if bl.split(',')[2]=='autodisc' ] # filtrage des autodisc historique = [ (strftime('%A %d %B %Y',strptime(bl[0],'%d/%m/%Y %H:%M')), bl[-1].split(' ')[-2]) for bl in historique ] # transfomation en tupple (date, upload) historique = [ '%s & %s & Mo'%(bl[0],bl[1]) for bl in historique ] # tranformation en ligne @@ -229,7 +230,7 @@ for elupload, eltype, elid in uploadeurs: file(dossier+fichier+'.tex','w').write(template) # compilation - commands.getstatusoutput('PATH="/bin:/usr/bin" cd %(dossier)s && latex %(base)s.tex && dvips %(base)s.ps && rm -f %(base)s.dvi %(base)s.aux %(base)s.log %(base)s.tex'%{'dossier':dossier,'base':fichier}) + print commands.getstatusoutput('PATH="/bin:/usr/bin" cd %(dossier)s && latex %(base)s.tex && dvips %(base)s.dvi && rm -f %(base)s.dvi %(base)s.aux %(base)s.log %(base)s.tex'%{'dossier':dossier,'base':fichier}) # envoie du mail à disconnect corps = upload.message_disconnect_multi % {'from':upload.expediteur, 'to':upload.expediteur, 'nbdeco':nb_decos, 'proprio':proprio.Nom(), 'ps':dossier+fichier+'.ps'}