débug comparaison de l'adresse de livraison

class_addresses.py

@@ -7,6 +7,7 @@ class cls_Addresses:
         self.items.append(items)
     def get_item_by_AVS(self, seek):
         for item in self.items:
+
             if item.AVS == seek:
                 return item
 

class_invoices.py

@@ -16,6 +16,57 @@ class cls_Invoice:
         self.data = obj
         self.a_index = {"invoice": [], "intervention": [], "patient": [], "debtor": [], "articles": []}
         self.index_counter = 0
+        self.format_debitor_addr_2()
+    def format_debitor_addr_2(self):
+        debitor = self.Debtor
+        con = ""
+        concat_str = ""
+        if "name" in debitor.keys():
+            if debitor["name"] is not None:
+                concat_str += con + debitor["name"]
+                # con = "#chr(13)##chr(10)#"
+                con = "\n"
+
+        if debitor["gender"] is not None:
+            concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["lastname"] is not None:
+            concat_str += con + self.ifNotNull(debitor["lastname"]) + " " + self.ifNotNull(
+                debitor["firstname"])
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["complement"] is not None:
+            concat_str += con + debitor["complement"]
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["street"] is not None:
+            concat_str += con + self.ifNotNull(debitor["street"]) + " " + self.ifNotNull(
+                debitor["street_number"])
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["city"] is not None:
+            concat_str += con + self.ifNotNull(debitor["postal_code"]) + " " + self.ifNotNull(
+                debitor["city"])
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        if debitor["country_name"] != "Suisse":
+            concat_str += con + debitor["country_name"]
+            # con = "#chr(13)##chr(10)#"
+            con = "\n"
+        self.Patient["addr_2"] = concat_str
+        self.Patient["selfish"] = self.is_addr_2_selfish(self.Patient)
+    def is_addr_2_selfish(self, patient):
+        print(patient)
+        temp_addr_2 = str(patient["addr_2"]).replace("Monsieur","").replace("Madame","").replace("\n","").replace(" ","")
+        str_compare = self.ifNotNull(patient['lastname']).replace('.','') + self.ifNotNull(patient['firstname']).replace('.','') + self.ifNotNull(patient['complement']).strip()+ self.ifNotNull(patient['street']).strip() + self.ifNotNull(patient['street_number']).strip()  + self.ifNotNull(patient['postal_code']).strip()   +self.ifNotNull(patient['city']).strip()
+        str_compare = str_compare.replace(" ","")
+        print(f"is_addr_2_selfish ? {str_compare} <> {temp_addr_2} = {str_compare == temp_addr_2}")
+        return str_compare == temp_addr_2
+    def ifNotNull(self, value, ret=""):
+        if value == None or value == "None":
+            return ret
+        return value.strip()
 
 class cls_Col:
     data = []

custom_popup.py

@@ -45,45 +45,14 @@ class Check_addresses_popup(Toplevel):
         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}")
 
-        con = ""
-        concat_str = ""
-        if "name" in debitor.keys():
-            if debitor["name"] is not None:
-                concat_str += con + debitor["name"]
-                #con = "#chr(13)##chr(10)#"
-                con = "\r\n"
 
