Merge lp:~ellimistd/schooltool.quiz/SchoolToolQuizDev into lp:schooltool.quiz

[David Reich]

Changed tests (quiz_duplicate, quiz_management, quiz_deployment, quiz_import, quiz_export, and student_answers) to account for rational tests. I also fixed bugs that had been indicated by failing tests in quiz_import and quiz_duplicate, but quiz_export is still not functional.

[lp:~ellimistd/schooltool.quiz/SchoolToolQuizDev]

39. By David Reich <email address hidden> on 2013-03-02

changed tests to account for rational questions

Unmerged revisions

39. By David Reich <email address hidden> on 2013-03-02

changed tests to account for rational questions

38. By David Reich <email address hidden> on 2013-02-18

Added rational questions, with automatic validation (No tests yet)

=== modified file 'src/schooltool/quiz/browser/deployedquiz.py'
--- src/schooltool/quiz/browser/deployedquiz.py	2013-01-23 23:42:02 +0000
+++ src/schooltool/quiz/browser/deployedquiz.py	2013-03-04 22:05:25 +0000
@@ -78,6 +78,7 @@
 from schooltool.quiz.utils import render_rst, render_pre
 from schooltool.quiz.browser.quiz import SolutionDoneLinkViewlet
 from schooltool.quiz.utils import render_date
+from schooltool.quiz.utils import RationalValidator
 
 
 def getStartTime(adapter):
@@ -941,8 +942,10 @@
             return self.createOpenQuestionField(item)
         elif term.token == 'multiple':
             return self.createMultipleSelectionField(item)
-        else:
+        elif term.token == 'selection':
             return self.createSelectionField(item)
+        else:
+            return self.createRationalQuestionField(item)
 
     def createOpenQuestionField(self, item):
         name = item.__name__.encode('utf-8')
@@ -953,6 +956,16 @@
         datamanager.DictionaryField(self.values, schema_field)
         result = field.Fields(schema_field)
         return result
+        
+    def createRationalQuestionField(self, item):
+        name = item.__name__.encode('utf-8')
+        schema_field = interfaces.ReStructuredText(
+            __name__=name,
+            description=item.body)
+        self.values[name] = None
+        datamanager.DictionaryField(self.values, schema_field)
+        result = field.Fields(schema_field)
+        return result
 
     def choicesVocabulary(self, item, shuffle=False):
         terms = []
@@ -1013,8 +1026,10 @@
                     grade = UNSCORED
                 elif term.token == 'multiple':
                     grade = self.calculateMultipleSelectionGrade(item, answer)
-                else:
+                elif term.token == "selection":
                     grade = self.calculateSelectionGrade(item, answer)
+                else:
+                    grade = self.calculateRationalGrade(item, answer)
                 evaluation = AnsweredEvaluation(item, answer, grade)
                 evaluations.addEvaluation(evaluation)
         self.request.response.redirect(self.nextURL())
@@ -1041,6 +1056,11 @@
             if choice.correct and choice in given_choices:
                 return 100
         return 0
+        
+    def calculateRationalGrade(self, item, answer):
+        if RationalValidator(item.solution, answer):
+            return 100
+        return 0
 
     @button.buttonAndHandler(_('Cancel'), name='cancel')
     def handle_cancel(self, action):
@@ -1132,6 +1152,13 @@
         term = self.types_vocabulary.getTerm(item.type_)
         return term.token == 'open'
 
+    def is_rational(self, item):
+        term = self.types_vocabulary.getTerm(item.type_)
+        return term.token == 'rational'
+
+    def has_open_view(self, item):
+        return self.is_rational(item) or self.is_open(item)
+
     def is_graded(self, evaluation):
         return evaluation and evaluation.value not in (UNSCORED, None)
 
 
=== modified file 'src/schooltool/quiz/browser/quiz.py'
--- src/schooltool/quiz/browser/quiz.py	2013-01-24 10:01:26 +0000
+++ src/schooltool/quiz/browser/quiz.py	2013-03-04 22:05:25 +0000
@@ -73,56 +73,72 @@
 choices_column_separator = '**|**'
 
 
+<<<<<<< TREE
+=======
+class PersonSections(object):
+
+	person = None
+
+	@Lazy
+	def learner_sections(self):
+		return list(ILearner(self.person).sections())
+
+	@Lazy
+	def instructor_sections(self):
+		return list(IInstructor(self.person).sections())
+
+
+>>>>>>> MERGE-SOURCE
 class QuizContainerAbsoluteURLAdapter(BrowserView):
-
-    adapts(interfaces.IQuizContainer, IBrowserRequest)
-    implements(IAbsoluteURL)
-
-    def __str__(self):
-        app = ISchoolToolApplication(None)
-        return '%s/quizzes' % absoluteURL(app, self.request)
-
-    __call__ = __str__
+	adapts(interfaces.IQuizContainer, IBrowserRequest)
+	implements(IAbsoluteURL)
+
+	def __str__(self):
+		app = ISchoolToolApplication(None)
+		return '%s/quizzes' % absoluteURL(app, self.request)
+
+	__call__ = __str__
 
 
 class QuizzesLink(flourish.page.LinkViewlet, PersonSections):
 
-    startup_view_name = 'quizzes.html'
-
-    @Lazy
-    def person(self):
-        return IPerson(self.request.principal, None)
-
-    @property
-    def enabled(self):
-        if self.person is None:
-            return False
-        editable_quizzes = getRelatedObjects(
-            self.person, relationships.URIQuiz, relationships.URIQuizEditors)
-        return self.instructor_sections or \
-               self.learner_sections or \
-               editable_quizzes
-
-    @property
-    def url(self):
-        if self.person is None:
-            return ''
-        return '%s/%s' % (absoluteURL(self.person, self.request),
-                          self.startup_view_name)
+	startup_view_name = 'quizzes.html'
+
+	@Lazy
+	def person(self):
+		return IPerson(self.request.principal, None)
+
+	@property
+	def enabled(self):
+		if self.person is None:
+			return False
+		editable_quizzes = getRelatedObjects(
+			self.person, relationships.URIQuiz, relationships.URIQuizEditors)
+		return self.instructor_sections or \
+			   self.learner_sections or \
+			   editable_quizzes
+
+	@property
+	def url(self):
+		if self.person is None:
+			return ''
+		return '%s/%s' % (absoluteURL(self.person, self.request),
+						  self.startup_view_name)
 
 
 def taken(person, deployed):
-    result = False
-    evaluations = IEvaluations(removeSecurityProxy(person))
-    for item in deployed:
-        evaluation = evaluations.get(item, None)
-        if evaluation is not None:
-            return True
-    return result
+	result = False
+	evaluations = IEvaluations(removeSecurityProxy(person))
+	for item in deployed:
+		evaluation = evaluations.get(item, None)
+		if evaluation is not None:
+			return True
+	return result
 
 
 class PersonQuizzesView(flourish.page.Page, PersonSections):
 
+<<<<<<< TREE
     implements(interfaces.ISchoolToolQuizView,
                interfaces.IPersonQuizView)
 
@@ -176,163 +192,228 @@
 
     def taken(self, deployed):
         return taken(self.context, deployed)
+=======
+	implements(interfaces.ISchoolToolQuizView)
+
+	container_class = 'container widecontainer'
+
+	@Lazy
+	def person(self):
+		return self.context
+
+	@property
+	def quizContainer(self):
+		app = ISchoolToolApplication(None)
+		return interfaces.IQuizContainer(app)
+
+	@Lazy
+	def editable_quizzes(self):
+		result = []
+		for quiz in self.quizContainer.values():
+			if self.person in quiz.editors:
+				result.append(quiz)
+		return result
+
+	@Lazy
+	def deployed_quizzes(self):
+		result = []
+		for section in self.instructor_sections:
+			container = interfaces.IDeployedQuizContainer(section)
+			for deployed in container.values():
+				result.append(deployed)
+		return result
+
+	@Lazy
+	def takeable_quizzes(self):
+		result = []
+		for section in self.learner_sections:
+			container = interfaces.IDeployedQuizContainer(section)
+			for deployed in container.values():
+				if not self.taken(deployed):
+					result.append(deployed)
+		return result
+
+	@Lazy
+	def taken_quizzes(self):
+		result = []
+		for section in self.learner_sections:
+			container = interfaces.IDeployedQuizContainer(section)
+			for deployed in container.values():
+				if self.taken(deployed):
+					result.append(deployed)
+		return result
+
+	def taken(self, deployed):
+		return taken(self.context, deployed)
+>>>>>>> MERGE-SOURCE
 
 
 class QuizContainerView(flourish.page.Page):
 
-    def update(self):
-        print list(self.context.keys())
+	def update(self):
+		print list(self.context.keys())
 
 
 class QuizContainerAddLinks(flourish.page.RefineLinksViewlet):
 
-    pass
+	pass
 
 
 class QuizContainerActionsLinks(flourish.page.RefineLinksViewlet):
 
-    pass
+	pass
 
 
 class QuizAddLinks(flourish.page.RefineLinksViewlet):
 
-    pass
+	pass
 
 
 class QuizViewLinks(flourish.page.RefineLinksViewlet):
 
-    pass
+	pass
 
 
 class QuizActionLinks(flourish.page.RefineLinksViewlet):
 
-    pass
+	pass
 
 
 class QuizAddLink(flourish.page.LinkViewlet):
 
-    @property
-    def url(self):
-        app = ISchoolToolApplication(None)
-        container = interfaces.IQuizContainer(app)
-        return '%s/add.html' % absoluteURL(container, self.request)
+	@property
+	def url(self):
+		app = ISchoolToolApplication(None)
+		container = interfaces.IQuizContainer(app)
+		return '%s/add.html' % absoluteURL(container, self.request)
 
 
 class QuizDeployLinkViewlet(flourish.page.LinkViewlet):
 
-    @property
-    def enabled(self):
-        return len(list(self.context))
+	@property
+	def enabled(self):
+		return len(list(self.context))
 
 
 class PersonQuizAddLink(QuizAddLink, PersonSections):
 
-    @Lazy
-    def person(self):
-        return IPerson(self.request.principal, None)
-
-    @property
-    def enabled(self):
-        if self.person is not None:
-            return self.instructor_sections
-        return False
-
-    @property
-    def url(self):
-        app = ISchoolToolApplication(None)
-        container = interfaces.IQuizContainer(app)
-        camefrom = '%s/quizzes.html' % absoluteURL(self.context, self.request)
-        return '%s/add.html?camefrom=%s' % (
-            absoluteURL(container, self.request), camefrom)
+	@Lazy
+	def person(self):
+		return IPerson(self.request.principal, None)
+
+	@property
+	def enabled(self):
+		if self.person is not None:
+			return self.instructor_sections
+		return False
+
+	@property
+	def url(self):
+		app = ISchoolToolApplication(None)
+		container = interfaces.IQuizContainer(app)
+		camefrom = '%s/quizzes.html' % absoluteURL(self.context, self.request)
+		return '%s/add.html?camefrom=%s' % (
+			absoluteURL(container, self.request), camefrom)
 
 
 class PersonQuizImportLink(QuizAddLink, PersonSections):
 
