Update app.py

app.py

@@ -74,6 +74,14 @@ assistance_choices = ['Expand the breadth of moderator role',
                     
 default_choices = function_choices
 
+consent_text = 'By taking part in this study you agree that you read all the details in [the consent form](https://someurl.com) and that you give your consent to participate in the study.'
+guidelines_text = 'Please read <a href="https://someurl.com">the guidelines</a>'
+study_code = 'some code here'
+
+intro_fields: List[Field] = [
+    Field(name="intro_comments_1", type="text", title="Further comments1: free text"),
+    Field(name="intro_comments_2", type="text", title="Further comments2: free text"),
+]
 
 fields: List[Field] = [
     Field(name="topic", type="input_col", title="**Topic:**"),
@@ -244,8 +252,8 @@ div[data-testid="stMarkdownContainer"] > p {
     </style>
     """, unsafe_allow_html=True)
 
-with st.expander(label="Annotation Guidelines", expanded=False):
-    st.write('some guidelines here')
+#with st.expander(label="Annotation Guidelines", expanded=False):
+#    st.write('some guidelines here')
 
 # Load the data to annotate
 if 'data' not in st.session_state:
@@ -253,45 +261,89 @@ if 'data' not in st.session_state:
 
 # Initialize the current index
 if 'current_index' not in st.session_state:
-    st.session_state.current_index = -1
+    st.session_state.current_index = -3
+
+def add_checked_submit():
+    check = st.checkbox('I agree', key='consent')
+    if st.form_submit_button("Submit"):
+        if not check:
+            st.error("Please agree to give your consent to proceed")
+        else:
+            navigate(1)
 
-if st.session_state.current_index == -1:
+def add_annotation_guidelines():
+    st.markdown(
+        "<details open><summary>Annotation Guidelines</summary>"+guidelines_text+"</details>"
+        , unsafe_allow_html=True)
+    st.write(f"username is {st.session_state.user_id}")
+
+if st.session_state.current_index == -3:
+    with st.form("data_form"):
+        st.markdown(consent_text)
+        add_checked_submit()
+
+elif st.session_state.current_index == -2:
     user_id_from_url = get_user_id_from_url()
     if user_id_from_url:
         st.session_state.user_id = user_id_from_url
         navigate(1)
     else:
-        st.session_state.user_id = st.text_input('Please enter your user ID to proceed', value=user_id_from_url)
-        if st.button("Next"):
-            navigate(1)
+        with st.form("data_form"):
+            st.session_state.user_id = st.text_input('Please enter your user ID', value=user_id_from_url)
+            if st.form_submit_button("Submit"):
+                navigate(1)
+
+elif st.session_state.current_index == -1:
+    add_annotation_guidelines()
+    with st.form("data_form"):
+        show_fields(intro_fields)
 
 elif st.session_state.current_index < len(st.session_state.data):
-    st.write(f"username is {st.session_state.user_id}")
-    
-    # Creating the form
-    with st.form("feedback_form"):
-        index = st.session_state.current_index
-        data_collected = read_saved_data()
-        st.session_state.default_values = {}
-        st.session_state.data_inputs = {}
-
-        for field in fields:
-            if field.name not in st.session_state.data.columns:
-                # Field doesn't exist in input dataframe, add it with a default value
-                st.session_state.data_inputs[field.name] = None
-            show_field(field, index)
-
-        submitted = st.form_submit_button("Submit")
-        if submitted:
-            with st.spinner(text="saving"):
-                save_data({
-                    'user_id': st.session_state.user_id,
-                    'index': st.session_state.current_index,
-                    **st.session_state.data.iloc[index][COLS_TO_SAVE].to_dict(),
-                    **st.session_state.data_inputs
-                })
-            st.success("Feedback submitted successfully!")
-            navigate(1)
+    add_annotation_guidelines()
+    with st.form("data_form"):
+        show_fields(fields)
+
+else:
+    st.write(f"Thank you for taking part in this study! Code to finish the study: {study_code}")
+
+
+#if st.session_state.current_index == -1:
+#    user_id_from_url = get_user_id_from_url()
+#    if user_id_from_url:
+#        st.session_state.user_id = user_id_from_url
+#        navigate(1)
+#    else:
+#        st.session_state.user_id = st.text_input('Please enter your user ID to proceed', value=user_id_from_url)
+#        if st.button("Next"):
+#            navigate(1)
+#
+#elif st.session_state.current_index < len(st.session_state.data):
+#    st.write(f"username is {st.session_state.user_id}")
+#    
+#    # Creating the form
+#    with st.form("feedback_form"):
+#        index = st.session_state.current_index
+#        data_collected = read_saved_data()
+#        st.session_state.default_values = {}
+#        st.session_state.data_inputs = {}
+#
+#        for field in fields:
+#            if field.name not in st.session_state.data.columns:
+#                # Field doesn't exist in input dataframe, add it with a default value
+#                st.session_state.data_inputs[field.name] = None
+#            show_field(field, index)
+#
+#        submitted = st.form_submit_button("Submit")
+#        if submitted:
+#            with st.spinner(text="saving"):
+#                save_data({
+#                    'user_id': st.session_state.user_id,
+#                    'index': st.session_state.current_index,
+#                    **st.session_state.data.iloc[index][COLS_TO_SAVE].to_dict(),
+#                    **st.session_state.data_inputs
+#                })
+#            st.success("Feedback submitted successfully!")
+#            navigate(1)
 
 else:
     st.write("Finished all data points!")
@@ -304,6 +356,7 @@ if st.session_state.current_index > 0:
 if 0 <= st.session_state.current_index < len(st.session_state.data):
     st.write(f"Page {st.session_state.current_index + 1} out of {len(st.session_state.data)}")
 
+
 # disable text input enter to submit
 # https://discuss.streamlit.io/t/text-input-how-to-disable-press-enter-to-apply/14457/6
 import streamlit.components.v1 as components