merge master

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():

controllers/ajax.py

@@ -302,9 +302,13 @@ def gethist():
     codetbl = db.code
     acid = request.vars.acid
 
+    # if vars.sid then we know this is being called from the grading interface
     if request.vars.sid:
         sid = request.vars.sid
-        course_id = db(db.auth_user.username == sid).select(db.auth_user.course_id).first().course_id
+        if auth.user and verifyInstructorStatus(auth.user.course_name, auth.user.id):
+            course_id = auth.user.course_id
+        else:
+            course_id = None
     elif auth.user:
         sid = auth.user.username
         course_id = auth.user.course_id
@@ -982,8 +986,11 @@ def preview_question():
         # Prevent any changes to the database when building a preview question.
         del env['DBURL']
         # Run a runestone build.
+        # We would like to use sys.executable But when we run web2py
+        # in uwsgi then sys.executable is uwsgi which doesn't work.
+        # Why not just run runestone?
         popen_obj = subprocess.Popen(
-            [sys.executable, '-m', 'runestone', 'build'],
+            [settings.python_interpreter, '-m', 'runestone', 'build'],
             # The build must be run from the directory containing a ``conf.py`` and all the needed support files.
             cwd='applications/{}/build/preview'.format(request.application),
             # Capture the build output in case of an error.

controllers/books.py

@@ -52,6 +52,7 @@ def _route_book(is_published=True):
 
         # Ensure the base course in the URL agrees with the base course in ``course``. If not, ask the user to select a course.
         if not course or course.base_course != base_course:
+            session.flash = "{} is not the course your are currently in,  switch to or add it to go there".format(base_course)
             redirect(URL(c='default', f='courses'))
 
         # Ensure the user has access to this book.

controllers/dashboard.py

@@ -23,6 +23,55 @@
 
 # select acid, sid from code as T where timestamp = (select max(timestamp) from code where sid=T.sid and acid=T.acid);
 
+class ChapterGet:
+#    chapnum_map={}
+#    sub_chapters={}
+#    subchap_map={}
+#    subchapnum_map={}
+#    subchapNum_map={}
+    def __init__(self,chapters):
+
+        self.Cmap={}
+        self.Smap={} #dictionary organized by chapter and section labels
+        self.SAmap={} #organized just by section label
+        for chapter in chapters:
+            label=chapter.chapter_label
+            self.Cmap[label]=chapter
+            sub_chapters=db(db.sub_chapters.chapter_id==chapter.id).select(db.sub_chapters.ALL) #FIX: get right course_id, too
+            #NOTE: sub_chapters table doesn't have a course name column in it, kind of a problem
+            self.Smap[label]={}
+
+            for sub_chapter in sub_chapters:
+                self.Smap[label][sub_chapter.sub_chapter_label]=sub_chapter
+                self.SAmap[sub_chapter.sub_chapter_label]=sub_chapter
+    def ChapterNumber(self,label):
+        """Given the label of a chapter, return its number"""
+        try:
+            return self.Cmap[label].chapter_num
+        except KeyError:
+            return ""
+    def ChapterName(self,label):
+        try:
+            return self.Cmap[label].chapter_name
+        except KeyError:
+            return label
+    def SectionName(self,chapter,section):
+        try:
+            return self.Smap[chapter][section].sub_chapter_name
+        except KeyError:
+            return section
+    def SectionNumber(self,chapter,section=None):
+        try:
+            if section==None:
+                lookup=self.SAmap
+                section=chapter
+            else:
+                lookup=self.Smap[chapter]
+
+            return lookup[section].sub_chapter_num
+        except KeyError:
+            return 999
+
 @auth.requires_login()
 def index():
     selected_chapter = None
@@ -36,11 +85,10 @@ def index():
 
     course = db(db.courses.id == auth.user.course_id).select().first()
     assignments = db(db.assignments.course == course.id).select(db.assignments.ALL, orderby=db.assignments.name)
+    chapters = db(db.chapters.course_id == course.base_course).select(orderby=db.chapters.chapter_num)
+
     logger.debug("getting chapters for {}".format(auth.user.course_name))
-    chapters = db(db.chapters.course_id == course.base_course).select()
-    chap_map = {}
-    for chapter in chapters:
-        chap_map[chapter.chapter_label] = chapter.chapter_name
+    chapget = ChapterGet(chapters)
     for chapter in chapters.find(lambda chapter: chapter.chapter_label==request.vars['chapter']):
         selected_chapter = chapter
     if selected_chapter is None:
@@ -61,12 +109,16 @@ def index():
 
         if data_analyzer.questions[problem_id]:
             chtmp = data_analyzer.questions[problem_id].chapter
+            schtmp = data_analyzer.questions[problem_id].subchapter
             entry = {
                 "id": problem_id,
                 "text": metric.problem_text,
                 "chapter": chtmp,
-                "chapter_title": chap_map.get(chtmp,chtmp),
-                "sub_chapter": data_analyzer.questions[problem_id].subchapter,
+                "chapter_title": chapget.ChapterName(chtmp),
+                "chapter_number": chapget.ChapterNumber(chtmp),
+                "sub_chapter": schtmp,
+                "sub_chapter_number": chapget.SectionNumber(chtmp,schtmp),
+                "sub_chapter_title": chapget.SectionName(chtmp,schtmp),
                 "correct": stats[2],
                 "correct_mult_attempt": stats[3],
                 "incomplete": stats[1],
@@ -79,6 +131,8 @@ def index():
                 "text": metric.problem_text,
                 "chapter": "unknown",
                 "sub_chapter": "unknown",
+                "sub_chapter_number": 0,
+                "sub_chapter_title":"unknown",
                 "chapter_title": "unknown",
                 "correct": stats[2],
                 "correct_mult_attempt": stats[3],
@@ -89,14 +143,20 @@ def index():
         questions.append(entry)
         logger.debug("ADDING QUESTION %s ", entry["chapter"])
 
-    logger.debug("getting questsions")
-    questions = sorted(questions, key=itemgetter("chapter"))
+    logger.debug("getting questions")
+    try:
+        questions = sorted(questions, key=itemgetter("chapter","sub_chapter_number"))
+    except:
+        logger.error("FAILED TO SORT {}".format(questions))
     logger.debug("starting sub_chapter loop")
     for sub_chapter, metric in six.iteritems(progress_metrics.sub_chapters):
         sections.append({
             "id": metric.sub_chapter_label,
             "text": metric.sub_chapter_text,
             "name": metric.sub_chapter_name,
+            "number": chapget.SectionNumber(selected_chapter.chapter_label,metric.sub_chapter_label),
+            #FIX: Using selected_chapter here might be a kludge
+            #Better if metric contained chapter numbers associated with sub_chapters
             "readPercent": metric.get_completed_percent(),
             "startedPercent": metric.get_started_percent(),
             "unreadPercent": metric.get_not_started_percent()

controllers/default.py

@@ -457,7 +457,7 @@ def donate():
 @auth.requires_login()
 def delete():
     if request.vars['deleteaccount']:
-        logger.error("deleting account {} for {}".format(auth.user.id, auth.user.username)) 
+        logger.error("deleting account {} for {}".format(auth.user.id, auth.user.username))
         session.flash = "Account Deleted"
         db(db.auth_user.id == auth.user.id).delete()
         db(db.useinfo.sid == auth.user.username).delete()

models/0.py

@@ -8,6 +8,7 @@
 from gluon.storage import Storage
 import logging
 from os import environ
+import sys
 
 settings = Storage()
 
@@ -61,3 +62,4 @@
 settings.logger = "web2py.app.runestone"
 settings.sched_logger = settings.logger  # works for production where sending log to syslog but not for dev.
 settings.log_level = logging.DEBUG
+settings.python_interpreter = sys.executable

models/db.py

@@ -81,6 +81,12 @@
 #auth.settings.auth_two_factor_enabled = True
 #auth.settings.two_factor_methods = [lambda user, auth_two_factor: 'password_here']
 
+if os.environ.get("WEB2PY_CONFIG","") == 'production':
+    SELECT_CACHE = dict(cache=(cache.ram, 3600), cacheable=True)
+    COUNT_CACHE = dict(cache=(cache.ram, 3600))
+else:
+    SELECT_CACHE = {}
+    COUNT_CACHE = {}
 
 ## create all tables needed by auth if not custom tables
 db.define_table('courses',
@@ -131,11 +137,11 @@ def verifyInstructorStatus(course, instructor):
     given course.
     """
     if type(course) == str:
-        course = db(db.courses.course_name == course).select(db.courses.id).first()
+        course = db(db.courses.course_name == course).select(db.courses.id, **SELECT_CACHE).first()
 
     return db((db.course_instructor.course == course) &
              (db.course_instructor.instructor == instructor)
-            ).count() > 0
+            ).count(**COUNT_CACHE) > 0
 
 class IS_COURSE_ID:
     ''' used to validate that a course name entered (e.g. devcourse) corresponds to a

static/js/admin.js

@@ -49,8 +49,8 @@ function gradeIndividualItem() {
                 }
             }
             if(!sid){continue}
-            var newid="Q"+question+"S"+sid;
-
+            var newid= "Q" + question.replace(/[#@+:>~.\/ ]/g,'_') +
+            	       	  "S" + sid.replace(/[#@+:>~.\/]/g,'_');
             //This creates the equivalent of outerRightDiv for each question and student
             var divstring='<div style="border:1px solid;padding:5px;margin:5px;" id="'+newid+'">';
             divstring+='<h4 id="rightTitle"></h4><div id="questiondisplay">Question Display</div>'
@@ -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_ajax2.py

@@ -384,7 +384,6 @@ def test_GetHist(test_client, test_user_1):
         kwargs['code'] = 'test_code_{}'.format(x)
         test_client.post('ajax/runlog', data = kwargs)
 
-
     kwargs = dict(
             acid = 'test_activecode_1',
             sid = 'test_user_1'
@@ -393,6 +392,17 @@ def test_GetHist(test_client, test_user_1):
     print(test_client.text)
     res = json.loads(test_client.text)
 
+    assert len(res['timestamps']) == 0
+    assert len(res['history']) == 0
+
+    kwargs = dict(
+            acid = 'test_activecode_1',
+            #sid = 'test_user_1'
+            )
+    test_client.post('ajax/gethist', data = kwargs)
+    print(test_client.text)
+    res = json.loads(test_client.text)
+
     assert len(res['timestamps']) == 10
     assert len(res['history']) == 10
 

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