Merge branch 'sahi1l-renameAssignments'

Author: runestonetest

controllers/admin.py

@@ -782,10 +782,14 @@ def createAssignment():
     response.headers['content-type'] = 'application/json'
     due = None
     logger.debug(type(request.vars['name']))
-
     try:
-        logger.debug("Adding new assignment {} for course".format(request.vars['name'], auth.user.course_id))
-        newassignID = db.assignments.insert(course=auth.user.course_id, name=request.vars['name'], duedate=datetime.datetime.utcnow() + datetime.timedelta(days=7))
+        name=request.vars['name']
+        course=auth.user.course_id
+        logger.debug("Adding new assignment {} for course".format(request.vars['name'], course))
+        name_existsQ = len(db((db.assignments.name == name) & (db.assignments.course == course)).select())
+        if name_existsQ>0:
+            return json.dumps("EXISTS")
+        newassignID = db.assignments.insert(course=course, name=name, duedate=datetime.datetime.utcnow() + datetime.timedelta(days=7))
     except Exception as ex:
         logger.error(ex)
         return json.dumps('ERROR')
@@ -796,6 +800,27 @@ def createAssignment():
         logger.error(ex)
         return json.dumps('ERROR')
 
+@auth.requires(lambda: verifyInstructorStatus(auth.user.course_name, auth.user), requires_login=True)
+def renameAssignment():
+    response.headers['content-type'] = 'application/json'
+    try:
+        logger.debug("Renaming {} to {} for course {}.".format(request.vars['original'],request.vars['name'],auth.user.course_id))
+        assignment_id=request.vars['original']
+        name=request.vars['name']
+        course=auth.user.course_id
+        name_existsQ = len(db((db.assignments.name == name) & (db.assignments.course == course)).select())
+        if name_existsQ>0:
+            return json.dumps("EXISTS")
+        db(db.assignments.id == assignment_id).update(name=name)
+    except Exception as ex:
+        logger.error(ex)
+        return json.dumps('ERROR')
+    try:
+        returndict={name: assignment_id}
+        return json.dumps(returndict)
+    except Exception as ex:
+        logger.error(ex)
+        return json.dumps('ERROR')
 
 @auth.requires(lambda: verifyInstructorStatus(auth.user.course_name, auth.user), requires_login=True)
 def questionBank():

static/js/admin.js

@@ -1053,6 +1053,31 @@ function menu_from_editable(
 }
 
 
