Update app.py

app.py

@@ -131,13 +131,13 @@ fields0: List[Field] = [
                     other_params={'labels': mentioned_y_n}, mandatory=True),
     ]),
 
-#    Field(type="container", title="#### Rupture Markers", children=[
-#        Field(type="expander", title="**Overview of rupture markers** *(expand)*", children=[
-#            Field(type="markdown", title="", other_params={"path": "rupture_marker_overview.md"}),
-#        ]),
-#        Field(name="rupture_marker", type="rupture_markers",
-#          title="Select rupture markers noted in the session, include line numbers where rupture is found.", mandatory=False),
-#    ]),
+    Field(type="container", title="#### Rupture Markers", children=[
+        Field(type="expander", title="**Overview of rupture markers** *(expand)*", children=[
+            Field(type="markdown", title="", other_params={"path": "rupture_marker_overview.md"}),
+        ]),
+        Field(name="rupture_marker", type="rupture_markers",
+          title="Select rupture markers noted in the session, include line numbers where rupture is found.", mandatory=False),
+    ]),
 ]
 fields1: List[Field] = [
     Field(type="container", title="#### True-To-Patient-Prompt Features", children=[
@@ -490,6 +490,11 @@ def prime_rupture_markers_from_saved(index: int, data_collected: dict | None):
     st.session_state[primed_flag] = True
 
 def validate_current_page(fields: List[Field], index: int) -> bool:
+    """
+    Walk the field tree and verify mandatory inputs are filled.
+    Honors `following_mandatory_values`: if a field's value is in that list,
+    subsequent siblings become mandatory.
+    """
     ok = True
 
     def walk(nodes: List[Field], following_required: bool = False):
@@ -658,7 +663,7 @@ def show_field(f: Field, index: int, data_collected):
                     st.session_state.following_mandatory = True
 
         if f.mandatory or st.session_state.following_mandatory:
-            f.title += " :green[* required!]" if (validation_error and not SHOW_VALIDATION_ERROR_MESSAGE) else' :green[*]'
+            f.title += " :red[* required!]" if (validation_error and not SHOW_VALIDATION_ERROR_MESSAGE) else' :red[*]'
         f.help = None
         
     value = st.session_state[key] if key in st.session_state else \
@@ -780,7 +785,7 @@ def prep_and_save_data(index, skip_sample, completed: bool):
         'user_id': st.session_state.user_id,
         'index': st.session_state.current_index,
         **(st.session_state.data.iloc[index][COLS_TO_SAVE].to_dict() if 0 <= index < len(st.session_state.data) else {}),
-        #**{k: st.session_state[k + str(index)] for k in st.session_state.data_inputs_keys},
+        **{k: st.session_state[k + str(index)] for k in st.session_state.data_inputs_keys},
         'skip': skip_sample,
         'completed': completed,
     }
@@ -879,7 +884,6 @@ if user_id_from_url and not st.session_state.get("user_id"):
 # current index
 if 'current_index' not in st.session_state:
     start_index = get_start_index()
-    
     if start_index < len(st.session_state.data)-1:
         st.session_state.current_index = start_index
     else:
@@ -894,6 +898,7 @@ if get_param_from_url('show_extra_fields'):
 else:
     fields1 += url_conditional_fields
 
+
 def add_validated_submit(fields, message):
     st.session_state.form_displayed = st.session_state.current_index
     if st.form_submit_button("Submit"):
@@ -934,9 +939,9 @@ elif st.session_state.current_index < len(st.session_state.data):
     show_fields(STEPS[step])
 
     # Action buttons
-    c1, c2, c3 = st.columns([4,5,4])
+    c1, c2, c3 = st.columns([5,3,2])
     with c1:
-        label = "**Submit**" if step < total_steps - 1 else "**Submit & next session**"
+        label = "**:red[Submit]**" if step < total_steps - 1 else "**:red[Submit & next session]**"
         if st.button(label):
             if validate_current_page(STEPS[step], st.session_state.current_index):
                 is_last_page = (step == total_steps - 1)
@@ -962,6 +967,8 @@ elif st.session_state.current_index < len(st.session_state.data):
                 st.rerun()
 elif st.session_state.current_index == len(st.session_state.data):
     st.write(f"**Thank you for taking part in this study!** \n ")
+#    if st.button("Previous"):
+#        navigate(-2)
 
 # Navigation buttons
 #if 0 < st.session_state.current_index < len(st.session_state.data):
@@ -984,4 +991,3 @@ st.markdown(
     }
     </style>""", unsafe_allow_html=True
 )
-