Merge branch 'fix_practice_feature' of git://github.com/ImanYZ/RunestoneServer into ImanYZ-fix_practice_feature

Author: runestonetest

controllers/admin.py

@@ -432,18 +432,18 @@ def add_practice_items():
     course = db(db.courses.course_name == auth.user.course_name).select().first()
     data = json.loads(request.vars.data)
 
-    string_data = [x.encode('UTF8') for x in data]
+    # Was for Python 2.x
+    # string_data = [x.encode('UTF8') for x in data]
+    # Is for Python 3.x
+    string_data = data
 
     now = datetime.datetime.utcnow()
     now_local = now - datetime.timedelta(hours=float(session.timezoneoffset))
 
-    students = db((db.auth_user.course_name == auth.user.course_name)) \
-        .select()
-    chapters = db((db.chapters.course_id == course.base_course)) \
-        .select()
+    students = db((db.auth_user.course_name == auth.user.course_name)).select()
+    chapters = db((db.chapters.course_id == course.base_course)).select()
     for chapter in chapters:
-        subchapters = db((db.sub_chapters.chapter_id == chapter.id)) \
-            .select()
+        subchapters = db((db.sub_chapters.chapter_id == chapter.id)).select()
         for subchapter in subchapters:
             subchapterTaught = db((db.sub_chapter_taught.course_name == auth.user.course_name) &
                                (db.sub_chapter_taught.chapter_label == chapter.chapter_label) &

controllers/assignments.py

@@ -836,7 +836,7 @@ def practice():
                                                      float(session.timezoneoffset) if 'timezoneoffset' in session else 0)
 
     if message1 != "":
-        session.flash = message1 + " " + message2
+        # session.flash = message1 + " " + message2
         return redirect(URL('practiceNotStartedYet',
                             vars=dict(message1=message1,
                                       message2=message2)))
@@ -848,7 +848,7 @@ def practice():
                         (db.user_topic_practice.user_id == auth.user.id) &
                         (db.user_topic_practice.chapter_label == db.chapters.chapter_label) &
                         (db.user_topic_practice.sub_chapter_label == db.sub_chapters.sub_chapter_label) &
-                        (db.chapters.course_id == auth.user.course_name) &
+                        (db.chapters.course_id == course.base_course) &
                         (db.sub_chapters.chapter_id == db.chapters.id)) \
             .select(db.chapters.chapter_name,
                     db.sub_chapters.sub_chapter_name,
@@ -881,20 +881,31 @@ def practice():
         elif f_card["mastery_percent"] >= 25:
             f_card["mastery_color"] = "warning"
 
-    # If the student has any flashcards to practice and has not practiced enough to get their points for today or they
-    # have intrinsic motivation to practice beyond what they are expected to do.
-    if available_flashcards_num > 0 and (practiced_today_count != questions_to_complete_day or
-                                            request.vars.willing_to_continue or
-                                            spacing == 0):
+    # If an instructor removes the practice flag from a question in the middle of the semester
+    # and students are in the middle of practicing it, the following code makes sure the practice tool does not crash.
+    questions = []
+    if len(presentable_flashcards) > 0:
         # Present the first one.
         flashcard = presentable_flashcards[0]
         # Get eligible questions.
         questions = _get_qualified_questions(course.base_course,
                                              flashcard.chapter_label,
                                              flashcard.sub_chapter_label)
+    # If the student has any flashcards to practice and has not practiced enough to get their points for today or they
+    # have intrinsic motivation to practice beyond what they are expected to do.
+    if (available_flashcards_num > 0 and 
+        len(questions) > 0 and
+        (practiced_today_count != questions_to_complete_day or
+            request.vars.willing_to_continue or
+            spacing == 0)):
         # Find index of the last question asked.
         question_names = [q.name for q in questions]
-        qIndex = question_names.index(flashcard.question_name)
+
+        try:
+            qIndex = question_names.index(flashcard.question_name)
+        except:
+            qIndex = 0
+
         # present the next one in the list after the last one that was asked
         question = questions[(qIndex + 1) % len(questions)]
 
@@ -935,15 +946,15 @@ def practice():
                 course_name=auth.user.course_name,
                 practice_completion_date=now_local.date()
             )
+            practice_completion_count = _get_practice_completion(auth.user.id,
+                                                                    auth.user.course_name,
+                                                                    spacing)
             if practice_graded == 1:
                 # send practice grade via lti, if setup for that
                 lti_record = _get_lti_record(session.oauth_consumer_key)
                 practice_grade = _get_student_practice_grade(auth.user.id, auth.user.course_name)
                 course_settings = _get_course_practice_record(auth.user.course_name)
 
-                practice_completion_count = _get_practice_completion(auth.user.id,
-                                                                     auth.user.course_name,
-                                                                     spacing)
                 if spacing == 1:
                     total_possible_points = day_points * max_days
                     points_received = day_points * practice_completion_count

tests/test_course_1/_sources/test_chapter_1/subchapter_b.rst

@@ -11,6 +11,7 @@ Lets add one activity to this Subchapter!
    :correct: b
    :feedback_a: It usually takes longer to read a program because the structure is as important as the content and must be interpreted in smaller pieces for understanding.
    :feedback_b: It usually takes longer to read a program because the structure is as important as the content and must be interpreted in smaller pieces for understanding.
+   :practice: T
 
    True or False:  Reading a program is like reading other kinds of text.
 
