another hacky vversion

app.py

@@ -6,7 +6,7 @@ from dotenv import load_dotenv
 from views.intro_screen import welcome_screen
 from views.questions_screen import questions_screen
 from views.continue_survey import continue_survey_screen
-from views.ui_helpers import exit_screen
+from views.ui_helpers import exit_screen, display_completion_message
 from css.layout import custom_css
 
 st.set_page_config(layout="wide")
@@ -29,12 +29,14 @@ def initialization():
         st.session_state.show_questions = False
     if "survey_continued" not in st.session_state:
         st.session_state.survey_continued = None
-    if "start_new_survey" not in st.session_state:
-        st.session_state.start_new_survey = False
+    # if "start_new_survey" not in st.session_state:
+    #     st.session_state.start_new_survey = False
     if 'ratings' not in st.session_state:
         st.session_state.ratings = {}
     if 'previous_ratings' not in st.session_state:
         st.session_state.previous_ratings = {}
+    if 'screen' not in st.session_state:
+        st.session_state.screen = 'welcome'
 
 
 def ui():
@@ -43,11 +45,12 @@ def ui():
     data = load_data()
     initialization()
 
-    if st.session_state.completed and not st.session_state.start_new_survey:
+    if st.session_state.completed: \
+            # and not st.session_state.start_new_survey:
         exit_screen()
         return
 
-    if st.session_state.username is None:
+    if st.session_state.username is None and st.session_state.screen == 'welcome':
         welcome_screen()
     else:
         # Check if user progress exists in Firebase
@@ -60,7 +63,7 @@ def ui():
                 if st.session_state.current_index >= len(data):
                     # If all questions have been answered, show the exit screen
                     print("survey completed")
-                    survey_completed()
+                    display_completion_message()
                 # Otherwise, show questions from where they left off
                 questions_screen(data)
         else:

views/intro_screen.py

@@ -33,6 +33,7 @@ def welcome_screen():
         if (username_input and validation_code_input) or next_button:
             if validate_username(username_input) and validate_code(validation_code_input):
                 st.session_state.username = username_input
+                st.session_state.screen = "questions"
             else:
                 if not validate_username(username_input):
                     st.warning("Invalid username. Please check and try again.")

views/nav_buttons.py

@@ -5,26 +5,30 @@ from datetime import datetime
 import os
 from dotenv import load_dotenv
 
-from views.ui_helpers import display_completion_message
+from views.ui_helpers import display_completion_message, exit_screen
 
 load_dotenv()
 VALIDATION_CODE = os.getenv("VALIDATION_CODE")
 
 
-def submit_feedback(current_index):
+def submit_feedback(current_index, all_ratings):
     """Handles feedback submission to the database."""
-    feedback = Feedback(
-        id=current_index + 1,
-        user_id=st.session_state.username,
-        time_stamp=datetime.now().isoformat(),
-        responses=st.session_state.responses,
-    )
-    try:
-        save_feedback(feedback)
-        st.session_state.completed = True
-        st.rerun()
-    except Exception as e:
-        st.error(f"An error occurred while submitting feedback: {e}")
+    if any(rating == 0 for rating in all_ratings):
+        st.warning("Please provide all ratings before exiting.")
+        st.session_state.show_exit_screen = True
+    else:
+        feedback = Feedback(
+            id=current_index + 1,
+            user_id=st.session_state.username,
+            time_stamp=datetime.now().isoformat(),
+            responses=st.session_state.responses,
+        )
+        try:
+            save_feedback(feedback)
+            st.session_state.completed = True
+            st.session_state.screen = "exit"
+        except Exception as e:
+            st.error(f"An error occurred while submitting feedback: {e}")
 
 
 def flatten_ratings(response):
@@ -61,17 +65,18 @@ def navigation_buttons(data, response: Response):
                 st.warning("Please provide all ratings before proceeding.")
             else:
                 if current_index < len(data) - 1:
-                    st.session_state.previous_ratings[data.iloc[st.session_state.current_index]['config_id']] = response.model_ratings
+                    st.session_state.previous_ratings[
+                        data.iloc[st.session_state.current_index]['config_id']] = response.model_ratings
                     st.session_state.current_index += 1
                     st.rerun()
-                else:
-                    if st.button("Finish"):
-                        submit_feedback(current_index)
+
+                if st.button("Finish", disabled=st.session_state.current_index != len(data) - 1):
+                    st.session_state.screen = "exit"
+                    submit_feedback(current_index, all_ratings)
 
     with col3:  # Save & Resume Later button
         if st.button("Exit & Resume Later"):
-            submit_feedback(current_index)
-            if st.session_state.current_index == len(data) - 1:
-                st.session_state.completed = True
-                display_completion_message()
-                # st.rerun()
+            all_ratings = flatten_ratings(response)
+            submit_feedback(current_index, all_ratings)
+            st.session_state.screen = "exit"
+            # st.rerun()

views/ui_helpers.py

@@ -1,5 +1,7 @@
 import streamlit as st
 
+from views.intro_screen import welcome_screen
+
 
 def exit_screen():
     """Display exit screen"""
@@ -10,17 +12,21 @@ def exit_screen():
             <p>You can safely close this window or start a new survey.</p>
         </div>
     """, unsafe_allow_html=True)
-
-    if st.button("Resume Survey"):
-        reset_survey()
-        st.rerun()
+    st.session_state.completed = True
+    st.session_state.show_exit_screen = True
+    # btn = st.button("Resume Survey")
+    # if btn:
+    #     reset_survey()
+    #     st.session_state.screen ="welcome"
+        # st.rerun()
 
 
 def reset_survey():
     """Reset the survey state to start over."""
     st.session_state.responses = []
     st.session_state.completed = True
-    st.session_state.start_new_survey = True
+    # st.session_state.start_new_survey = True
+    st.show_exit_screen = False
 
 
 def display_completion_message():
@@ -35,6 +41,8 @@ def display_completion_message():
         """,
         unsafe_allow_html=True,
     )
+    print("trying to show completion message agian")
     st.session_state.show_questions = False
     st.session_state.completed = True
     st.session_state.start_new_survey = True
+    st.rerun()