-    @Lazy
-    def person(self):
-        return IPerson(self.request.principal, None)
-
-    @property
-    def enabled(self):
-        if self.person is not None:
-            return self.instructor_sections
-        return False
-
-    @property
-    def url(self):
-        app = ISchoolToolApplication(None)
-        container = interfaces.IQuizContainer(app)
-        camefrom = '%s/quizzes.html' % absoluteURL(self.context, self.request)
-        return '%s/import.html?camefrom=%s' % (
-            absoluteURL(container, self.request), camefrom)
+	@Lazy
+	def person(self):
+		return IPerson(self.request.principal, None)
+
+	@property
+	def enabled(self):
+		if self.person is not None:
+			return self.instructor_sections
+		return False
+
+	@property
+	def url(self):
+		app = ISchoolToolApplication(None)
+		container = interfaces.IQuizContainer(app)
+		camefrom = '%s/quizzes.html' % absoluteURL(self.context, self.request)
+		return '%s/import.html?camefrom=%s' % (
+			absoluteURL(container, self.request), camefrom)
 
 
 class QuizSolutionLinkViewlet(flourish.page.LinkViewlet):
 
-    @property
-    def enabled(self):
-        return len(list(self.context))
+	@property
+	def enabled(self):
+		return len(list(self.context))
 
 
 class QuizView(flourish.page.Page):
 
-    implements(interfaces.ISchoolToolQuizView,
-               interfaces.IMathJaxView)
-
-    container_class = 'container widecontainer'
-
-    @property
-    def title(self):
-        return self.context.title
-
-    @property
-    def can_modify(self):
-        person = IPerson(self.request.principal, None)
-        return person in self.context.editors
-
-    @Lazy
-    def quiz_items(self):
-        return list(self.context)
-
-    @Lazy
-    def deployed_quizzes(self):
-        return list(self.context.deployed)
+	implements(interfaces.ISchoolToolQuizView,
+			   interfaces.IMathJaxView)
+
+	container_class = 'container widecontainer'
+
+	@property
+	def title(self):
+		return self.context.title
+
+	@property
+	def can_modify(self):
+		person = IPerson(self.request.principal, None)
+		return person in self.context.editors
+
+	@Lazy
+	def quiz_items(self):
+		return list(self.context)
+
+	@Lazy
+	def deployed_quizzes(self):
+		return list(self.context.deployed)
 
 
 class EditableQuizzesViewlet(flourish.viewlet.Viewlet, PersonSections):
 
-    template = InlineViewPageTemplate('''
-      <tal:block i18n:domain="schooltool.quiz"
-                 tal:define="quizzes view/view/editable_quizzes">
-        <h3 i18n:translate="">Editable Quizzes</h3>
-        <div tal:condition="quizzes"
-             tal:define="ajax nocall:view/view/providers/ajax"
-             tal:content="structure ajax/view/context/editable_quizzes_table"
-             />
-        <p i18n:translate="" tal:condition="not:quizzes">
-          There are no quizzes you can edit yet.
-        </p>
-      </tal:block>
-    ''')
-
-    @Lazy
-    def person(self):
-        return self.context
-
-    @property
-    def enabled(self):
-        editable_quizzes = getRelatedObjects(self.person,
-                                             relationships.URIQuiz,
-                                             relationships.URIQuizEditors)
-        return self.instructor_sections or editable_quizzes
-
-    def render(self, *args, **kw):
-        if self.enabled:
-            return self.template(*args, **kw)
-
-
+	template = InlineViewPageTemplate('''
+	  <tal:block i18n:domain="schooltool.quiz"
+				 tal:define="quizzes view/view/editable_quizzes">
+		<h3 i18n:translate="">Editable Quizzes</h3>
+		<div tal:condition="quizzes"
+			 tal:define="ajax nocall:view/view/providers/ajax"
+			 tal:content="structure ajax/view/context/editable_quizzes_table"
+			 />
+		<p i18n:translate="" tal:condition="not:quizzes">
+		  There are no quizzes you can edit yet.
+		</p>
+	  </tal:block>
+	''')
+
+	@Lazy
+	def person(self):
+		return self.context
+
+	@property
+	def enabled(self):
+		editable_quizzes = getRelatedObjects(self.person,
+											 relationships.URIQuiz,
+											 relationships.URIQuizEditors)
+		return self.instructor_sections or editable_quizzes
+
+	def render(self, *args, **kw):
+		if self.enabled:
+			return self.template(*args, **kw)
+
+
+<<<<<<< TREE
+=======
+def quiz_editors_formatter(editors, quiz, formatter):
+	collator = ICollator(formatter.request.locale)
+	result = sorted([person.title for person in editors],
+					cmp=collator.cmp)
+	return '<br />'.join(result)
+
+
+>>>>>>> MERGE-SOURCE
 class EditableQuizzesTable(table.ajax.Table):
 
+<<<<<<< TREE
     def items(self):
         return self.view.editable_quizzes
 
@@ -371,259 +452,333 @@
                        batch_size=self.batch_size,
                        prefix=self.__name__,
                        css_classes={'table': 'data editable-quizzes-table'})
+=======
+	table_formatter = AJAXCSSTableFormatter
+
+	def items(self):
+		return self.view.editable_quizzes
+
+	def columns(self):
+		default = super(EditableQuizzesTable, self).columns()
+		questions = GetterColumn(
+			name='questions',
+			title=_('Questions'),
+			getter=lambda quiz, formatter: len(list(quiz)))
+		editors = GetterColumn(
+			name='editors',
+			title=_('Editors'),
+			getter=lambda quiz, formatter: quiz.editors,
+			cell_formatter=quiz_editors_formatter)
+		created = GetterColumn(
+			name='created',
+			title=_('Created'),
+			getter=lambda i, f: IZopeDublinCore(i).created,
+			cell_formatter=lambda v, i, f: render_date(v),
+			subsort=True)
+		directlyProvides(created, ISortableColumn)
+		duplicate = QuizActionColumn(
+			'duplicate',
+			title=_('Duplicate this quiz'),
+			action='duplicate_quiz.html',
+			library='schooltool.quiz.flourish',
+			image='duplicate-icon.png')
+		return default + [questions, editors, created, duplicate]
+
+	def sortOn(self):
+		return (('created', True),)
+
+	def updateFormatter(self):
+		if self._table_formatter is None:
+			self.setUp(table_formatter=self.table_formatter,
+					   batch_size=self.batch_size,
+					   prefix=self.__name__,
+					   css_classes={'table': 'data editable-quizzes-table'})
+>>>>>>> MERGE-SOURCE
 
 
 class QuizAddView(flourish.form.AddForm):
 
-    legend = _('Quiz Information')
-    fields = field.Fields(interfaces.IQuiz['title'])
-    content_template = ViewPageTemplateFile('templates/form.pt')
-
-    def updateActions(self):
-        super(QuizAddView, self).updateActions()
-        self.actions['add'].addClass('button-ok')
-        self.actions['cancel'].addClass('button-cancel')
-
-    def create(self, data):
-        quiz = Quiz()
-        form.applyChanges(self, quiz, data)
-        return quiz
-
-    def add(self, quiz):
-        chooser = INameChooser(self.context)
-        name = chooser.chooseName('', quiz)
-        self.context[name] = quiz
-        self.setCreator(quiz)
-        self._quiz = quiz
-        return quiz
-
-    def nextURL(self):
-        if self._finishedAdd:
-            url = absoluteURL(self._quiz, self.request)
-        else:
-            url = self.request.get('camefrom',
-                                   absoluteURL(self.context, self.request))
-        return url
-
-    def setCreator(self, quiz):
-        creator = IPerson(self.request.principal)
-        quiz.editors.add(removeSecurityProxy(creator))
+	legend = _('Quiz Information')
+	fields = field.Fields(interfaces.IQuiz['title'])
+	content_template = ViewPageTemplateFile('templates/form.pt')
+
+	def updateActions(self):
+		super(QuizAddView, self).updateActions()
+		self.actions['add'].addClass('button-ok')
+		self.actions['cancel'].addClass('button-cancel')
+
+	def create(self, data):
+		quiz = Quiz()
+		form.applyChanges(self, quiz, data)
+		return quiz
+
+	def add(self, quiz):
+		chooser = INameChooser(self.context)
+		name = chooser.chooseName('', quiz)
+		self.context[name] = quiz
+		self.setCreator(quiz)
+		self._quiz = quiz
+		return quiz
+
+	def nextURL(self):
+		if self._finishedAdd:
+			url = absoluteURL(self._quiz, self.request)
+		else:
+			url = self.request.get('camefrom',
+								   absoluteURL(self.context, self.request))
+		return url
+
+	def setCreator(self, quiz):
+		creator = IPerson(self.request.principal)
+		quiz.editors.add(removeSecurityProxy(creator))
 
 
 class QuizEditView(flourish.form.Form, form.EditForm):
 
-    legend = _('Quiz Information')
-    fields = field.Fields(interfaces.IQuiz['title'])
-    content_template = ViewPageTemplateFile('templates/form.pt')
-
-    @property
-    def title(self):
-        return self.context.title
-
-    def update(self):
-        return form.EditForm.update(self)
-
-    def updateActions(self):
-        super(QuizEditView, self).updateActions()
-        self.actions['submit'].addClass('button-ok')
-        self.actions['cancel'].addClass('button-cancel')
-
-    def nextURL(self):
-        return absoluteURL(self.context, self.request)
-
-    @button.buttonAndHandler(_('Submit'), name='submit')
-    def handle_submit(self, action):
-        super(QuizEditView, self).handleApply.func(self, action)
-        if (self.status == self.successMessage or
-            self.status == self.noChangesMessage):
-            self.request.response.redirect(self.nextURL())
-
-    @button.buttonAndHandler(_('Cancel'), name='cancel')
-    def handle_cancel(self, action):
-        self.request.response.redirect(self.nextURL())
+	legend = _('Quiz Information')
+	fields = field.Fields(interfaces.IQuiz['title'])
+	content_template = ViewPageTemplateFile('templates/form.pt')
+
+	@property
+	def title(self):
+		return self.context.title
+
+	def update(self):
+		return form.EditForm.update(self)
+
+	def updateActions(self):
+		super(QuizEditView, self).updateActions()
+		self.actions['submit'].addClass('button-ok')
+		self.actions['cancel'].addClass('button-cancel')
+
+	def nextURL(self):
+		return absoluteURL(self.context, self.request)
+
+	@button.buttonAndHandler(_('Submit'), name='submit')
+	def handle_submit(self, action):
+		super(QuizEditView, self).handleApply.func(self, action)
+		if (self.status == self.successMessage or
+			self.status == self.noChangesMessage):
+			self.request.response.redirect(self.nextURL())
+
+	@button.buttonAndHandler(_('Cancel'), name='cancel')
+	def handle_cancel(self, action):
+		self.request.response.redirect(self.nextURL())
 
 
 class QuizEditorsView(EditPersonRelationships):
 
