update

app.py

@@ -443,6 +443,7 @@ def _map_confidence_for_form(raw_confidence, form_hint):
         return {
             'registry_no':            p('registry_no'),
             'city_municipality':      p('city_municipality'),
+            'date_submitted':         p('registration_date'),
             'child_first':            p('name_first'),
             'child_middle':           p('name_middle'),
             'child_last':             p('name_last'),
@@ -462,9 +463,11 @@ def _map_confidence_for_form(raw_confidence, form_hint):
     if form_hint == '2A':
         # Keys must match what Form2A Val looks up:
         # registry → registry_no (via confidenceKeyMap)
+        # date_reg → date_submitted (via confidenceKeyMap)
         # all others are direct display-key lookups
         return {
             'registry_no':    p('registry_no'),
+            'date_submitted': p('registration_date'),
             'deceased_name':  p('deceased_name'),
             'sex':            p('sex'),
             'age':            p('age'),
@@ -500,6 +503,7 @@ def _map_confidence_for_form(raw_confidence, form_hint):
             'wife_father_citizenship':    p('wife_father_citizenship'),
             'marriage_venue':             p('place_of_marriage'),
             'marriage_month':             p('date_of_marriage'),
+            'city_municipality':          p('city_municipality'),
         }
 
     if form_hint == '90':
@@ -514,6 +518,7 @@ def _map_confidence_for_form(raw_confidence, form_hint):
             'registry_no':     p('registry_no'),
             'city':            p('city_municipality'),
             'province':        p('province'),
+            'date':            p('date_issued', 'date_issuance'),
             'groom_name':      avg('groom_name_first', 'groom_name_middle', 'groom_name_last'),
             'groom_age':       p('groom_age'),
             'groom_residence': p('groom_residence'),
@@ -691,6 +696,7 @@ def _map_template_output(raw: dict, form_hint: str) -> dict:
             'registry_no': g('registry_no'),
             'city_municipality': g('city_municipality'),
             'province': g('province'),
+            'date_submitted': g('registration_date'),
             'child_first': g('name_first'),
             'child_middle': g('name_middle'),
             'child_last': g('name_last'),
@@ -715,6 +721,7 @@ def _map_template_output(raw: dict, form_hint: str) -> dict:
             'registry_no': g('registry_no'),
             'city_municipality': g('city_municipality'),
             'province': g('province'),
+            'date_submitted': g('registration_date'),
             'deceased_first': g('deceased_name'),
             'sex': g('sex'),
             'age_years': g('age'),
@@ -730,6 +737,7 @@ def _map_template_output(raw: dict, form_hint: str) -> dict:
             'registry_no': g('registry_no'),
             'city_municipality': g('city_municipality'),
             'province': g('province'),
+            'date_submitted': g('registration_date'),
             'husband_first': g('husband_name_first'),
             'husband_middle': g('husband_name_middle'),
             'husband_last': g('husband_name_last'),
@@ -762,6 +770,7 @@ def _map_template_output(raw: dict, form_hint: str) -> dict:
             'registry_no':      g('registry_no'),
             'city_municipality': g('city_municipality'),
             'province':         raw.get('province', '').strip(),
+            'date_issuance':    g('date_issued', 'date_issuance'),
             'groom_name':       _join_name('groom_name_first', 'groom_name_middle', 'groom_name_last'),
             'groom_age':        g('groom_age'),
             'groom_residence':  g('groom_residence'),