Update app.py

app.py

@@ -6,13 +6,16 @@ from get_next_question import next_question_level
 lvl = {"easy" : 0, "medium" : 1, "hard" : 2}
 idx = ["easy", "medium", "hard"]
 
+# Limit
+limit = 15
+
 # Update Ability Score
 def ability(H,L,R,W):
     if R == 0:
-        R  += 0.5
+        R  = 0.5
         W -= 0.5
     elif W == 0:
-        W  += 0.5
+        W  = 0.5
         R -= 0.5
 
     score = (H/L) + np.log(R/W)
@@ -98,10 +101,10 @@ def start_test(fileName):
                                           question["Option3"], question["Option4"]])
         
         # Submit Button
-        submit_button = st.form_submit_button("Next Question")
+        submit_button = st.form_submit_button("Next Question", disabled=(st.session_state.question_no >= limit))
 
         # End Button
-        end_test = st.form_submit_button("End Test")
+        end_test = st.form_submit_button("End Test", disabled=(st.session_state.question_no < limit))
     
     if submit_button:
         correct = (options == question["Correct Answer"])
@@ -113,6 +116,15 @@ def start_test(fileName):
         # Update Score
         st.session_state.score += int(response["correct"])
 
+        # Update L, H, R, W
+        st.session_state.L = st.session_state.question_no
+        st.session_state.H = st.session_state.level + 1
+        st.session_state.R += int(response["correct"])
+        st.session_state.W += int(not response["correct"])
+
+        # Update Question No
+        st.session_state.question_no += 1
+
         # Update Next State
         st.session_state.visited_question.append(response["id"])
         st.session_state.level = next_level(idx[st.session_state.level], response)
@@ -121,29 +133,58 @@ def start_test(fileName):
         st.session_state.question = fetch_question(fileName, st.session_state.level, st.session_state.visited_question)
         question = st.session_state.question
 
+        # Re-Render the Page
+        st.experimental_rerun()
+    
+    if end_test:
+        correct = (options == question["Correct Answer"])
+        question["correct"] = correct
+    
+        # Response -> Updated Question with Correct or Not
+        response = question
+
+        # Update Score
+        st.session_state.score += int(response["correct"])
+
         # Update L, H, R, W
         st.session_state.L = st.session_state.question_no
         st.session_state.H = st.session_state.level + 1
         st.session_state.R += int(response["correct"])
         st.session_state.W += int(not response["correct"])
 
-        # Update Question No
-        st.session_state.question_no += 1
-
-        # Re-Render the Page
-        st.experimental_rerun()
-    
-    if end_test:
-        st.write("No of Questions : ", st.session_state.question_no - 1)
+        # Display Values
+        st.write("No of Questions : ", st.session_state.question_no)
         st.write("Ability Score : ", ability(st.session_state.H, st.session_state.L, st.session_state.R, st.session_state.W))
         st.write("Correct Answers : ", st.session_state.R)
         st.write("Wrong Answers : ", st.session_state.W)
 
+        # Reset Values
+        st.session_state.next_class = next_question_level({'easy':50,'medium':30, 'hard':20})
+        st.session_state.probability = st.session_state.next_class.get_probabilty
+        st.session_state.score = 0
+        st.session_state.level = lvl[st.session_state.next_class.level()]
+        st.session_state.visited_question = []
+        st.session_state.question_no = 1
+        st.session_state.H = 0
+        st.session_state.L = 0
+        st.session_state.R = 0
+        st.session_state.W = 0 
+        st.session_state.question = fetch_question(fileName, st.session_state.level, st.session_state.visited_question)
+
+        # Re-Test Button
+        re_test = st.button("Re Test")
+
+        if re_test:
+            st.session_state.clicked = False
+
+            # Re-Render the Page
+            st.experimental_rerun()
+
     # Probability and Chart
     probabilty = st.session_state.next_class.get_probabilty()
-    #st.write(probabilty)
+    st.write(probabilty)
     
-    data = {"Difficulty Level" : ["Easy", "Medium", "Hard"], "Probabilty" : probabilty.values()}
+    data = {"Difficulty Level" : ["1 - Easy", "2 - Medium", "3 - Hard"], "Probabilty" : probabilty.values()}
     chart_data = pd.DataFrame(data)
     st.bar_chart(chart_data, x = "Difficulty Level", y = "Probabilty")