Einige Anpassungen 2024

.gitignore

@@ -1,3 +1,4 @@
+.venv/
 save/
 __pycache__
 .~lock.*

requirements.txt

@@ -1,5 +1,7 @@
-Flask>=2.2.0
 beautifulsoup4
+Flask>=2.2.0
+flask_cors
+ldap3
 pandas
-sqlalchemy
-zipfile
+plac
+sqlalchemy

webservice/csv_accounts.py

@@ -41,7 +41,7 @@ def actuals(period):
     df["YTDQ"] = np.where(df["Bookkeep_Period"] <= period, df["CYQ"], 0)
     df["FC"] = df["YTD"] * 12 / month_no
     df["FCQ"] = df["YTDQ"] * 12 / month_no
-    df.drop(columns=["Menge", "Betrag"], inplace=True)
+    df.drop(columns=["Menge", "Betrag", "Jahr", "Bookkeep_Period"], inplace=True)
 
     # df2 = pd.pivot_table(df, values='Betrag', index=['Konto Nr', 'Betrieb Nr'],
     # columns=['Jahr'], aggfunc=np.sum, fill_value=0.0)
@@ -60,7 +60,7 @@ def actuals(period):
 
 @plac.pos("year", "", type=str)
 def planning_prev(year):
-    base_dir = Path.cwd().parent
+    base_dir = Path.cwd()  # .parent
     print(base_dir)
     df1 = pd.read_csv(
         base_dir / f"data/Planner_{year}_V1_Plan.csv",

webservice/file_io.py

@@ -41,7 +41,7 @@ def list_json():
 def list_dict():
     result = {"list": [], "tree": {}}
     for currentFile in save_dir.iterdir():
-        if currentFile.is_file() and currentFile.name[-5:] == ".json":
+        if currentFile.is_file() and currentFile.name[-5:] == ".json" and currentFile.name[:2] == "20":
             year, version, timestamp = currentFile.name[:-5].split("_")
             if year not in result["tree"]:
                 result["tree"][year] = {}

webservice/plan_export.py

@@ -118,5 +118,6 @@ if __name__ == "__main__":
     # export_plan('V3', '2021', 'Plan')
     # export_plan('V3', '2021', 'Stk')
     filename = "../save/2023_V1_20230214225753"
-    export_plan(filename, "V1", "2023", "Plan")
-    export_plan(filename, "V1", "2023", "Stk")
+    filename = "../save/2024_V1_20240119104555"
+    export_plan(filename, "V1", "2024", "Plan")
+    export_plan(filename, "V1", "2024", "Stk")

webservice/planner_load.py

@@ -1,4 +1,4 @@
-from plan_values2 import VALUES2_MAPPING
+from webservice.plan_values2 import VALUES2_MAPPING
 
 import json
 from pathlib import Path