CLERC/AttribWinbiz
5
0
Fork 0
Code Issues Pull Requests Releases 52 Wiki Activity

Débug des virgule dans adresse de PEC et adresse DEST + ajout des KM

Browse Source
This commit is contained in:
Ambulance Clerc
2022-05-30 10:57:06 +02:00
parent a56cc4bc1c
commit 3567b6942f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.py
View File

@@ -500,6 +500,7 @@ class ClercAttrib2Biz():
if data.Intervention["destination_name"] is not None: if data.Intervention["destination_name"] is not None:
concat_str += con + data.Intervention["destination_name"] concat_str += con + data.Intervention["destination_name"]
con = ", " con = ", "
if data.Intervention["destination_street"] is not None:
concat_str += con + data.Intervention["destination_street"] + " " + self.ifNotNull(data.Intervention["destination_street_number"]) concat_str += con + data.Intervention["destination_street"] + " " + self.ifNotNull(data.Intervention["destination_street_number"])
con = ", " con = ", "
concat_str += con + data.Intervention["destination_postal_code"] + " " + data.Intervention["destination_city"] concat_str += con + data.Intervention["destination_postal_code"] + " " + data.Intervention["destination_city"]
@@ -510,6 +511,7 @@ class ClercAttrib2Biz():
if data.Intervention["site_name"] is not None: if data.Intervention["site_name"] is not None:
concat_str += con + data.Intervention["site_name"] concat_str += con + data.Intervention["site_name"]
con = ", " con = ", "
if data.Intervention["site_street"] is not None:
concat_str += con + self.ifNotNull(data.Intervention["site_street"]) + " " + self.ifNotNull(data.Intervention["site_street_number"]) concat_str += con + self.ifNotNull(data.Intervention["site_street"]) + " " + self.ifNotNull(data.Intervention["site_street_number"])
con = ", " con = ", "
concat_str += con + self.ifNotNull(data.Intervention["site_postal_code"]) + " " + self.ifNotNull(data.Intervention["site_city"]) concat_str += con + self.ifNotNull(data.Intervention["site_postal_code"]) + " " + self.ifNotNull(data.Intervention["site_city"])
@@ -651,6 +653,7 @@ class ClercAttrib2Biz():
csv_col.data[107] = data.Patient["fip_number"] csv_col.data[107] = data.Patient["fip_number"]
csv_col.data[107] += " - " + data.data["comments"] if data.data["comments"] is not None else "" csv_col.data[107] += " - " + data.data["comments"] if data.data["comments"] is not None else ""
csv_col.data[116] = self.ifNotNull(data.Patient["category"]) + " - " + self.ifNotNull(data.Intervention["type"]) csv_col.data[116] = self.ifNotNull(data.Patient["category"]) + " - " + self.ifNotNull(data.Intervention["type"])
csv_col.data[117] = data.Intervention["kilometers"]
csv_col.data[135] = data.Intervention["base_name"] csv_col.data[135] = data.Intervention["base_name"]
csv_col.data[136] = 2 if data.Intervention["base_name"] == "Uvrier" else 3 csv_col.data[136] = 2 if data.Intervention["base_name"] == "Uvrier" else 3
csv_col.data[146] = csv_col.data[136] csv_col.data[146] = csv_col.data[136]