From 3ff3416b3928546d3b1cdf5865eea6e731a67c61 Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Thu, 20 Apr 2023 20:44:38 +0200 Subject: [PATCH] Changement sur la comparaison d'adresse. --- custom_popup.py | 8 ++++---- main.py | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/custom_popup.py b/custom_popup.py index 88cea99..5227921 100644 --- a/custom_popup.py +++ b/custom_popup.py @@ -35,8 +35,8 @@ class Check_addresses_popup(Toplevel): self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Nom:", str1=item_1['lastname'], str2=item_2.lastName) self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Prénom:", str1=item_1['firstname'], str2=item_2.firstName) self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Date de naissance:", str1=datetime.strptime(item_1['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y"), str2=item_2.birth) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Adresse:", str1=f"{item_1['street']} {item_1['street_number']}", str2=item_2.street) - self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Complément:", str1=f"{item_1['complement']}", str2=item_2.street_cpl) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Adresse:", str1=f"{item_1['street'].strip()} {item_1['street_number'].strip()}", str2=item_2.street.strip()) + self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="Complément:", str1=f"{item_1['complement'].strip()}", str2=item_2.street_cpl.strip()) self.add_compares_element(new_frame=lbf_new, old_frame=lbf_old, label="NPA/Localité:", str1=f"{item_1['postal_code']} {item_1['city']}", str2=f"{item_2.npa} {item_2.city}") @@ -44,8 +44,8 @@ class Check_addresses_popup(Toplevel): str_address_1 += item_1['lastname'].strip() str_address_1 += item_1['firstname'].strip() str_address_1 += datetime.strptime(item_1['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") - str_address_1 += f"{item_1['street']} {item_1['street_number']}" - str_address_1 += f"{item_1['complement']}" + str_address_1 += f"{item_1['street'].strip()} {item_1['street_number'].strip()}" + str_address_1 += f"{item_1['complement'].strip()}" str_address_1 += f"{item_1['postal_code']} {item_1['city']}" diff --git a/main.py b/main.py index 8df7302..337f738 100644 --- a/main.py +++ b/main.py @@ -267,8 +267,8 @@ class ClercAttrib2Biz(): o_addresse.lastName = row[9] o_addresse.firstName = row[10] o_addresse.birth = row[38] - o_addresse.street = row[11] - o_addresse.street_cpl = row[12] + o_addresse.street = row[12] + o_addresse.street_cpl = row[11] o_addresse.npa = row[13] o_addresse.city = row[15] self.addresses.add_addresse(o_addresse) @@ -390,7 +390,8 @@ class ClercAttrib2Biz(): return False if datetime.strptime(new['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") != old.birth: return False - if f"{new['street']} {new['street_number']}" != old.street: + if f"{new['street'].strip()} {new['street_number'].strip()}" != f"{old.street.strip()}": + print(f"({new['street'].strip()} {new['street_number'].strip()}) != [" + old.street.strip()+"]") return False if f"{new['postal_code']} {new['city']}" != f"{old.npa} {old.city}": return False @@ -514,12 +515,13 @@ class ClercAttrib2Biz(): - - if data.Patient["complement"] != None: + ''' + Désactivé, plus utile + if data.Patient["complement"] != None : self.a_listings["to_check"].append(data.Patient["fip_number"]) print(data.Patient["complement"]) self.logger.warning(f"Complément patient: facture N°: {data.data['id']} / {data.Patient['fip_number']}") - + ''' if data.Patient['insurance_policy_number'] == None: data.Patient['insurance_policy_number'] = f"{uuid.uuid4()}"[:15] @@ -758,7 +760,10 @@ class ClercAttrib2Biz(): csv_col.data[116] = self.ifNotNull(data.Patient["category"]) + " - " + self.ifNotNull(data.Intervention["type"]) csv_col.data[118] = data.Intervention["kilometers"] csv_col.data[135] = data.Intervention["base_name"] - csv_col.data[136] = 3 if data.Debtor["code"] != "101" else "EBILL" #code présentation de facture + if data.Debtor["code"] == "100" or data.Debtor["code"] == "101": + csv_col.data[136] = "EBILL" #code présentation de facture + else: + csv_col.data[136] = 3 #code présentation de facture csv_col.data[146] = 3 #Code méthode de payement définit à 3 csv_col.data[168] = 1 if data.Intervention["team_name"] == "Planification" else 2 csv_col.data[169] = data.Patient['insurance_policy_number']