added next button on the intro screen

app.py

@@ -2,7 +2,7 @@ import json
 from typing import Dict
 
 from db.schema import Feedback, Response
-from db.crud import ingest
+from db.crud import ingest, read
 import pandas as pd
 import streamlit as st
 from datetime import datetime
@@ -17,43 +17,72 @@ class SurveyState:
     """Class to handle survey state management"""
 
     def __init__(self):
-        self.state_file = "survey_states.json"
+        pass
 
     def save_state(self, prolific_id: str, current_state: Dict) -> None:
-        """Save current state to file"""
+        """Save current state to Firebase"""
         try:
-            if os.path.exists(self.state_file):
-                with open(self.state_file, 'r') as f:
-                    states = json.load(f)
-            else:
-                states = {}
-
-            states[prolific_id] = current_state
-
-            with open(self.state_file, 'w') as f:
-                json.dump(states, f)
-
+            # Saving to Firebase via the ingest function
+            feedback = Feedback(user_id=prolific_id, time_stamp=datetime.now().isoformat(),
+                                responses=current_state["responses"])
+            ingest(feedback)  # Ingest feedback to Firebase
+            st.success("Your progress has been saved! You can continue later.")
         except Exception as e:
-            st.error(f"Error saving state: {e}")
+            st.error(f"Error saving state to Firebase: {e}")
 
     def load_state(self, prolific_id: str) -> Dict:
-        """Load state for a specific user"""
+        """Load state for a specific user from Firebase"""
         try:
-            if os.path.exists(self.state_file):
-                with open(self.state_file, 'r') as f:
-                    states = json.load(f)
-                return states.get(prolific_id, {})
+            # Retrieve the state from Firebase for the given Prolific ID
+            state = self.get_state_from_firebase(prolific_id)
+            if state:
+                return state
         except Exception as e:
-            st.error(f"Error loading state: {e}")
+            st.error(f"Error loading state from Firebase: {e}")
         return {}
 
+    class SurveyState:
+        """Class to handle survey state management"""
+
+        def __init__(self):
+            pass
+
+        @staticmethod
+        def save_state(self, username: str, current_state: Dict) -> None:
+            """Save current state to Firebase"""
+            try:
+                # Saving to Firebase via the ingest function
+                feedback = Feedback(user_id=username, time_stamp=datetime.now().isoformat(),
+                                    responses=current_state["responses"])
+                ingest(feedback)  # Ingest feedback to Firebase
+                st.success("Your progress has been saved! You can continue later.")
+            except Exception as e:
+                st.error(f"Error saving state to Firebase: {e}")
+
+        def load_state(self, username: str) -> Dict:
+            """Load state for a specific user from Firebase"""
+            try:
+                # Retrieve the state from Firebase for the given Prolific ID
+                state = self.get_state_from_firebase(username)
+                if state:
+                    return state
+            except Exception as e:
+                st.error(f"Error loading state from Firebase: {e}")
+            return {}
+
+        def get_state_from_firebase(self, username: str) -> Dict:
+            # Placeholder method to simulate getting state from Firebase
+            # In practice, you will query Firebase to get the current state
+            data = read(username)
+            return {}
+
 
 def initialization():
     """Initialize session state variables."""
     if "current_index" not in st.session_state:
         st.session_state.current_index = 0
-    if "prolific_id" not in st.session_state:
-        st.session_state.prolific_id = None
+    if "username" not in st.session_state:
+        st.session_state.username = None
     if "responses" not in st.session_state:
         st.session_state.responses = []
     if "completed" not in st.session_state:
@@ -62,8 +91,8 @@ def initialization():
         st.session_state.survey_state = SurveyState()
 
 
-def validate_prolific_id(prolific_id: str) -> bool:
-    return bool(prolific_id.strip())
+def validate_username(username: str) -> bool:
+    return bool(username.strip())
 
 
 def validate_code(input_code: str) -> bool:
@@ -71,20 +100,21 @@ def validate_code(input_code: str) -> bool:
     return input_code.strip() == VALIDATION_CODE
 
 
-def prolific_id_screen():
+def username_screen():
     """Display the Prolific ID entry screen."""
     st.title("Welcome to the Feedback Survey")
 
-    prolific_id_input = st.text_input("Enter your Prolific ID and press ENTER:")
-    validation_code_input = st.text_input("Enter the validation code to proceed:")
+    username_input = st.text_input("Enter your First name and press TAB:")
+    validation_code_input = st.text_input("Enter the validation code to proceed and press ENTER:")
 
-    if prolific_id_input and validation_code_input:
+    next_button = st.button("Next")
+    if (username_input and validation_code_input) or next_button:
         # Validate Prolific ID and code
-        if validate_prolific_id(prolific_id_input) and validate_code(validation_code_input):
-            st.session_state.prolific_id = prolific_id_input
+        if validate_username(username_input) and validate_code(validation_code_input):
+            st.session_state.username = username_input
 
             # Load previous state if exists
-            saved_state = st.session_state.survey_state.load_state(prolific_id_input)
+            saved_state = st.session_state.survey_state.load_state(username_input)
             if saved_state:
                 st.session_state.current_index = saved_state.get('current_index', 0)
                 st.session_state.responses = saved_state.get('responses', [])
