Assignment directive

runestone/__init__.py

@@ -87,7 +87,7 @@ def build(options):
             idxfile = os.path.join(options.build.sourcedir,'index.rst')
 
         populateChapterInfo(options.build.project_name, idxfile)
-        print('Creating Chapter Information')
+        print('Creating Chapter Information for {}'.format(idxfile))
     except ImportError as e:
         print('Chapter information database population skipped, This is OK for a standalone build.',e)
     except Exception as e:

runestone/activecode/activecode.py

@@ -192,8 +192,8 @@ def run(self):
             env.activecodecounter = 0
         env.activecodecounter += 1
         self.options['name'] = self.arguments[0].strip()
-
         self.options['divid'] = self.arguments[0]
+
         if not self.options['divid']:
             raise Exception("No divid for ..activecode or ..actex in activecode.py")
 

runestone/activecode/js/activecode.js

@@ -459,11 +459,19 @@ ActiveCode.prototype.createGradeSummary = function () {
         var report = eval(data)[0];
         // check for report['message']
         if (report) {
-            var body = "<h4>Grade Report</h4>" +
-                   "<p>This assignment: " + report['grade'] + "</p>" +
-                   "<p>" + report['comment'] + "</p>" +
-                   "<p>Number of graded assignments: " + report['count'] + "</p>" +
-                   "<p>Average score: " +  report['avg'] + "</p>"
+            if (report['version'] == 2){
+                // new version; would be better to embed this in HTML for the activecode
+                var body = "<h4>Grade Report</h4>" +
+                       "<p>This question: " + report['grade'] + " out of " + report['max'] + "</p>" +
+                       "<p>" + report['comment'] + "</p>"
+            }
+            else{
+                var body = "<h4>Grade Report</h4>" +
+                       "<p>This assignment: " + report['grade'] + "</p>" +
+                       "<p>" + report['comment'] + "</p>" +
+                       "<p>Number of graded assignments: " + report['count'] + "</p>" +
+                       "<p>Average score: " +  report['avg'] + "</p>"
+            }
 
         } else {
             body = "<h4>The server did not return any grade information</h4>";

runestone/assess/multiplechoice.py

@@ -21,7 +21,7 @@
 from .assessbase import *
 import json
 import random
-from runestone.server.componentdb import addQuestionToDB
+from runestone.server.componentdb import addQuestionToDB, addHTMLToDB
 
 
 class MChoiceNode(nodes.General, nodes.Element):
@@ -36,6 +36,10 @@ def __init__(self,content):
         self.mc_options = content
 
 def visit_mc_node(self,node):
+
+    node.delimiter = "_start__{}_".format(node.mc_options['divid'])
+    self.body.append(node.delimiter)
+
     res = ""
     if 'random' in node.mc_options:
         node.mc_options['random'] = 'data-random'
@@ -70,9 +74,15 @@ def depart_mc_node(self,node):
 
 
     res += node.template_end % node.mc_options
-
     self.body.append(res)
 
+    addHTMLToDB(node.mc_options['divid'],
+                node.mc_options['basecourse'],
+                "".join(self.body[self.body.index(node.delimiter) + 1:]))
+
+    self.body.remove(node.delimiter)
+
+
 
 
 

runestone/assignment/__init__.py

@@ -0,0 +1,162 @@
+# Copyright (C) 2015  Paul Resnick
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+from __future__ import print_function
+
+__author__ = 'Paul Resnick'
+
+from docutils import nodes
+from docutils.parsers.rst import directives
+from docutils.parsers.rst import Directive
+from runestone.server.componentdb import addAssignmentToDB, addAssignmentQuestionToDB, getCourseID, getOrCreateAssignmentType, getQuestionID, get_HTML_from_DB
+from runestone.common.runestonedirective import RunestoneDirective
+from datetime import datetime
+
+def setup(app):
+    app.add_directive('assignment',Assignment)
+    app.add_node(AssignmentNode, html=(visit_a_node, depart_a_node))
+
+    app.connect('doctree-resolved',process_nodes)
+    app.connect('env-purge-doc', purge)
+
+class AssignmentNode(nodes.General, nodes.Element):
+    def __init__(self, content):
+        """
+
+        Arguments:
+        - `self`:
+        - `content`:
+        """
+        super(AssignmentNode, self).__init__(name=content['name'])
+        self.a_components = content
+
+
+def visit_a_node(self, node):
+    pass
+
+def depart_a_node(self, node):
+    question_ids = node.a_components['question_ids']
+    basecourse = node.a_components['basecourse']
+    for q_id in question_ids:
+        src = get_HTML_from_DB(q_id, basecourse)
+        if src:
+            self.body.append(src)
+        else:
+            self.body.append("<p>Missing HTML source for {}</p>".format(q_id))
+            print("No HTML source saved for {}; can't include that kind of question until code writing to HTML is implemented for that directive".format(q_id))
+
+def process_nodes(app,env,docname):
+    pass
+
+
+def purge(app,env,docname):
+    pass
+
+
+
+class Assignment(RunestoneDirective):
+    """
+        .. assignment:
+            :name: Problem Set 1
+            :assignment_type: formative
+            :questions: (divid_1 50), (divid_2 100), ...
+            :deadline: 23-09-2016 15:30
+            :points: integer
+    """
+    required_arguments = 0 # not a sphinx_id for these; just a name parameter
+    optional_arguments = 0
+    has_content = False
+    option_spec = RunestoneDirective.option_spec.copy()
+    option_spec.update({
+        'name': directives.unchanged,
+        'assignment_type': directives.unchanged,
+        'questions': directives.unchanged,
+        'deadline':directives.unchanged,
+        'points':directives.positive_int,
+        'threshold': directives.positive_int,
+        'autograde': directives.unchanged,
+        'generate_html': directives.flag
+    })
+
+    def run(self):
+        """
+            .. assignment:
+                :name: Problem Set 1
+                :assignment_type: formative
+                :questions: (divid_1 50), (divid_2 100), ...
+                :deadline: 23-09-2016 15:30
+                :points: integer
+                :threshold: integer
+                :autograde: visited
+                :generate_html:
+        """
+
+        course_name = self.state.document.settings.env.config.html_context['course_id']
+        self.options['course_name'] = course_name
+        course_id = getCourseID(course_name)
+        basecourse_name = self.state.document.settings.env.config.html_context.get('basecourse', "unknown")
+        self.options['basecourse'] = self.state.document.settings.env.config.html_context.get('basecourse', "unknown")
+
+        name = self.options.get('name') # required; error if missing
+        assignment_type_name = self.options.get('assignment_type')
+        assignment_type_id = getOrCreateAssignmentType(assignment_type_name)
+
+        deadline = None
+
+        if 'deadline' in self.options:
+            try:
+                deadline = datetime.strptime(self.options['deadline'], '%Y-%m-%d %H:%M')
+            except:
+                try:
+                    deadline = datetime.strptime(self.options['deadline'], '%Y-%m-%d %H:%M:%S')
+                    self.state.document.settings.env.warn(self.state.document.settings.env.docname, "deadline not in preferred format %Y-%m-%d %H:%M but accepting alternate format with seconds")
+                except:
+                    self.state.document.settings.env.warn(self.state.document.settings.env.docname, "deadline missing or incorrectly formatted; Omitting deadline")
+
+        points = self.options.get('points', 0)
+        threshold = self.options.get('threshold', None)
+        if threshold:
+            threshold = int(threshold)
+        autograde = self.options.get('autograde', None)
+
+        assignment_id = addAssignmentToDB(name = name,
+                          course_id = course_id,
+                          assignment_type_id = assignment_type_id,
+                          deadline = deadline,
+                          points = points,
+                          threshold = threshold)
+
+        unparsed = self.options.get('questions', None)
+        question_names = []
+        if unparsed:
+            summative_type_id = getOrCreateAssignmentType("summative")
+            q_strings = unparsed.split(',')
+            for q in q_strings:
+                (question_name, points) = q.strip().split()
+                question_names.append(question_name)
+                # first get the question_id associated with question_name
+                question_id = getQuestionID(basecourse_name, question_name)
+                if question_id:
+                    addAssignmentQuestionToDB(question_id, assignment_id, points, assessment_type = summative_type_id, autograde = autograde)
+                else:
+                    self.state.document.settings.env.warn(self.state.document.settings.env.docname, "Question {} is not in the database for basecourse {}".format(question_name, basecourse_name))
+        else:
+            self.state.document.settings.env.warn(self.state.document.settings.env.docname, "No questions for assignment {}".format(name))
+        self.options['question_ids'] = question_names
+
+        if 'generate_html' in self.options:
+            return [AssignmentNode(self.options)]
+        else:
+            return []

runestone/common/runestonedirective.py

@@ -46,4 +46,3 @@ def __init__(self, *args, **kwargs):
         self.options['basecourse'] = self.basecourse
         self.options['chapter'] = self.chapter
         self.options['subchapter'] = self.subchapter
-

runestone/external/__init__.py

@@ -0,0 +1 @@
+from .external import *

runestone/external/css/external.css

@@ -0,0 +1,109 @@
+.modal-profile {
+	display:none;
+    min-height: 300px;
+    overflow: hidden;
+	width: 700px;
+	padding:25px;
+	border:1px solid #fff;
+	box-shadow: 0px 2px 7px #292929;
+	-moz-box-shadow: 0px 2px 7px #292929;
+	-webkit-box-shadow: 0px 2px 7px #292929;
+	border-radius:10px;
+	-moz-border-radius:10px;
+	-webkit-border-radius:10px;
+	background: #f2f2f2;
+	z-index:50;
+}
+
+.modal-lightsout {
+	display:none;
+    position:absolute;
+	top:0;
+	left:0;
+	width:100%;
+	z-index:25;
+	background:#000 ;
+}
+
+.modal-close-profile {
+	display:none;
+	position:absolute;
+    height: 43px;
+	width: 43px;
+    background-image: url('close.png');
+	top:1px;
+	right:0.5px;
+}
+
+
+.ac_actions{
+	text-align: center;
+}
+
+.ac_sep {
+	background: #000;
+	display: inline-block;
+	margin: -15px 10px;
+	width: 1px;
+	height: 35px;
+	padding: 0;
+	border: 0;
+}
+.ac_section{
+	position: relative;
+	clear:both;
+}
+.ac_section>* {
+	max-width: 500pt;
+	margin-left: auto;
+	margin-right: auto;
+	position:relative;
+}
+.ac_section .clearfix{
+	position: initial;
+}
+.ac_output{
+	display:none;
+	max-width: 450px;
+}
+
+.ac_caption {
+    text-align: center;
+    font-weight: bold;
+}
+
+.ac_caption_text {
+    font-weight: normal;
+}
+.ac_caption:before {
+    content: "ActiveCode: " counter(activecode) " ";
+    counter-increment: activecode;
+}
+
+.active_out {
+    background-color:#dcdcdc;
+    border-radius: 6px;
+    min-width: 20em;
+    max-height: 300px;
+    overflow: auto;
+}
+
+.visible-ac-canvas {
+    border: 2px solid black;
+}
+
+.ac_section>.col-md-12 {
+	max-width: 100% !important;
+}
+
+.full_width ol {
+	max-width: 100% !important;
+}
+
+.ac-disabled {
+	pointer-events: none;
+}
+
+.ac-feedback {
+	border: 1px solid black;
+}