Update pages/2_Pest_Control_Report.py
Browse files
pages/2_Pest_Control_Report.py
CHANGED
|
@@ -32,7 +32,8 @@ def build_photo_grid_pages(all_photos, photos_per_page=9):
|
|
| 32 |
n = math.ceil(len(all_photos) / photos_per_page)
|
| 33 |
return [all_photos[i * photos_per_page:(i + 1) * photos_per_page] for i in range(n)]
|
| 34 |
|
| 35 |
-
|
|
|
|
| 36 |
PAGE_W, PAGE_H = 595, 842
|
| 37 |
PADDING, HEADER_H, FOOTER_H, CELL_GAP = 20, 50, 25, 10
|
| 38 |
|
|
@@ -44,8 +45,8 @@ def photo_grid_to_pdf_bytes(page_photos, page_num, total_pages, client_name, dat
|
|
| 44 |
font_wm = load_font(8)
|
| 45 |
|
| 46 |
draw.rectangle([(0, 0), (PAGE_W, HEADER_H)], fill=(0, 84, 166))
|
| 47 |
-
# UPDATED: Header string
|
| 48 |
-
draw.text((PADDING, 15), f"{
|
| 49 |
|
| 50 |
grid_top = HEADER_H + PADDING
|
| 51 |
cell_w = (PAGE_W - 2 * PADDING - 2 * CELL_GAP) // 3
|
|
@@ -218,7 +219,8 @@ if st.button("🚀 Generate Pest Control Report", type="primary", use_container_
|
|
| 218 |
photo_bytes = [f.getvalue() for f in uploaded_photos]
|
| 219 |
photo_pages = build_photo_grid_pages(photo_bytes, 9)
|
| 220 |
for idx, pg in enumerate(photo_pages):
|
| 221 |
-
|
|
|
|
| 222 |
|
| 223 |
writer = PdfWriter()
|
| 224 |
|
|
|
|
| 32 |
n = math.ceil(len(all_photos) / photos_per_page)
|
| 33 |
return [all_photos[i * photos_per_page:(i + 1) * photos_per_page] for i in range(n)]
|
| 34 |
|
| 35 |
+
# UPDATED: Replaced client_name with building_name in the function parameters
|
| 36 |
+
def photo_grid_to_pdf_bytes(page_photos, page_num, total_pages, building_name, date_str):
|
| 37 |
PAGE_W, PAGE_H = 595, 842
|
| 38 |
PADDING, HEADER_H, FOOTER_H, CELL_GAP = 20, 50, 25, 10
|
| 39 |
|
|
|
|
| 45 |
font_wm = load_font(8)
|
| 46 |
|
| 47 |
draw.rectangle([(0, 0), (PAGE_W, HEADER_H)], fill=(0, 84, 166))
|
| 48 |
+
# UPDATED: Header string now uses the Project/Location variable
|
| 49 |
+
draw.text((PADDING, 15), f"{building_name} | {date_str}", font=font_header, fill=(255, 255, 255))
|
| 50 |
|
| 51 |
grid_top = HEADER_H + PADDING
|
| 52 |
cell_w = (PAGE_W - 2 * PADDING - 2 * CELL_GAP) // 3
|
|
|
|
| 219 |
photo_bytes = [f.getvalue() for f in uploaded_photos]
|
| 220 |
photo_pages = build_photo_grid_pages(photo_bytes, 9)
|
| 221 |
for idx, pg in enumerate(photo_pages):
|
| 222 |
+
# UPDATED: Passing building_name instead of client_name to the function
|
| 223 |
+
grid_pdfs.append(photo_grid_to_pdf_bytes(pg, idx+1, len(photo_pages), building_name, date_str))
|
| 224 |
|
| 225 |
writer = PdfWriter()
|
| 226 |
|