remove prints

[librarian.git] / librarian / pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index bd3bbce..106e30b 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -6,7 +6,7 @@
 from lxml import etree
 from librarian import OutputFile, RDFNS, DCNS
 from xmlutils import Xmill, tag, tagged, ifoption
 from lxml import etree
 from librarian import OutputFile, RDFNS, DCNS
 from xmlutils import Xmill, tag, tagged, ifoption

- 
+import random

 
 class EduModule(Xmill):
     def __init__(self, *args):
 
 class EduModule(Xmill):
     def __init__(self, *args):


@@ -37,7 +37,7 @@ class EduModule(Xmill):
     def handle_aktywnosc(self, element):
         self.activity_counter += 1
         self.options = {
     def handle_aktywnosc(self, element):
         self.activity_counter += 1
         self.options = {

-            'activity': True, 
+            'activity': True,

             'activity_counter': self.activity_counter
             }
         submill = EduModule()
             'activity_counter': self.activity_counter
             }
         submill = EduModule()


@@ -61,7 +61,7 @@ class EduModule(Xmill):
 
         return u"""
 <div class="activity">
 
         return u"""
 <div class="activity">

- <div class="text">%(counter)d. 
+ <div class="text">%(counter)d.

   %(opis)s
   %(wskazowki)s
  </div>
   %(opis)s
   %(wskazowki)s
  </div>


@@ -76,27 +76,28 @@ class EduModule(Xmill):
 
     handle_opis = ifoption(activity=False)(tag('div', 'description'))
     handle_wskazowki = ifoption(activity=False)(tag('div', ('hints', 'teacher')))
 
     handle_opis = ifoption(activity=False)(tag('div', 'description'))
     handle_wskazowki = ifoption(activity=False)(tag('div', ('hints', 'teacher')))

-    
+

     @ifoption(activity=False)
     @tagged('div', 'materials')
     def handle_pomoce(self, _):
         return "Pomoce: ", ""
     @ifoption(activity=False)
     @tagged('div', 'materials')
     def handle_pomoce(self, _):
         return "Pomoce: ", ""

-    
+

     def handle_czas(self, *_):
         return
 
     def handle_forma(self, *_):
         return
     def handle_czas(self, *_):
         return
 
     def handle_forma(self, *_):
         return

-            
+

     def handle_cwiczenie(self, element):
         excercise_handlers = {
             'wybor': Wybor,
             'uporzadkuj': Uporzadkuj,
             'luki': Luki,
             'zastap': Zastap,
     def handle_cwiczenie(self, element):
         excercise_handlers = {
             'wybor': Wybor,
             'uporzadkuj': Uporzadkuj,
             'luki': Luki,
             'zastap': Zastap,

-            'przyporzadkuj': Przyporzadkuj
+            'przyporzadkuj': Przyporzadkuj,
+            'prawdafalsz': PrawdaFalsz

             }
             }

-        
+

         typ = element.attrib['typ']
         handler = excercise_handlers[typ](self.options)
         return handler.generate(element)
         typ = element.attrib['typ']
         handler = excercise_handlers[typ](self.options)
         return handler.generate(element)


@@ -108,17 +109,17 @@ class EduModule(Xmill):
             self.options = {'slowniczek': True}
             return '<div class="slowniczek">', '</div>'
 ### robie teraz punkty wyboru
             self.options = {'slowniczek': True}
             return '<div class="slowniczek">', '</div>'
 ### robie teraz punkty wyboru

-        listtag = {'num': 'ol', 
-               'punkt': 'ul', 
-               'alfa': 'ul', 
+        listtag = {'num': 'ol',
+               'punkt': 'ul',
+               'alfa': 'ul',

                'czytelnia': 'ul'}[ltype]
 
         classes = attrs.get('class', '')
         if classes: del attrs['class']
                'czytelnia': 'ul'}[ltype]
 
         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
         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):
         return '<%s class="lista %s %s"%s>' % (listtag, ltype, classes, attrs_s), '</%s>' % listtag
 
     def handle_punkt(self, element):


