Update pdf_generator.py

pdf_generator.py

@@ -159,28 +159,27 @@ def process_quantitative_criteria(answer, styles):
     return story
 
 def parse_quantitative_criteria(input_string):
-    # Match "Name: value [min-max]" format
-    match = re.match(r'(.+?):\s*([-+]?(?:\d*\.*\d+)(?:%)?)\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)?\]', 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)
     if match:
-        name, value, min_val, max_val = match.groups()
+        name, min_val, max_val = match.groups()
         name = name.strip()
 
-        # Handle percentage inputs
-        is_percentage = '%' in value or '%' in min_val or '%' in max_val
+        def parse_value(val):
+            if '%' in val:
+                return float(val.rstrip('%')), True
+            elif '.' in val:
+                return float(val), False
+            else:
+                return int(val), False
 
-        # Convert values to appropriate types
-        if is_percentage:
-            value = float(value.rstrip('%'))
-            min_val = float(min_val.rstrip('%'))
-            max_val = float(max_val.rstrip('%'))
-        else:
-            value = float(value)
-            min_val = float(min_val)
-            max_val = float(max_val)
+        min_val, is_min_percent = parse_value(min_val)
+        max_val, is_max_percent = parse_value(max_val)
+
+        is_percentage = is_min_percent or is_max_percent
 
-        # Convert to int if all values are whole numbers
-        if all(v.is_integer() for v in [value, min_val, max_val]):
-            value, min_val, max_val = int(value), int(min_val), int(max_val)
+        # If no value is provided, use the minimum value as the default
+        value = min_val
 
         return name, value, min_val, max_val, is_percentage
     return None