Merge branch 'copy_assignment'

Author: runestonetest

controllers/admin.py

@@ -546,24 +546,22 @@ def admin():
             if row.user_id not in instructordict:
                 studentdict[row.user_id]= name
 
-    #Not rebuilding
-    if not request.vars.projectname or not request.vars.startdate:
-        course = db(db.courses.course_name == auth.user.course_name).select().first()
-        curr_start_date = course.term_start_date.strftime("%m/%d/%Y")
-        return dict(sectionInfo=sectionsList,startDate=date,
-                    coursename=auth.user.course_name, course_id=auth.user.course_name,
-                    instructors=instructordict, students=studentdict,
-                    curr_start_date=curr_start_date, confirm=True,
-                    build_info=my_build, master_build=master_build, my_vers=my_vers,
-                    mst_vers=mst_vers,
-                    course=sidQuery,
-                    )
-
-    return dict(sectionInfo=sectionsList, startDate=date.isoformat(), coursename=auth.user.course_name,
-                instructors=instructordict, students=studentdict, confirm=False,
-                task_name=uuid, course_url=course_url, course_id=auth.user.course_name,
+    course = db(db.courses.course_name == auth.user.course_name).select().first()
+    instructor_course_list = db( (db.course_instructor.instructor == auth.user.id) &
+                                 (db.courses.id == db.course_instructor.course) &
+                                 (db.courses.base_course == course.base_course) &
+                                 (db.courses.course_name != course.course_name)).select(db.courses.course_name, db.courses.id)
+
+    curr_start_date = course.term_start_date.strftime("%m/%d/%Y")
+    return dict(sectionInfo=sectionsList,startDate=date,
+                coursename=auth.user.course_name, course_id=auth.user.course_name,
+                instructors=instructordict, students=studentdict,
+                curr_start_date=curr_start_date, confirm=True,
+                build_info=my_build, master_build=master_build, my_vers=my_vers,
+                mst_vers=mst_vers,
                 course=sidQuery,
-)
+                instructor_course_list=instructor_course_list
+                )
 
 # Called in admin.js from courseStudents to populate  the list of students
 # eBookConfig.getCourseStudentsURL
@@ -1648,6 +1646,50 @@ def reorder_assignment_questions():
 
     return json.dumps("Reordered in DB")
 
+@auth.requires(lambda: verifyInstructorStatus(auth.user.course_name, auth.user), requires_login=True)
+def copy_assignment():
+    """
+    vars:
+      - oldassignment id or  todo (-1 for all assignments)
+      - course
+    """
+
+    if not verifyInstructorStatus(request.vars['course'], auth.user):
+        return "Error: Not Authorized"
+    else:
+        if request.vars.oldassignment == '-1':
+            assignments = db((db.assignments.course == db.courses.id) &
+                             (db.courses.course_name == request.vars['course'])).select()
+            for a in assignments:
+                print("A = {}".format(a))
+                res = _copy_one_assignment(request.vars['course'], a.assignments['id'])
+                if res != "success":
+                    break
+        else:
+            res = _copy_one_assignment(request.vars['course'], request.vars['oldassignment'])
+    return res
+
+def _copy_one_assignment(course, oldid):
+        old_course = db(db.courses.course_name == course).select().first()
+        this_course = db(db.courses.course_name == auth.user.course_name).select().first()
+        old_assignment = db(db.assignments.id == int(oldid)).select().first()
+        due_delta = old_assignment.duedate.date() - old_course.term_start_date
+        due_date = this_course.term_start_date + due_delta
+        newassign_id = db.assignments.insert(course=auth.user.course_id, name=old_assignment.name,
+            duedate=due_date, description=old_assignment.description,
+            points=old_assignment.points,
+            threshold_pct=old_assignment.threshold_pct)
+
+        old_questions = db(db.assignment_questions.assignment_id == old_assignment.id).select()
+        for q in old_questions:
+            dq = q.as_dict()
+            dq['assignment_id'] = newassign_id
+            del dq['id']
+            db.assignment_questions.insert(**dq)
+
+        return "success"
+
+
 
 @auth.requires(lambda: verifyInstructorStatus(auth.user.course_name, auth.user), requires_login=True)
 def courselog():

static/js/admin.js

@@ -1857,3 +1857,18 @@ function toggle_release_grades() {
         set_release_button();
     }
 }
+
+
+function copyAssignments() {
+    let selectedCourse = document.getElementById("courseSelection").value;
+    data = {oldassignment: -1,
+            course: selectedCourse
+        };
+    $.post("/runestone/admin/copy_assignment", data, function(mess, stat, w) {
+        if(mess == "success") {
+            alert('Done')
+        } else {
+            alert('Copy Failed')
+        }
+    });
+}

tests/test_admin.py

@@ -1,5 +1,5 @@
 import json
-
+import pytest
 
 def test_add_assignment(test_assignment, test_user_1, runestone_db_tools):
     my_ass = test_assignment('test_assignment', test_user_1.course)
@@ -175,3 +175,42 @@ def test_get_assignment(test_assignment, test_user_1, test_client):
     res = json.loads(res)
     assert res
     assert res['questions_data']