@@ -129,7 +130,7 @@ class EduModule(Xmill):
 
     def handle_rdf__RDF(self, _):
         # ustal w opcjach  rzeczy :D
 
     def handle_rdf__RDF(self, _):
         # ustal w opcjach  rzeczy :D

-        return 
+        return

 
 
 class Excercise(EduModule):
 
 
 class Excercise(EduModule):


@@ -137,16 +138,19 @@ 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
         self.piece_counter = 0
 
     def handle_cwiczenie(self, element):
         self.options = {'excercise': element.attrib['typ']}
         self.question_counter = 0
         self.piece_counter = 0
 

-        return u"""
+        pre = u"""

 <div class="excercise %(typ)s" data-type="%(typ)s">
 <form action="#" method="POST">
 <div class="excercise %(typ)s" data-type="%(typ)s">
 <form action="#" method="POST">

-""" % element.attrib, \
-u"""
+""" % element.attrib
+        post = u"""

 <div class="buttons">
 <span class="message"></span>
 <input type="button" class="check" value="sprawdź"/>
 <div class="buttons">
 <span class="message"></span>
 <input type="button" class="check" value="sprawdź"/>


@@ -155,17 +159,32 @@ u"""
 </form>
 </div>
 """
 </form>
 </div>
 """

- 
+        # Add a single <pytanie> tag if it's not there
+        if not element.xpath(".//pytanie"):
+            qpre, qpost = self.handle_pytanie(element)
+            pre = pre + qpre
+            post = qpost + post
+        return pre, post
+

     def handle_pytanie(self, element):
     def handle_pytanie(self, element):

+        """This will handle <cwiczenie> element, when there is no <pytanie>
+        """
+        add_class = ""

         self.question_counter += 1
         self.piece_counter = 0
         solution = element.attrib.get('rozw', None)
         if solution: solution_s = ' data-solution="%s"' % solution
         else: solution_s = ''
 
         self.question_counter += 1
         self.piece_counter = 0
         solution = element.attrib.get('rozw', None)
         if solution: solution_s = ' data-solution="%s"' % solution
         else: solution_s = ''
 

-        return '<div class="question" data-no="%d" %s>' %\
-            (self.question_counter, solution_s), \
-    "</div>"    
+        handles = element.attrib.get('uchwyty', None)
+        if handles:
+            add_class += ' handles handles-%s' % handles
+            self.options = {'handles': handles}
+
+
+        return '<div class="question%s" data-no="%d" %s>' %\
+            (add_class, self.question_counter, solution_s), \
+    "</div>"

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


@@ -175,8 +194,9 @@ class Wybor(Excercise):
             self.piece_counter += 1
             no = self.piece_counter
             eid = "q%(qc)d_%(no)d" % locals()
             self.piece_counter += 1
             no = self.piece_counter
             eid = "q%(qc)d_%(no)d" % locals()

+            aname = element.attrib.get('nazwa', None)

             return u"""
             return u"""

-<li class="question-piece" data-qc="%(qc)d" data-no="%(no)d">
+<li class="question-piece" data-qc="%(qc)d" data-no="%(no)d" data-name="%(aname)s">

 <input type="checkbox" name="" id="%(eid)s" />
 <label for="%(eid)s">
 """ % locals(), u"</label></li>"
 <input type="checkbox" name="" id="%(eid)s" />
 <label for="%(eid)s">
 """ % locals(), u"</label></li>"


@@ -186,16 +206,18 @@ class Wybor(Excercise):
 
 
 class Uporzadkuj(Excercise):
 
 
 class Uporzadkuj(Excercise):

-    def handle_cwiczenie(self, element):
-        pre, post = super(Uporzadkuj, self).handle_cwiczenie(element)
+    def handle_pytanie(self, element):
+        """
+Overrides the returned content default handle_pytanie
+        """
+        # we ignore the result, returning our own
+        super(Uporzadkuj, self).handle_pytanie(element)

         order_items = element.xpath(".//punkt/@rozw")
         order_items = element.xpath(".//punkt/@rozw")

-        import pdb
-        if order_items == []: pdb.set_trace()

 
 

-        return pre + u"""<div class="question" data-original="%s">""" % \
-            ','.join(order_items), \
-            u"""</div>""" + post
-    
+        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,\


@@ -203,19 +225,53 @@ class Uporzadkuj(Excercise):
 
 
 class Luki(Excercise):
 
 
 class Luki(Excercise):

+    def find_pieces(self, question):
+        return question.xpath("//luka")
+
+    def solution_html(self, piece):
+        return piece.text + ''.join(
+            [etree.tostring(n, encoding=unicode)
+             for n in piece])
+
+    def handle_pytanie(self, element):
+        qpre, qpost = super(Luki, self).handle_pytanie(element)
+
+        luki = list(enumerate(self.find_pieces(element)))
+        luki_html = ""
+        i = 0
+        random.shuffle(luki)
+        for (i, luka) in luki:
+            i += 1
+            luka_html = self.solution_html(luka)
+            luki_html += u'<span class="draggable question-piece" data-no="%d">%s</span>' % (i, luka_html)
+        self.words_html = '<div class="words">%s</div>' % luki_html
+
+        return qpre, qpost
+
+    def handle_opis(self, element):
+        pre, post = super(Luki, self).handle_opis(element)
+        return pre, self.words_html + post
+

     def handle_luka(self, element):
     def handle_luka(self, element):

-        return '<input type="text" class="luka question-piece" data-solution="%s"></input>' % element.text
+        self.piece_counter += 1
+        return '<span class="placeholder" data-solution="%d"></span>' % self.piece_counter
+

 
 

+class Zastap(Luki):
+    def find_pieces(self, question):
+        return question.xpath("//zastap")

 
 

+    def solution_html(self, piece):
+        return piece.attrib['rozw']

 
 

-class Zastap(Excercise):

     def handle_zastap(self, element):
     def handle_zastap(self, element):

-        return '<span class="zastap question-piece" data-solution="%(rozw)s">' % element.attrib, '</span>'
+        self.piece_counter += 1
+        return '<span class="placeholder zastap question-piece" data-solution="%d">' \
+            % self.piece_counter, '</span>'

 
 
 class Przyporzadkuj(Excercise):
     def handle_lista(self, lista):
 
 
 class Przyporzadkuj(Excercise):
     def handle_lista(self, lista):

-        print "in lista %s %s" % (lista.attrib, self.options)

         if 'nazwa' in lista.attrib:
             attrs = {
                 'data-name': lista.attrib['nazwa'],
         if 'nazwa' in lista.attrib:
             attrs = {
                 'data-name': lista.attrib['nazwa'],


@@ -230,20 +286,35 @@ 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):
 
     def handle_punkt(self, element):

-        print "in punkt %s %s" % (element.attrib, self.options)
-

         if self.options['subject']:
         if self.options['subject']:

-            return '<li data-solution="%(rozw)s" class="question-piece draggable multiple">' % element.attrib, '</li>'
+            self.piece_counter += 1
+            if self.options['handles']:
+                return '<li><span data-solution="%s" data-no="%s" class="question-piece draggable handle">%s</span>' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '</li>'
+            else:
+                return '<li data-solution="%s" data-no="%s" class="question-piece draggable">' % (element.attrib['rozw'], self.piece_counter), '</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>'
+            placeholders = u'<li class="placeholder multiple"/>'
+            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul class="subjects">' + placeholders + '</ul></li>'
+

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

+class PrawdaFalsz(Excercise):
+    def handle_punkt(self, element):
+        if 'rozw' in element.attrib:
+            return u'''<li data-solution="%s" class="question-piece">
+            <span class="buttons">
+            <a href="#" data-value="true" class="true">Prawda</a>
+            <a href="#" data-value="false" class="false">Fałsz</a>
+        </span>''' % {'prawda': 'true', 'falsz': 'false'}[element.attrib['rozw']], '</li>'
+        else:
+            return super(PrawdaFalsz, self).handle_punkt(element)

 
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
 
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):


@@ -253,7 +324,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())