excercises almost done with checking

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 621340e..bb835ae 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -137,6 +137,9 @@ class Excercise(EduModule):
         self.question_counter = 0
         super(Excercise, self).__init__(*args, **kw)
 
         self.question_counter = 0
         super(Excercise, self).__init__(*args, **kw)
 

+    def handle_rozw_kom(self, element):
+        return None
+

     def handle_cwiczenie(self, element):
         self.options = {'excercise': element.attrib['typ']}
         self.question_counter = 0
     def handle_cwiczenie(self, element):
         self.options = {'excercise': element.attrib['typ']}
         self.question_counter = 0


@@ -173,7 +176,7 @@ class Excercise(EduModule):
 
         return '<div class="question" data-no="%d" %s>' %\
             (self.question_counter, solution_s), \
 
         return '<div class="question" data-no="%d" %s>' %\
             (self.question_counter, solution_s), \

-    "</div>"    
+    "</div>"

 
 
 class Wybor(Excercise):
 
 
 class Wybor(Excercise):


@@ -205,7 +208,7 @@ Overrides the returned content default handle_pytanie
         return u"""<div class="question" data-original="%s" data-no="%s">""" % \
             (','.join(order_items), self.question_counter), \
             u"""</div>"""
         return u"""<div class="question" data-original="%s" data-no="%s">""" % \
             (','.join(order_items), self.question_counter), \
             u"""</div>"""

-    
+

     def handle_punkt(self, element):
         return """<li class="question-piece" data-pos="%(rozw)s"/>""" \
             % element.attrib,\
     def handle_punkt(self, element):
         return """<li class="question-piece" data-pos="%(rozw)s"/>""" \
             % element.attrib,\


@@ -217,7 +220,6 @@ class Luki(Excercise):
         return '<input type="text" class="luka question-piece" data-solution="%s"></input>' % element.text
 
 
         return '<input type="text" class="luka question-piece" data-solution="%s"></input>' % element.text
 
 

-

 class Zastap(Excercise):
     def handle_zastap(self, element):
         return '<span class="zastap question-piece" data-solution="%(rozw)s">' % element.attrib, '</span>'
 class Zastap(Excercise):
     def handle_zastap(self, element):
         return '<span class="zastap question-piece" data-solution="%(rozw)s">' % element.attrib, '</span>'


@@ -240,22 +242,20 @@ class Przyporzadkuj(Excercise):
             self.options = {'subject': True}
         else:
             attrs = {}
             self.options = {'subject': True}
         else:
             attrs = {}

-        return super(Przyporzadkuj, self).handle_lista(lista, attrs)  
-
+        pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
+        return pre, post + '<br class="clr"/>'

 
     def handle_punkt(self, element):
         print "in punkt %s %s" % (element.attrib, self.options)
 
         if self.options['subject']:
 
     def handle_punkt(self, element):
         print "in punkt %s %s" % (element.attrib, self.options)
 
         if self.options['subject']:

-            return '<li data-solution="%(rozw)s" class="question-piece draggable multiple">' % element.attrib, '</li>'
+            return '<li data-solution="%(rozw)s" class="question-piece draggable">' % element.attrib, '</li>'

         elif self.options['predicate']:
         elif self.options['predicate']:

-            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul class="subjects droppable"><li>Placeholder</li></ul></li>'
+            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul class="subjects droppable"></ul></li>'

         else:
             return super(Przyporzadkuj, self).handle_punkt(element)
 
 
         else:
             return super(Przyporzadkuj, self).handle_punkt(element)
 
 

-
-

 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     """Transforms the WL document to XHTML.
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     """Transforms the WL document to XHTML.
 


@@ -263,7 +263,6 @@ def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     otherwise returns True if file has been written,False if it hasn't.
     File won't be written if it has no content.
     """
     otherwise returns True if file has been written,False if it hasn't.
     File won't be written if it has no content.
     """

-    

     edumod = EduModule(options)
 #    from pdb import set_trace; set_trace()
     html = edumod.generate(wldoc.edoc.getroot())
     edumod = EduModule(options)
 #    from pdb import set_trace; set_trace()
     html = edumod.generate(wldoc.edoc.getroot())