-
-        if debitor["gender"] is not None:
-            concat_str += con + "Monsieur" if debitor["gender"] == "Masculin" else con + "Madame"
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-        if debitor["lastname"] is not None:
-            concat_str += con + self.ifNotNull(debitor["lastname"]) + " " + self.ifNotNull(
-                debitor["firstname"])
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-        if debitor["complement"] is not None:
-            concat_str += con + debitor["complement"]
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-        if debitor["street"] is not None:
-            concat_str += con + self.ifNotNull(debitor["street"]) + " " + self.ifNotNull(
-                debitor["street_number"])
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-        if debitor["city"] is not None:
-            concat_str += con + self.ifNotNull(debitor["postal_code"]) + " " + self.ifNotNull(
-                debitor["city"])
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-        if debitor["country_name"] != "Suisse":
-            concat_str += con + debitor["country_name"]
-            #con = "#chr(13)##chr(10)#"
-            con = "\r\n"
-
-        self.add_compares_element(new_frame=lbf_addr_2_new, old_frame=lbf_addr_2_old, label="Adresse livraison:", str1=concat_str,
-                              str2=self.ifNotNull(item_2.addr_2))
+        if int(debitor["code"]) < 100:
+            if item_1["selfish"]:
+                force_color = "green"
+            else:
+                force_color = None
+            self.add_compares_element(new_frame=lbf_addr_2_new, old_frame=lbf_addr_2_old, label="Adresse livraison:", str1=item_1["addr_2"],
+                              str2=self.ifNotNull(item_2.addr_2),force_color_1=force_color)
 
 
         str_address_1 += item_1['insurance_policy_number'].replace('.', '')
@@ -139,19 +108,23 @@ class Check_addresses_popup(Toplevel):
             return ret
         return value.strip()
 
-    def add_compares_element(self,new_frame, old_frame,str1, str2, label):
+    def add_compares_element(self,new_frame, old_frame,str1, str2, label, force_color_1=None):
         label_font = font.Font(weight='bold', size=9)
 
-        value_color = "black"
+        value_color_1 = "black"
+        value_color_2 = "black"
         con = ""
         if str1 != str2:
-            value_color = "red"
+            value_color_1 = "red"
+            value_color_2 = "red"
             con = "*"
+        if force_color_1 is not None:
+            value_color_1 = force_color_1
 
         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(new_frame, text=con + str(str1) + con, fg=value_color_1, anchor="w",  justify=LEFT).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")
+        Label(old_frame, text=con + str(str2) + con, fg=value_color_2, anchor="w", justify=LEFT).grid(row=self.x_row, column=1, sticky="W")
 
         self.x_row += 1
 

dl_version

@@ -1 +1 @@
-20230616-1615
+20230620-1544

main.py

@@ -289,7 +289,6 @@ class ClercAttrib2Biz():
         file_addresses_path = os.path.join(temp_dir, f"adresses.dbf")
         if os.path.exists(file_addresses_path):
             for record in DBF(file_addresses_path, load=True):
-
                 o_addresse = cls_addresse()
                 o_addresse.AVS = str(record["AD_CODE"])
                 o_addresse.lastName =str( record["AD_NOM"])
@@ -303,7 +302,7 @@ class ClercAttrib2Biz():
                 o_addresse.street_cpl =str( record["AD_RUE_1"])
                 o_addresse.npa =str( record["AD_NPA"])
                 o_addresse.city = str(record["AD_VILLE"])
-                o_addresse.addr_2 = str(record["AD_ADR2"])
+                o_addresse.addr_2 = str(record["AD_ADR2"]).replace("\r\n","\n")
                 self.addresses.add_addresse(o_addresse)
             logging.warning(f"Chargement du fichier adresses.dbf terminé ! {len(self.addresses.items)} adresses trouvées ")
         else:
@@ -397,25 +396,39 @@ class ClercAttrib2Biz():
 
         return ret
 
-    def compare_old_and_new_adresses(self, new, old):
-
-        if new['insurance_policy_number'].replace('.','') != old.AVS:
+    def compare_old_and_new_adresses(self, new, old, code):
+        print(f"compare_old_and_new_adresses ")
+        if self.ifNotNull(new['insurance_policy_number']).replace('.','') != old.AVS:
+            print("compare adresse exit avs")
             return False
-        if new['lastname'].replace('.','') != old.lastName:
+        if self.ifNotNull(new['lastname']).replace('.','') != old.lastName:
+            print("compare adresse exit lastname")
             return False
-        if new['firstname'].replace('.','') != old.firstName:
+        if self.ifNotNull(new['firstname']).replace('.','') != old.firstName:
+            print("compare adresse exit firstname")
             return False
