fix row and import new travel data

mrzaizai2k · Oct 11, 2024 · 8cd9da3 · 8cd9da3
1 parent cffbb5d
commit 8cd9da3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/config/data2.json b/config/data2.json
@@ -9,7 +9,7 @@
         "fixed_lines": [
             {
                 "title": "Hotel",
-                "amount": 412.5,
+                "amount": 0,
                 "payment_method": "self paid",
                 "with_breakfast": true,
                 "can_book_again": true

diff --git a/config/data3.json b/config/data3.json
@@ -1,6 +1,6 @@
 {
     "invoice_info": {
-        "name": "Stiboy Dirk",
+        "name": "Tümmler Dirk",
         "project_number": "V240045",
         "customer": "Magua",
         "city": "Krakau",

diff --git a/config/data4.json b/config/data4.json
@@ -1,6 +1,6 @@
 {
     "invoice_info": {
-        "name": "Stiboy Dirk",
+        "name": "Tümmler Dirk",
         "project_number": "V240045",
         "is_in_egw": true,
         "currency": "EUR",

diff --git a/config/travel_expenses-2024.xlsx b/config/travel_expenses-2024.xlsx
diff --git a/src/export_excel/importData.py b/src/export_excel/importData.py
@@ -284,7 +284,7 @@ def handle_add_service(json_data, excel_des_path, sheet_name):
 
     # Handle with hotel
     for fixed_line in json_data['fixed_lines']:
-        if fixed_line['title'] == 'Hotel':
+        if fixed_line['title'] == 'Hotel' and float(fixed_line['amount']) != 0.0:
             if fixed_line['payment_method'] == 'self paid':
                 value_to_write = fixed_line['amount']
                 cell = f'E{line}'
@@ -376,12 +376,13 @@ def fix_date_with_hotel(excel_des_path, sheet_name, line):
     '''
     Fixed date if hotel enable
     '''
+    row = line
     last_line = get_last_row(excel_des_path, sheet_name, 'A', line)
 
     value_to_write = 24
     cell = f'C{line}'
     write_data(excel_des_path, sheet_name, cell, value_to_write)
-
+    
     for row in range(line + 1, last_line - 1):
         value_to_write = 0
         cell = f'B{row}'

diff --git a/src/export_excel/main.py b/src/export_excel/main.py
@@ -171,6 +171,7 @@ def export_json_to_excel(invoice_pairs: list[tuple[dict, dict]], logger=None):
 
     # print(invoice_1['invoice_info'])
     # print(invoice_2['invoice_info'])
+
     for i in range(2):
         employee_expense_report_path, output_2_excel = export_json_to_excel(invoice_pairs =[(invoice_1, invoice_2), (invoice_1_b, invoice_2_b)],)
         print("employee_expense_report_path, output_2_excel", employee_expense_report_path, output_2_excel)

diff --git a/src/mail.py b/src/mail.py
@@ -120,14 +120,14 @@ def _attach_files(self, message, attachment_paths):
     config = read_config(path=config_path)
     email_sender = EmailSender(config=config, logger=None)
 
-    # email_sender.send_email(
-    #     email_type="modify_invoice_remind",
-    #     receivers=None,
-    #     # attachment_paths=["output/Stdi_08_24.xlsx", "output/1.4437_10578_A3DS GmbH_04_2024 .xlsm"],  # List of file paths
-    # )
-
     email_sender.send_email(
-        email_type="send_excel",
-        receivers=["[email protected]"],
-        attachment_paths=["output/Stdi_08_24.xlsx", "output/1.4437_10578_A3DS GmbH_04_2024 .xlsm", "notfoundfile.txt", "output/Tüdi_08_24.xlsx"],  # List of file paths
-    )
+        email_type="modify_invoice_remind",
+        receivers=None,
+        # attachment_paths=["output/Stdi_08_24.xlsx", "output/1.4437_10578_A3DS GmbH_04_2024 .xlsm"],  # List of file paths
+    )
+
+    # email_sender.send_email(
+    #     email_type="send_excel",
+    #     receivers=["[email protected]"],
+    #     attachment_paths=["output/Stdi_08_24.xlsx", "output/1.4437_10578_A3DS GmbH_04_2024 .xlsm", "notfoundfile.txt", "output/Tüdi_08_24.xlsx"],  # List of file paths
+    # )