-    current_title = _('Current editors')
-    available_title = _('Add editors')
-
-    @property
-    def title(self):
-        return self.context.title
-
-    def getCollection(self):
-        return self.context.editors
+	current_title = _('Current editors')
+	available_title = _('Add editors')
+
+	@property
+	def title(self):
+		return self.context.title
+
+	def getCollection(self):
+		return self.context.editors
 
 
 class QuizDeleteView(flourish.form.DialogForm):
 
-    template = ViewPageTemplateFile('templates/confirm_delete_quiz.pt')
-
-    dialog_submit_actions = ('delete',)
-    dialog_close_actions = ('cancel',)
-    label = None
-
-    @button.buttonAndHandler(_('Delete'), name='delete')
-    def handle_delete(self, action):
-        url = '%s/delete.html?delete.%s&CONFIRM' % (
-            absoluteURL(self.context.__parent__, self.request),
-            self.context.__name__)
-        self.request.response.redirect(url)
-        self.ajax_settings['dialog'] = 'close'
-
-    @button.buttonAndHandler(_('Cancel'), name='cancel')
-    def handle_cancel(self, action):
-        pass
-
-    def updateActions(self):
-        super(QuizDeleteView, self).updateActions()
-        self.actions['delete'].addClass('button-ok')
-        self.actions['cancel'].addClass('button-cancel')
+	template = ViewPageTemplateFile('templates/confirm_delete_quiz.pt')
+
+	dialog_submit_actions = ('delete',)
+	dialog_close_actions = ('cancel',)
+	label = None
+
+	@button.buttonAndHandler(_('Delete'), name='delete')
+	def handle_delete(self, action):
+		url = '%s/delete.html?delete.%s&CONFIRM' % (
+			absoluteURL(self.context.__parent__, self.request),
+			self.context.__name__)
+		self.request.response.redirect(url)
+		self.ajax_settings['dialog'] = 'close'
+
+	@button.buttonAndHandler(_('Cancel'), name='cancel')
+	def handle_cancel(self, action):
+		pass
+
+	def updateActions(self):
+		super(QuizDeleteView, self).updateActions()
+		self.actions['delete'].addClass('button-ok')
+		self.actions['cancel'].addClass('button-cancel')
 
 
 class QuizDuplicateView(flourish.page.Page):
 
-    def __call__(self):
-        container = self.context.__parent__
-        copy = removeSecurityProxy(self.context).copy()
-        chooser = INameChooser(container)
-        name = chooser.chooseName('', copy)
-        container[name] = copy
-        copy.title = translate(
-            _('DUPLICATED: ${quiz}', mapping={'quiz': self.context.title}),
-            context=self.request)
-        person = IPerson(self.request.principal, None)
-        if person is not None:
-            copy.editors.add(removeSecurityProxy(person))
-        notify(ObjectCreatedEvent(copy))
-        camefrom = self.request.get('camefrom',
-                                    absoluteURL(container, self.request))
-        self.request.response.redirect(camefrom)
+	def __call__(self):
+		container = self.context.__parent__
+		copy = removeSecurityProxy(self.context).copy()
+		chooser = INameChooser(container)
+		name = chooser.chooseName('', copy)
+		container[name] = copy
+		copy.title = translate(
+			_('DUPLICATED: ${quiz}', mapping={'quiz': self.context.title}),
+			context=self.request)
+		person = IPerson(self.request.principal, None)
+		if person is not None:
+			copy.editors.add(removeSecurityProxy(person))
+		notify(ObjectCreatedEvent(copy))
+		camefrom = self.request.get('camefrom',
+									absoluteURL(container, self.request))
+		self.request.response.redirect(camefrom)
 
 
 class QuizContainerDeleteView(flourish.containers.ContainerDeleteView):
 
-    def nextURL(self):
-        if 'CONFIRM' in self.request:
-            person = IPerson(self.request.principal)
-            url = '%s/quizzes.html' % absoluteURL(person, self.request)
-            return url
-        return super(QuizContainerDeleteView, self).nextURL()
+	def nextURL(self):
+		if 'CONFIRM' in self.request:
+			person = IPerson(self.request.principal)
+			url = '%s/quizzes.html' % absoluteURL(person, self.request)
+			return url
+		return super(QuizContainerDeleteView, self).nextURL()
 
 
 class QuizSolutionView(flourish.page.Page):
 
-    implements(interfaces.ISchoolToolQuizView,
-               interfaces.IMathJaxView)
-
-    container_class = 'container extra-wide-container'
-
-    @property
-    def title(self):
-        return self.context.title
-
-    @Lazy
-    def quiz_items(self):
-        return self.context
+	implements(interfaces.ISchoolToolQuizView,
+			   interfaces.IMathJaxView)
+
+	container_class = 'container extra-wide-container'
+
+	@property
+	def title(self):
+		return self.context.title
+
+	@Lazy
+	def quiz_items(self):
+		return self.context
 
 
 class QuizTitleViewlet(flourish.viewlet.Viewlet):
 
-    template = ViewPageTemplateFile('templates/quiz_title.pt')
+	template = ViewPageTemplateFile('templates/quiz_title.pt')
 
 
 class QuizItemsViewlet(flourish.viewlet.Viewlet):
 
-    template = InlineViewPageTemplate('''
-      <tal:block i18n:domain="schooltool.quiz"
-                 tal:define="items view/view/quiz_items">
-        <h3 i18n:translate="">Questions</h3>
-        <div tal:condition="items"
-             tal:define="ajax nocall:view/view/providers/ajax"
-             tal:content="structure ajax/view/context/quiz_items_table"
-             />
-        <p i18n:translate="" tal:condition="not:items">
-          This quiz has no questions yet.
-        </p>
-      </tal:block>
-    ''')
-
-
+	template = InlineViewPageTemplate('''
+	  <tal:block i18n:domain="schooltool.quiz"
+				 tal:define="items view/view/quiz_items">
+		<h3 i18n:translate="">Questions</h3>
+		<div tal:condition="items"
+			 tal:define="ajax nocall:view/view/providers/ajax"
+			 tal:content="structure ajax/view/context/quiz_items_table"
+			 />
+		<p i18n:translate="" tal:condition="not:items">
+		  This quiz has no questions yet.
+		</p>
+	  </tal:block>
+	''')
+
+
+<<<<<<< TREE
+=======
+class ReStructuredTextColumn(GetterColumn):
+
+	def __init__(self, *args, **kw):
+		self.schema_field = kw.pop('schema_field')
+		super(ReStructuredTextColumn, self).__init__(*args, **kw)
+
+	def renderCell(self, item, formatter):
+		renderer = flourish.form.Form(item, formatter.request)
+		renderer.mode = DISPLAY_MODE
+		renderer.fields = field.Fields(self.schema_field)
+		renderer.update()
+		return renderer.widgets['body'].render()
+
+
+class TypeColumn(GetterColumn):
+
+	def __init__(self, *args, **kw):
+		super(TypeColumn, self).__init__(*args, **kw)
+		factory = getUtility(IVocabularyFactory,
+							 name='schooltool.quiz.quiz_item_types')
+		vocabulary = factory(None)
+		self.vocabulary = vocabulary
+
+	def getter(self, item, formatter):
+		term = self.vocabulary.getTerm(item.type_)
+		return term.title
+
+
+>>>>>>> MERGE-SOURCE
 class ActionColumn(table.column.ImageInputColumn):
 
-    def __init__(self, name, title=None, action=None, library=None,
-                 image=None):
-        super(ActionColumn, self).__init__(
-            'item.', '', name, library=library, image=image)
-        self.alt = title
-        self.link_title = title
-        self.action = action
+	def __init__(self, name, title=None, action=None, library=None,
+				 image=None):
+		super(ActionColumn, self).__init__(
+			'item.', '', name, library=library, image=image)
+		self.alt = title
+		self.link_title = title
+		self.action = action
 
-    def template(self):
-        return '\n'.join([
-                '<a href="%(href)s" title="%(title)s">',
-                '<img src="%(src)s" alt="%(alt)s" />',
-                '</a>'
-                ])
+	def template(self):
+		return '\n'.join([
+				'<a href="%(href)s" title="%(title)s">',
+				'<img src="%(src)s" alt="%(alt)s" />',
+				'</a>'
+				])
 
 
 class QuizActionColumn(ActionColumn):
 
-    def params(self, item, formatter):
-        result = super(QuizActionColumn, self).params(item, formatter)
-        person_url = absoluteURL(formatter.context, formatter.request)
-        camefrom = '%s/quizzes.html' % person_url
-        quiz_url = absoluteURL(item, formatter.request)
-        result['title'] = translate(self.link_title,
-                                    context=formatter.request) or ''
-        result['href'] = '%s/%s?camefrom=%s' % (
-            quiz_url, self.action, camefrom)
-        return result
+	def params(self, item, formatter):
+		result = super(QuizActionColumn, self).params(item, formatter)
+		person_url = absoluteURL(formatter.context, formatter.request)
+		camefrom = '%s/quizzes.html' % person_url
+		quiz_url = absoluteURL(item, formatter.request)
+		result['title'] = translate(self.link_title,
+									context=formatter.request) or ''
+		result['href'] = '%s/%s?camefrom=%s' % (
+			quiz_url, self.action, camefrom)
+		return result
 
 
 class ItemActionColumn(ActionColumn):
 
-    def params(self, item, formatter):
-        result = super(ItemActionColumn, self).params(item, formatter)
-        quiz_url = absoluteURL(formatter.context, formatter.request)
-        result['title'] = translate(self.link_title,
-                                    context=formatter.request) or ''
-        result['href'] = '%s/%s?item_id=%s&camefrom=%s' % (
-            quiz_url, self.action, item.__name__, quiz_url)
-        return result
+	def params(self, item, formatter):
+		result = super(ItemActionColumn, self).params(item, formatter)
+		quiz_url = absoluteURL(formatter.context, formatter.request)
+		result['title'] = translate(self.link_title,
+									context=formatter.request) or ''
+		result['href'] = '%s/%s?item_id=%s&camefrom=%s' % (
+			quiz_url, self.action, item.__name__, quiz_url)
+		return result
 
 
 class ModalItemActionColumn(ItemActionColumn):
 
-    template = ViewPageTemplateFile('templates/modal_item_column.pt')
+	template = ViewPageTemplateFile('templates/modal_item_column.pt')
 