-        if datetime.strptime(new['birthdate'], "%Y-%m-%d").strftime("%d.%m.%Y") != old.birth:
+        if datetime.strptime(self.ifNotNull(new['birthdate']), "%Y-%m-%d").strftime("%d.%m.%Y") != old.birth:
+            print("compare adresse exit date")
             return False
-        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()+"]")
+        if f"{self.ifNotNull(new['street']).strip()} {self.ifNotNull(new['street_number']).strip()}" != f"{self.ifNotNull(old.street).strip()}":
+            print(f"compare adresse exit ({self.ifNotNull(new['street']).strip()} {self.ifNotNull(new['street_number']).strip()}) != [" + self.ifNotNull(old.street).strip()+"]")
             return False
-        if f"{new['postal_code']} {new['city']}" != f"{old.npa} {old.city}":
+        if f"{self.ifNotNull(new['postal_code'])} {self.ifNotNull(new['city'])}" != f"{self.ifNotNull(old.npa)} {self.ifNotNull(old.city)}":
+            print("compare adresse exit city")
             return False
-
+        if new["addr_2"] != old.addr_2 and int(code) < 100:
+            if not new["selfish"]:
+                print(f"Exit selfish")
+                return False
+            if old.addr_2 != "None":
+                print(f"Exit addr_2 = {old.addr_2}/{new['selfish']}")
+                print(old.addr_2 != "None")
+                return False
+        print("return True (same)")
         return True
 
 
+
     def parseFile(self, data, filename):
         self.progress_bar["value"] = 0
         self.index_counter += 1
@@ -545,7 +558,7 @@ 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):
+                if addresses_exist is not None and not self.compare_old_and_new_adresses(new=data.Patient, old=addresses_exist, code=data.Debtor['code']):
 
                     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()
@@ -644,39 +657,7 @@ class ClercAttrib2Biz():
                         print("NON mise à jour de l'adresse")
 
                     if int(data.Debtor["code"]) > 1:
-                        con = ""
-                        concat_str = ""
-                        if "name" in data.Debtor.keys():
-                            if data.Debtor["name"] is not None:
-                                concat_str += con + data.Debtor["name"]
-                                con = "#chr(13)##chr(10)#"
-                            else:
-                                messagebox.showerror(title="Erreur nom débiteur", message=f"Le nom débiteur de la facture {data.data['id']}  est faux: [{data.Debtor['name']}], merci de le corriger ")
-
-
-                        if data.Debtor["gender"] is not None:
-                            concat_str += con +  "Monsieur" if data.Debtor["gender"] == "Masculin" else con + "Madame"
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["lastname"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["lastname"]) + " " + self.ifNotNull(data.Debtor["firstname"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["complement"] is not None:
-                            concat_str += con + data.Debtor["complement"]
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["street"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["street"]) + " " + self.ifNotNull(data.Debtor["street_number"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["city"] is not None:
-                            concat_str += con + self.ifNotNull(data.Debtor["postal_code"]) + " " + self.ifNotNull(data.Debtor["city"])
-                            con = "#chr(13)##chr(10)#"
-                        if data.Debtor["country_name"] != "Suisse":
-                            concat_str += con + data.Debtor["country_name"]
-                            con = "#chr(13)##chr(10)#"
-
-
-
-
-                        csv_col.data[42] = concat_str #Adresse de livraison
+                        csv_col.data[42] = data.Patient["addr_2"].replace("\n", "#chr(13)##chr(10)#") #Adresse de livraison
                 else:
                     csv_col.data[19] = data.Debtor["code"]  # Code adresse à récupérer dans recherche d'adresse automatisée
                     csv_col.data[22] = data.Debtor["lastname"]

version.py

@@ -1 +1 @@
-VERSION = "20230616-1615"
+VERSION = "20230620-1544"