toolsos 0.3.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

toolsos/huisstijl/tables/table_helpers.py

@@ -1,76 +1,76 @@
-from pathlib import Path
+# from pathlib import Path
 
-import pandas as pd
-import win32com.client as win32
+# import pandas as pd
+# import win32com.client as win32
 
 
-def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
-    df.columns = df.columns.str.replace("_", " ")
-    return df
+# def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
+#     df.columns = df.columns.str.replace("_", " ")
+#     return df
 
 
-def get_excel_files_from_folder(folder: str) -> list[str]:
-    return [str(f.resolve()) for f in Path(folder).glob("*") if f.suffix == ".xlsx"]
+# def get_excel_files_from_folder(folder: str) -> list[str]:
+#     return [str(f.resolve()) for f in Path(folder).glob("*") if f.suffix == ".xlsx"]
 
 
-def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):
-    out_path = Path(out_path)
+# def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):
+#     out_path = Path(out_path)
 
-    if overwrite:
-        if out_path.exists():
-            out_path.unlink()
+#     if overwrite:
+#         if out_path.exists():
+#             out_path.unlink()
 
-    # INITIALIZE EXCEL COM APP
-    try:
-        xlapp = win32.gencache.EnsureDispatch("Excel.Application")
+#     # INITIALIZE EXCEL COM APP
+#     try:
+#         xlapp = win32.gencache.EnsureDispatch("Excel.Application")
 
-        # constants
-        xlPasteValues = -4163
-        lPasteFormats = -4122
-        xlWorkbookDefault = 51
+#         # constants
+#         xlPasteValues = -4163
+#         lPasteFormats = -4122
+#         xlWorkbookDefault = 51
 
-        # create new workbook
-        new_wb = xlapp.Workbooks.Add()
-        new_wb.SaveAs(Filename=str(out_path), FileFormat=xlWorkbookDefault)
+#         # create new workbook
+#         new_wb = xlapp.Workbooks.Add()
+#         new_wb.SaveAs(Filename=str(out_path), FileFormat=xlWorkbookDefault)
 
-        dup_count = 1
+#         dup_count = 1
 
-        for wb in files:
-            xlwb = xlapp.Workbooks.Open(wb)
+#         for wb in files:
+#             xlwb = xlapp.Workbooks.Open(wb)
 
-            for xlsh in xlwb.Worksheets:
-                new_sh = new_wb.Worksheets.Add()
+#             for xlsh in xlwb.Worksheets:
+#                 new_sh = new_wb.Worksheets.Add()
 
-                try:
-                    new_sh.Name = xlsh.Name
+#                 try:
+#                     new_sh.Name = xlsh.Name
 
-                # Ugly non defined exception. Be aware that this wil caputre
-                except Exception as e:
-                    new_sh.Name = f"{xlsh.Name}_{dup_count}"
-                    dup_count += 1
+#                 # Ugly non defined exception. Be aware that this wil caputre
+#                 except Exception as e:
+#                     new_sh.Name = f"{xlsh.Name}_{dup_count}"
+#                     dup_count += 1
 
-                new_wb.Save()
-                new_sh.Move(After=new_wb.Worksheets(new_wb.Worksheets.Count))
+#                 new_wb.Save()
+#                 new_sh.Move(After=new_wb.Worksheets(new_wb.Worksheets.Count))
 
-                xlsh.Cells.Copy(new_sh.Cells)
-                new_sh = None
+#                 xlsh.Cells.Copy(new_sh.Cells)
+#                 new_sh = None
 
-            xlwb.Close(True)
-            xlwb = None
+#             xlwb.Close(True)
+#             xlwb = None
 
-        # remove default blad1
-        new_wb.Worksheets("Blad1").Delete()
-        new_wb.Save()
+#         # remove default blad1
+#         new_wb.Worksheets("Blad1").Delete()
+#         new_wb.Save()
 
-    except Exception as e:
-        print(e)
+#     except Exception as e:
+#         print(e)
 
-    # RELEASE RESOURCES
-    finally:
-        xlsh = None
-        new_sh = None
-        xlwb = None
-        new_wb = None
-        xlapp.Quit()
-        xlapp = None
-        xlwb = None
+#     # RELEASE RESOURCES
+#     finally:
+#         xlsh = None
+#         new_sh = None
+#         xlwb = None
+#         new_wb = None
+#         xlapp.Quit()
+#         xlapp = None
+#         xlwb = None

toolsos/huisstijl/tables/table_styles.py

@@ -7,13 +7,20 @@ STYLE_OLD = {
         "fill": {"fill_type": "solid", "fgColor": "B1D9F5"},
         "font": {"bold": False},
     },
-    "calibri": {"font": {"name": "Calibri", "size": 9}},
+    "calibri": {
+        "font": {"name": "Calibri", "size": 9},
+        # "alignment": {"vertical": "center"},
+    },
     "blue_border_bottom": {
         "border_bottom": {"color": "00a0e6", "border_style": "medium"}
     },
     "left_align": {"alignment": {"horizontal": "left"}, "font": {"bold": False}},
     "right_align": {"alignment": {"horizontal": "right"}},
