Update app.py

app.py

@@ -466,8 +466,8 @@ def show_field(f: Field, index: int, data_collected):
                         show_field(child, index, data_collected)
             case 'skip_checkbox':
                 st.checkbox(f.title, key=f.name, value=False)
-            #case 'rupture_markers':
-            #    render_rupture_markers_widget(index, rupture_choices)
+            case 'rupture_markers':
+                render_rupture_markers_widget(index, rupture_choices)
     else:
         key = f.name + str(index)
         st.session_state.data_inputs_keys.append(f.name)
@@ -559,6 +559,7 @@ def show_field(f: Field, index: int, data_collected):
             st.session_state.unacceptable_response = False
             st.error(f"Mandatory field")
 
+'''
 def show_fields(fields: List[Field]):
     st.session_state.valid = True
     index = st.session_state.current_index
@@ -585,6 +586,19 @@ def show_fields(fields: List[Field]):
             navigate(1)
 
     st.session_state.form_displayed = st.session_state.current_index
+'''
+
+def show_fields(fields: List[Field]):
+    index = st.session_state.current_index
+    data_collected = read_saved_data()
+    st.session_state.data_inputs_keys = []  # rebuilt each render
+    st.session_state.following_mandatory = False
+
+    for field in fields:
+        show_field(field, index, data_collected)
+
+    # mark that the page has been rendered at least once (if you still use this elsewhere)
+    st.session_state.form_displayed = st.session_state.current_index
 
 def prep_and_save_data(index, skip_sample):
     payload = {
@@ -735,9 +749,26 @@ elif st.session_state.current_index == -1:
 
 elif st.session_state.current_index < len(st.session_state.data):
     #add_annotation_guidelines()
-    with st.form("data_form"+str(st.session_state.current_index)):
-        show_fields(fields)
-    render_rupture_markers_widget(st.session_state.current_index, rupture_choices)
+    #with st.form("data_form"+str(st.session_state.current_index)):
+    #    show_fields(fields)
+    #render_rupture_markers_widget(st.session_state.current_index, rupture_choices)
+    show_fields(fields)
+
+    # Action buttons
+    c1, c2, c3 = st.columns([1,1,6])
+    with c1:
+        if st.button("Save & Next"):
+            if validate_current_page(fields, st.session_state.current_index):
+                with st.spinner("saving"):
+                    prep_and_save_data(st.session_state.current_index, ('skip' in st.session_state and st.session_state['skip']))
+                st.success("Saved!")
+                navigate(1)
+    with c2:
+        if st.button("Save only"):
+            if validate_current_page(fields, st.session_state.current_index):
+                with st.spinner("saving"):
+                    prep_and_save_data(st.session_state.current_index, ('skip' in st.session_state and st.session_state['skip']))
+                st.success("Saved!")
 
 elif st.session_state.current_index == len(st.session_state.data):
     st.write(f"**Thank you for taking part in this study!** \n ")