phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finaliser tests grénérer dossiers demandes de mission

Browse Source
This commit is contained in:
Phuoc
2019-08-03 10:42:32 +02:00
parent ea51d84ca2
commit b0cd27ce4f
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mondumas/models/dossier.py
View File

@@ -258,7 +258,7 @@ def insert_facture_rdf(request, societe, nochantier, user, ref, date_rapport):
query = "CALL spINS_FACTURE_RDF(:societe, :nochantier, :user, :ref, :date_rapport)" query = "CALL spINS_FACTURE_RDF(:societe, :nochantier, :user, :ref, :date_rapport)"
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'user': user, 'ref': ref, 'date_rapport': date_rapport}) execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'user': user, 'ref': ref, 'date_rapport': date_rapport})
def insert_dossier(request, mbx_name, mbx_search, logged_in, c_nom, c_adr, c_cp, c_ville, c_tel1, nosin): def insert_dossier(request, mbx_name, mbx_search, logged_in, c_nom, c_adr, c_adr2, c_cp, c_ville, c_tel1, nosin, c_obs, tx_trav):
# créer une dem_devis selon l'email de l'OS # créer une dem_devis selon l'email de l'OS
societe = mbx_name[0:2].upper() societe = mbx_name[0:2].upper()
if 'maif.fr' in mbx_search: if 'maif.fr' in mbx_search:
@@ -268,6 +268,6 @@ def insert_dossier(request, mbx_name, mbx_search, logged_in, c_nom, c_adr, c_cp,
cd_cli = 8991 cd_cli = 8991
cabinet = 289 cabinet = 289
query = """CALL spINS_DEMANDES(:societe, :cd_cli, :c_nom, :c_adr, '', :c_cp, :c_ville, :c_tel1, 'MR', :cabinet, 6, :nosin, :logged_in);""" query = """CALL spINS_DEMANDES(:societe, :cd_cli, :c_nom, :c_adr, :c_adr2, :c_cp, :c_ville, :c_tel1, 'MR', :cabinet, 6, :nosin, :c_obs, :tx_trav, :logged_in);"""
execute_query(request, query, {'societe': societe, 'cd_cli': cd_cli, 'c_nom': c_nom, 'c_adr': c_adr, 'c_cp': c_cp, 'c_ville': c_ville, execute_query(request, query, {'societe': societe, 'cd_cli': cd_cli, 'c_nom': c_nom, 'c_adr': c_adr, 'c_adr2': c_adr2, 'c_cp': c_cp,
'c_tel1': c_tel1, 'cabinet': cabinet, 'nosin': nosin, 'logged_in': logged_in}) 'c_ville': c_ville,'c_tel1': c_tel1, 'cabinet': cabinet, 'nosin': nosin, 'c_obs': c_obs, 'tx_trav': tx_trav, 'logged_in': logged_in})

31
mondumas/views/dossier.py
View File

@@ -748,8 +748,8 @@ def demandes(request):
demandes_afficher(conn, mbx_name, mbx_search, liste) demandes_afficher(conn, mbx_name, mbx_search, liste)
# lire demandes de DOMUS # lire demandes de DOMUS
mbx_search = 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier"' # mbx_search = 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier"'
demandes_afficher(conn, mbx_name, mbx_search, liste) # demandes_afficher(conn, mbx_name, mbx_search, liste)
conn.logout() conn.logout()
@@ -843,6 +843,8 @@ def demandes_generer(request, conn, mbx_name, mbx_search, liste, logged_in):
with open(filepath) as fp: with open(filepath) as fp:
cnt = 1 cnt = 1
line = fp.readline() line = fp.readline()
c_obs = ''
tx_trav = ''
while line: while line:
if line.find('Nos références') == 0: if line.find('Nos références') == 0:
line = fp.readline() line = fp.readline()
@@ -856,19 +858,36 @@ def demandes_generer(request, conn, mbx_name, mbx_search, liste, logged_in):
line = fp.readline() line = fp.readline()
c_adr = line[:-1] c_adr = line[:-1]
line = fp.readline() line = fp.readline()
c_cp = line[0:5] c_adr2 = line[:-1]
c_ville = line[6:-1] line = fp.readline()
c_adr3 = line[:-1]
# début 3ème ligne adr est un code postal ?
if to_int(c_adr3[0:5]) > 0 :
# oui, mémoriser le code postal et la ville
c_cp = c_adr3[0:5]
c_ville = c_adr3[6:]
else:
# non, le code postal et la ville se trouvent dans la 2è ligne
c_cp = c_adr2[0:5]
c_ville = c_adr2[6:]
c_adr2 = ''
if line.find('N° de téléphone :') == 0: if line.find('N° de téléphone :') == 0:
# les 10 derniers caratères # les 10 derniers caratères
c_tel1 = line[-11:-1] c_tel1 = line[-11:-1]
if 'une franchise de ' in line:
i1 = line.find('franchise de ')
i2 = line.find(' € ')
c_obs = line[i1:i2+2]
if ' pour un montant de ' in line:
i1 = line.find('pour un montant de ')
tx_trav = line[i1:-2].replace(',', '.')
# lire ligne suivante # lire ligne suivante
line = fp.readline() line = fp.readline()
cnt += 1 cnt += 1
# créer un dem_devis # créer un dem_devis
insert_dossier(request, mbx_name, mbx_search, logged_in, c_nom, c_adr, c_cp, c_ville, c_tel1, no_sinistre) insert_dossier(request, mbx_name, mbx_search, logged_in, c_nom, c_adr, c_adr2, c_cp, c_ville, c_tel1, no_sinistre, c_obs, tx_trav)
import pdb;pdb.set_trace()
return return