.gitignore

@@ -4,7 +4,6 @@ dist/
 InputFiles/
 __pycache__/
 2023/
-ilr_test/
 
 *.lnk
 *.spec

create_dir_schema.py

@@ -1,61 +0,0 @@
-from pathlib import Path
-from dataclasses import dataclass
-import os
-from datetime import datetime, timedelta, date
-
-import shutil as sh
-
-class Report:
-
-    def __init__(self, sample_file: str, sample_folder: str):
-        self.sample_file: Path = Path(sample_file)
-        self.folder_name: Path = Path(sample_folder)
-
-    def create_record(self, location: Path) -> Path|None:
-
-        # Create the folder
-        fp = Path(location, self.folder_name)
-        
-
-
-def main():
-
-    folders = [
-        Report(r"InputFiles\2022.09.02_ACH_C", r"ACH"),
-        Report(r"InputFiles\2022.09.02_PROGPAY_BER", r"CHECKS LIVE"),
-        Report(r"InputFiles\2022.09.01_VMCC_BER", r"CREDIT CARDS"),
-        Report(r"InputFiles\2022.09.02_DISPOSITION_PM_C", r"DISPOSITION REPORTING"),
-        Report(r"InputFiles\2022.09.02_LOCKBOX_094_C", r"LOCKBOX"),
-        Report(r"InputFiles\2022.09.02_PBP_EPAY_DPS_BER", r"PAY BY PHONE"),
-        Report(r"InputFiles\2022.12.30_PBP_EPAY_RETURNS_BER", r"RETURN REPORTING"),
-        Report(r"InputFiles\2022.09.01_PUB_WIRES_BER", r"WIRES"),   
-    ]
-
-    folder_date = date(2023,1,1)
-
-    while folder_date < date(2024,1,1):
-
-        year = folder_date.strftime("%Y")
-        month = folder_date.strftime("%Y.%m")
-        day = folder_date.strftime("%Y.%m.%d")
-
-        date_path = Path(year, month, day)
-
-        for rp in folders:
-
-
-            # Create folder
-            fold_p = Path(date_path, rp.folder_name)
-            print(f"Creating filepath: {fold_p}")
-            os.makedirs(fold_p, exist_ok=True)
-
-            file_p = Path(fold_p, rp.sample_file.name)
-            print(f"Cp {rp.sample_file} into {file_p}")
-
-            sh.copyfile(rp.sample_file, file_p )
-
-        folder_date += timedelta(days=1)
-
-if __name__ == "__main__":
-
-    main()

report_config_termplate.toml

@@ -0,0 +1 @@
+name = "Test Name"

settings.toml

@@ -1,14 +1,14 @@
 debug = true
-consolidatedBasePath = ""
+consolidatedBasePath = '\\leafnow.com\shared\Accounting\CASH APPS\2023'
 
 [defaultLocations]
-ach = "//leafnow.com/shared/Business Solutions/Griff/Code/InfoLeaseExtract/2023/2023.03/2023.03.01/ACH"
+ach = ''
-disp = ""
+disp = ''
-gl = ""
+gl = ''
-lb = "//leafnow.com/shared/Business Solutions/Griff/Code/InfoLeaseExtract/2023/2023.03/2023.03.01/LOCKBOX"
+lb = ''
-minv = ""
+minv =''
-niv = ""
+niv = ''
-ren = ""
+ren = ''
-pymt = ""
+pymt = ''
-uap = ""
+uap =''
-pastdue = ""
+pastdue = ''

src/il_extract.py

@@ -2,25 +2,20 @@ from ui_ile_main_window import Ui_MainWindow
 import sys
 import os 
 import pandas as pd 
+import json
 from PyQt5 import QtWidgets
 from datetime import datetime as dt
 import il_reports as ilx #TODO redo aliasing
-from logging import debug, DEBUG, basicConfig, exception, warn
+from logging import debug, DEBUG, basicConfig, exception
 from tomllib import load
 from tomli_w import dump
-from shutil import copyfile
-from pathlib import Path
-from getpass import getuser
 
 with open("settings.toml", mode='rb') as s:
     settings = load(s)
     #if settings["debug"]:
-    basicConfig(filename='debug.log', mode='w', encoding='utf-8', 
+    basicConfig(filename='debug.log', mode='w', encoding='utf-8', level=DEBUG)
-        level=DEBUG,
-        format="%(asctime)s %(message)s",        
-    )
 
-debug("\n\n\n########################### VERSION = 3.4 ###########################\n\n\n")
+debug("\n\n\n########################### VERSION = 3.3 ###########################\n\n\n")
 debug("Running main.py...")
 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
     """
@@ -312,21 +307,3 @@ if __name__ == "__main__":
         app.exec()
     except Exception as e:
         exception(f"HIGH LEVEL EXECPTION: {e}")
-    finally:
-        log_path = Path(os.curdir,'debug.log')
-        
-        remote_log_folder = Path(
-            r"\\leafnow.com\public\Business Solutions\Apps\AppSources\Logging\ILE", 
-        )
-        if not remote_log_folder.exists:
-            os.mkdir(remote_log_folder)
-        
-        rlog_file = f"{getuser()}_ile.log"
-
-        try:
-            copyfile(
-                log_path,
-                Path(remote_log_folder, rlog_file)
-            )
-        except Exception as e:
-            warn(f"Failed to save remote log: {remote_log_folder}/{rlog_file}!")

src/il_reports.py

@@ -11,7 +11,7 @@ from hashlib import md5
 import openpyxl as pxl
 from tomllib import load
 
-# V3.4 | 06/15/23
+# V332 | 05/24/23
 
 with open("settings.toml", mode='rb') as s:
     settings = load(s)
@@ -76,7 +76,7 @@ class ILReport:
         if dataframe.empty:
             warn(f"ILReport: resulting dataframe was empty! Exiting with None.")
             return dataframe
-        self._append_to_consolidated_report(dataframe)
+        self._append_to_consolidated_report(dataframe, settings["consolidatedBasePath"])
         return dataframe
     
     def _append_to_consolidated_report(self, dataframe_to_append: DataFrame,
@@ -126,6 +126,7 @@ class ILReport:
             else:
                 month_dir = reports_base_path
 
+            
         
         report_name: Path = Path(f"{report_month} ConsolidatedReport.xlsx")
         debug(f"{month_dir=}")
@@ -133,6 +134,7 @@ class ILReport:
         save_path = Path(month_dir, report_name)
         debug(f"Consolidated Report {save_path=}")   
         
+        
         consolidated_df = dataframe_to_append.copy(deep=True)
         consolidated_df["ExtractDate"] = report_date
         consolidated_df.fillna('--', inplace=True)

todo.md

@@ -8,10 +8,10 @@
    - [X] LOCKBOX
    - [X] PAY BY PHONE
    - [X] WIRES
-   - [X] RETURNS ACH
+   - [ ] RETURNS ACH
-   - [X] RETURNS Portal *(new addition)*
+   - [ ] RETURNS Portal *(new addition)*
 
-- [X] Adjust pyinstaller spec for new file structure
+- [ ] Adjust pyinstaller spec for new file structure
 
 - [ ] Function to recap year
 - [ ] Fix Logging
@@ -33,5 +33,7 @@ Generate monthly consolidated reports for each month in a year
 - [ ] Simpify & standardize row/data parsing
 
 
+## Completed last commit
+
 
 ---