Update app.py

app.py

@@ -146,6 +146,7 @@ def upload_file_to_salesforce(file_path, filename, sf_connection, file_type):
     except Exception as e:
         return None, None, f"Error uploading {filename} to Salesforce: {str(e)}"
 
+# Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 # Function to generate the daily progress report (DPR), save as PDF, and upload to Salesforce
 def generate_dpr(files):
     dpr_text = []
@@ -166,14 +167,12 @@ def generate_dpr(files):
         
         # Generate DPR section for this image with dynamic caption
         dpr_section = f"\nImage: {file.name}\nDescription: {caption}\n"
-        # Remove the description from the dpr_text section
-        # No need to add it again as the image and caption will be inserted in the PDF
         dpr_text.append(dpr_section)
         
         # Save image path for embedding in the report
         image_paths.append(file.name)
     
-    # Combine DPR text (no redundant description here)
+    # Combine DPR text
     dpr_output = "\n".join(dpr_text)
     
     # Generate PDF filename with timestamp
@@ -182,7 +181,6 @@ def generate_dpr(files):
     # Save DPR text to PDF
     pdf_result, pdf_filepath = save_dpr_to_pdf(dpr_output, image_paths, captions, pdf_filename)
     
-    # Salesforce upload
     salesforce_result = ""
     pdf_content_document_id = None
     pdf_url = None
@@ -219,29 +217,23 @@ def generate_dpr(files):
                 })
                 salesforce_result += f"Updated PDF URL for record ID {dpr_record_id}\n"
             
-            # Upload images to Salesforce and create Site_Images__c records
+            # Upload images to Salesforce and link them to DPR record
             for file in files:
                 image_filename = os.path.basename(file.name)
-                image_content_document_id, image_upload_result = upload_file_to_salesforce(
+                image_content_document_id, image_url, image_upload_result = upload_file_to_salesforce(
                     file.name, image_filename, sf, "image"
                 )
+                
                 if image_content_document_id:
                     image_content_document_ids.append(image_content_document_id)
                 
-                # Create Site_Images__c record and link to DPR
-                site_image_record = sf.Site_Images__c.create({
-                    'Image__c': image_content_document_id,
-                    'Related_Report__c': dpr_record_id  # Link image to DPR record
+                # Now, link the image to the DPR record in the correct field (e.g., Site Images)
+                # Assuming you have a field like `Site_Images__c` in the DPR record that accepts ContentDocumentId
+                sf.Daily_Progress_Reports__c.update(dpr_record_id, {
+                    'Site_Images__c': image_content_document_id  # Store ContentDocumentId in Site_Images__c field
                 })
-                salesforce_result += image_upload_result + "\n"
                 
-                # Link image to DPR record
-                if image_content_document_id:
-                    sf.ContentDocumentLink.create({
-                        'ContentDocumentId': image_content_document_id,
-                        'LinkedEntityId': dpr_record_id,
-                        'ShareType': 'V'
-                    })
+                salesforce_result += image_upload_result + "\n"
             
         except Exception as e:
             salesforce_result += f"Error interacting with Salesforce: {str(e)}\n"