merge master

Author: runestonetest

controllers/admin.py

@@ -40,6 +40,10 @@
     datafile=[],
 )
 
+AUTOGRADEABLE = set(
+    ["clickablearea", "fillintheblank", "dragndrop", "mchoice", "parsonsprob"]
+)
+
 ALL_WHICH_OPTIONS = ["first_answer", "last_answer", "best_answer"]
 WHICH_TO_GRADE_POSSIBLE_VALUES = dict(
     clickablearea=ALL_WHICH_OPTIONS,
@@ -643,13 +647,22 @@ def grading():
             db.assignment_questions.question_id,
             db.assignment_questions.points,
             db.questions.name,
+            db.questions.question_type,
+            db.questions.autograde,
             orderby=db.assignment_questions.sorting_priority,
         )
         questions = []
         if row.name not in question_points:
             question_points[row.name] = {}
         for q in assignment_questions:
-            questions.append(q.questions.name)
+            if (
+                q.questions.question_type in AUTOGRADEABLE
+                or q.questions.autograde == "unittest"
+            ):
+                name_suff = "+"
+            else:
+                name_suff = ""
+            questions.append(q.questions.name + name_suff)
             question_points[row.name][q.questions.name] = q.assignment_questions.points
 
         assignments[row.name] = questions

controllers/dashboard.py

