05/16 Fix bugs 5

2026-05-16 14:53:21 -04:00
parent 8e9484e3ee
commit 82dabfd7b3
2 changed files with 55 additions and 13 deletions
@@ -50,6 +50,29 @@ def _parse_datetime(value):

 def _inspection_payload(inspection):
    """Serialize an Inspection to the dict returned in API responses."""
+    # Extract form responses from the notes JSON blob.
+    # Mobile submissions store form data as {"_form_data": {...}, "_inspector_notes": "..."}.
+    # Web submissions store form data in the form_data column directly.
+    form_data = {}
+    inspector_notes = ''
+    if inspection.notes:
+        try:
+            notes_obj = json.loads(inspection.notes)
+            if isinstance(notes_obj, dict):
+                form_data       = notes_obj.get('_form_data', {}) or {}
+                inspector_notes = notes_obj.get('_inspector_notes', '') or ''
+        except (json.JSONDecodeError, TypeError):
+            pass
+    # Fallback: web-created inspections store responses in form_data column
+    if not form_data and inspection.form_data:
+        form_data = inspection.form_data if isinstance(inspection.form_data, dict) else {}
+
+    # Include the template's form_schema so the iPad can render history
+    # without needing a locally cached copy of the template.
+    form_schema = []
+    if inspection.template:
+        form_schema = inspection.template.get_form_schema()
+
    return {
        'id':                    inspection.id,
        'template_id':           inspection.template_id,
@@ -59,12 +82,15 @@ def _inspection_payload(inspection):
        'area_id':               inspection.area_id,
        'area_name':             inspection.area.name if inspection.area else None,
        'status':                inspection.status,
-        'overall_score':         inspection.overall_score,
+        'overall_score':         float(inspection.overall_score) if inspection.overall_score is not None else None,
        'inspection_date':       inspection.inspection_date.isoformat()
                                 if inspection.inspection_date else None,
        'completed_at':          inspection.completed_at.isoformat()
                                 if inspection.completed_at else None,
        'mobile_local_id':       inspection.mobile_local_id,
+        'form_data':             form_data,
+        'form_schema':           form_schema,
+        'inspector_notes':       inspector_notes,
        # ── Follow-up / re-inspection fields ──────────────────────────────
        'follow_up_required':    inspection.follow_up_required,
        'follow_up_note':        inspection.follow_up_note,