-    def renderCell(self, item, formatter):
-        params = self.params(item, formatter)
-        params['dialog_title'] = translate(_('Remove this question?'),
-                                           context=formatter.request)
-        self.context = item
-        self.request = formatter.request
-        return self.template(params=params)
+	def renderCell(self, item, formatter):
+		params = self.params(item, formatter)
+		params['dialog_title'] = translate(_('Remove this question?'),
+										   context=formatter.request)
+		self.context = item
+		self.request = formatter.request
+		return self.template(params=params)
 
 
 class PositionColumn(GetterColumn):
 
-    def getter(self, item, formatter):
-        for position, current in enumerate(formatter.context):
-            if sameProxiedObjects(current, item):
-                return position
+	def getter(self, item, formatter):
+		for position, current in enumerate(formatter.context):
+			if sameProxiedObjects(current, item):
+				return position
 
-    def cell_formatter(self, value, item, formatter):
-        template = '<a href="%(href)s">%(title)s</a>'
-        quiz_url = absoluteURL(formatter.context, formatter.request)
-        href = '%s/view_item.html?item_id=%s' % (quiz_url, item.__name__)
-        params = {'href': href, 'title': value + 1}
-        return template % params
+	def cell_formatter(self, value, item, formatter):
+		template = '<a href="%(href)s">%(title)s</a>'
+		quiz_url = absoluteURL(formatter.context, formatter.request)
+		href = '%s/view_item.html?item_id=%s' % (quiz_url, item.__name__)
+		params = {'href': href, 'title': value + 1}
+		return template % params
 
 
 class SortColumn(PositionColumn):
 
+<<<<<<< TREE
     def cell_formatter(self, value, item, formatter):
         template = '<select name="%(name)s" class="item-sort">%(options)s</select>'
         options = []
@@ -638,10 +793,27 @@
             'options': ''.join(options),
             }
         return template % params
+=======
+	def cell_formatter(self, value, item, formatter):
+		template = '<select id="%(name)s" class="item-sort">%(options)s</select>'
+		options = []
+		for position, current in enumerate(formatter.context):
+			display_position = position + 1
+			option = '<option value="%d">%d</option>'
+			if sameProxiedObjects(current, item):
+				option = '<option value="%d" selected="selected">%d</option>'
+			options.append(option % (position, display_position))
+		params = {
+			'name': item.__name__,
+			'options': ''.join(options),
+			}
+		return template % params
+>>>>>>> MERGE-SOURCE
 
 
 class QuizItemsTable(table.ajax.Table):
 
+<<<<<<< TREE
     def columns(self):
         position = PositionColumn(
             name='position',
@@ -707,67 +879,137 @@
                 new_position = int(toChange)
                 self.context.updateOrder(changePosition, new_position)
         super(QuizItemsTable, self).update()
+=======
+	table_formatter = AJAXCSSTableFormatter
+
+	def columns(self):
+		position = PositionColumn(
+			name='position',
+			title=_('No.'))
+		body = ReStructuredTextColumn(
+			name='body',
+			title=_('Body'),
+			schema_field=interfaces.IQuizItem['body']
+			)
+		type_ = TypeColumn(
+			name='type',
+			title=_('Type'))
+		result = [position, body, type_]
+		result.extend(self.getActionColumns())
+		return result
+
+	def getActionColumns(self):
+		# XXX: set action columns only if principal is editor
+		sort = SortColumn(
+			name='sort',
+			title=u'')
+		edit = ItemActionColumn(
+			'edit',
+			title=_('Edit this item'),
+			action='edit_item.html',
+			library='schooltool.skin.flourish',
+			image='edit-icon.png')
+		duplicate = ItemActionColumn(
+			'duplicate',
+			title=_('Duplicate this item'),
+			action='duplicate_item.html',
+			library='schooltool.quiz.flourish',
+			image='duplicate-icon.png')
+		remove = ModalItemActionColumn(
+			'remove',
+			title=_('Remove this item'),
+			action='remove_item.html',
+			library='schooltool.skin.flourish',
+			image='remove-icon.png')
+		return [sort, edit, duplicate, remove]
+
+	def items(self):
+		return self.view.quiz_items
+
+	def sortOn(self):
+		return (('position', False),)
+
+	def updateFormatter(self):
+		# XXX: set -with-actions class only if principal is editor
+		klass = 'data quiz-items-table quiz-items-table-with-actions'
+		css_classes = {'table': klass}
+		if self._table_formatter is None:
+			self.setUp(table_formatter=self.table_formatter,
+					   batch_size=self.batch_size,
+					   prefix=self.__name__,
+					   css_classes=css_classes)
+
+	def update(self):
+		changePosition = self.request.get('changePosition')
+		if changePosition is not None:
+			toChange = self.request.get(changePosition)
+			if toChange is not None:
+				new_position = int(toChange)
+				self.context.updateOrder(changePosition, new_position)
+		super(QuizItemsTable, self).update()
+>>>>>>> MERGE-SOURCE
 
 
 class QuizViewDoneLinkViewlet(flourish.viewlet.Viewlet):
 
-    template = InlineViewPageTemplate('''
-        <h3 i18n:domain="schooltool" class="done-link">
-          <a tal:attributes="href view/url"
-             i18n:translate="">
-            Done
-          </a>
-        </h3>
-    ''')
+	template = InlineViewPageTemplate('''
+		<h3 i18n:domain="schooltool" class="done-link">
+		  <a tal:attributes="href view/url"
+			 i18n:translate="">
+			Done
+		  </a>
+		</h3>
+	''')
 
-    def url(self):
-        person = IPerson(self.request.principal, None)
-        if person is not None:
-            return '%s/quizzes.html' % (absoluteURL(person, self.request))
+	def url(self):
+		person = IPerson(self.request.principal, None)
+		if person is not None:
+			return '%s/quizzes.html' % (absoluteURL(person, self.request))
 
 
 class QuizDeleteLinkViewlet(flourish.page.ModalFormLinkViewlet):
 
-    @property
-    def dialog_title(self):
-        title = _('Delete this quiz?')
-        return translate(title, context=self.request)
+	@property
+	def dialog_title(self):
+		title = _('Delete this quiz?')
+		return translate(title, context=self.request)
 
 
 class QuizSolutionTableViewlet(flourish.viewlet.Viewlet):
 
-    template = InlineViewPageTemplate('''
-      <div tal:define="ajax nocall:view/view/providers/ajax"
-           tal:content="structure ajax/view/context/solution_table" />
-    ''')
+	template = InlineViewPageTemplate('''
+	  <div tal:define="ajax nocall:view/view/providers/ajax"
+		   tal:content="structure ajax/view/context/solution_table" />
+	''')
 
 
 class SolutionPositionColumn(PositionColumn):
 
-    def cell_formatter(self, value, item, formatter):
-        return value + 1
+	def cell_formatter(self, value, item, formatter):
+		return value + 1
 
 
 def solution_question_formatter(value, item, formatter):
-    return render_rst(item.body)
+	return render_rst(item.body)
 
 
 def solution_solution_formatter(value, item, formatter):
-    if item.type_ == u'Open':
-        return render_rst(item.solution)
-    choices = []
-    for choice in item.choices:
-        body = render_rst(choice.body)
-        if choice.correct:
-            choices.append(
-                '<span class="correct">%s</span>' % body)
-        else:
-            choices.append(body)
-    return ''.join(choices)
+	if item.type_ in (u'Open',u'Rational'):
+		return render_rst(item.solution)
+	choices = []
+	for choice in item.choices:
+		body = render_rst(choice.body)
+		if choice.correct:
+			choices.append(
+				'<span class="correct">%s</span>' % body)
+		else:
+			choices.append(body)
+	return ''.join(choices)
 
 
 class SolutionTable(table.ajax.Table):
 
+<<<<<<< TREE
     def items(self):
         return self.view.quiz_items
 
@@ -799,23 +1041,59 @@
                        batch_size=self.batch_size,
                        prefix=self.__name__,
                        css_classes={'table': 'data solution-table'})
+=======
+	table_formatter = AJAXCSSTableFormatter
+
+	def items(self):
+		return self.view.quiz_items
+
+	def columns(self):
+		position = SolutionPositionColumn(
+			name='position',
+			title=_('No.'))
+		type_ = TypeColumn(
+			name='type',
+			title=_('Type'))
+		question = GetterColumn(
+			name='question',
+			title=_('Question'),
+			getter=lambda i, f: '',
+			cell_formatter=solution_question_formatter)
+		solution = GetterColumn(
+			name='solution',
+			title=_('Solution'),
+			getter=lambda i, f: '',
+			cell_formatter=solution_solution_formatter)
+		return [position, type_, question, solution]
+
+	def sortOn(self):
+		return (('position', False),)
+
+	def updateFormatter(self):
+		if self._table_formatter is None:
+			self.setUp(table_formatter=self.table_formatter,
+					   batch_size=self.batch_size,
+					   prefix=self.__name__,
+					   css_classes={'table': 'data solution-table'})
+>>>>>>> MERGE-SOURCE
 
 
 class SolutionDoneLinkViewlet(flourish.viewlet.Viewlet):
 
-    template = InlineViewPageTemplate('''
-      <h3 i18n:domain="schooltool" class="done-link">
-        <a tal:attributes="href view/url" i18n:translate="">Done</a>
-      </h3>
-    ''')
+	template = InlineViewPageTemplate('''
+	  <h3 i18n:domain="schooltool" class="done-link">
+		<a tal:attributes="href view/url" i18n:translate="">Done</a>
+	  </h3>
+	''')
 
-    def url(self):
-        default = absoluteURL(self.context, self.request)
-        return self.request.get('camefrom', default)
+	def url(self):
+		default = absoluteURL(self.context, self.request)
+		return self.request.get('camefrom', default)
 
 
 class QuizImporter(ImporterBase):
 
+<<<<<<< TREE
     sheet_name = 'QuizItems'
 
     @Lazy
@@ -883,126 +1161,196 @@
                 continue
             item = self.createQuizItem(data)
             self.addItem(quiz, item, data)
