Update app.py

app.py

@@ -391,6 +391,61 @@ def render_rupture_markers_widget(index: int, choices: list[str]):
 
     st.caption(f"{st.session_state[count_key]}/{MAX_RUPTURE_MARKERS} markers")
 
+def _get_value_for_field(f: Field, index: int):
+    """Return the session value for input fields or None."""
+    if f.type in INPUT_FIELD_DEFAULT_VALUES:
+        key = f.name + str(index)
+        return st.session_state.get(key, INPUT_FIELD_DEFAULT_VALUES[f.type])
+    return None
+
+def _is_default_value(f: Field, val):
+    """Check if current value equals the default for this widget type."""
+    return val == INPUT_FIELD_DEFAULT_VALUES.get(f.type)
+
+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):
+        nonlocal ok
+        # local flag that can be turned on by a node for its following siblings
+        req_for_following = following_required
+
+        for f in nodes:
+            if f.children:
+                # containers/expanders: recurse; pass the current rule downward
+                walk(f.children, req_for_following)
+                continue
+
+            if f.type in INPUT_FIELD_DEFAULT_VALUES:
+                val = _get_value_for_field(f, index)
+
+                # decide if THIS field is required
+                required = bool(f.mandatory or req_for_following)
+
+                # if required and default → error
+                if required and _is_default_value(f, val):
+                    ok = False
+
+                # update the "following required" rule for siblings
+                if f.following_mandatory_values:
+                    try:
+                        if val in f.following_mandatory_values:
+                            req_for_following = True
+                    except Exception:
+                        pass
+
+            # structural types (markdown/input_col/etc.) don’t affect validation
+
+    walk(fields, False)
+
+    if not ok:
+        st.error("Please fill in all mandatory fields.")
+    return ok
 #################################### Streamlit App ####################################
 
 # Function to navigate rows
@@ -429,6 +484,7 @@ def navigate(index_change):
     )
     st.rerun()
 
+'''
 def show_field(f: Field, index: int, data_collected):
     if f.type not in INPUT_FIELD_DEFAULT_VALUES.keys():
         st.session_state.following_mandatory = False
@@ -559,7 +615,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
@@ -587,6 +643,125 @@ def show_fields(fields: List[Field]):
 
     st.session_state.form_displayed = st.session_state.current_index
 '''
+def show_field(f: Field, index: int, data_collected):
+    """Render a Field tree. No form logic; everything runs outside forms."""
+    # Non-input widgets (custom structural types)
+    if f.type not in INPUT_FIELD_DEFAULT_VALUES.keys():
+        match f.type:
+            case 'input_col':
+                # Safely read a column from the current CSV row (or None if missing)
+                value = st.session_state.data.iloc[index][f.name] if (
+                    f.name and f.name in st.session_state.data.columns
+                ) else None
+
+                # Render based on field name
+                if f.name == 'image_name' and value:
+                    display_image(os.path.join(input_repo_path, 'images', value))
+                elif f.name == 'dialogue_name' and value:
+                    render_dialogue(
+                        os.path.join(input_repo_path, 'dialogues', value),
+                        width_chars=115, height_px=520, show_border=False
+                    )
+                elif f.name == 'patient' and value:
+                    st.markdown(f"## Patient:  {value}")
+                elif value not in (None, np.nan, ""):
+                    # generic fallback
+                    st.write(f.title)
+                    st.write(value)
+
+            case 'markdown':
+                # If a file path is provided, load & render it; otherwise render the title string
+                path = f.other_params.get("path") if f.other_params else None
+                if path:
+                    content = load_text(os.path.join(input_repo_path, path))
+                    st.markdown(content, unsafe_allow_html=True)
+                else:
+                    st.markdown(f.title)
+
+            case 'expander':
+                # Markdown header above; expander label is plain text
+                st.markdown(f.title)
+                with st.expander(""):
+                    for child in (f.children or []):
+                        show_field(child, index, data_collected)
+
+            case 'container':
+                with st.container(border=True):
+                    st.markdown(f.title)
+                    for child in (f.children or []):
+                        show_field(child, index, data_collected)
+
+            case 'skip_checkbox':
+                # outside forms this is fine
+                st.checkbox(f.title, key=f.name, value=False)
+
+            case 'rupture_markers':
+                # dynamic widget (outside forms)
+                render_rupture_markers_widget(index, rupture_choices)
+
+        return  # done with non-input types
+
+    # Input widgets (saved via data_inputs_keys)
+    key = f.name + str(index)
+    st.session_state.data_inputs_keys.append(f.name)
+
+    # 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]
+
+    # Render inputs
+    match f.type:
+        case 'checkbox':
+            st.checkbox(f.title, key=key, value=value, help=f.help)
+
+        case 'radio':
+            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
+            st.radio(f.title,
+                     options=range(len(labels)),
+                     format_func=lambda x: labels[x],
+                     key=key,
+                     index=value if value is not None else 0,
+                     help=f.help, horizontal=False)
+
+        case 'slider':
+            st.slider(f.title, min_value=0, max_value=6, step=1, key=key, value=value, help=f.help)
+
+        case 'select_slider':
+            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
+            st.select_slider(f.title,
+                             options=[0, 20, 40, 60, 80, 100],
+                             format_func=lambda x: labels[x // 20],
+                             key=key, value=value, help=f.help)
+
+        case 'multiselect':
+            choices = f.other_params.get('choices') if f.other_params and f.other_params.get('choices') else default_choices
+            st.multiselect(f.title, options=choices, format_func=lambda x: x,
+                           key=key, max_selections=3, default=value, help=f.help)
+
+        case 'likert_radio':
+            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else default_labels
+            st.radio(f.title, options=[0, 1, 2, 3, 4],
+                     format_func=lambda x: labels[x],
+                     key=key, index=value if value is not None else 0,
+                     help=f.help, horizontal=True)
+
+        case 'y_n_radio':
+            labels = f.other_params.get('labels') if f.other_params and f.other_params.get('labels') else yes_no_labels
+            st.radio(f.title, options=[0, 1],
+                     format_func=lambda x: labels[x],
+                     key=key, index=value if value is not None else 0,
+                     help=f.help, horizontal=True)
+
+        case 'text':
+            st.text_input(f.title, key=key, value=value if value is not None else "", max_chars=None)
+
+        case 'textarea':
+            st.text_area(f.title, key=key, value=value if value is not None else "", max_chars=None)
+
 
 def show_fields(fields: List[Field]):
     index = st.session_state.current_index