Fixed Formatting issues with output JSON

app.py

@@ -24,27 +24,32 @@ def create_excel_file():
 def read_excel_file(uploaded_file, sheet_name):
     return pd.read_excel(uploaded_file, sheet_name=sheet_name)
 
+def format_value(value):
+    if pd.notna(value):
+        if isinstance(value, (int, float)):
+            return f"{value:.0f}"
+        return str(value)
+    return ""
+
 def generate_output(df, check_pointer, sheet_name):
     output_lines = []
     for _, row in df.iterrows():
-        pipedrive_value = row["pipedrive"] if pd.notna(row["pipedrive"]) else ""
-        bexio_value = row["bexio" if sheet_name != "Status" else "bexio_contact"] if pd.notna(row["bexio" if sheet_name != "Status" else "bexio_contact"]) else ""
-        comment_value = row["comment"] if pd.notna(row["comment"]) else ""
+        pipedrive_value = format_value(row["pipedrive"])
+        bexio_value = format_value(row["bexio" if sheet_name != "Status" else "bexio_contact"])
+        comment_value = format_value(row["comment"])
         
-        # Handle klicktipp_value differently for Salutation sheet
         if sheet_name != "Salutation" and "klicktipp" in df.columns:
-            klicktipp_value = row["klicktipp"] if pd.notna(row["klicktipp"]) else ""
+            klicktipp_value = format_value(row["klicktipp"])
         else:
             klicktipp_value = ""
         
         if sheet_name == "Status":
             output_line = f'{{{{if(contains({check_pointer}; {pipedrive_value}); ",{{""comment"": ""{comment_value}"",""bexio_contact"": ""{bexio_value}"",""klicktipp_id"": ""{klicktipp_value}""}}" )}}}}'
         elif sheet_name == "Salutation":
-            output_line = f'{{{{if({check_pointer} = "{pipedrive_value}"; "{{""comment"": ""{comment_value}"",""bexio_id"": ""{bexio_value}""}}")}}}}'
+            output_line = f'{{{{if({check_pointer} = "{pipedrive_value}"; ",{{""comment"": ""{comment_value}"",""bexio_salutation"": ""{bexio_value}""}}")}}}}'
         else:
-            output_line = f'{{{{if({check_pointer} = "{pipedrive_value}"; "{{""comment"": ""{comment_value}"",""bexio_id"": ""{bexio_value}"",""klicktipp_id"": ""{klicktipp_value}""}}")}}}}'
+            output_line = f'{{{{if({check_pointer} = "{pipedrive_value}"; ",{{""comment"": ""{comment_value}"",""bexio_id"": ""{bexio_value}"",""klicktipp_id"": ""{klicktipp_value}""}}")}}}}'
         output_lines.append(output_line)
-    
     return "\n".join(output_lines)
 
 def main():
@@ -70,17 +75,17 @@ def main():
             sheets = ["Status", "Teacher", "Location", "Billing", "Salutation"]
             check_pointers = [check_pointer_status, check_pointer_teacher, check_pointer_location, check_pointer_billing, check_pointer_salutation]
             
-            combined_results = []
+            all_output_lines = []
             for sheet, check_pointer in zip(sheets, check_pointers):
                 df = read_excel_file(uploaded_file, sheet)
                 result = generate_output(df, check_pointer, sheet)
-                combined_results.append(result)
+                all_output_lines.extend(result)  # Extend the list instead of appending
 
             final_output = f'''
 {{
   "data": [
-    {{"comment": "Pipedrive","bexio_id": "88","klicktipp_id": "11093548"}},
-    {",".join(combined_results)}
+    {{"comment": "Pipedrive","bexio_id": "88","klicktipp_id": "11093548"}}
+    {"".join(all_output_lines)}
   ]
 }}
 '''