Update pdf_generator.py

pdf_generator.py

@@ -8,13 +8,14 @@ from reportlab.lib.units import mm
 from reportlab.graphics.shapes import Drawing, Rect, String, Line
 
 class SliderFlowable(Flowable):
-    def __init__(self, name, value, min_val, max_val, is_percentage=False):
+    def __init__(self, name, value, min_val, max_val, is_percentage=False, is_integer=False):
         Flowable.__init__(self)
         self.name = name
         self.value = value
         self.min_val = min_val
         self.max_val = max_val
         self.is_percentage = is_percentage
+        self.is_integer = is_integer
         self.width = 400
         self.height = 80
 
@@ -27,7 +28,7 @@ class SliderFlowable(Flowable):
 
         # Draw slider value
         if self.max_val == self.min_val:
-            value_width = 50  # Default width when min and max are the same
+            value_width = 50  # or some default width
         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)
@@ -54,8 +55,8 @@ class SliderFlowable(Flowable):
     def format_value(self, value):
         if self.is_percentage:
             return f"{value:.1f}%"
-        elif isinstance(value, int):
-            return f"{value}"
+        elif self.is_integer:
+            return f"{int(value)}"
         else:
             return f"{value:.2f}"
 
@@ -140,49 +141,45 @@ def generate_pdf(session_state):
             story.append(Spacer(1, 12))
 
             # Add quantitative criteria visualization if applicable
-            if page['input_key'] in ['technological_literacy', 'cognitive_mismatch']:
-                story.extend(process_quantitative_criteria(answer, styles))
+            if page['input_key'] == 'useful_assets':
+                story.extend(process_quantitative_criteria(answers['useful_assets'], styles))
 
     doc.build(story, onFirstPage=create_page_template, onLaterPages=create_page_template)
     buffer.seek(0)
     return buffer
 
-def process_quantitative_criteria(answer, styles):
+def process_quantitative_criteria(answers, styles):
     story = []
-    lines = answer.split('\n')
-    for line in lines:
-        parsed = parse_quantitative_criteria(line)
+    quantitative_criteria = answers.get('quantitative', [])
+    for i, criterion in enumerate(quantitative_criteria):
+        parsed = parse_quantitative_criteria(criterion)
         if parsed:
-            name, value, min_val, max_val, is_percentage = parsed
-            slider = SliderFlowable(name, value, min_val, max_val, is_percentage)
+            name, min_val, max_val, is_percentage, is_integer = parsed
+            value = answers.get(f'quant_value_{i}', min_val)
+            slider = SliderFlowable(name, value, min_val, max_val, is_percentage=is_percentage, is_integer=is_integer)
             story.append(slider)
     return story
 
 def parse_quantitative_criteria(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)
-    
+    # 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()
 
-        is_percentage = '%' in min_val or '%' in max_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
+            if '%' in val:
+                return float(val.rstrip('%')) / 100, 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 = is_min_percent or is_max_percent
+        is_integer = isinstance(min_val, int) and isinstance(max_val, int)
+
+        return name, min_val, max_val, is_percentage, is_integer
     return None