fix(xl_app): Refactor XL App and Fix font / background color issue

PH-Tools · Dec 15, 2022 · 6e2176d · 6e2176d
1 parent 063789f
commit 6e2176d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/PHX/PHPP/sheet_io/io_areas.py b/PHX/PHPP/sheet_io/io_areas.py
@@ -138,12 +138,23 @@ def get_surface_phpp_id_by_name(self, _name: str, _use_cache: bool = False) -> s
             )
 
         # -- Figure out the right full PHPP name, with the ID-number prefix
-        prefix = self.xl.get_data(
-            self.shape.name,
-            f"{col_offset(str(self.shape.surface_rows.inputs.description.column), -1)}{row}",
-        )
+        prefix_range = f"{col_offset(str(self.shape.surface_rows.inputs.description.column), -1)}{row}"
+        prefix_value = self.xl.get_data(self.shape.name, prefix_range)
+
+        try:
+            prefix_value = str(prefix_value)  # prefix_value comes in from excel as "1.0"
+            prefix_value = float(prefix_value)  # Can't convert "1.0" -> 1 directly??
+            prefix_value = int(prefix_value)
+        except:
+            msg = (
+                f"\n\tError: Something went wrong trying to find the PHPP-ID "
+                f"number for the surface: '{_name}'? Expected to find an integer "
+                f"value but got: '{prefix_value}' at {self.shape.name}:{prefix_range}"
+            )
+            raise Exception(msg)
+
         self.xl.output(f"Getting PHPP Surface id for {_name}")
-        name = f"{int(str(prefix))}-{_name}"
+        name = f"{prefix_value}-{_name}"
 
         # -- Save in cache
         self.surface_cache[_name] = name

diff --git a/PHX/xl/xl_app.py b/PHX/xl/xl_app.py
@@ -511,9 +511,9 @@ def write_xl_item(self, _xl_item: Union[xl_data.XlItem, xl_data.XLItem_List]) ->
                         _xl_range = xl_range.offset(column_offset=i)
                         _xl_range.color = _xl_item.range_color
                         _xl_range.font.color = _xl_item.font_color
-            else:
-                xl_range.color = _xl_item.range_color
-                xl_range.font.color = _xl_item.font_color
+                else:
+                    xl_range.color = _xl_item.range_color
+                    xl_range.font.color = _xl_item.font_color
 
         except AttributeError as e:
             raise AttributeError(e)

diff --git a/PHX/xl/xl_data.py b/PHX/xl/xl_data.py
@@ -105,7 +105,7 @@ def write_value(self) -> xl_writable:
     @property
     def has_color(self) -> bool:
         """Return True if the Item has font or background color values."""
-        if self.font_color or self.range_color:
+        if self.font_color and self.range_color:
             return True
         return False