Update app.py

app.py

@@ -710,21 +710,37 @@ def show_field(f: Field, index: int, data_collected):
         return  # done with structural types
 
     # ---------- Input types (saved to session & later to JSON) ----------
-    key = f.name + str(index)
-    # track the logical field name once per page; prep_and_save_data relies on this
-    st.session_state.data_inputs_keys.append(f.name)
-
-    # Compose title with inline help (no stray/bare expression)
-    if not SHOW_HELP_ICON:
-        f.title = f'**{f.title}**\n\n{f.help}' if f.help else f.title
+    else:
+        key = f.name + str(index)
+        # track the logical field name once per page; prep_and_save_data relies on this
+        st.session_state.data_inputs_keys.append(f.name)
+        value = st.session_state[key] if key in st.session_state else \
+            (data_collected[f.name] if data_collected else INPUT_FIELD_DEFAULT_VALUES[f.type])
+        if not SHOW_HELP_ICON:
+            f.title = f'**{f.title}**\n\n{f.help}' if f.help else f.title
 
     # Resolve initial value: session_state > saved JSON > default
-    if key in st.session_state:
-        value = st.session_state[key]
-    elif data_collected and f.name in data_collected:
-        value = data_collected[f.name]
-    else:
-        value = INPUT_FIELD_DEFAULT_VALUES[f.type]
+#    if key in st.session_state:
+#        value = st.session_state[key]
+#    elif data_collected and f.name in data_collected:
+#        value = data_collected[f.name]
+#    else:
+#        value = INPUT_FIELD_DEFAULT_VALUES[f.type]
+
+        if st.session_state.form_displayed == st.session_state.current_index:
+            if st.session_state.following_mandatory and f.skip_mandatory:
+                st.session_state.following_mandatory = False
+            if f.following_mandatory_values and st.session_state[key] in f.following_mandatory_values:
+                st.session_state.following_mandatory = True
+            if f.mandatory or st.session_state.following_mandatory:
+                if st.session_state[key] == INPUT_FIELD_DEFAULT_VALUES[f.type]:
+                    st.session_state.valid = False
+                    validation_error = True
+                elif f.following_mandatory_values and st.session_state[key] in f.following_mandatory_values:
+                    st.session_state.following_mandatory = True
+
+    value = st.session_state[key] if key in st.session_state else \
+            (data_collected[f.name] if data_collected else INPUT_FIELD_DEFAULT_VALUES[f.type])
 
     match f.type:
         case 'checkbox':