@@ -93,7 +123,7 @@ def prolific_id_screen():
                 st.success("Prolific ID and code validated! Starting new survey.")
             st.rerun()
         else:
-            if not validate_prolific_id(prolific_id_input):
+            if not validate_username(username_input):
                 st.warning("Invalid Prolific ID. Please check and try again.")
             if not validate_code(validation_code_input):
                 st.warning("Invalid validation code. Please check and try again.")
@@ -169,7 +199,7 @@ def navigation_buttons(data, rating_v, rating_p0, rating_p1):
                 else:
                     feedback = Feedback(
                         id=current_index + 1,
-                        user_id=st.session_state.prolific_id,
+                        user_id=st.session_state.username,
                         time_stamp=datetime.now().isoformat(),
                         responses=st.session_state.responses,
                     )
@@ -201,7 +231,7 @@ def submit_survey():
     try:
         feedback = Feedback(
             id=st.session_state.current_index,
-            user_id=st.session_state.prolific_id,
+            user_id=st.session_state.username,
             time_stamp=datetime.now().isoformat(),
             responses=st.session_state.responses,
         )
@@ -215,7 +245,7 @@ def submit_survey():
 
 def reset_survey():
     """Reset the survey state to start over."""
-    st.session_state.prolific_id = None
+    st.session_state.username = None
     st.session_state.current_index = 0
     st.session_state.responses = []
     st.session_state.completed = False
@@ -235,8 +265,8 @@ def ui():
         exit_screen()
         return
 
-    if st.session_state.prolific_id is None:
-        prolific_id_screen()
+    if st.session_state.username is None:
+        username_screen()
     else:
         questions_screen(data)
 

db/crud.py

@@ -25,9 +25,9 @@ def ingest(data: Feedback):
 
 
 # Read operation (Fetch feedback data from Firebase)
-def read(feedback_id: int):
+def read(user_id: str):
     ref = db_setup()
-    feedback_ref = ref.child('feedback').order_by_child('id').equal_to(feedback_id).get()
+    feedback_ref = ref.child('feedback').order_by_child('user_id').equal_to(user_id).get()
 
     if feedback_ref:
         return feedback_ref
@@ -66,48 +66,39 @@ def delete(feedback_id: int):
 
 def test():
     # Create a feedback object
-    feedback_example = Feedback(
-        id=1,
-        user_id="user1234",
-        time_stamp=datetime.now(),
-        responses=[
-            {"q_id": "q1", "ans": 5},
-            {"q_id": "q2", "ans": 3}
-        ]
-    )
-    feedback = Feedback(
-        id=2,
-        user_id='tt',
-        time_stamp=datetime(2025, 1, 30, 21, 25, 15, 581994),
-        responses=[
-            Response(config_id='c_p_0_pop_low_easy', rating_v=1, rating_p0=1, rating_p1=1, comment='',
-                     timestamp='2025-01-30T21:25:12.642038'),
-            Response(config_id='c_p_1_pop_medium_medium', rating_v=1, rating_p0=1, rating_p1=1, comment='',
-                     timestamp='2025-01-30T21:25:13.854227'),
-            Response(config_id='c_p_2_pop_high_hard', rating_v=1, rating_p0=1, rating_p1=1, comment='',
-                     timestamp='2025-01-30T21:25:15.581948'),
-        ]
-    )
-    # Create (Ingest)
-    ingest(feedback)
+    # feedback = Feedback(
+    #     id=2,
+    #     user_id='tt',
+    #     time_stamp=datetime(2025, 1, 30, 21, 25, 15, 581994),
+    #     responses=[
+    #         Response(config_id='c_p_0_pop_low_easy', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+    #                  timestamp='2025-01-30T21:25:12.642038'),
+    #         Response(config_id='c_p_1_pop_medium_medium', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+    #                  timestamp='2025-01-30T21:25:13.854227'),
+    #         Response(config_id='c_p_2_pop_high_hard', rating_v=1, rating_p0=1, rating_p1=1, comment='',
+    #                  timestamp='2025-01-30T21:25:15.581948'),
+    #     ]
+    # )
+    # # Create (Ingest)
+    # ingest(feedback)
 
     # Read (Fetch)
-    feedback_data = read(1)
+    feedback_data = read("cdSf")
     if feedback_data:
         print(feedback_data)
 
     # Update (Modify)
-    updated_feedback = Feedback(
-        id=1,
-        user_id="user123",
-        time_stamp=datetime.now(),
-        responses=[
-            {"q_id": "q1", "ans": 4},  # Updated answer
-            {"q_id": "q2", "ans": 3}
-        ]
-    )
-    update(1, updated_feedback)
-
-    # Delete (Remove)
-    delete(1)
+    # updated_feedback = Feedback(
+    #     id=1,
+    #     user_id="user123",
+    #     time_stamp=datetime.now(),
+    #     responses=[
+    #         {"q_id": "q1", "ans": 4},  # Updated answer
+    #         {"q_id": "q2", "ans": 3}
+    #     ]
+    # )
+    # update(1, updated_feedback)
+    #
+    # # Delete (Remove)
+    # delete(1)