@@ -566,7 +566,7 @@ def questiongrades():
     )
     sid = request.vars.sid
     student = db(db.auth_user.username == sid).select(
-        db.auth_user.first_name, db.auth_user.last_name
+        db.auth_user.first_name, db.auth_user.last_name, db.auth_user.username
     )
 
     query = """select questions.name, score, points
@@ -736,7 +736,6 @@ def subchapoverview():
 
     if request.vars.tablekind == "sccount":
         x = pt.to_dict()
-        print(x)
         for k in x:
             for j in x[k]:
                 x[k][j] = format_cell(k, j[0], j[1], x[k][j])

static/js/admin.js

@@ -334,7 +334,7 @@ function createGradingPanel(element, acid, studentId, multiGrader) {
     function show(data) {
         // get rid of any other modals -- incase they are just hanging out.
         //jQuery('.modal.modal-grader:not(#modal-template .modal)').remove();
-
+        // the submit button is connected to the save function by a jquery submit event.
         var rightDiv = jQuery(element);
 
         jQuery("#gradingform", rightDiv).remove();
@@ -536,13 +536,18 @@ function makeOption(text, value, disabledQ) {
 function populateQuestions(select, question_names) {
     $(select).empty();
     var chapter = "";
+    var questiontext;
     for (i = 0; i < question_names.length; i++) {
         var q = question_names[i];
-        var questiontext = "";
-        questiontext = q;
-        /*
-        };*/
-        select.add(makeOption(questiontext, question_names[i]));
+        if (q.endsWith("+")) {
+            q = q.substring(0, q.length - 1);
+            questiontext = q + " ✓";
+        } else {
+            questiontext = q;
+        }
+
+        // makeOption(text,value)
+        select.add(makeOption(questiontext, q));
     }
 
     $(select).select2({
@@ -1615,7 +1620,7 @@ function create_question(formdata) {
 }
 
 // Given a question ID, preview it.
-function preview_question_id(question_id, preview_div) {
+function preview_question_id(question_id, preview_div, sid, gradeit) {
     if (arguments.length == 1) {
         preview_div = "component-preview";
     }
@@ -1624,10 +1629,65 @@ function preview_question_id(question_id, preview_div) {
         acid: question_id,
     }).done(function (html_src) {
         // Render it.
-        renderRunestoneComponent(html_src, preview_div, { acid: question_id });
+        data = { acid: question_id };
+        if (sid) {
+            data.sid = sid;
+            data.graderactive = true;
+            data.useRunestoneServices = true;
+        }
+        renderRunestoneComponent(html_src, preview_div, data);
+        if (gradeit) {
+            let pd = document.getElementById(preview_div);
+            pd.appendChild(renderGradingComponents(sid, question_id));
+        }
     });
 }
 
+function renderGradingComponents(sid, divid) {
+    let div = document.createElement("div");
+    let grade = document.createElement("input");
+    let gradelabel = document.createElement("label");
+    gradelabel.for = "grade-input";
+    $(gradelabel).text("Grade");
+    grade.type = "text";
+    grade.id = "grade-input";
+    let comment = document.createElement("input");
+    let commentlabel = document.createElement("label");
+    $(commentlabel).text("Comment");
+    comment.type = "text";
+    comment.id = "comment-input";
+    commentlabel.for = "comment-input";
+
+    let butt = document.createElement("button");
+    $(butt).text("Save Grade");
+    $(butt).addClass("btn btn-normal");
+
+    $(butt).click(function () {
+        jQuery.ajax({
+            url: eBookConfig.gradeRecordingUrl,
+            type: "POST",
+            dataType: "JSON",
+            data: {
+                acid: divid,
+                sid: sid,
+                grade: $(grade).val(),
+                comment: $(comment).val(),
+            },
+            success: function (data) {
+                $(grade).css("background", "lightgreen");
+                $(comment).css("background", "lightgreen");
+            },
+        });
+    });
+    div.appendChild(gradelabel);
+    div.appendChild(grade);
+    div.appendChild(commentlabel);
+    div.appendChild(comment);
+    div.appendChild(butt);
+
+    return div;
+}
+
 // Called by the "Preview" button of the "Write" panel.
 function preview_question(form, preview_div) {
     if (arguments.length == 1) {

views/_sphinx_static_files.html

@@ -22,8 +22,16 @@
 <script type="text/javascript" src="{{=base_static_url}}/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.js"></script>
 
+<<<<<<< HEAD
+=======
+<link href="{{=base_static_url}}/codemirror.css" rel="stylesheet" type="text/css"/>
+<script src="{{=base_static_url}}/underscore.js"></script>
+>>>>>>> master
 <link rel="stylesheet" type="text/css" href="{{=URL('static', 'jquery.datetimepicker.min.css')}}" />
 <link href="{{=base_static_url}}/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" type="text/css"/>
+<link rel="stylesheet" href="{{=base_static_url}}/pygments.css" type="text/css"/>
+<link rel="stylesheet" href="{{=base_static_url}}/runestone-custom-sphinx-bootstrap.css?v={{=settings.components_version}}" type="text/css"/>
+<link rel="stylesheet" type="text/css" href="{{=base_static_url}}/accessibility.css?v=DB047029"/>
 
 <script type="text/javascript" src="{{=base_static_url}}/sharedb.js?v={{=settings.components_version}}"></script>
 
@@ -158,6 +166,9 @@
         list-style-type: circle;
         list-style-image: url('{{=base_static_url}}/active.png');
     }
+    .gradeablerow:hover {
+        background-color: #cccccc;
+    }
 </style>
 
 
@@ -186,4 +197,5 @@
   eBookConfig.isLoggedIn = true ? "{{='auth' in globals()}}" == "True" : false;
   eBookConfig.useRunestoneServices = true;
   eBookConfig.basecourse = "{{=course['base_course']}}";
+  eBookConfig.gradeRecordingUrl = `${eBookConfig.app}/assignments/record_grade`;
 </script>

views/dashboard/index.html

@@ -50,7 +50,7 @@ <h2 style="width: 800px; display: inline;">{{=selected_chapter['chapter_name']}}
                 {{ for section in sections: }}
                     {{ sectionnumber=section["number"] }}
                     <div style="height: 30px;">
-                        <div style="font-size:1.0em; font-weight: bold; margin-top: 0.5em;"><a style="color:black;" href="{{=get_course_url(selected_chapter['chapter_label'], section['text'])}}">{{=selected_chapter['chapter_num']}}.{{=sectionnumber}}. {{=section["name"]}}</a></div>
+                        <div style="font-size:1.0em; font-weight: bold; margin-top: 0.5em;"><a style="color:black;" href="{{=get_course_url(selected_chapter['chapter_label'], section['text'])}}.html">{{=selected_chapter['chapter_num']}}.{{=sectionnumber}}. {{=section["name"]}}</a></div>
                         <div style="" class="dash-bar-container">
                             <div class="dash-bar dash-bar-correct" style="width: {{=section['readPercent']}};"> {{=section["readPercent"]}}&nbsp;</div>
                             <div class="dash-bar dash-bar-attempts" style=" width: {{=section['startedPercent']}};"> {{=section["startedPercent"]}}&nbsp;</div>

views/dashboard/questiongrades.html

@@ -1,4 +1,5 @@
 {{extend 'admin/instructors.html'}}
+
 {{ block tabcontent }}
 
 <script type="text/javascript" src="https://kozea.github.io/pygal.js/javascripts/svg.jquery.js"></script>
@@ -10,8 +11,8 @@
 
 <div id="dashboard">
 	<h2 style="text-align:center;">{{=assignment['name']}}</h2>
-	<h2>Report for {{=student[0]['first_name']}} {{=student[0]['last_name']}}</h2> 
-
+	<h2>Report for {{=student[0]['first_name']}} {{=student[0]['last_name']}}</h2>
+    <p>Click on the question name to display or update the grade for any question.</p>
 	<div id="questions" class="col-md-12">
 		<table class="sortable">
 			<thead style="cursor: pointer;">
@@ -24,14 +25,21 @@ <h2>Report for {{=student[0]['first_name']}} {{=student[0]['last_name']}}</h2>
 			<tbody>
 				{{for row in rows:}}
 					<tr>
-					{{for item in range(len(row)):}}
-						<td>{{=row[item]}}</td>
+                    {{for item in range(len(row)):}}
+                        {{ if item == 0:}}
+                            <td onclick="preview_question_id('{{=row[item]}}', 'question_viewer', '{{=student[0]['username']}}', true)"
+                            class="gradeablerow">
+                        {{ else: }}
+                            <td>
+                        {{ pass }}
+                            {{=row[item]}}
+                        </td>
 						{{if item == 1:}}
 							{{total += row[item] or 0}}
 						{{pass}}
 					{{pass}}
 					</tr>
-				{{pass}}					
+				{{pass}}
 			</tbody>
 			<tfoot>
 				<tr>
@@ -44,4 +52,8 @@ <h2>Report for {{=student[0]['first_name']}} {{=student[0]['last_name']}}</h2>
 	</div>
 
 </div>
+<p></p>
+<div id="question_viewer">
+</div>
+
 {{end}}

views/dashboard/subchapdetail.html

@@ -1,11 +1,18 @@
-{{extend 'admin/instructors.html'}} {{ block moreincludes }} {{super}}
+{{extend 'admin/instructors.html'}}
+
+{{ block moreincludes }}
+{{super}}
+{{include '_sphinx_static_files.html'}}
+
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/handsontable.full.js"></script>
 <link
     href="https://cdn.jsdelivr.net/npm/[email protected]/dist/handsontable.full.min.css"
     rel="stylesheet"
     media="screen"
 />
-{{ end }} {{ block tabcontent }}
+{{ end }}
+
+{{ block tabcontent }}
 <h2>{{=chapter}} / {{=subchapter}}</h2>
 <h2>{{=sid}}</h2>
 <hr />
@@ -31,7 +38,11 @@ <h2>{{=sid}}</h2>
         <td>{{=row["first"]}}</td>
         <td>{{=row["last"]}}</td>
         <td>{{=row["clicks"]}}</td>
+        <td><button onclick="preview_question_id('{{=row['name']}}', 'question_viewer', '{{=sid}}', true)">View</button></td>
     </tr>
     {{ pass }}
 </table>
+
+<div id="question_viewer"></div>
+
 {{ end }}