New: Show completion message for peer async

Author: bnmnetp

controllers/peer.py

@@ -136,13 +136,15 @@ def _get_numbered_question(assignment_id, qnum):
     a_qs = db(db.assignment_questions.assignment_id == assignment_id).select(
         orderby=[db.assignment_questions.sorting_priority, db.assignment_questions.id]
     )
+    done = False
     if qnum > len(a_qs) - 1:
         qnum = len(a_qs) - 1
+        done = True
 
     current_question_id = a_qs[qnum].question_id
     current_question = db(db.questions.id == current_question_id).select().first()
 
-    return current_question
+    return current_question, done
 
 
 def _get_lastn_answers(num_answer, div_id, course_name, start_time, end_time=None):
@@ -500,14 +502,15 @@ def peer_async():
     if request.vars.question_num:
         qnum = int(request.vars.question_num)
 
-    current_question = _get_numbered_question(assignment_id, qnum)
+    current_question, all_done = _get_numbered_question(assignment_id, qnum)
 
     return dict(
         course_id=auth.user.course_name,
         course=get_course_row(db.courses.ALL),
         current_question=current_question,
         assignment_id=assignment_id,
         nextQnum=qnum + 1,
+        all_done=all_done,
     )
 
 

views/peer/peer_async.html

@@ -21,8 +21,14 @@ <h2>Peer Instruction Question (After Class)</h2>
 </div>
 
 <div class="row">
+    {{ if not all_done: }}
     <div class="oneq col-md-6">{{=XML(current_question['htmlsrc'])}}</div>
-
+    {{ else: }}
+    <div class="oneq col-md-6">
+        <h3>Congratulations, you have completed this assignment!</h3>
+    </div>
+    {{ pass }}
+    {{ if not all_done: }}
     <div class="col-md-6">
         <p>
             Please provide an explanation for why you answered
@@ -37,16 +43,18 @@ <h4>A discussion for you to consider</h4>
             <p id="nextStep"></p>
         </div>
     </div>
+    {{pass}}
 </div>
 
+{{ if not all_done: }}
 <div>
     <form action="/peer/peer_async">
         <input type="hidden" name="assignment_id" value="{{=assignment_id}}" />
         <input type="hidden" name="question_num" value="{{=nextQnum}}" />
         <button type="submit" onclick="return checkVoteCount()">Next Question</button>
     </form>
 </div>
-
+{{ pass }}
 <script src="/runestone/static/js/peer.js?v={{=request.peer_mtime}}"></script>
 <script>
     var user = "{{=auth.user.username}}";