Merge branch 'peer_updates'

Author: bnmnetp

controllers/admin.py

@@ -1954,6 +1954,7 @@ def get_assignment():
     assignment_data["nofeedback"] = assignment_row.nofeedback
     assignment_data["nopause"] = assignment_row.nopause
     assignment_data["is_peer"] = assignment_row.is_peer
+    assignment_data["peer_async_visible"] = assignment_row.peer_async_visible
 
     # Still need to get:
     #  -- timed properties of assignment
@@ -2058,6 +2059,7 @@ def save_assignment():
     nofeedback = request.vars["nofeedback"]
     nopause = request.vars["nopause"]
     is_peer = request.vars["is_peer"]
+    peer_async_visible = request.vars["peer_async_visible"]
     try:
         d_str = request.vars["due"]
         format_str = "%Y/%m/%d %H:%M"
@@ -2080,6 +2082,7 @@ def save_assignment():
             nopause=nopause,
             is_peer=is_peer,
             current_index=0,
+            peer_async_visible=peer_async_visible,
         )
         return json.dumps({request.vars["name"]: assignment_id, "status": "success"})
     except Exception as ex:

controllers/peer.py

@@ -103,6 +103,19 @@ def dashboard():
     )
 
 
+def extra():
+    assignment_id = request.vars.assignment_id
+    current_question = _get_current_question(assignment_id, False)
+
+    return dict(
+        course_id=auth.user.course_name,
+        course=get_course_row(db.courses.ALL),
+        current_question=current_question,
+        assignment_id=assignment_id,
+        is_instructor=True,
+    )
+
+
 def _get_current_question(assignment_id, get_next):
 
     assignment = db(db.assignments.id == assignment_id).select().first()
@@ -265,6 +278,21 @@ def num_answers():
     return json.dumps({"count": acount, "mess_count": mess_count})
 
 
+def percent_correct():
+    div_id = request.vars.div_id
+    start_time = request.vars.start_time
+    course_name = request.vars.course_name
+    df = _get_lastn_answers(1, div_id, course_name, start_time)
+    logger.debug(f"Data Frame is {df}")
+    tot = len(df)
+    logger.debug(f"num rows = {tot}")
+    corr = len(df[df.correct == "T"])
+    if corr == 0:
+        return json.dumps({"pct_correct": "No Correct Answers"})
+    else:
+        return json.dumps({"pct_correct": tot / corr * 100})
+
+
 #
 # Student Facing pages
 #
@@ -559,17 +587,18 @@ def _get_user_answer(div_id, s):
 
 
 def _get_user_messages(user, div_id, course_name):
+    # this gets both sides of the conversation -- thus the | in the query below.
     messages = db(
         (db.useinfo.event == "sendmessage")
-        & (db.useinfo.sid == user)
+        & ((db.useinfo.sid == user) | (db.useinfo.act.like(f"to:{user}%")))
         & (db.useinfo.div_id == div_id)
         & (db.useinfo.course_id == course_name)
     ).select(orderby=db.useinfo.id)
     user = messages[0].sid
     mess = "<ul>"
     for row in messages:
         mpart = row.act.split(":")[2]
-        mess += f"<li>{mpart}</li>"
+        mess += f"<li>{row.sid} said: {mpart}</li>"
     mess += "</ul>"
 
     return mess

models/grouped_assignments.py

@@ -27,6 +27,7 @@
     Field("from_source", "boolean", default=False),
     Field("nofeedback", "boolean"),
     Field("nopause", "boolean"),
+    Field("peer_async_visible", "boolean", default=False),
     format="%(name)s",
     migrate=bookserver_owned("assignments"),
 )

static/js/admin.js

@@ -1364,6 +1364,11 @@ function update_assignment(form) {
     } else {
         data.is_peer = "F";
     }
+    if (form.peer_async_visible.checked) {
+        data.peer_async_visible = "T"
+    } else {
+        data.peer_async_visible = "F"
+    }
     data.timelimit = form.timelimit.value;
     data.description = form.description.value;
     data.assignment_id = getAssignmentId();
@@ -1426,6 +1431,7 @@ function assignmentInfo() {
             $("#nopause").val(assignmentData.nopause);
             $("#nofeedback").val(assignmentData.nofeedback);
             $("#assign_is_peer").val(assignmentData.is_peer);
+            $("#peer_async_visible").val(assignmentData.peer_async_visible);            
             if (assignmentData.visible === true) {
                 $("#assign_visible").prop("checked", true);
             } else {
@@ -1451,6 +1457,11 @@ function assignmentInfo() {
             } else {
                 $("#assign_is_peer").prop("checked", false);
             }
+            if (assignmentData.peer_async_visible === true) {
+                $("#peer_async_visible").prop("checked", true);
+            } else {
+                $("#peer_async_visible").prop("checked", false);
+            }
             if (assignmentData.is_timed === true) {
                 $("#assign_is_timed").prop("checked", true);
                 // add simulator button