X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/9b253dcb10940e8c8d25a02059153d4c80469b79..e0e7693096469f5952eef1c5847dabc9cf797f70:/librarian/pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index da7e643..fcfb3a6 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -14,6 +14,7 @@ class EduModule(Xmill):
         self.activity_counter = 0
 
 
+
 #     def handle_utwor(self, element):
 #         v = {}
 # #        from pdb import *; set_trace()
@@ -113,7 +114,9 @@ class EduModule(Xmill):
     def handle_cwiczenie(self, element):
         excercise_handlers = {
             'wybor': Wybor,
-            'uporzadkuj': Uporzadkuj
+            'uporzadkuj': Uporzadkuj,
+            'luki': Luki,
+            'zastap': Zastap,
             }
         
         typ = element.attrib['typ']
@@ -121,7 +124,7 @@ class EduModule(Xmill):
         return handler.generate(element)
 
     # Lists
-    def handle_lista(self, element):
+    def handle_lista(self, element, attrs={}):
         ltype = element.attrib.get('typ', 'punkt')
         if ltype == 'slowniczek':
             self.options = {'slowniczek': True}
@@ -132,7 +135,13 @@ class EduModule(Xmill):
                'alfa': 'ul', 
                'czytelnia': 'ul'}[ltype]
 
-        return '<%s class="lista %s">' % (listtag, ltype), '</%s>' % listtag
+        classes = attrs.get('class', '')
+        if classes: del attrs['class']
+            
+        attrs_s = ' '.join(['%s="%s"' % kv for kv in attrs.items()])
+        if attrs_s: attrs_s = ' ' + attrs_s
+            
+        return '<%s class="lista %s %s"%s>' % (listtag, ltype, classes, attrs_s), '</%s>' % listtag
 
     def handle_punkt(self, element):
         if self.options['slowniczek']:
@@ -187,13 +196,15 @@ class Wybor(Excercise):
             qc = self.question_counter
             self.piece_counter += 1
             no = self.piece_counter
-
+            eid = "q%(qc)d_%(no)d" % locals()
             return u"""
-<li class="question-piece" data-qc="%(qc)d" data-no="%(no)d"><input type="checkbox" name="q%(qc)d_%(no)d"/>
-""" % locals(), u"</li>"
+<li class="question-piece" data-qc="%(qc)d" data-no="%(no)d">
+<input type="checkbox" name="" id="%(eid)s" />
+<label for="%(eid)s">
+""" % locals(), u"</label></li>"
 
         else:
-            return super(Wybor, self).handle_punkt(self, element)
+            return super(Wybor, self).handle_punkt(element)
 
 
 class Uporzadkuj(Excercise):
@@ -203,15 +214,46 @@ class Uporzadkuj(Excercise):
         import pdb
         if order_items == []: pdb.set_trace()
 
-        return pre + u"""<div class="question" data-solution="%s">""" % \
+        return pre + u"""<div class="question" data-original="%s">""" % \
             ','.join(order_items), \
             u"""</div>""" + post
     
     def handle_punkt(self, element):
-        return """<li class="question-piece" data-pos="%(rozw)s"/>""" % element.attrib,\
+        return """<li class="question-piece" data-pos="%(rozw)s"/>""" \
+            % element.attrib,\
             "</li>"
 
 
+class Luki(Excercise):
+    def handle_luka(self, element):
+        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 Przyporzadkuj(Excercise):
+    def handle_lista(self, element):
+        if 'nazwa' in lista.attrib:
+            attrs = {
+                'data-name': lista.attrib['nazwa'],
+                'class': 'category'
+                }
+        elif 'cel' in lista.attrib:
+            attrs = {
+                'data-target': lista.attrib['cel'],
+                'class': 'object'
+                }
+        else:
+            attrs = {}
+        return super(Przyporzadkuj, self).handle_lista(element, attrs)  
+
+
+
+
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     """Transforms the WL document to XHTML.