Update app.py

app.py

@@ -699,43 +699,45 @@ def _map_template_output(raw: dict, form_hint: str) -> dict:
             'marriage_month':            g('date_of_marriage'),
         }
 
-  else:  # Form 90
-    def _join_name(*keys):
-        return ' '.join(raw.get(k, '') for k in keys).strip()
-
-    return {
-        'registry_no':              g('registry_no'),
-        'city_municipality':        g('city_municipality'),
-        'province':                 raw.get('province', '').strip(),
-        'license_no':               g('marriage_license_no'),
-        'date_issuance':            g('date_issued'),
-        'groom_name':               _join_name('groom_name_first', 'groom_name_middle', 'groom_name_last'),
-        'groom_dob':                g('groom_dob'),
-        'groom_age':                g('groom_age'),
-        'groom_place_of_birth':     g('groom_place_of_birth'),
-        'groom_sex':                g('groom_sex'),
-        'groom_citizenship':        g('groom_citizenship'),
-        'groom_civil_status':       g('groom_civil_status'),
-        'groom_residence':          g('groom_residence'),
-        'groom_religion':           g('groom_religion'),
-        'groom_father_first':       g('groom_father_name'),
-        'groom_father_citizenship': g('groom_father_citizenship'),
-        'groom_mother_first':       g('groom_mother_name'),
-        'groom_mother_citizenship': g('groom_mother_citizenship'),
-        'bride_name':               _join_name('bride_name_first', 'bride_name_middle', 'bride_name_last'),
-        'bride_dob':                g('bride_dob'),
-        'bride_age':                g('bride_age'),
-        'bride_place_of_birth':     g('bride_place_of_birth'),
-        'bride_sex':                g('bride_sex'),
-        'bride_citizenship':        g('bride_citizenship'),
-        'bride_civil_status':       g('bride_civil_status'),
-        'bride_residence':          g('bride_residence'),
-        'bride_religion':           g('bride_religion'),
-        'bride_father_first':       g('bride_father_name'),
-        'bride_father_citizenship': g('bride_father_citizenship'),
-        'bride_mother_first':       g('bride_mother_name'),
-        'bride_mother_citizenship': g('bride_mother_citizenship'),
-    }
+    else:  # Form 90
+        # Join name parts properly since g() only returns first non-empty key
+        def _join_name(*keys):
+            return ' '.join(raw.get(k, '') for k in keys).strip()
+
+        return {
+            'registry_no':              g('registry_no'),
+            'city_municipality':        g('city_municipality'),
+            # ← this was already correct
+            'province': raw.get('province', '').strip(),
+            'license_no':               g('marriage_license_no'),
+            'date_issuance':            g('date_issued'),
+            'groom_name':               _join_name('groom_name_first', 'groom_name_middle', 'groom_name_last'),
+            'groom_dob':                g('groom_dob'),
+            'groom_age':                g('groom_age'),
+            'groom_place_of_birth':     g('groom_place_of_birth'),
+            'groom_sex':                g('groom_sex'),
+            'groom_citizenship':        g('groom_citizenship'),
+            'groom_civil_status':       g('groom_civil_status'),
+            'groom_residence':          g('groom_residence'),
+            'groom_religion':           g('groom_religion'),
+            'groom_father_first':       g('groom_father_name'),
+            'groom_father_citizenship': g('groom_father_citizenship'),
+            'groom_mother_first':       g('groom_mother_name'),
+            'groom_mother_citizenship': g('groom_mother_citizenship'),
+            'bride_name':               _join_name('bride_name_first', 'bride_name_middle', 'bride_name_last'),
+            'bride_dob':                g('bride_dob'),
+            'bride_age':                g('bride_age'),
+            'bride_place_of_birth':     g('bride_place_of_birth'),
+            'bride_sex':                g('bride_sex'),
+            'bride_citizenship':        g('bride_citizenship'),
+            'bride_civil_status':       g('bride_civil_status'),
+            'bride_residence':          g('bride_residence'),
+            'bride_religion':           g('bride_religion'),
+            'bride_father_first':       g('bride_father_name'),
+            'bride_father_citizenship': g('bride_father_citizenship'),
+            'bride_mother_first':       g('bride_mother_name'),
+            'bride_mother_citizenship': g('bride_mother_citizenship'),
+        }
 
 
 # ═════════════════════════════════════════════════════════════