-    "title_bold": {"font": {"bold": True, "name": "Calibri", "size": 9}},
+    "title_bold": {
+        "font": {"bold": True, "name": "Calibri", "size": 9},
+        "alignment": {"vertical": "center"},
+    },
+    "vert_align_middle": {"alignment": {"vertical": "center"}},
 }
 
 STYLE_NEW = {
@@ -25,11 +32,18 @@ STYLE_NEW = {
         "fill": {"fill_type": "solid", "fgColor": "b8bcdd"},
         "font": {"bold": True},
     },
-    "calibri": {"font": {"name": "Calibri", "size": 9}},
+    "calibri": {
+        "font": {"name": "Calibri", "size": 9},
+        "alignment": {"vertical": "center"},
+    },
     "blue_border_bottom": {
         "border_bottom": {"color": "004699", "border_style": "medium"}
     },
     "left_align": {"alignment": {"horizontal": "left"}, "font": {"bold": True}},
     "right_align": {"alignment": {"horizontal": "right"}},
-    "title_bold": {"font": {"bold": True, "name": "Calibri", "size": 9}},
+    "title_bold": {
+        "font": {"bold": True, "name": "Calibri", "size": 9},
+        # "alignment": {"vertical": "center"},
+    },
+    "vert_align_middle": {"alignment": {"vertical": "center"}},
 }

toolsos/huisstijl/tables/tables.py

@@ -322,6 +322,7 @@ def cell_formatting(
     float_col_format: str | None = None,
     blue_border_ids: bool | None = None,
     number_format: str | None = None,
+    middle_vertical_aligment: list = None,
 ):
     """Function to create the nested list with the shape of the input data (including columns)
     containing dictionaries with the formatting
@@ -382,6 +383,9 @@ def cell_formatting(
     if blue_border_ids:
         fmt = set_style_row(fmt, blue_border_ids, STYLES["blue_border_bottom"])
 
+    if middle_vertical_aligment:
+        fmt = set_style_row(fmt, middle_vertical_aligment, STYLES["vert_align_middle"])
+
     return fmt
 
 
@@ -521,7 +525,7 @@ def write_table(
     column_widths: list[int] | None = None,
     min_column_width: int | None = None,
     col_filter: bool | None = False,
-    style: str = "old",
+    style: str = "new",
     combine_multiindex: bool | int = False,
     column_names_to_string: bool = True,
 ):
@@ -772,6 +776,11 @@ def format_worksheet(
     else:
         col_widths = None
 
+    # The top row of a table should be bottom aligned vertically. The rest of the table
+    # should vertically be aligned in the middle. If there is a title row the alignment
+    # needs to be shifted on row
+    row_vert_middle = [i for i in range(1, arr.shape[0] + 1)]
+
     ws = wb.create_sheet(sheet_name)
 
     fmt = cell_formatting(
@@ -788,6 +797,7 @@ def format_worksheet(
         float_col_format=float_col_format,
         number_format=number_format,
         blue_border_ids=blue_border_ids,
+        middle_vertical_aligment=row_vert_middle,
     )
 
     write_to_worksheet(

{toolsos-0.3.3.dist-info → toolsos-0.4.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.3
+Version: 0.4.0
 Summary: OS tools
-Author-email: OS <d.schmitz@amsterdam.nl>
+Author-email: Daan Schmitz <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python

{toolsos-0.3.3.dist-info → toolsos-0.4.0.dist-info}/RECORD

@@ -18,10 +18,10 @@ toolsos/huisstijl/graphs/styler.py,sha256=-uZ7pjY1G39XvmaGHQd31gPRxjxmJGhYZk8xhy
 toolsos/huisstijl/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolsos/huisstijl/maps/choropleth.py,sha256=2B2Av5hQXkuFHR-TDcDndSmksji-mIwGoqq_JDMwO6w,2531
 toolsos/huisstijl/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolsos/huisstijl/tables/table_helpers.py,sha256=Q1VuaEHl__K0xFQOeucihN212joTkxhcNbS6wKZaMew,2033
-toolsos/huisstijl/tables/table_styles.py,sha256=oYU6GJcfqlKpZof5PUjPsA7woJ3Tew78CHPyT0_jY6w,1343
-toolsos/huisstijl/tables/tables.py,sha256=Ri08lyz0y9PYdtTpWpVdDAiGlgVYW2JEyawg636cfWQ,28194
-toolsos-0.3.3.dist-info/METADATA,sha256=lqAFIt4-_XNUrHfsgIQSIfC90WdXCZd7V-j9U5y8D0c,2767
-toolsos-0.3.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-toolsos-0.3.3.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
-toolsos-0.3.3.dist-info/RECORD,,
+toolsos/huisstijl/tables/table_helpers.py,sha256=LgFEH3g_qOo79JHplV_ONEg5vP0p3P00QisMDaoCZmE,2141
+toolsos/huisstijl/tables/table_styles.py,sha256=tzwTDRRUyw8f9zsGNo08lK2hVl_Eahj-2ZOSNyN1SF0,1729
+toolsos/huisstijl/tables/tables.py,sha256=jS55zIxTJ2Q_mQEivyDaZZu7sl2gORCXfvO7HetewvM,28691
+toolsos-0.4.0.dist-info/METADATA,sha256=V3u8o42Fx8wyPHyZ89JkYq9OlUg8vFGfcDvkXmTYzq8,2777
+toolsos-0.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+toolsos-0.4.0.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
+toolsos-0.4.0.dist-info/RECORD,,