Merge branch 'master' into use_webpack

Author: runestonetest

static/motd.html

@@ -3,10 +3,11 @@
 <p><img src="/runestone/static/_images/logo-trademark.png" height="20" alt="Edfinity"> <strong>online homework for Runestone</strong> now available <a href="https://edfinity.com/products?tags=runestone">Here</a></p>
 </div>
 
-<h4>Recent Updates (April 11, 2020)</h4>
+<h4>Recent Updates (April 28, 2020)</h4>
 <ul>
     <li>Editorial Page - I am looking for volunteers to be Editors!  This page allows an editor to review questions that have been flagged. It allows you to delete obviously bad questions or edit questions to fix typos or problems with autograding.  If you are interested in becoming an editor please contact me. Here is a short video overview: https://youtu.be/ErWAni-aAI4 </li>
-    <li>Timed Exam -- The students will not see a button to finish the exam untill they have at least looked at every question. This should help prevent accidental submissions.</li>
+    <li>Chapter Progress -- This report has been greatly updated and enhanced based on teacher feedback.  This is especially useful if you don't use Runestone Assignments.</li>
+    <li>Datafiles - You can now add a custom datafile via the assignment interface.  This datafile is available on the assignment page, as well as in the grading interface.</li>
 </ul>
 
 <h4>Support Runestone</h4>

tests/test_dashboard.py

@@ -1,3 +1,5 @@
+import datetime
+
 #
 # Unit Tests for DASHBOARD API endpoints
 # Set up the environment variables
@@ -97,6 +99,97 @@ def test_exercisemetrics(test_client, runestone_db_tools, test_user, test_user_1
     )
 
 
+def test_grades(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()
+
+    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
+
+    # set up practice - similar to test_instructor_practice_admin
+    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,
+        },
+    )
+
+    test_client.validate("dashboard/grades",)
+
+    assert "Gradebook" in test_client.text
+
+
+def test_questiongrades_redirect(
+    test_client, runestone_db_tools, test_user, test_user_1
+):
+    course_3 = runestone_db_tools.create_course(
+        "test_course_3", base_course="test_course_1"
+    )
+    test_instructor_1 = test_user("test_instructor_1", "password_1", course_3)
+    test_instructor_1.make_instructor()
+
+    test_instructor_1.login()
+
+    test_client.validate("dashboard/questiongrades",)
+
+    assert "Cannot call questiongrades directly" in test_client.text
+
+
+def test_questiongrades(test_assignment, test_client, test_user, test_user_1):
+    # make a dummy student to do work
+    student1 = test_user("student1", "password", test_user_1.course)
+    student1.logout()
+
+    test_user_1.make_instructor()
+    test_user_1.login()
+
+    # make dummy assignment
+    my_ass = test_assignment("test_assignment", test_user_1.course)
+    assignment_id = my_ass.assignment_id
+    my_ass.addq_to_assignment(question="subc_b_fitb", points=10)
+    my_ass.save_assignment()
+
+    # record a grade for that student on an assignment
+    sid = student1.username
+    acid = "subc_b_fitb"
+    grade = 5
+    comment = "OK job"
+    res = test_client.validate(
+        "assignments/record_grade",
+        data=dict(sid=sid, acid=acid, grade=grade, comment=comment),
+    )
+
+    res = test_user_1.test_client.validate(
+        "dashboard/questiongrades",
+        "Click on the question name to display or update the grade for any question.",
+        data=dict(sid=sid, assignment_id=assignment_id),
+    )
+
+
 # TODO:
 # grades
 # questiongrades

views/designer/index.html

@@ -10,9 +10,7 @@ <h3>{{=message}}</h3>
 
 <p><strong>For Instructors ONLY</strong> If you are a self learner you DO NOT need to build your own course.  If you are a student and think that building your own course will show you the answers, YOU ARE WRONG.</p>
 <p>
-    This page allows you to select a book for your own class. Once you have selected and built the book, you will also be
-    able to edit
-    the table of contents to re-order or remove content, and create assignments for your students. These assignments
+    This page allows you to select a book for your own class. Once you have selected and built the book, you will be able to create assignments for your students. These assignments
     will be publish
     right in the book. As the instructor, You can grade your students homework, and have access to a dashboard that
     allows you
@@ -165,6 +163,13 @@ <h3>{{=message}}</h3>
                 </label>
             </div>
 
+            <div class="radio">
+                <label>
+                    <input type="radio" name="coursetype" value="ac1" />
+                    Introduction to Google Sheets and SQL
+                </label>
+            </div>
+
             <!-- <label>
           OR
         </label>

views/layout.html

@@ -245,7 +245,7 @@
                     {{ pass }}
                 </p>
                 <p>
-                    &copy; Copyright 2018 Runestone Interactive LLC
+                    &copy; Copyright {{=request.now.year}} Runestone Interactive LLC
                     {{ if settings.academy_mode: }}
                         &emsp; ● <a href="/{{=request.application}}/default/privacy">Privacy Policy</a> &emsp; ●  <a href="/{{=request.application}}/default/terms">Terms of Service</a>
                     {{ pass }}