Compare commits
3 Commits
20230421-0
...
20230425-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c198410cd3 | ||
|
|
48353c6f98 | ||
|
|
a94b2cc0d6 |
@@ -100,10 +100,10 @@ class Check_addresses_popup(Toplevel):
|
||||
value_color = "red"
|
||||
con = "*"
|
||||
|
||||
Label(new_frame, text=label, font=label_font).grid(row=self.x_row, column=0, sticky="W")
|
||||
Label(new_frame, text=con + str1 + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
|
||||
Label(old_frame, text=label, font=label_font).grid(row=self.x_row, column=0, sticky="W")
|
||||
Label(old_frame, text=con + str2 + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
|
||||
Label(new_frame, text=str(label), font=label_font).grid(row=self.x_row, column=0, sticky="W")
|
||||
Label(new_frame, text=con + str(str1) + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
|
||||
Label(old_frame, text=str(label), font=label_font).grid(row=self.x_row, column=0, sticky="W")
|
||||
Label(old_frame, text=con + str(str2) + con, fg=value_color).grid(row=self.x_row, column=1, sticky="W")
|
||||
|
||||
self.x_row += 1
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
20230421-0754
|
||||
20230425-1636
|
||||
23
main.py
23
main.py
@@ -285,14 +285,18 @@ class ClercAttrib2Biz():
|
||||
if os.path.exists(file_addresses_path):
|
||||
for record in DBF(file_addresses_path):
|
||||
o_addresse = cls_addresse()
|
||||
o_addresse.AVS = record["AD_CODE"]
|
||||
o_addresse.lastName = record["AD_NOM"]
|
||||
o_addresse.firstName = record["AD_PRENOM"]
|
||||
o_addresse.birth = record["AD_NAISSAN"]
|
||||
o_addresse.street = record["AD_RUE_2"]
|
||||
o_addresse.street_cpl = record["AD_RUE_1"]
|
||||
o_addresse.npa = record["AD_NPA"]
|
||||
o_addresse.city = record["AD_VILLE"]
|
||||
o_addresse.AVS = str(record["AD_CODE"])
|
||||
o_addresse.lastName =str( record["AD_NOM"])
|
||||
o_addresse.firstName = str(record["AD_PRENOM"])
|
||||
if record["AD_NAISSAN"] is not None:
|
||||
o_addresse.birth = datetime.strptime(str(record["AD_NAISSAN"]), "%Y-%m-%d").strftime("%d.%m.%Y")
|
||||
|
||||
else:
|
||||
o_addresse.birth = ""
|
||||
o_addresse.street =str( record["AD_RUE_2"])
|
||||
o_addresse.street_cpl =str( record["AD_RUE_1"])
|
||||
o_addresse.npa =str( record["AD_NPA"])
|
||||
o_addresse.city = str(record["AD_VILLE"])
|
||||
self.addresses.add_addresse(o_addresse)
|
||||
logging.warning(f"Chargement du fichier adresses.dbf terminé ! {len(self.addresses.items)} adresses trouvées ")
|
||||
else:
|
||||
@@ -548,8 +552,11 @@ class ClercAttrib2Biz():
|
||||
if self.check_addresses.get():
|
||||
addresses_exist = self.addresses.get_item_by_AVS(data.Patient['insurance_policy_number'].replace(".", ""))
|
||||
if addresses_exist is not None and not self.compare_old_and_new_adresses(new=data.Patient, old=addresses_exist):
|
||||
|
||||
popup = Check_addresses_popup(self.fenetre, item_1=data.Patient, item_2=addresses_exist, debitor=data.Debtor, factureID=data.data['id'])
|
||||
b_address_update = popup.show()
|
||||
self.logger.warning(
|
||||
f"Adresse connue donnée attrib conservé: [{b_address_update}]: {data.data['id']} / {data.Patient['fip_number']} {data.Debtor['code']} {data.Debtor['lastname']} {data.Debtor['firstname']}")
|
||||
print(f"Result Popup: {b_address_update}")
|
||||
else:
|
||||
b_address_update = True
|
||||
|
||||
@@ -1 +1 @@
|
||||
VERSION = "20230421-0754"
|
||||
VERSION = "20230425-1636"
|
||||
Reference in New Issue
Block a user