Update app.py

app.py

@@ -157,23 +157,38 @@ def generate_dpr(files):
     
     # Salesforce upload
     salesforce_result = ""
+    pdf_content_document_id = None
+    image_content_document_ids = []
+    
     if sf and pdf_filepath:
         try:
-            # Create Daily_Progress_Reports__c record
-            report_description = "; ".join(captions)[:255]  # Concatenate captions, limit to 255 chars
-            dpr_record = sf.Daily_Progress_Reports__c.create({
-                'Report_Date__c': current_time,
-                'Report_Description__c': report_description
-            })
-            dpr_record_id = dpr_record['id']
-            salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"
-            
             # Upload PDF to Salesforce for Report_PDF__c
             pdf_content_document_id, pdf_upload_result = upload_file_to_salesforce(
                 pdf_filepath, pdf_filename, sf, 'Report_PDF__c'
             )
             salesforce_result += pdf_upload_result + "\n"
             
+            # Upload images to Salesforce for Site_Images__c
+            for file in files:
+                image_filename = os.path.basename(file.name)
+                image_content_document_id, image_upload_result = upload_file_to_salesforce(
+                    file.name, image_filename, sf, 'Site_Images__c'
+                )
+                if image_content_document_id:
+                    image_content_document_ids.append(image_content_document_id)
+                salesforce_result += image_upload_result + "\n"
+            
+            # Create Daily_Progress_Reports__c record with file references
+            report_description = "; ".join(captions)[:255]  # Concatenate captions, limit to 255 chars
+            images_ids = ";".join(image_content_document_ids)  # Semicolon-separated image IDs
+            dpr_record = sf.Daily_Progress_Reports__c.create({
+                'Report_Description__c': report_description,
+                'Report_PDF__c': pdf_content_document_id if pdf_content_document_id else '',
+                'Site_Images__c': images_ids if images_ids else ''
+            })
+            dpr_record_id = dpr_record['id']
+            salesforce_result += f"Created Daily_Progress_Reports__c record with ID: {dpr_record_id}\n"
+            
             # Link PDF to DPR record
             if pdf_content_document_id:
                 sf.ContentDocumentLink.create({
@@ -182,21 +197,13 @@ def generate_dpr(files):
                     'ShareType': 'V'
                 })
             
-            # Upload images to Salesforce for Site_Images__c
-            for file in files:
-                image_filename = os.path.basename(file.name)
-                image_content_document_id, image_upload_result = upload_file_to_salesforce(
-                    file.name, image_filename, sf, 'Site_Images__c'
-                )
-                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'
-                    })
+            # Link images to DPR record
+            for image_content_document_id in image_content_document_ids:
+                sf.ContentDocumentLink.create({
+                    'ContentDocumentId': image_content_document_id,
+                    'LinkedEntityId': dpr_record_id,
+                    'ShareType': 'V'
+                })
             
         except Exception as e:
             salesforce_result += f"Error interacting with Salesforce: {str(e)}\n"