merge main branch and make async step banner more clear

Author: sethbern

bases/rsptx/web2py_server/applications/runestone/controllers/peer.py

@@ -143,10 +143,25 @@ def dashboard():
         is_last=done,
         lti=is_lti,
         has_vote1=has_vote1,
+        peer_async_visible=assignment.peer_async_visible or False,
         **course_attrs,
     )
 
 
+@auth.requires(
+    lambda: verifyInstructorStatus(auth.user.course_id, auth.user),
+    requires_login=True,
+)
+def toggle_async():
+    response.headers["content-type"] = "application/json"
+    assignment_id = request.vars.assignment_id
+    assignment = db(db.assignments.id == assignment_id).select().first()
+    new_value = not (assignment.peer_async_visible or False)
+    db(db.assignments.id == assignment_id).update(peer_async_visible=new_value)
+    db.commit()
+    return json.dumps({"peer_async_visible": new_value})
+
+
 def extra():
     assignment_id = request.vars.assignment_id
     current_question, done, idx = _get_current_question(assignment_id, False)

bases/rsptx/web2py_server/applications/runestone/views/peer/dashboard.html

@@ -61,6 +61,7 @@ <h3>Question {{ =current_qnum }} of {{ =num_questions }}</h3>
                 </div>
 
                 <div id="pi-assignment-navigation">
+                    {{ if current_qnum < num_questions: }}
                     <button
                         type="submit"
                         id="nextq"
@@ -70,6 +71,19 @@ <h3>Question {{ =current_qnum }} of {{ =num_questions }}</h3>
                     >
                         Next Question
                     </button>
+                    {{ else: }}
+                    <div id="asyncBtnArea" style="display:inline-block;">
+                        <button
+                            type="button"
+                            id="toggleAsyncBtn"
+                            class="btn btn-info" {{ if peer_async_visible: }}style="background-color:#a3d4ec; border-color:#a3d4ec; color:#fff;"{{ pass }}
+                            onclick="showAsyncConfirm()"
+                            style="margin-right: 4px;"
+                        >
+                            {{ if peer_async_visible: }}Undo After-Class Release{{ else: }}Release After-Class PI{{ pass }}
+                        </button>
+                    </div>
+                    {{ pass }}
                     <button
                         type="submit"
                         id="restart"
@@ -349,8 +363,33 @@ <h3>Question {{ =current_qnum }} of {{ =num_questions }}</h3>
     var mess_count = 0;
     var answerCount = 0;
     var done = {{=is_last }}
-    if (done) {
-        document.getElementById("nextq").disabled = true;
+
+    var asyncReleased = {{=peer_async_visible}};
+
+    function showAsyncConfirm() {
+        var area = document.getElementById("asyncBtnArea");
+        var msg = asyncReleased
+            ? "Undo the after-class PI release?"
+            : "Release after-class PI questions to students?";
+        area.innerHTML = `
+            <span style="margin-right:6px; font-weight:bold;">${msg}</span>
+            <button type="button" class="btn btn-sm btn-default" onclick="confirmToggleAsync()" style="margin-right:4px;">Yes</button>
+            <button type="button" class="btn btn-sm btn-default" onclick="cancelAsyncConfirm()">Cancel</button>
+        `;
+    }
+
+    function cancelAsyncConfirm() {
+        var area = document.getElementById("asyncBtnArea");
+        var label = asyncReleased ? "Undo After-Class Release" : "Release After-Class PI";
+        var extraStyle = asyncReleased ? 'style="background-color:#a3d4ec; border-color:#a3d4ec; color:#fff; margin-right:4px;"' : 'style="margin-right:4px;"';
+        area.innerHTML = `<button type="button" id="toggleAsyncBtn" class="btn btn-info" onclick="showAsyncConfirm()" ${extraStyle}>${label}</button>`;
+    }
+
+    async function confirmToggleAsync() {
+        var resp = await fetch("/runestone/peer/toggle_async?assignment_id={{=assignment_id}}", { method: "POST" });
+        var data = await resp.json();
+        asyncReleased = data.peer_async_visible;
+        cancelAsyncConfirm();
     }
 </script>
 {{ end }}

bases/rsptx/web2py_server/applications/runestone/views/peer/peer_async.html

@@ -53,7 +53,11 @@ <h2>Peer Instruction Question (After Class)</h2>
         <ol>
             <li>Answer the question as best you can.</li>
             <li>Then, in the space provided write a justification for your answer.</li>
-            <li>Read the dialog between two of your peers on why they answered the question the way they did.</li>
+            {{ if llm_enabled: }}
+            <li>Discuss the question with an AI peer — explain your reasoning and respond to their questions.</li>
+            {{ else: }}
+            <li>Read the discussion between other students on why they answered the question the way they did.</li>
+            {{ pass }}
             <li>Answer the question <strong>again.</strong>  Even if you are not changing your answer from the first time.</li>
         </ol>
     </p>
@@ -116,7 +120,7 @@ <h3>Congratulations, you have completed this assignment!</h3>
               </div>
 
               <p id="llmDisclaimer" style="display:none; font-size:0.8em; color:#888; margin-top:4px; margin-bottom:0;">
-                You are chatting with an AI, not a real peer.
+                You are chatting with an LLM, not a real peer.
               </p>
               <p id="nextStep" style="margin-top:8px; font-style:italic;"></p>
             </div>
@@ -142,6 +146,7 @@ <h3>Congratulations, you have completed this assignment!</h3>
 {{ pass }}
 <script>
   window.DISABLE_ASYNC_EXPLAINER = true;
+  window.PI_LLM_MODE = {{="true" if llm_enabled else "false"}};
 </script>
 <script src="/runestone/static/js/peer.js?v={{=request.peer_mtime}}"></script>
 <script>
@@ -192,7 +197,9 @@ <h3>Congratulations, you have completed this assignment!</h3>
       label = "Step 1 of 3: Answer the question";
       bg = "#4A9FDE";
     } else if (step === 2) {
-      label = "Step 2 of 3: Explain your answer and discuss";
+      label = window.PI_LLM_MODE
+        ? "Step 2 of 3: Explain your answer and discuss with the LLM peer"
+        : "Step 2 of 3: Explain your answer and read the previous discussions";
       bg = "#2878B5";
     } else if (step === 3) {
       label = "Step 3 of 3: Vote again — you may keep or change your answer";