Update app.py

app.py

@@ -486,165 +486,166 @@ 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
-        match f.type:
-            case 'input_col':
-                #if f.name and f.name in st.session_state.data.columns:
-                #    value = st.session_state.data.iloc[index][f.name]
-                #else:
-                #    value = None
-                value = st.session_state.data.iloc[index][f.name]
-                if value and value is not np.nan:
-                    st.write(f.title)
-                    if f.name == 'image_name':
-                        display_image(os.path.join(input_repo_path, 'images', value))
-                    elif f.name == 'dialogue_name':
-                        render_dialogue(os.path.join(input_repo_path, 'dialogues', value), width_chars=115, height_px=520, show_border=False)
-                    #elif f.name == 'rupture_marker_overview':
-                    #    display_dialogue(os.path.join(input_repo_path, 'rupture_marker_overview.md'))
-                    elif f.name == 'patient':
-                        st.markdown(f"## Patient:  {value}")
-                    else:
-                        st.write(value)
-            case 'markdown':
-                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' | 'container':
-                with (st.expander(f.title) if f.type == 'expander' else st.container(border=True)):
-                    if f.type == 'container':
-                        st.markdown(f.title)
-                    for child in f.children:
-                        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)
-    else:
-        key = f.name + str(index)
-        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
-        
-        validation_error = False
-        
-        # form is not displayed for first time
-        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
-        
-            # check for any unaccepted values
-            if (
-                    (f.other_params.get('accepted_values') and
-                     value not in f.other_params.get('accepted_values')) or
-                    (f.other_params.get('accepted_values_per_sample') and
-                     index in f.other_params.get('accepted_values_per_sample') and
-                     value not in f.other_params.get('accepted_values_per_sample').get(index))
-            ):
-                st.session_state.unacceptable_response = True
-
-        if f.mandatory or st.session_state.following_mandatory:
-            f.title += " :red[* required!]" if (validation_error and not SHOW_VALIDATION_ERROR_MESSAGE) else' :red[*]'
-        f.help = None
-
-        match f.type:
-            case 'checkbox':
-                st.checkbox(f.title,
-                            key=key,
-                            value=value, help=f.help)
-            case 'radio':
-                labels = default_labels if not f.other_params.get('labels') else f.other_params.get('labels')
-                st.radio(f.title,
-                         options=range(len(labels)),
-                         format_func=lambda x: labels[x],
-                         key=key,
-                         index=value, 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 = default_labels if not f.other_params.get('labels') else f.other_params.get('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 = default_choices if not f.other_params.get('choices') else f.other_params.get('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 = default_labels if not f.other_params.get('labels') else f.other_params.get('labels')
-                st.radio(f.title,
-                         options=[0, 1, 2, 3, 4],
-                         format_func=lambda x: labels[x],
-                         key=key,
-                         index=value, help=f.help, horizontal=True)
-            case 'y_n_radio':
-                labels = yes_no_labels if not f.other_params.get('labels') else f.other_params.get('labels')
-                st.radio(f.title,
-                         options=[0, 1],
-                         format_func=lambda x: labels[x],
-                         key=key,
-                         index=value, help=f.help, horizontal=True)
-            case 'text':
-                st.text_input(f.title, key=key, value=value, max_chars=None)
-            case 'textarea':
-                st.text_area(f.title, key=key, value=value, max_chars=None)
-
-        if validation_error:
-            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
-    data_collected = read_saved_data()
-    st.session_state.data_inputs_keys = []
-    st.session_state.following_mandatory = False
 
-    for field in fields:
-        show_field(field, index, data_collected)
+#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
+#        match f.type:
+#            case 'input_col':
+#                #if f.name and f.name in st.session_state.data.columns:
+#                #    value = st.session_state.data.iloc[index][f.name]
+#                #else:
+#                #    value = None
+#                value = st.session_state.data.iloc[index][f.name]
+#                if value and value is not np.nan:
+#                    st.write(f.title)
+#                    if f.name == 'image_name':
+#                        display_image(os.path.join(input_repo_path, 'images', value))
+#                    elif f.name == 'dialogue_name':
+#                        render_dialogue(os.path.join(input_repo_path, 'dialogues', value), width_chars=115, height_px=520, show_border=False)
+#                    #elif f.name == 'rupture_marker_overview':
+#                    #    display_dialogue(os.path.join(input_repo_path, 'rupture_marker_overview.md'))
+#                    elif f.name == 'patient':
+#                        st.markdown(f"## Patient:  {value}")
+#                    else:
+#                        st.write(value)
+#            case 'markdown':
+#                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' | 'container':
+#                with (st.expander(f.title) if f.type == 'expander' else st.container(border=True)):
+#                    if f.type == 'container':
+#                        st.markdown(f.title)
+#                    for child in f.children:
+#                        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)
+#    else:
+#        key = f.name + str(index)
+#        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
+#        
+#        validation_error = False
+#        
+#        # form is not displayed for first time
+#        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
+#        
+#            # check for any unaccepted values
+#            if (
+#                    (f.other_params.get('accepted_values') and
+#                     value not in f.other_params.get('accepted_values')) or
+#                    (f.other_params.get('accepted_values_per_sample') and
+#                     index in f.other_params.get('accepted_values_per_sample') and
+#                     value not in f.other_params.get('accepted_values_per_sample').get(index))
+#            ):
+#                st.session_state.unacceptable_response = True
+#
+#        if f.mandatory or st.session_state.following_mandatory:
+#            f.title += " :red[* required!]" if (validation_error and not SHOW_VALIDATION_ERROR_MESSAGE) else' :red[*]'
+#        f.help = None
+#
+#        match f.type:
+#            case 'checkbox':
+#                st.checkbox(f.title,
+#                            key=key,
+#                            value=value, help=f.help)
+#            case 'radio':
+#                labels = default_labels if not f.other_params.get('labels') else f.other_params.get('labels')
+#                st.radio(f.title,
+#                         options=range(len(labels)),
+#                         format_func=lambda x: labels[x],
+#                         key=key,
+#                         index=value, 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 = default_labels if not f.other_params.get('labels') else f.other_params.get('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 = default_choices if not f.other_params.get('choices') else f.other_params.get('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 = default_labels if not f.other_params.get('labels') else f.other_params.get('labels')
+#                st.radio(f.title,
+#                         options=[0, 1, 2, 3, 4],
+#                         format_func=lambda x: labels[x],
+#                         key=key,
+#                         index=value, help=f.help, horizontal=True)
+#            case 'y_n_radio':
+#                labels = yes_no_labels if not f.other_params.get('labels') else f.other_params.get('labels')
+#                st.radio(f.title,
+#                         options=[0, 1],
+#                         format_func=lambda x: labels[x],
+#                         key=key,
+#                         index=value, help=f.help, horizontal=True)
+#            case 'text':
+#                st.text_input(f.title, key=key, value=value, max_chars=None)
+#            case 'textarea':
+#                st.text_area(f.title, key=key, value=value, max_chars=None)
+#
+#        if validation_error:
+#            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
+#    data_collected = read_saved_data()
+#    st.session_state.data_inputs_keys = []
+#    st.session_state.following_mandatory = False
+#
+#    for field in fields:
+#        show_field(field, index, data_collected)
+#
+#    submitted = st.form_submit_button("Submit")
+#    if submitted:
+#        if 'unacceptable_response' in st.session_state and st.session_state.unacceptable_response:
+#            prep_and_save_data(index, ('skip' in st.session_state and st.session_state['skip']))
+#            st.rerun()
+#        skip_sample = ('skip' in st.session_state and st.session_state['skip'])
+#        if not skip_sample and not st.session_state.valid:
+#            st.error("Please fill in all mandatory fields")
+#            # st.rerun() # filed-out values are not shown otherwise
+#        else:
+#            with st.spinner(text="saving"):
+#                prep_and_save_data(index, skip_sample)
+#            st.success("Feedback submitted successfully!")
+#            navigate(1)
+#
+#    st.session_state.form_displayed = st.session_state.current_index
+#
 
-    submitted = st.form_submit_button("Submit")
-    if submitted:
-        if 'unacceptable_response' in st.session_state and st.session_state.unacceptable_response:
-            prep_and_save_data(index, ('skip' in st.session_state and st.session_state['skip']))
-            st.rerun()
-        skip_sample = ('skip' in st.session_state and st.session_state['skip'])
-        if not skip_sample and not st.session_state.valid:
-            st.error("Please fill in all mandatory fields")
-            # st.rerun() # filed-out values are not shown otherwise
-        else:
-            with st.spinner(text="saving"):
-                prep_and_save_data(index, skip_sample)
-            st.success("Feedback submitted successfully!")
-            navigate(1)
-
-    st.session_state.form_displayed = st.session_state.current_index
-'''
 def show_field(f: Field, index: int, data_collected):
     """Render a Field tree. Pure rendering (no form submit logic here)."""