@@ -54,6 +55,7 @@ Lets add one activity to this Subchapter!
 
 .. activecode:: units1
     :autograde: unittest
+    :practice: T
 
     def add(a,b):
         return 4

tests/test_server.py

@@ -15,6 +15,7 @@
 from textwrap import dedent
 import json
 from threading import Thread
+import datetime
 
 # Third-party imports
 # -------------------
@@ -567,6 +568,103 @@ def test_assignments(test_client, runestone_db_tools, test_user):
     assert "Error" in test_client.text
 
 
+def test_instructor_practice_admin(test_client, runestone_db_tools, test_user):
+    course_4 = runestone_db_tools.create_course('test_course_1')
+    test_student_1 = test_user('test_student_1', 'password_1', course_4)
+    test_student_1.logout()
+    test_instructor_1 = test_user('test_instructor_1', 'password_1', course_4)
+    test_instructor_1.make_instructor()
+    test_instructor_1.login()
+    db = runestone_db_tools.db
+    
+    course_start_date = datetime.datetime.strptime(course_4.term_start_date, '%Y-%m-%d').date()
+
+    today = datetime.datetime.today()
+    start_date = course_start_date + datetime.timedelta(days=13)
+    end_date = datetime.datetime.today().date() + datetime.timedelta(days=30)
+    max_practice_days = 40
+    max_practice_questions = 400
+    day_points = 1
+    question_points = 0.2
+    questions_to_complete_day = 5
+    graded = 0
+
+    # Test the practice tool settings for the course.
+    flashcard_creation_method = 2
+    test_client.post('admin/practice',
+        data = {"StartDate": start_date,
+                "EndDate": end_date,
+                "graded": graded,
+                'maxPracticeDays': max_practice_days,
+                'maxPracticeQuestions': max_practice_questions,
+                'pointsPerDay': day_points,
+                'pointsPerQuestion': question_points,
+                'questionsPerDay': questions_to_complete_day,
+                'flashcardsCreationType': 2,
+                'question_points': question_points})
+
+    practice_settings_1 = db(
+        (db.course_practice.auth_user_id == test_instructor_1.user_id) &
+        (db.course_practice.course_name == course_4.course_name) &
+        (db.course_practice.start_date == start_date) &
+        (db.course_practice.end_date == end_date) &
+        (db.course_practice.flashcard_creation_method == flashcard_creation_method) &
+        (db.course_practice.graded == graded)
+        ).select().first()
+    assert practice_settings_1
+    if practice_settings_1.spacing == 1:
+        assert practice_settings_1.max_practice_days == max_practice_days
+        assert practice_settings_1.day_points == day_points
+        assert practice_settings_1.questions_to_complete_day == questions_to_complete_day
+    else:
+        assert practice_settings_1.max_practice_questions == max_practice_questions
+        assert practice_settings_1.question_points == question_points
+
+    # Test instructor adding a subchapter to the practice tool for students.
+
+    # I need to call set_tz_offset to set timezoneoffset in the session.
+    test_client.post('ajax/set_tz_offset',
+        data = { 'timezoneoffset': 0 })
+    
+    # The reason I'm manually stringifying the list value is that test_client.post does something strange with compound objects instead of passing them to json.dumps.
+    test_client.post('admin/add_practice_items',
+        data = { 'data': '["Test chapter 1/Subchapter B"]' })
+
+
+    practice_settings_1 = db(
+        (db.user_topic_practice.user_id == test_student_1.user_id) &
+        (db.user_topic_practice.course_name == course_4.course_name) &
+        (db.user_topic_practice.chapter_label == "test_chapter_1") &
+        (db.user_topic_practice.sub_chapter_label == "subchapter_b")
+        ).select().first()
+    assert practice_settings_1
+
+    # Testing whether a student can answer a practice question.
+    # test_client.logout()
+    # test_student_1.login()
+
+    # ts = datetime.datetime.utcnow()
+    # ts -= datetime.timedelta(microseconds=ts.microsecond)
+
+    # test_client.post('ajax/hsblog',
+    #     data = {'event': 'mChoice',
+    #             'act': 'answer:1:correct',
+    #             'answer': 1,
+    #             'correct': 'T',
+    #             'div_id': 'subc_b_1',
+    #             'course': course_4.course_name,
+    #             'timezoneoffset': 0})
+
+    # mchoice_answers_1 = db(
+    #     (db.mchoice_answers.sid == test_student_1.user_id) &
+    #     (db.mchoice_answers.course_name == course_4.course_name) &
+    #     (db.mchoice_answers.correct == "test_chapter_1") &
+    #     (db.mchoice_answers.sub_chapter_label == "subchapter_b")
+    #     ).select().first()
+    # assert practice_settings_1
+    # db.mchoice_answers.insert(sid=sid,timestamp=ts, div_id=div_id, answer=answer, correct=correct, course_name=course)
+
+
 def test_deleteaccount(test_client, runestone_db_tools, test_user):
     course_3 = runestone_db_tools.create_course('test_course_3')
     the_user = test_user('user_to_delete', 'password_1', course_3)

views/assignments/practice.html

@@ -3,6 +3,13 @@
 {{block tabcontent}}
 {{include '_sphinx_static_files.html'}}
 
+<script type="text/javascript">
+    if(! eBookConfig) {
+        eBookConfig = {};
+    }
+    eBookConfig.practice_mode = true;
+</script>
+
 <!-- Add icon library -->
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">