+=======
+	sheet_name = 'QuizItems'
+
+	@Lazy
+	def types_vocabulary(self):
+		factory = getUtility(IVocabularyFactory,
+							 name='schooltool.quiz.quiz_item_types')
+		return factory(None)
+
+	def createQuiz(self, title):
+		quiz = Quiz()
+		quiz.title = translate(_('IMPORTED: ${quiz}', mapping={'quiz': title}),
+							   context=self.request)
+		return quiz
+
+	def createQuizItem(self, data):
+		item = QuizItem()
+		item.body = data['body']
+		item.solution = data['solution']
+		item.type_ = self.types_vocabulary.getTermByToken(data['type_']).value
+		if data['choices']:
+			choices = []
+			for choice in data['choices'].split(choices_row_separator):
+				body, correct = choice.split(choices_column_separator)
+				item_choice = Choice()
+				item_choice.body = body
+				try:
+					item_choice.correct = bool(int(correct))
+				except (ValueError,):
+					item_choice.correct = False
+				choices.append(item_choice)
+			item.choices = choices
+		return item
+
+	def addItem(self, quiz, item, data):
+		app = ISchoolToolApplication(None)
+		container = interfaces.IQuizItemContainer(app)
+		chooser = INameChooser(container)
+		name = chooser.chooseName('', item)
+		container[name] = item
+		item.quizzes.add(quiz)
+		quiz.order.append(item.__name__)
+		notify(ObjectCreatedEvent(item))
+
+	def process(self):
+		sh = self.sheet
+		num_errors = len(self.errors)
+		title = self.getRequiredTextFromCell(sh, 0, 1)
+		if num_errors < len(self.errors):
+			return
+		quiz = self.createQuiz(title)
+		chooser = INameChooser(self.context)
+		name = chooser.chooseName('', quiz)
+		self.context[name] = quiz
+		person = IPerson(self.request.principal)
+		quiz.editors.add(removeSecurityProxy(person))
+		notify(ObjectCreatedEvent(quiz))
+		for row in range(3, sh.nrows):
+			num_errors = len(self.errors)
+			data = {}
+			data['body'] = self.getRequiredTextFromCell(sh, row, 0)
+			data['type_'] = self.getRequiredTextFromCell(sh, row, 1)
+			data['choices'] = self.getTextFromCell(sh, row, 2)
+			data['solution'] = self.getTextFromCell(sh, row, 3)
+			if num_errors < len(self.errors):
+				continue
+			item = self.createQuizItem(data)
+			self.addItem(quiz, item, data)
+>>>>>>> MERGE-SOURCE
 
 
 class QuizImportView(FlourishMegaImporter):
 
-    content_template = ViewPageTemplateFile('templates/quiz_import.pt')
-
-    @property
-    def importers(self):
-        return [
-            QuizImporter,
-            ]
-
-    def nextURL(self):
-        return self.request.get('camefrom',
-                                absoluteURL(self.context, self.request))
+	content_template = ViewPageTemplateFile('templates/quiz_import.pt')
+
+	@property
+	def importers(self):
+		return [
+			QuizImporter,
+			]
+
+	def nextURL(self):
+		return self.request.get('camefrom',
+								absoluteURL(self.context, self.request))
 
 
 class QuizExportView(MegaExporter):
 
-    def __call__(self):
-        wb = xlwt.Workbook()
-        self.export_items(wb)
-        datafile = StringIO()
-        wb.save(datafile)
-        data = datafile.getvalue()
-        self.setUpHeaders(data)
-        return data
-
-    def export_items(self, wb):
-        ws = wb.add_sheet('QuizItems')
-        self.write_header(ws, 0, 0, 'Quiz Title')
-        self.write(ws, 0, 1, self.context.title)
-        self.print_table(self.format_items(), ws, offset=2)
-
-    def print_table(self, table, ws, offset=0):
-        for x, row in enumerate(table):
-            for y, cell in enumerate(row):
-                self.write(ws, x + offset, y, cell.data, **cell.style)
-        return len(table)
-
-    def format_items(self):
-        factory = getUtility(IVocabularyFactory,
-                             name='schooltool.quiz.quiz_item_types')
-        vocabulary = factory(None)
-
-        def type_getter(item):
-            return vocabulary.getTerm(item.type_).token
-
-        def choices_getter(item):
-            result = []
-            if item.choices is not None:
-                for choice in item.choices:
-                    result.append(self.format_choice(choice))
-            return choices_row_separator.join(result)
-
-        fields = [
-            ('Body', Text, attrgetter('body')),
-            ('Type', Text, type_getter),
-            ('Choices', Text, choices_getter),
-            ('Solution', Text, attrgetter('solution')),
-            ]
-        return self.format_table(fields, self.context)
-
-    def format_choice(self, choice):
-        correct = [0, 1][choice.correct]
-        return choices_column_separator.join([choice.body, str(correct)])
+	def __call__(self):
+		wb = xlwt.Workbook()
+		self.export_items(wb)
+		datafile = StringIO()
+		wb.save(datafile)
+		data = datafile.getvalue()
+		self.setUpHeaders(data)
+		return data
+
+	def export_items(self, wb):
+		ws = wb.add_sheet('QuizItems')
+		self.write_header(ws, 0, 0, 'Quiz Title')
+		self.write(ws, 0, 1, self.context.title)
+		self.print_table(self.format_items(), ws, offset=2)
+
+	def print_table(self, table, ws, offset=0):
+		for x, row in enumerate(table):
+			for y, cell in enumerate(row):
+				self.write(ws, x + offset, y, cell.data, **cell.style)
+		return len(table)
+
+	def format_items(self):
+		factory = getUtility(IVocabularyFactory,
+							 name='schooltool.quiz.quiz_item_types')
+		vocabulary = factory(None)
+
+		def type_getter(item):
+			return vocabulary.getTerm(item.type_).token
+
+		def choices_getter(item):
+			result = []
+			if item.choices is not None:
+				for choice in item.choices:
+					result.append(self.format_choice(choice))
+			return choices_row_separator.join(result)
+
+		fields = [
+			('Body', Text, attrgetter('body')),
+			('Type', Text, type_getter),
+			('Choices', Text, choices_getter),
+			('Solution', Text, attrgetter('solution')),
+			]
+		return self.format_table(fields, self.context)
+
+	def format_choice(self, choice):
+		correct = [0, 1][choice.correct]
+		return choices_column_separator.join([choice.body, str(correct)])
 
 
 class QuizHelpLinks(flourish.page.RefineLinksViewlet, PersonSections):
 
-    @Lazy
-    def person(self):
-        return IPerson(self.request.principal, None)
-
-    @property
-    def enabled(self):
-        if self.person is not None:
-            editable_quizzes = getRelatedObjects(self.person,
-                                                 relationships.URIQuiz,
-                                                 relationships.URIQuizEditors)
-            return self.instructor_sections or editable_quizzes
-
-    def render(self, *args, **kw):
-        if self.enabled:
-            return super(QuizHelpLinks, self).render(*args, **kw)
-        return ''
+	@Lazy
+	def person(self):
+		return IPerson(self.request.principal, None)
+
+	@property
+	def enabled(self):
+		if self.person is not None:
+			editable_quizzes = getRelatedObjects(self.person,
+												 relationships.URIQuiz,
+												 relationships.URIQuizEditors)
+			return self.instructor_sections or editable_quizzes
+
+	def render(self, *args, **kw):
+		if self.enabled:
+			return super(QuizHelpLinks, self).render(*args, **kw)
+		return ''
 
 
 class QuizEditingHelpViewlet(flourish.page.LinkIdViewlet):
 
-    template = InlineViewPageTemplate('''
-    <a tal:attributes="href view/url;
-                       onclick view/script"
-       tal:content="view/title" />
-    ''')
-
-    @property
-    def enabled(self):
-        app = ISchoolToolApplication(None)
-        preferences = interfaces.IApplicationPreferences(app)
-        return preferences.mathjax_help is not None
-
-    @property
-    def script(self):
-        url = self.url
-        name = self.html_id
-        params = {
-            'width': 640,
-            'height': 480,
-            'resizable': 'yes',
-            'scrollbars': 'yes',
-            'toolbar': 'no',
-            'location': 'no',
-            }
-        return "window.open('%s', '%s', '%s'); return false" % (
-            url, name, ','.join(['%s=%s' % (k, v) for k, v in params.items()]))
+	template = InlineViewPageTemplate('''
+	<a tal:attributes="href view/url;
+					   onclick view/script"
+	   tal:content="view/title" />
+	''')
+
+	@property
+	def enabled(self):
+		app = ISchoolToolApplication(None)
+		preferences = interfaces.IApplicationPreferences(app)
+		return preferences.mathjax_help is not None
+
+	@property
+	def script(self):
+		url = self.url
+		name = self.html_id
+		params = {
+			'width': 640,
+			'height': 480,
+			'resizable': 'yes',
+			'scrollbars': 'yes',
+			'toolbar': 'no',
+			'location': 'no',
+			}
+		return "window.open('%s', '%s', '%s'); return false" % (
+			url, name, ','.join(['%s=%s' % (k, v) for k, v in params.items()]))
 
 
 class QuizEditingHelpView(flourish.page.Page):
 
+<<<<<<< TREE
     implements(interfaces.ISchoolToolQuizView,
                interfaces.IMathJaxView)
 