+
+@pytest.mark.parametrize('assign_id',[ (-1), (0) ])
+def test_copy_assignment(assign_id, test_assignment, test_client, test_user_1, runestone_db_tools):
+    test_user_1.make_instructor()
+    test_user_1.login()
+    course1_id = test_user_1.course.course_id
+    my_ass = test_assignment('test_assignment', test_user_1.course)
+    # Should provide the following to addq_to_assignment
+    # -- assignment (an integer)
+    # -- question == div_id
+    # -- points
+    # -- autograde  one of ['manual', 'all_or_nothing', 'pct_correct', 'interact']
+    # -- which_to_grade one of ['first_answer', 'last_answer', 'best_answer']
+    # -- reading_assignment (boolean, true if it's a page to visit rather than a directive to interact with)
+    my_ass.addq_to_assignment(question='subc_b_fitb',points=10)
+    print(my_ass.questions())
+    db = runestone_db_tools.db
+    my_ass.save_assignment()
+
+    course_3 = runestone_db_tools.create_course('test_course_3', base_course='test_course_1')
+    test_user_1.make_instructor(course_3.course_id)
+    db(db.auth_user.id == test_user_1.user_id).update(course_id=course_3.course_id, course_name='test_course_3')
+    db.commit()
+    test_user_1.logout()
+    test_user_1.login()
+    if assign_id == 0:
+        assign_id = my_ass.assignment_id
+    res = test_client.validate('admin/copy_assignment', data=dict(
+            oldassignment=assign_id,
+            course='test_course_1'
+    ))
+    assert res == "success"
+
+    rows = db(db.assignments.name == 'test_assignment').count()
+    assert rows == 2
+
+    row = db(db.assignments.name == 'test_assignment').select(orderby=~db.assignments.id).first()
+    rows = db(db.assignment_questions.assignment_id == row.id).count()
+    assert rows == 1

views/admin/admin.html

@@ -20,6 +20,10 @@ <h4 style="text-align: center" class="list-group-item-heading">Add TA</h4>
         <a id="courselog" href="/{{=request.application}}/admin/courselog" class="list-group-item">
             <h4 style="text-align: center" class="list-group-item-heading">Download Log</h4>
         </a>
+
+        <a id="CopyAssignmentsTab" data-toggle="tab" href="#CopyAssignments" class="list-group-item">
+            <h4 style="text-align: center" class="list-group-item-heading">Copy Assignments</h4>
+        </a>
         <a id="DeleteTab" data-toggle="tab" href="#Delete" class="list-group-item">
             <h4 style="text-align: center" class="list-group-item-heading">Delete</h4>
         </a>
@@ -196,12 +200,29 @@ <h3 style="text-align: center">This action CANNOT BE UNDONE</h3>
                     <form action="/{{=request.application}}/admin/deletecourse" method="post"
                     onsubmit="return confirm('Are you sure you want to delete this course? This will remove the course for all students and all custom assignments you have made will be deleted. This cannot be undone.')">
                     <button type="submit" style="width: 33%; align-self: center;">Really Delete</button>
-                        </form>
+                    </form>
                 </div>
                 <h3 style="text-align: center">This will delete all sections under this course. Students will not be able to access course materials.</h3>
             </div>
+        </div>
+
+
+        <div id="CopyAssignments" class="tab-pane fade">
+            <div class="col-md-8">
+                <h2 style="text-align: center">Copy Assignments</h2>
+                <label for="courseSelection">Select the course you want to copy assignments from.</label>
+                <div class="col-sm-3">
+                <select id="courseSelection" class="form-control">
+                    {{ for course in instructor_course_list: }}
+                    <option value="{{=course.course_name}}">{{=course.course_name}}</option>
+                    {{ pass }}
+                </select>
+                <button onclick="copyAssignments();" class="btn btn-primary">Copy</button>
+                </div>
             </div>
-          </div>
+        </div>
+
+    </div>
 
 <script>
     $(".dashboardnav").removeClass("active");
@@ -214,22 +235,31 @@ <h3 style="text-align: center">This will delete all sections under this course.
     $('#studentsTab').css('background-color','transparent');
     $('#AddInstructorTab').css('background-color','transparent');
     $('#DeleteTab').css('background-color','transparent');
-
+    $('#CopyAssignmentsTab').css('background-color', 'transparent');
 });
 
     $('#AddInstructorTab').click(function(){
     $('#AddInstructorTab').css('background-color', 'gainsboro');
     $('#sectionsTab').css('background-color','transparent');
     $('#studentsTab').css('background-color','transparent');
     $('#DeleteTab').css('background-color','transparent');
-
+    $('#CopyAssignmentsTab').css('background-color', 'transparent');
 });
 
     $('#DeleteTab').click(function(){
     $('#DeleteTab').css('background-color', 'gainsboro');
     $('#sectionsTab').css('background-color','transparent');
     $('#studentsTab').css('background-color','transparent');
     $('#AddInstructorTab').css('background-color','transparent');
+    $('#CopyAssignmentsTab').css('background-color', 'transparent');
+});
+
+    $('#CopyAssignmentsTab').click(function(){
+    $('#CopyAssignmentsTab').css('background-color', 'gainsboro');
+    $('#DeleteTab').css('background-color', 'transparent');
+    $('#sectionsTab').css('background-color','transparent');
+    $('#studentsTab').css('background-color','transparent');
+    $('#AddInstructorTab').css('background-color','transparent');
 
 });
 
@@ -238,7 +268,7 @@ <h3 style="text-align: center">This will delete all sections under this course.
     $('#sectionsTab').css('background-color','transparent');
     $('#DeleteTab').css('background-color','transparent');
     $('#AddInstructorTab').css('background-color','transparent');
-
+    $('#CopyAssignmentsTab').css('background-color', 'transparent');
 });
 
 </script>