Update pdf_generator.py

pdf_generator.py

@@ -37,13 +37,13 @@ class SliderFlowable(Flowable):
         drawing.add(String(0, 60, self.name, fontSize=12, fillColor=colors.HexColor("#26004d")))
 
         # Add range labels
-        min_str = f"{self.min_val:.1f}%" if self.is_percentage else f"{self.min_val:.1f}"
-        max_str = f"{self.max_val:.1f}%" if self.is_percentage else f"{self.max_val:.1f}"
+        min_str = self.format_value(self.min_val)
+        max_str = self.format_value(self.max_val)
         drawing.add(String(40, 10, min_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
         drawing.add(String(340, 10, max_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
 
         # Add value label
-        value_str = f"{self.value:.1f}%" if self.is_percentage else f"{self.value:.1f}"
+        value_str = self.format_value(self.value)
         drawing.add(String(value_width - 20, 55, value_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
 
         # Add value marker
@@ -51,6 +51,14 @@ class SliderFlowable(Flowable):
 
         drawing.drawOn(self.canv, 0, 0)
 
+    def format_value(self, val):
+        if self.is_percentage:
+            return f"{val:.1f}%"
+        elif isinstance(val, int):
+            return f"{val}"
+        else:
+            return f"{val:.2f}"
+
 def create_styles():
     styles = getSampleStyleSheet()
     styles['Title'].fontName = 'Helvetica-Bold'
@@ -146,40 +154,33 @@ def process_quantitative_criteria(answer, styles):
         parsed = parse_quantitative_criteria(line)
         if parsed:
             name, value, min_val, max_val, is_percentage = parsed
-            if is_percentage:
-                slider = SliderFlowable(name, value*100, min_val*100, max_val*100, is_percentage=True)
-            else:
-                slider = SliderFlowable(name, value, min_val, max_val, is_percentage=False)
+            slider = SliderFlowable(name, value, min_val, max_val, is_percentage)
             story.append(slider)
     return story
 
 def parse_quantitative_criteria(input_string):
-    # Match both "Name: value [min-max]" and "Name [min-max]" formats
-    match = re.match(r'(.+?)(?:\s*:\s*([-+]?(?:\d*\.*\d+)(?:%)?))?\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)?\]', input_string)
+    # Match "Name: value [min-max]" format
+    match = re.match(r'(.+?):\s*([-+]?(?:\d*\.*\d+)(?:%)?)\s*\[([-+]?(?:\d*\.*\d+)(?:%)?)\s*-\s*([-+]?(?:\d*\.*\d+)(?:%)?)?\]', input_string)
     if match:
         name, value, min_val, max_val = match.groups()
         name = name.strip()
 
-        # Handle the case where value is None
-        if value is None:
-            value = 0  # or you can raise an error, depending on your requirements
-
         # Handle percentage inputs
-        is_percentage = '%' in str(value) or '%' in min_val or '%' in max_val
-        value = float(str(value).rstrip('%'))
-
-        min_val = float(min_val.rstrip('%'))
-        max_val = float(max_val.rstrip('%'))
+        is_percentage = '%' in value or '%' in min_val or '%' in max_val
 
+        # Convert values to appropriate types
         if is_percentage:
-            value /= 100
-            value = int(value)
-            min_val = int(min_val)
-            max_val = int(max_val)
+            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)
 
+        # 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)
+
         return name, value, min_val, max_val, is_percentage
     return None