@@ -1032,3 +1380,25 @@
         MathJax.Hub.Queue(['Typeset', MathJax.Hub]);
       </script>
     ''')
+=======
+	implements(interfaces.ISchoolToolQuizView,
+			   interfaces.IMathJaxView)
+
+	template = InlineViewPageTemplate('''
+	<tal:block content="structure view/mathjax_help" />
+	''')
+
+	def mathjax_help(self):
+		app = ISchoolToolApplication(None)
+		preferences = interfaces.IApplicationPreferences(app)
+		return self.render_rst(preferences,
+							   interfaces.IApplicationPreferences,
+							   'mathjax_help')
+
+	def render_rst(self, value, iface, field_name):
+		renderer = flourish.form.Form(value, self.request)
+		renderer.mode = DISPLAY_MODE
+		renderer.fields = field.Fields(iface[field_name])
+		renderer.update()
+		return renderer.widgets[field_name].render()
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/schooltool/quiz/browser/quizitem.py'
--- src/schooltool/quiz/browser/quizitem.py	2013-01-24 06:54:46 +0000
+++ src/schooltool/quiz/browser/quizitem.py	2013-03-04 22:05:25 +0000
@@ -59,6 +59,7 @@
 from schooltool.quiz.browser.widget import LabeledCheckBoxFieldWidget
 from schooltool.quiz.quizitem import Choice
 from schooltool.quiz.quizitem import QuizItem
+from schooltool.quiz.utils import Validator
 
 registerFactoryAdapter(interfaces.IChoice, Choice)
 
@@ -66,6 +67,10 @@
 class OneCorrectChoiceRequired(ValidationError):
 
     __doc__ = _('One correct choice is required.')
+    
+class ValidSolutionRequired(ValidationError):
+
+    __doc__ = _('A syntactically valid solution is required.')
 
 
 class SolutionRequiredError(ValidationError):
@@ -83,7 +88,8 @@
 
     def validate(self, value):
         super(ChoicesValidator, self).validate(value)
-        if not self.view.is_open_question():
+        if not (self.view.is_open_question() \
+         or self.view.is_rational_question()):
             if not value:
                 raise OneCorrectChoiceRequired(value)
             correct = []
@@ -98,8 +104,12 @@
 
     def validate(self, value):
         super(SolutionValidator, self).validate(value)
-        if self.view.is_open_question() and not value:
+        if (self.view.is_open_question() \
+         or self.view.is_rational_question()) \
+         and not value:
             raise SolutionRequiredError(value)
+        if self.view.is_rational_question() and not Validator(value):
+            raise ValidSolutionRequired(value)
 
 
 class ChoiceSubForm(ObjectSubForm):
@@ -118,6 +128,7 @@
     container_class = 'container widecontainer'
     content_template = ViewPageTemplateFile('templates/form.pt')
     _open_question_token = 'open'
+    _rational_question_token = 'rational'
 
     @property
     def fields(self):
@@ -146,7 +157,7 @@
         result = {}
         for widget in self.widgets.values():
             result.update(self.encodeWidget(widget))
-        if self.is_open_question():
+        if self.is_open_question() or self.is_rational_question():
             solution_widget = self.widgets['solution']
             result.update(self.encodeWidget(solution_widget))
         else:
@@ -162,6 +173,10 @@
     def is_open_question(self):
         item_type = getattr(self.widgets['type_'], 'value', [])
         return self._open_question_token in item_type
+        
+    def is_rational_question(self):
+        item_type = getattr(self.widgets['type_'], 'value', [])
+        return self._rational_question_token in item_type
 
     def setQuiz(self, item):
         quiz = removeSecurityProxy(self.context)
@@ -419,6 +434,7 @@
             'selection': _('Selection Question'),
             'multiple': _('Multiple Selection Question'),
             'open': _('Open Question'),
+            'rational': _('Rational Question'),
             }
         return result[self.type_token]
 
@@ -431,6 +447,7 @@
             'selection': _('Selection Question'),
             'multiple': _('Multiple Selection Question'),
             'open': _('Open Question'),
+            'rational': _('Rational Question'),
             }
         return result[self.type_token]
 
@@ -556,7 +573,13 @@
 
     def is_open_question(self):
         return self.view.type_token == 'open'
+        
+    def is_rational_question(self):
+        return self.view.type_token == 'rational'
 
+    def has_open_field(self):
+	return self.is_rational_question() or self.is_open_question()
+    
     def has_skill(self):
         return None not in (self.view.item.course, self.view.item.skill)
 
 
=== modified file 'src/schooltool/quiz/browser/stests/quiz_deployment.txt'
--- src/schooltool/quiz/browser/stests/quiz_deployment.txt	2012-10-07 06:00:01 +0000
+++ src/schooltool/quiz/browser/stests/quiz_deployment.txt	2013-03-04 22:05:25 +0000
@@ -64,6 +64,11 @@
     ...     ('Eric Raymond', False),
     ... ]    
     >>> fill_question_form(teacher, 'Selection', body, choices)
+    >>> teacher.query.id('form-buttons-submitadd').click()
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3 + 4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
     >>> teacher.query.id('form-buttons-submit').click()
 
     >>> print_quiz_item_bodies(teacher)
@@ -82,6 +87,11 @@
         Who is Python's original author?
       </p>
     </div>
+    <div ...>
+      <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
 
 Deploy the quiz to one of the instructor's sections:
 
@@ -162,6 +172,9 @@
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="4"]'
     >>> camila.query.css(sel).click()
 
+    >>> answer_4 = '9/3 + 4'
+    >>> camila.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
+    
     >>> camila.query.id('form-buttons-submit').click()
 
     >>> sel = '.taken-quizzes-table tbody tr'
@@ -189,6 +202,9 @@
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="3"]'
     >>> mario.query.css(sel).click()
 
+    >>> answer_4 = '6'
+    >>> mario.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
+
     >>> mario.query.id('form-buttons-submit').click()
 
     >>> sel = '.taken-quizzes-table tbody tr'
@@ -216,6 +232,9 @@
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="3"]'
     >>> liliana.query.css(sel).click()
 
+    >>> answer_4 = '7'
+    >>> liliana.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
+
     >>> liliana.query.id('form-buttons-submit').click()
 
     >>> sel = '.taken-quizzes-table tbody tr'
@@ -238,7 +257,7 @@
 The instructor updates the grades:
 
     >>> teacher.query.link('Update Grades').click()
-
+    
 The instructor goes to see the gradebook:
 
     >>> teacher.ui.section.go('2012', '2012', 'Programming A1')
@@ -252,9 +271,9 @@
     | Name             | FreeS | Total | Ave.  |
     |                  | 100   |       |       |
     +------------------+-------+-------+-------+
-    | Cerna, Camila    | 94.4  | 94.4  | 94.4% |
-    | Tejada, Mario    | 16.7  | 16.7  | 16.7% |
-    | Vividor, Liliana | 61.1  | 61.1  | 61.1% |
+    | Cerna, Camila    | 95.8  | 95.8  | 95.8% |
+    | Tejada, Mario    | 12.5  | 12.5  | 12.5% |
+    | Vividor, Liliana | 70.8  | 70.8  | 70.8% |
     +------------------+-------+-------+-------+
 
 Camila checks her grade:
@@ -264,7 +283,7 @@
     >>> for row in camila.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    Free Software Exam | Programming A1 | | 94%
+    Free Software Exam | Programming A1 | | 96%
 
 Mario checks his grade:
 
@@ -273,7 +292,7 @@
     >>> for row in mario.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    Free Software Exam | Programming A1 | | 17%
+    Free Software Exam | Programming A1 | | 12%
 
 Liliana checks her grade:
 
@@ -282,4 +301,4 @@
     >>> for row in liliana.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    Free Software Exam | Programming A1 | | 61%
+    Free Software Exam | Programming A1 | | 71%
 
=== modified file 'src/schooltool/quiz/browser/stests/quiz_duplicate.txt'
--- src/schooltool/quiz/browser/stests/quiz_duplicate.txt	2012-12-06 18:26:06 +0000
+++ src/schooltool/quiz/browser/stests/quiz_duplicate.txt	2013-03-04 22:05:25 +0000
@@ -59,6 +59,11 @@
     ...     ('Eric Raymond', False),
     ... ]    
     >>> fill_question_form(teacher, 'Selection', body, choices)
+    >>> teacher.query.id('form-buttons-submitadd').click()
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3 + 4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
     >>> teacher.query.id('form-buttons-submit').click()
 
 Check the quiz:
@@ -68,7 +73,7 @@
     >>> for row in teacher.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    Free/Open Source Software Quiz | 3 | Elkner, Jeffrey | ...
+    Free/Open Source Software Quiz | 4 | Elkner, Jeffrey | ...
 
 Duplicate the quiz:
 
@@ -81,8 +86,8 @@
     >>> for row in teacher.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    DUPLICATED: Free/Open Source Software Quiz | 3 | Elkner, Jeffrey | ...
-    Free/Open Source Software Quiz | 3 | Elkner, Jeffrey | ...
+    DUPLICATED: Free/Open Source Software Quiz | 4 | Elkner, Jeffrey | ...
+    Free/Open Source Software Quiz | 4 | Elkner, Jeffrey | ...
 
     >>> teacher.query.link('DUPLICATED: Free/Open Source Software Quiz').click()
     >>> print_quiz_item_bodies(teacher)
@@ -101,8 +106,14 @@
         Who is Python's original author?
       </p>
     </div>
+    <div ...>
+      <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
 
     >>> print_quiz_item_types(teacher)
     Open
     Multiple Selection
-    Selection    
+    Selection
+    Rational
 
=== modified file 'src/schooltool/quiz/browser/stests/quiz_export.txt'
--- src/schooltool/quiz/browser/stests/quiz_export.txt	2012-10-10 23:31:01 +0000
+++ src/schooltool/quiz/browser/stests/quiz_export.txt	2013-03-04 22:05:25 +0000
@@ -59,6 +59,11 @@
     ...     ('Eric Raymond', False),
     ... ]    
     >>> fill_question_form(teacher, 'Selection', body, choices)
+    >>> teacher.query.id('form-buttons-submitadd').click()
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3 + 4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
     >>> teacher.query.id('form-buttons-submit').click()
 
 Export the quiz:
 
=== modified file 'src/schooltool/quiz/browser/stests/quiz_import.txt'
--- src/schooltool/quiz/browser/stests/quiz_import.txt	2012-12-06 18:26:06 +0000
+++ src/schooltool/quiz/browser/stests/quiz_import.txt	2013-03-04 22:05:25 +0000
@@ -35,7 +35,7 @@
     >>> for row in teacher.query_all.css(sel):
     ...     columns = row.query_all.tag('td')
     ...     print ' | '.join([column.text for column in columns])
-    IMPORTED: Prime Factors 1 | 9 | Elkner, Jeffrey | ...
+    IMPORTED: Prime Factors 1 | 11 | Elkner, Jeffrey | ...
 
     >>> teacher.query.link('IMPORTED: Prime Factors 1').click()
     >>> print teacher.query.css('.page .header h1').text
@@ -69,3 +69,9 @@
     <div class="textarea-widget ...">
       ...
     </div>
+    <div class="textarea-widget ...">
+      ...
+    </div>
+    <div class="textarea-widget ...">
+      ...
+    </div>
 
=== modified file 'src/schooltool/quiz/browser/stests/quiz_import.xls'
 Binary files src/schooltool/quiz/browser/stests/quiz_import.xls	2012-10-10 23:31:01 +0000 and src/schooltool/quiz/browser/stests/quiz_import.xls	2013-03-04 22:05:25 +0000 differ
=== modified file 'src/schooltool/quiz/browser/stests/quiz_management.txt'
--- src/schooltool/quiz/browser/stests/quiz_management.txt	2012-09-06 17:35:42 +0000
+++ src/schooltool/quiz/browser/stests/quiz_management.txt	2013-03-04 22:05:25 +0000
@@ -138,6 +138,7 @@
     Selection
     Multiple Selection
     Open
+    Rational
 
 With Selection being selected by default:
 
@@ -319,8 +320,72 @@
         Which of the following are free software?
       </p>
     </div>
-
-Let's add one more question:
+    
+And this time let's try a rational question.  We'll try two examples
+of invalid solutions, to test the validator.
+
+    >>> teacher.query.link('Question').click()
+    >>> sel = '//span[@class="label" and text()="Rational"]'
+    >>> teacher.query.xpath(sel).click()
+
+It has a solution, not choices
+
+    >>> teacher.query.id('form-widgets-solution').is_displayed()
+    True
+    
+An empty solution gives an error:
+
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = ''
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
+    >>> teacher.query.id('form-buttons-submit').click()
+    
+    >>> sel = '#form-widgets-solution-row .error div.error'
+    >>> print teacher.query.css(sel).text
+    Required input is missing.
+    
+So does an unformatted one:
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3+4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
+    >>> teacher.query.id('form-buttons-submit').click()
+    
+    >>> sel = '#form-widgets-solution-row .error div.error'
+    >>> print teacher.query.css(sel).text
+    A syntactically valid solution is required.
+    
+So let's close this, open a new one, and submit that:
+
+    >>> teacher.query.id('form-buttons-cancel').click()
+    >>> teacher.query.link('Question').click()
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3 + 4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
+    >>> teacher.query.id('form-buttons-submit').click()
+    
+Now the rational question should also be visible:
+
+    >>> print_quiz_item_bodies(teacher)
+    <div ...>
+      <p>
+        What is the meaning of RMS?
+      </p>
+    </div>
+    <div ...>
+      <p>
+        Which of the following are free software?
+      </p>
+    </div>
+    <div ...>
+      <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
+    
+    
+And just one more:
 
     >>> teacher.query.link('Question').click()
     >>> body = "Who is Python's original author?"
@@ -378,6 +443,11 @@
     </div>
     <div ...>
       <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
+    <div ...>
+      <p>
         Who is Python's original author?
       </p>
     </div>
@@ -385,9 +455,10 @@
     >>> print_quiz_item_types(teacher)
     Open
     Multiple Selection
+    Rational
     Selection    
 
-Now, let's visit eache of these questions, to see their content. To do
+Now, let's visit each of these questions, to see their content. To do
 so, we click the link in the No. column:
 
     >>> teacher.query.link('1').click()
@@ -488,6 +559,34 @@
     >>> teacher.query.link('Done').click()
 
     >>> teacher.query.link('3').click()
+    
+    >>> print teacher.query.css('.page .header h1').text
+    Free/Open Source Software Quiz
+    
+    >>> print teacher.query.css('.page .header h2').text
+    Rational Question
+
+    >>> sel = '.quiz-item-body .body .restructuredtext-widget'
+    >>> for content in teacher.query_all.css(sel):
+    ...     print content
+    <div ...>
+      <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
+
+    >>> sel = '.quiz-item-body .solution .restructuredtext-widget'
+    >>> for content in teacher.query_all.css(sel):
+    ...     print content
+    <div ...>
+      <p>
+        3 + 4
+      </p>
+    </div>
+
+    >>> teacher.query.link('Done').click()
+
+    >>> teacher.query.link('4').click()
 
     >>> print teacher.query.css('.page .header h1').text
     Free/Open Source Software Quiz
@@ -581,6 +680,11 @@
     </div>
     <div ...>
       <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
+    <div ...>
+      <p>
         Who is Python's original author?
       </p>
     </div>
@@ -593,6 +697,7 @@
     >>> print_quiz_item_types(teacher)
     Open
     Multiple Selection
+    Rational
     Selection    
     Multiple Selection
 
@@ -618,6 +723,11 @@
     </div>
     <div ...>
       <p>
+        What is the first prime number higher than 5?
+      </p>
+    </div>
+    <div ...>
+      <p>
         Who is Python's original author?
       </p>
     </div>
@@ -629,6 +739,7 @@
 
     >>> print_quiz_item_types(teacher)
     Multiple Selection
+    Rational
     Selection    
     Multiple Selection
 
 
=== modified file 'src/schooltool/quiz/browser/stests/student_answers.txt'
--- src/schooltool/quiz/browser/stests/student_answers.txt	2012-10-07 17:40:13 +0000
+++ src/schooltool/quiz/browser/stests/student_answers.txt	2013-03-04 22:05:25 +0000
@@ -64,6 +64,11 @@
     ...     ('Eric Raymond', False),
     ... ]    
     >>> fill_question_form(teacher, 'Selection', body, choices)
+    >>> teacher.query.id('form-buttons-submitadd').click()
+    
+    >>> body = 'What is the first prime number higher than 5?'
+    >>> solution = '3 + 4'
+    >>> fill_question_form(teacher, 'Rational', body, solution=solution)
     >>> teacher.query.id('form-buttons-submit').click()
 
 Deploy the quiz to one of the instructor's sections:
@@ -123,6 +128,9 @@
 
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="4"]'
     >>> camila.query.css(sel).click()
+    
+    >>> answer_4 = '9/3 + 4'
+    >>> camila.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
 
     >>> camila.query.id('form-buttons-submit').click()
 
@@ -151,6 +159,9 @@
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="3"]'
     >>> mario.query.css(sel).click()
 
+    >>> answer_4 = '6'
+    >>> mario.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
+
     >>> mario.query.id('form-buttons-submit').click()
 
     >>> sel = '.taken-quizzes-table tbody tr'
@@ -178,6 +189,9 @@
     >>> sel = '#form-widgets-QuizItem-3-row .radio-widget[value="3"]'
     >>> liliana.query.css(sel).click()
 
+    >>> answer_4 = '7'
+    >>> liliana.query.id('form-widgets-QuizItem-4').ui.set_value(answer_4)
+
     >>> liliana.query.id('form-buttons-submit').click()
 
     >>> sel = '.taken-quizzes-table tbody tr'
@@ -262,3 +276,18 @@
       <table ...>
       </table>
     </div>
+    Question 4
+    <div ...>
+      ...
+        <p>
+          What is the first prime number higher than 5?
+        </p>
+      ...
+    </div>
+    <div ...>
+      ...
+        <pre>
+          9/3 + 4
+        </pre>
+      ...
+    </div>
 
=== modified file 'src/schooltool/quiz/browser/stests/test_selenium.py'
--- src/schooltool/quiz/browser/stests/test_selenium.py	2012-12-02 07:10:04 +0000
+++ src/schooltool/quiz/browser/stests/test_selenium.py	2013-03-04 22:05:25 +0000
@@ -56,7 +56,7 @@
     sel = '//span[@class="label" and text()="%s"]' % type_
     browser.query.xpath(sel).click()
     browser.query.id('form-widgets-body').ui.set_value(body)
-    if type_ == 'Open':
+    if type_ in ('Open','Rational'):
         sel = 'form-widgets-solution'
         browser.query.id(sel).ui.set_value(solution)
     else:
 
=== modified file 'src/schooltool/quiz/browser/templates/answers.pt'
--- src/schooltool/quiz/browser/templates/answers.pt	2012-11-29 15:28:05 +0000
+++ src/schooltool/quiz/browser/templates/answers.pt	2013-03-04 22:05:25 +0000
@@ -7,7 +7,7 @@
   <div class="evaluation"
        tal:define="item evaluation/requirement;
                    answer evaluation/answer;
-                   is_open_question python:view.is_open(item)">
+                   has_open_view python:view.has_open_view(item);">
     <h3 class="number" i18n:translate=""
         style="border-top: 1px solid #000; border-bottom: 1px solid #000; padding: 4px 0;">
       Question
@@ -22,13 +22,13 @@
       Your answer
     </h3>
     <div class="answer">
-      <div tal:condition="is_open_question"
+      <div tal:condition="has_open_view"
            tal:define="score_info python:view.score_info(evaluation)"
            tal:attributes="class score_info/css">
         <h3 class="score-type" tal:content="score_info/label" />
         <div tal:content="structure python:view.render_pre(answer)" />
       </div>
-      <table class="data" tal:condition="not:is_open_question">
+      <table class="data" tal:condition="not:has_open_view">
         <thead>
           <th i18n:translate="">Choice</th>
           <th i18n:translate="">Correct Answers</th>
@@ -61,7 +61,7 @@
       </table>
     </div>
     <tal:block define="graded python:view.is_graded(evaluation)"
-               condition="python:is_open_question and graded">
+               condition="python:has_open_view and graded">
       <h3 i18n:translate="">
         Solution
       </h3>
 
=== modified file 'src/schooltool/quiz/browser/templates/quiz_item_body.pt'
--- src/schooltool/quiz/browser/templates/quiz_item_body.pt	2012-10-25 20:31:25 +0000
+++ src/schooltool/quiz/browser/templates/quiz_item_body.pt	2013-03-04 22:05:25 +0000
@@ -1,5 +1,5 @@
 <tal:block i18n:domain="schooltool.quiz"
-           define="is_open_question view/is_open_question">
+           define="has_open_field view/has_open_field">
   <table class="quiz-item-body">
     <thead>
       <tr>
@@ -12,7 +12,8 @@
       </tr>
     </tbody>
   </table>
-  <table class="data quiz-item-body" tal:condition="is_open_question">
+  <table class="data quiz-item-body" 
+  tal:condition="has_open_field">
     <thead>
       <tr>
         <th i18n:translate="">Solution</th>
@@ -25,7 +26,8 @@
     </tbody>
   </table>
   <table
-      class="data quiz-item-body" tal:condition="not:is_open_question"
+      class="data quiz-item-body" 
+      tal:condition="not:has_open_field"
       tal:define="flourish nocall:context/++resource++schooltool.quiz.flourish;
                   correct_icon flourish/correct-icon.png;
                   error_icon flourish/error-icon.png;">
 
=== modified file 'src/schooltool/quiz/browser/templates/quiz_item_form_script.pt'
--- src/schooltool/quiz/browser/templates/quiz_item_form_script.pt	2012-10-25 20:31:25 +0000
+++ src/schooltool/quiz/browser/templates/quiz_item_form_script.pt	2013-03-04 22:05:25 +0000
@@ -2,6 +2,7 @@
 <tal:script
     tal:define="widgets view/view/widgets;
                 open_question_token view/view/_open_question_token;
+                rational_question_token view/view/_rational_question_token;
                 course nocall:widgets/course|nothing;
                 skill nocall:widgets/skill|nothing;"
     tal:replace="structure scriptlocal:
@@ -9,6 +10,7 @@
                  choices_id widgets/choices/id;
                  solution_id widgets/solution/id;
                  open_question_token;
+                 rational_question_token;
                  course_id course/id|nothing;
                  course_novalue_token course/noValueToken|nothing;
                  skill_id skill/id|nothing;
@@ -24,6 +26,7 @@
           skill_id = ST.local.skill_id,
           skill_novalue_token = ST.local.skill_novalue_token,
           open_question_token = ST.local.open_question_token;
+          rational_question_token = ST.local.rational_question_token;
       return function(e) {
           var item_types = $('input[id^="'+type_id+'"]'),
               course,
@@ -66,7 +69,8 @@
               var type_value = $(this).attr('value'),
                   choices_row = $('.row[id^="'+choices_id+'"]'),
                   solution_row = $('.row[id^="'+solution_id+'"]');
-              if (type_value == open_question_token) {
+              if ((type_value == open_question_token) 
+              || (type_value == rational_question_token)){
                   solution_row.show();
                   choices_row.hide();
               } else {
 
=== modified file 'src/schooltool/quiz/quiz.py'
--- src/schooltool/quiz/quiz.py	2013-01-10 07:34:28 +0000
+++ src/schooltool/quiz/quiz.py	2013-03-04 22:05:25 +0000
@@ -78,7 +78,12 @@
             name = chooser.chooseName('', copy)
             item_container[name] = copy
             result.items.add(copy)
+<<<<<<< TREE
             result.order.append(name)
+=======
+        for item_id in self.order:
+            result.order.append(item_id) #formerly copy.order...
+>>>>>>> MERGE-SOURCE
         return result
 
     def updateOrder(self, item_id, position):
 
=== modified file 'src/schooltool/quiz/quizitem.py'
--- src/schooltool/quiz/quizitem.py	2013-01-17 08:12:40 +0000
+++ src/schooltool/quiz/quizitem.py	2013-03-04 22:05:25 +0000
@@ -102,6 +102,7 @@
         ('selection', _('Selection')),
         ('multiple', _('Multiple Selection')),
         ('open', _('Open')),
+        ('rational', _('Rational')),
         ]
     terms = [SimpleTerm(item, token=token, title=item)
              for token, item in items]
 
=== added file 'src/schooltool/quiz/rational.py'
--- src/schooltool/quiz/rational.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/quiz/rational.py	2013-03-04 22:05:25 +0000
@@ -0,0 +1,125 @@
+'''rational.py:  Module to do rational arithmetic.
+
+  For full documentation, see http://www.nmt.edu/tcc/help/lang/python/examples/rational/.
+  Exports:
+    gcd ( a, b ):
+      [ a and b are integers ->
+          return the greatest common divisor of a and b ]
+    Rational ( a, b ):
+      [ (a is a nonnegative integer) and
+        (b is a positive integer) ->
+          return a new Rational instance with 
+          numerator a and denominator b ]
+    .n:    [ the numerator ]
+    .d:    [ the denominator ]   
+    .__add__(self, other):
+      [ other is a Rational instance ->
+          return the sum of self and other as a Rational instance ]
+    .__sub__(self, other):
+      [ other is a Rational instance ->
+          return the difference of self and other as a Rational
+          instance ]
+    .__mul__(self, other):
+      [ other is a Rational instance ->
+          return the product of self and other as a Rational
+          instance ]
+    .__div__(self, other):
+      [ other is a Rational instance ->
+          return the quotient of self and other as a Rational
+          instance ]
+    .__exp__(self, integer):
+      [ integer is an Integer instance ->
+          return self exponentiated to other as a Rational
+          instance ]
+    .__str__(self):
+      [ return a string representation of self ]
+    .__float__(self):
+      [ return a float approximation of self ]
+    .mixed(self):
+      [ return a string representation of self as a mixed
+        fraction ]
+'''
+def gcd ( a, b ):
+    '''Greatest common divisor function; Euclid's algorithm.
+
+      [ a and b are integers ->
+          return the greatest common divisor of a and b ]
+   '''
+    if  b == 0:
+        return a
+    else:
+        return gcd(b, a%b)
+
+class Rational:
+    """An instance represents a rational number.
+    """
+    def __init__ ( self, a, b ):
+        """Constructor for Rational.
+        """
+        if  b == 0:
+            raise ZeroDivisionError, ( "Denominator of a rational "
+                "may not be zero." )
+        else:
+            g  =  gcd ( a, b )
+            self.n  =  a / g
+            self.d  =  b / g
+    def __add__ ( self, other ):
+        """Add two rational numbers.
+        """
+        return Rational ( self.n * other.d + other.n * self.d,
+                          self.d * other.d )
+    def __sub__ ( self, other ):
+        """Return self minus other.
+        """
+        return Rational ( self.n * other.d - other.n * self.d,
+                          self.d * other.d )
+    def __mul__ ( self, other ):
+        """Implement multiplication.
+        """
+        return  Rational ( self.n * other.n, self.d * other.d )
+    def __div__ ( self, other ):
+        """Implement division.
+        """
+        return  Rational ( self.n * other.d, self.d * other.n )
+    def __pow__ ( self, integer):
+        """Implement division.
+        """
+        return Rational ( self.n ** integer, self.d ** integer )
+    def __str__ ( self ):
+        '''Display self as a string.
+        '''
+        return "%d/%d" % ( self.n, self.d )
+    def __repr__ (self):
+        """ Works 
+        """
+        return str(self)
+    def __eq__ (self, other):
+        """ test for equality 
+        """
+        if type(other) != type(self):
+            return False
+        return (self.d == other.d and self.n == other.n)
+    def __float__ ( self ):
+        """Implement the float() conversion function.
+        """
+        return  float ( self.n ) / float ( self.d )
+    def mixed ( self ):
+        """Render self as a mixed fraction in string form.
+        """
+        #-- 1 --
+        # [ whole  :=  self.n / self.d, truncated
+        #   n2  :=  self.n % self.d ]
+        whole, n2  =  divmod ( self.n, self.d )
+        #-- 2 --
+        # [ if self.d == 1 ->
+        #     return str(self.n)
+        #   else if whole == zero ->
+        #     return str(n2)+"/"+str(self.d)
+        #   else ->
+        #     return str(whole)+" and "+str(n2)+"/"+str(self.d) ]
+        if  self.d == 1:
+            return str(self.n)
+        elif whole == 0:
+            return "%s/%s" % (n2, self.d)
+        else:
+            return "%s and %s/%s" % (whole, n2, self.d)
 
=== added file 'src/schooltool/quiz/utils.py'
--- src/schooltool/quiz/utils.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/quiz/utils.py	2013-03-04 22:05:25 +0000
@@ -0,0 +1,135 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2012 Shuttleworth Foundation,
+#
+# 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 2 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+"""
+SchoolTool Quiz utility functions.
+"""
+
+from cgi import escape
+from docutils.core import publish_parts
+
+from schooltool.quiz import QuizMessage as _
+from schooltool.quiz.rst import QuizHTMLWriter
+
+import rational
+
+# XXX: customize and use IApplicationPreferences for this
+DATETIME_FORMAT = _('YYYY-MM-DD HH:MM:SS')
+DATETIME_INPUT_FORMAT = '%Y-%m-%d %H:%M:%S'
+DATE_FORMAT = _('YYYY-MM-DD')
+DATE_INPUT_FORMAT = '%Y-%m-%d'
+
+
+def render_rst(rst):
+    # XXX: sanitize before rendering
+    return publish_parts(rst, writer=QuizHTMLWriter())['body']
+
+
+def render_pre(text):
+    return '<pre>%s</pre>' % escape(text)
+
+
+def render_datetime(value):
+    return value.strftime(DATETIME_INPUT_FORMAT)
+
+
+def render_date(value):
+    return value.strftime(DATE_INPUT_FORMAT)
+
+
+def render_bool(value):
+    return [_('No'), _('Yes')][value]
+
+
+def format_percentage(number):
+    return '%.0f%%' % number
+
+
+def Validator(instring):
+    instring = str(instring)
+    inlist = instring.split(' ')
+    operators = ['+','-','*','/','**']
+    validated = []
+    while '' in inlist:
+        inlist.remove('')
+    for substring in inlist: #Convert to list
+        if substring in operators:
+            validated.append(substring)
+        elif CharacterValidation(substring):
+	    #Convert to Rational
+            if "/" in substring:
+                parts = substring.split("/")
+                if len(parts) != 2:
+                    return False
+                A = rational.Rational(int(parts[0]),int(parts[1]))
+                validated.append(A)
+            else:
+                A = rational.Rational(int(substring),1)
+	        validated.append(A)
+        else:
+            return False
+    dup = 0
+    for item in validated: #Check for order
+        if dup == 0:
+            if type(item).__name__ != "instance":
+                return False
+            dup = 1
+        elif dup == 1:
+            if not item in operators:
+                return False
+            dup = 0
+    if validated[-1] in operators:
+        return False
+    for index in range(0,len(validated)-1):
+        if validated[index] == "**":
+            if validated[index+1].d != 1:
+                return False
+    return validated
+
+
+def CharacterValidation(string):
+    valid = "1234567890/"
+    for char in string:
+        if not char in valid:
+            return False
+    return True
+
+def Evaluator(validated):
+    if len(validated) == 1:
+	return validated[0]
+    for index in range(0,(len(validated)-1)):
+        if type(validated[index]) == type("") and validated[index] == "**":
+            result = validated[index-1] ** validated[index+1].n
+            return Evaluator(validated[:index-1]+[result]+validated[index+2:])
+    for index in range(0,(len(validated)-1)):
+        if type(validated[index]) == type("") and validated[index] == "*":
+            result = validated[index-1] * validated[index+1]
+            return Evaluator(validated[:index-1]+[result]+validated[index+2:])
+        elif type(validated[index]) == type("") and validated[index] == "/":
+            result = validated[index-1] / validated[index+1]
+            return Evaluator(validated[:index-1]+[result]+validated[index+2:])
+    for index in range(0,(len(validated)-1)):
+        if type(validated[index]) == type("") and validated[index] == "+":
+            result = validated[index-1] + validated[index+1]
+            return Evaluator(validated[:index-1]+[result]+validated[index+2:])
+        elif type(validated[index]) == type("") and validated[index] == "-":
+            result = validated[index-1] - validated[index+1]
+            return Evaluator(validated[:index-1]+[result]+validated[index+2:])
+
+def RationalValidator(studentstring, teacherstring):
+    return Evaluator(Validator(studentstring)) == Evaluator(Validator(teacherstring))    
 
=== removed file 'src/schooltool/quiz/utils.py'
--- src/schooltool/quiz/utils.py	2012-09-19 20:06:18 +0000
+++ src/schooltool/quiz/utils.py	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-#
-# SchoolTool - common information systems platform for school administration
-# Copyright (c) 2012 Shuttleworth Foundation,
-#
-# 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 2 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-"""
-SchoolTool Quiz utility functions.
-"""
-
-from cgi import escape
-from docutils.core import publish_parts
-
-from schooltool.quiz import QuizMessage as _
-from schooltool.quiz.rst import QuizHTMLWriter
-
-
-# XXX: customize and use IApplicationPreferences for this
-DATETIME_FORMAT = _('YYYY-MM-DD HH:MM:SS')
-DATETIME_INPUT_FORMAT = '%Y-%m-%d %H:%M:%S'
-DATE_FORMAT = _('YYYY-MM-DD')
-DATE_INPUT_FORMAT = '%Y-%m-%d'
-
-
-def render_rst(rst):
-    # XXX: sanitize before rendering
-    return publish_parts(rst, writer=QuizHTMLWriter())['body']
-
-
-def render_pre(text):
-    return '<pre>%s</pre>' % escape(text)
-
-
-def render_datetime(value):
-    return value.strftime(DATETIME_INPUT_FORMAT)
-
-
-def render_date(value):
-    return value.strftime(DATE_INPUT_FORMAT)
-
-
-def render_bool(value):
-    return [_('No'), _('Yes')][value]
-
-
-def format_percentage(number):
-    return '%.0f%%' % number