correction filename = none

This commit is contained in:
2020-11-25 11:58:07 +01:00
parent d03e90b7b8
commit ab0d4997eb
2 changed files with 38 additions and 33 deletions

View File

@@ -1,5 +1,5 @@
<metal:block use-macro="main_template"> <metal:block use-macro="main_template">
<div metal:fill-slot="content">logged_in <div metal:fill-slot="content">
<div id="jquery" class="container-fluid"> <div id="jquery" class="container-fluid">
<div class="row text-center"> <div class="row text-center">

View File

@@ -129,7 +129,7 @@ def dossier_view(request):
if 'form.close' in request.params: if 'form.close' in request.params:
update_dossier_cloture(request, nodossier, logged_in) update_dossier_cloture(request, nodossier, logged_in)
request.session.flash(u"Le dossier a été cloturé avec succès.", 'success') request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) return HTTPFound(location=request.route_url('demandes'))
return { return {
'page_title': "Dossier : %s" % (nodossier), 'page_title': "Dossier : %s" % (nodossier),
@@ -930,10 +930,10 @@ def demandes(request):
# récupère le nom du fichier et ajouter le no de dossier # récupère le nom du fichier et ajouter le no de dossier
filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf') filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf')
tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', 0, 'CLT', temp_file_path, filename, 'EMAIL') tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', 0, 'CLT', temp_file_path, filename, 'EMAIL')
#import pdb;pdb.set_trace()
# insérer une ligne de suivi ANNULATION # insérer une ligne de suivi ANNULATION
insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR DOMUS') insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR DOMUS')
# log de nuit
print('--> CREER DOSSIER sinistre %s <--' % nodossier)
traite = 1 traite = 1
return traite return traite
@@ -985,14 +985,14 @@ def demandes(request):
break break
# downloading attachment # downloading attachment
temp_file_path = download_pdf_to_tmp(email_message) temp_file_path = download_pdf_to_tmp(email_message)
if temp_file_path != '':
# convertir le fichier pdf en texte # si attachement existe, convertir le fichier pdf en texte
texte, extracted_file = pdf_convert_to_txt(temp_file_path) texte, extracted_file = pdf_convert_to_txt(temp_file_path)
nbLus = nbLus + 1 nbLus = nbLus + 1
# mission annulée ? # mission annulée ?
if 'Objet : ANNULATION MISSION' in texte : if 'Objet : ANNULATION MISSION' in texte :
# genere ANNULATION mission MAIF # genere ANNULATION mission MAIF
# import pdb;pdb.set_trace() #import pdb;pdb.set_trace()
n = generer_annul_maif(request, societe, extracted_file, temp_file_path) n = generer_annul_maif(request, societe, extracted_file, temp_file_path)
if n > 0: if n > 0:
nbAnnules = nbAnnules + n nbAnnules = nbAnnules + n
@@ -1001,13 +1001,14 @@ def demandes(request):
elif 'ANNULATION ORDRE DE MISSION' in texte: elif 'ANNULATION ORDRE DE MISSION' in texte:
# genere ANNULATION mission DOMUS # genere ANNULATION mission DOMUS
nosin = str(body)[84:95] nosin = str(body)[84:95]
# import pdb;pdb.set_trace() #import pdb;pdb.set_trace()
n = generer_annul_domus(request, societe, nosin, temp_file_path) n = generer_annul_domus(request, societe, nosin, temp_file_path)
if n > 0: if n > 0:
nbAnnules = nbAnnules + n nbAnnules = nbAnnules + n
# déplacer le message dans la poubelle # déplacer le message dans la poubelle
conn.store(num, '+FLAGS', '\\Deleted') conn.store(num, '+FLAGS', '\\Deleted')
else: else:
#import pdb;pdb.set_trace()
# genere le dossier d'après le mail # genere le dossier d'après le mail
n = generer_mission(request, societe, criteria, extracted_file, temp_file_path) n = generer_mission(request, societe, criteria, extracted_file, temp_file_path)
if n > 0: if n > 0:
@@ -1124,6 +1125,8 @@ def tempFile2Dossier(request, societe, nochantier, norapport, nosection, origine
insert_dossier_attaches(request, '%s-%s' % (societe, nochantier), norapport, nosection, origine, filename, '%s Ko' % str(filesize), logged_in) insert_dossier_attaches(request, '%s-%s' % (societe, nochantier), norapport, nosection, origine, filename, '%s Ko' % str(filesize), logged_in)
def download_pdf_to_tmp(email_message): def download_pdf_to_tmp(email_message):
# import pdb;pdb.set_trace()
temp_file_path = ''
# downloading attachments # downloading attachments
for part in email_message.walk(): for part in email_message.walk():
# this part comes from the snipped I don't understand yet... # this part comes from the snipped I don't understand yet...
@@ -1139,6 +1142,7 @@ def download_pdf_to_tmp(email_message):
fp = open(temp_file_path, 'wb') fp = open(temp_file_path, 'wb')
fp.write(part.get_payload(decode=True)) fp.write(part.get_payload(decode=True))
fp.close() fp.close()
return temp_file_path return temp_file_path
def pdf_convert_to_txt(path): def pdf_convert_to_txt(path):
@@ -1344,3 +1348,4 @@ def photos_size(photos):
return '%s Mo' % round(sum_size / 1024, 1) return '%s Mo' % round(sum_size / 1024, 1)