Update pdf_generator.py

pdf_generator.py

@@ -27,7 +27,7 @@ class SliderFlowable(Flowable):
 
         # Draw slider value
         if self.max_val == self.min_val:
-            value_width = 50  # or some default width
+            value_width = 50  # Default width when min and max are the same
         else:
             value_width = 50 + ((self.value - self.min_val) / (self.max_val - self.min_val) * 300)
         value_bar = Rect(50, 30, value_width - 50, 20, fillColor=colors.HexColor("#9999ff"), strokeColor=None)
@@ -51,13 +51,13 @@ class SliderFlowable(Flowable):
 
         drawing.drawOn(self.canv, 0, 0)
 
-    def format_value(self, val):
+    def format_value(self, value):
         if self.is_percentage:
-            return f"{val:.1f}%"
-        elif isinstance(val, int):
-            return f"{val}"
+            return f"{value:.1f}%"
+        elif isinstance(value, int):
+            return f"{value}"
         else:
-            return f"{val:.2f}"
+            return f"{value:.2f}"
 
 def create_styles():
     styles = getSampleStyleSheet()
@@ -159,27 +159,30 @@ def process_quantitative_criteria(answer, styles):
     return story
 
 def parse_quantitative_criteria(input_string):
-    # Match "Text [min-max]" format, where min and max can be int, float, or percentage
-    match = re.match(r'(.+?)\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)\]', input_string)
+    # Match the entire string, with an optional value before the range
+    match = re.match(r'(.+?)(?:\s*:\s*([-+]?(?:\d*\.*\d+)(?:%)?))?\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)?\]', input_string)
+    
     if match:
-        name, min_val, max_val = match.groups()
+        name, value, min_val, max_val = match.groups()
         name = name.strip()
 
-        def parse_value(val):
-            if '%' in val:
-                return float(val.rstrip('%')), True
-            elif '.' in val:
-                return float(val), False
-            else:
-                return int(val), False
-
-        min_val, is_min_percent = parse_value(min_val)
-        max_val, is_max_percent = parse_value(max_val)
+        is_percentage = '%' in min_val or '%' in max_val
 
-        is_percentage = is_min_percent or is_max_percent
-
-        # If no value is provided, use the minimum value as the default
-        value = min_val
+        def parse_value(val):
+            if val is None:
+                return None
+            val = val.rstrip('%')
+            if '.' in val:
+                return float(val)
+            return int(val)
+
+        value = parse_value(value)
+        min_val = parse_value(min_val)
+        max_val = parse_value(max_val)
+
+        # If no value is provided, use the minimum value as default
+        if value is None:
+            value = min_val
 
         return name, value, min_val, max_val, is_percentage
     return None