Convert choices back to the unslugified variant

CHANGELOG.rst

@@ -4,6 +4,9 @@ Change log
 Next version
 ------------
 
+* Changed form submissions to convert choice values back to the unslugified
+  variant.
+
 0.25
 ----
 

form_designer/models.py

@@ -176,20 +176,21 @@ def submissions_data(self, *, submissions=None):
         if submissions is None:
             submissions = self.submissions.all()
 
-        def loader(submission, field):
+        def loader(submission, field, choice_dict):
+            value = None
             if field.name in submission.data:
-                return submission.data[field.name]
-            if (old := field._old_name) is not None and old in submission.data:
-                return submission.data[old]
-            return None
+                value = submission.data[field.name]
+            elif (old := field._old_name) is not None and old in submission.data:
+                value = submission.data[old]
+            return choice_dict.get(value, value)
 
         def old_name_loader(submission, old_name):
             return submission.data.get(old_name)
 
         fields_and_loaders = [
             (
                 {"name": field.name, "title": field.title},
-                partial(loader, field=field),
+                partial(loader, field=field, choice_dict=dict(field.get_choices())),
             )
             for field in self.fields.all()
         ]

tests/testapp/test_forms.py

@@ -158,7 +158,7 @@ def test_forms(self):
                             "title": "Please call me",
                             "value": False,
                         },
-                        {"name": "radio", "title": "Radio Select", "value": "two-what"},
+                        {"name": "radio", "title": "Radio Select", "value": "two what"},
                         {"name": "date", "title": "Date", "value": "2022-10-02"},
                     ],
                 }