+function fillinAssignmentName(target){
+    //On the assignments tab, fill in the target with the name of the current assignment
+    //Only used by the rename assignment button for now
+    select=$("#assignlist")[0]
+    $("#"+target).html(select.options[select.selectedIndex].innerHTML)
+}
+//Invoked by the "Rename" button of the "Rename Assignment" dialog
+function renameAssignment(form) {
+    var select=$("#assignlist")[0]
+    var id=select[select.selectedIndex].value
+    var name = form['rename-name'].value;
+    data={'name':name,'original':id}
+    url='/runestone/admin/renameAssignment';
+    jQuery.post(url,data,function(iserror,textStatus,whatever){
+        if (iserror=="EXISTS"){
+            alert('There already is an assignment called "'+name+'".') //FIX: reopen the dialog box?
+        } else if (iserror!='ERROR'){
+            //find the assignment
+            select=$('#assignlist')[0];
+            select.options[select.selectedIndex].innerHTML=name
+        } else {
+            alert('Error in renaming assignment '+id)
+        }
+    },'json')
+}
 // Invoked by the "Create" button of the "Create Assignment" dialog.
 function createAssignment(form) {
     var name = form.name.value;
@@ -1061,7 +1086,9 @@ function createAssignment(form) {
     data = {'name': name}
     url = '/runestone/admin/createAssignment';
     jQuery.post(url, data, function (iserror, textStatus, whatever) {
-        if (iserror != 'ERROR') {
+        if (iserror=="EXISTS"){
+            alert('There already is an assignment called "'+name+'".') //FIX: reopen the dialog box?
+        } else if (iserror!='ERROR'){
                 select = document.getElementById('assignlist');
                 newopt = document.createElement('option');
                 newopt.value = iserror[name];

tests/test_server.py

@@ -523,21 +523,50 @@ def test_assignments(test_client, runestone_db_tools, test_user):
     test_instructor_1.make_instructor()
     test_instructor_1.login()
     db = runestone_db_tools.db
-
+    name_1 = 'test_assignment_1'
+    name_2 = 'test_assignment_2'
+    name_3 = 'test_assignment_3'
+    
     # Create an assignment -- using createAssignment
     test_client.post('admin/createAssignment',
-        data=dict(name='test_assignment_1'))
+        data=dict(name=name_1))
 
-    assign = db(
-        (db.assignments.name == 'test_assignment_1') &
+    assign1 = db(
+        (db.assignments.name == name_1) &
         (db.assignments.course == test_instructor_1.course.course_id)
     ).select().first()
-    assert assign
+    assert assign1
 
-    # Delete an assignment -- using removeassignment
-    test_client.post('admin/removeassign', data=dict(assignid=assign.id))
-    assert not db(db.assignments.name == 'test_assignment_1').select().first()
+    # Make sure you can't create two assignments with the same name
+    test_client.post('admin/createAssignment',
+                     data=dict(name=name_1))
+    assert "EXISTS" in test_client.text
 
+    # Rename assignment
+    test_client.post('admin/createAssignment',
+                     data=dict(name=name_2))
+    assign2 = db(
+        (db.assignments.name == name_2) &
+        (db.assignments.course == test_instructor_1.course.course_id)
+    ).select().first()
+    assert assign2
+    
+    test_client.post('admin/renameAssignment',
+                     data=dict(name=name_3,original=assign2.id))
+    assert db(db.assignments.name == name_3).select().first()
+    assert not db(db.assignments.name == name_2).select().first()
+
+    # Make sure you can't rename an assignment to an already used assignment
+    test_client.post('admin/renameAssignment',
+                     data=dict(name=name_3,original=assign1.id))
+    assert "EXISTS" in test_client.text
+    
+    # Delete an assignment -- using removeassignment
+    test_client.post('admin/removeassign', data=dict(assignid=assign1.id))
+    assert not db(db.assignments.name == name_1).select().first()
+    test_client.post('admin/removeassign', data=dict(assignid=assign2.id))
+    assert not db(db.assignments.name == name_3).select().first()
+    
     test_client.post('admin/removeassign', data=dict(assignid=9999999))
     assert "Error" in test_client.text
 

views/admin/assignments.html

@@ -32,7 +32,6 @@
 </script>
 <script src="{{=URL('static', 'js/bootstrap-table/bootstrap-table-reorder-rows.js')}}">
 </script>
-
 <div class="row">
   <div class="col-md-2"></div>
   <div class="col-md-8">
@@ -42,8 +41,9 @@ <h4 style="text-align: center;">Assignment</h4>
       <option value="{{=assignmentid}}">{{=assignments[assignmentid]}}</option>
       {{ pass }}
     </select>
-    <button class="btn" data-target="#addAssignment" data-toggle="modal" style="margin-top: 12px;">+</button>
-    <button class="btn" onclick="remove_assignment();" style="margin-top: 12px;">-</button>
+    <button class="btn" data-target="#addAssignment" data-toggle="modal" style="margin-top: 12px;">Add</button>
+    <button class="btn" onclick="remove_assignment();" style="margin-top: 12px;">Delete</button>
+    <button class="btn" data-target="#renameAssignment" data-toggle="modal" onclick="fillinAssignmentName('renameName');" style="margin-top: 12px;">Rename</button>
     <fieldset>
       <legend>Assignment properties</legend>
       <span id="totalPoints"></span><br>
@@ -62,14 +62,14 @@ <h4 style="text-align: center;">Assignment</h4>
   <div class="col-md-2"></div>
 </div>
 
-<!-- Modal -->
-<div aria-hidden="true" aria-labelledby="myModalLabel" class="modal fade" id="addAssignment" role="dialog" tabindex="-1">
+<!-- Modal: Add -->
+<div aria-hidden="true" aria-labelledby="myAddModalLabel" class="modal fade" id="addAssignment" role="dialog" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <!-- Modal Header -->
       <div class="modal-header">
         <button class="close" data-dismiss="modal" type="button"><span aria-hidden="true">&times;</span> <span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">Create Assignment</h4>
+        <h4 class="modal-title" id="myAddModalLabel">Create Assignment</h4>
       </div><!-- Modal Body -->
       <div class="modal-body">
         <form role="form">
@@ -80,12 +80,38 @@ <h4 class="modal-title" id="myModalLabel">Create Assignment</h4>
         </form>
       </div><!-- Modal Footer -->
       <div class="modal-footer">
-        <button class="btn btn-default" data-dismiss="modal" type="button">Close</button>
+        <button class="btn btn-default" data-dismiss="modal" type="button">Cancel</button>
       </div>
     </div>
   </div>
 </div>
 
+<!-- Modal: Rename -->
+<div aria-hidden="true" aria-labelledby="myRenameModalLabel" class="modal fade" id="renameAssignment" role="dialog" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <button class="close" data-dismiss="modal" type="button"><span aria-hidden="true">&times;</span> <span class="sr-only">Close</span></button>
+        <h4 class="modal-title" id="myRenameModalLabel">Rename Assignment</h4>
+      </div><!-- Modal Body -->
+      <div class="modal-body">
+        <form role="form">
+          <div class="form-group">
+            <label for="rename-name">Enter the new name for assignment "<span id="renameName"></span>"</label> <input class="form-control" id="rename-name" placeholder="Enter assignment name" type="text">
+          </div>
+          <input class="btn btn-default" data-dismiss="modal" onclick="renameAssignment(this.form)" type="button" value="Rename">
+        </form>
+      </div><!-- Modal Footer -->
+      <div class="modal-footer">
+        <button class="btn btn-default" data-dismiss="modal" type="button">Cancel</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+
 <div class="row">
   <div class="col-md-12" id="leftpanel2" style="visibility: hidden">
     <div class="panel-group">