Update utils.py

utils.py

@@ -8,6 +8,7 @@ from convertion import convert_feet_to_inches,convert_inches_to_feet
 from convertion import convert_meters_to_unit, convert_to_meters
 
 
+
 # Common function for shutter and glass calculations
 def calculate_reduced_dimensions(width, height, unit, selection, object_item_value, item_type="Door"):
     # Use the selected unit for the width and height reduction
@@ -40,7 +41,7 @@ def calculate_area_and_frame(width, height, unit, item_type="Door"):
     
     return area, frame_area
 
-def generate_pdf(dfs, company_name, address, unit, items):
+def generate_pdf(df_combined, company_name, address, unit):
     buffer = BytesIO()
     
     # Create a canvas for the PDF
@@ -57,55 +58,39 @@ def generate_pdf(dfs, company_name, address, unit, items):
     c.setLineWidth(1)
     c.line(30, height - 70, width - 30, height - 70)  # Draw line under the address
 
-
     # Title
     c.setFont("Helvetica-Bold", 16)
     c.drawString(30, height - 100, f"Dimensions Calculation Results: for units ({unit})")
     
     # Calculate the y-position to avoid overlapping
-    y_position = height - 150
-    
-    # Iterate over each item in the items list
-    for i, item in enumerate(items):
-        # Add a new page if the y-position gets too low
-        if y_position < 100:
+    y_position = height - 200
+
+    if y_position < 100:
             c.showPage()
             y_position = height - 40  # Reset the y-position
-        
-        # Display item label (e.g., Item 1, Item 2)
-        c.setFont("Helvetica-Bold", 12)
-        c.drawString(30, y_position, f"Item {i+1}: {item}")
-        y_position -= 130  # Move down after the label
-        
-        # Retrieve the corresponding dataframe for this item
-        df = dfs[i]
-        
-        # Create and style the table
-        data = [["Dimension", "Outer Frame", "Shutter", "Glass"]]  # Table Header
-        for index, row in df.iterrows():
-            data.append([index] + [str(value) for value in row])  # Use row values directly for each column
-        
-        # Create the table
-        table = Table(data, colWidths=[100, 100, 100, 100], rowHeights=30)
-        table.setStyle(TableStyle([
-            ('TEXTCOLOR', (0, 0), (-1, 0), (0, 0, 0)),
-            ('ALIGN', (0, 0), (-1, -1), 'CENTER'),
-            ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
-            ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
-            ('BACKGROUND', (0, 0), (-1, 0), (0.7, 0.7, 0.7)),
-            ('GRID', (0, 0), (-1, -1), 0.5, (0, 0, 0))
-        ]))
-        
-        # Position the table just below the item label
-        table.wrapOn(c, width, height)
-        table.drawOn(c, 30, y_position)
-        
-        # Adjust the y-position for the next table
-        y_position -= len(data) + 20  # Move down for next table
-    c.line(30, y_position , width - 30, y_position)  # Draw line under the address
-
+    # Create and style the table
+    data = [["Sl no", "Type", "Outer Frame", "Shutter", "Glass", "Area"]]  # Table Header
+    for index, row in df_combined.iterrows():
+        data.append([row['Sl no'], row['Type'], row['Outer Frame'], row['Shutter'], row['Glass'], row['Area']])
+    
+    # Create the table
+    table = Table(data, colWidths=[50, 100, 100, 100, 100, 100], rowHeights=30)
+    table.setStyle(TableStyle([
+        ('TEXTCOLOR', (0, 0), (-1, 0), (0, 0, 0)),
+        ('ALIGN', (0, 0), (-1, -1), 'CENTER'),
+        ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
+        ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
+        ('BACKGROUND', (0, 0), (-1, 0), (0.7, 0.7, 0.7)),
+        ('GRID', (0, 0), (-1, -1), 0.5, (0, 0, 0))
+    ]))
+    
+    # Position the table just below the title
+    table.wrapOn(c, width, height)
+    table.drawOn(c, 30, y_position)
+    
     # Save the PDF
     c.save()
     
     buffer.seek(0)
-    return buffer
+    return buffer
+