added SKIP and OK tokens for reports

hydroffice · Nov 3, 2024 · 5a8ab3a · 5a8ab3a
1 parent 78305c5
commit 5a8ab3a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/examples/app/report/ex_report.py b/examples/app/report/ex_report.py
@@ -26,7 +26,9 @@
 r += "OK"
 
 r += "Check 2 [CHECK]"
-r += "An issue"
+r += "[SKIP] An issue"
+r += "[ERROR] An issue"
+r += "[WARNING] An issue"
 
 r += "Section 2 [SKIP_SEC]"
 

diff --git a/hyo2/abc2/__init__.py b/hyo2/abc2/__init__.py
@@ -12,7 +12,7 @@
 logger.addHandler(logging.NullHandler())
 
 name = "ABC"
-__version__ = "2.3.11"
+__version__ = "2.3.12"
 __license__ = "LGPLv3 license"
 __copyright__ = "Copyright 2024 University of New Hampshire, Center for Coastal and Ocean Mapping"
 

diff --git a/hyo2/abc2/app/report/report.py b/hyo2/abc2/app/report/report.py
@@ -376,21 +376,35 @@ def print_page_template():
                 if first_item == "[ERROR]":
                     if use_colors:
                         painter.setPen(red_pen)
-                    painter.drawText(row_area, lc_flags, content_item)
+                    painter.drawText(row_area, lc_flags, content_item[len("[ERROR] "):])
                     if use_colors:
                         painter.setPen(black_pen)
 
                 elif first_item == "[WARNING]":
                     if use_colors:
                         painter.setPen(orange_pen)
-                    painter.drawText(row_area, lc_flags, content_item)
+                    painter.drawText(row_area, lc_flags, content_item[len("[WARNING] "):])
                     if use_colors:
                         painter.setPen(black_pen)
 
                 elif first_item == "[INFO]":
                     if use_colors:
                         painter.setPen(magenta_pen)
-                    painter.drawText(row_area, lc_flags, content_item)
+                    painter.drawText(row_area, lc_flags, content_item[len("[INFO] "):])
+                    if use_colors:
+                        painter.setPen(black_pen)
+
+                elif first_item == "[SKIP]":
+                    if use_colors:
+                        painter.setPen(gray_pen)
+                    painter.drawText(row_area, lc_flags, content_item[len("[SKIP] "):])
+                    if use_colors:
+                        painter.setPen(black_pen)
+
+                elif first_item == "[OK]":
+                    if use_colors:
+                        painter.setPen(gray_pen)
+                    painter.drawText(row_area, lc_flags, content_item[len("[OK] "):])
                     if use_colors:
                         painter.setPen(black_pen)