Update pdf_generator.py

pdf_generator.py

@@ -40,12 +40,12 @@ class SliderFlowable(Flowable):
         # Add range labels
         min_str = self.format_label(self.min_val)
         max_str = self.format_label(self.max_val)
-        drawing.add(String(40, 35, min_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
-        drawing.add(String(340, 35, max_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
+        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 = self.format_label(self.value)
-        drawing.add(String(value_width - 20, 60, value_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
+        drawing.add(String(value_width - 20, 55, value_str, fontSize=10, fillColor=colors.HexColor("#26004d")))
 
         # Add value marker
         drawing.add(Line(value_width, 25, value_width, 55, strokeColor=colors.HexColor("#26004d"), strokeWidth=2))
@@ -54,17 +54,12 @@ class SliderFlowable(Flowable):
 
     def format_label(self, value):
         if self.is_percentage:
-            return f"{value}%"
+            return f"{value:.2f}%"
         elif self.is_integer:
             return f"{int(value)}"
         else:
             return f"{value:.2f}"
 
-    def format_value(self, value):
-        if self.is_percentage:
-            return value / 100  # Convert percentage back to decimal for calculations
-        return value
-
 def create_styles():
     styles = getSampleStyleSheet()
     styles['Title'].fontName = 'Helvetica-Bold'
@@ -166,7 +161,6 @@ def process_quantitative_criteria(answers, 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)
     if match:
         name, min_val, max_val = match.groups()
@@ -174,7 +168,7 @@ def parse_quantitative_criteria(input_string):
 
         def parse_value(val):
             if '%' in val:
-                return float(val.rstrip('%')) / 100, True
+                return float(val.rstrip('%')), True
             elif '.' in val:
                 return float(val), False
             else:
@@ -184,7 +178,7 @@ def parse_quantitative_criteria(input_string):
         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)
+        is_integer = isinstance(min_val, int) and isinstance(max_val, int) and not is_percentage
 
         return name, min_val, max_val, is_percentage, is_integer
     return None