%(counter)d.
%(opis)s
%(wskazowki)s
@@ -76,20 +80,20 @@ class EduModule(Xmill):
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: ", ""
-
+
def handle_czas(self, *_):
return
def handle_forma(self, *_):
return
-
+
def handle_cwiczenie(self, element):
- excercise_handlers = {
+ exercise_handlers = {
'wybor': Wybor,
'uporzadkuj': Uporzadkuj,
'luki': Luki,
@@ -97,29 +101,33 @@ class EduModule(Xmill):
'przyporzadkuj': Przyporzadkuj,
'prawdafalsz': PrawdaFalsz
}
-
+
typ = element.attrib['typ']
- handler = excercise_handlers[typ](self.options)
+ handler = exercise_handlers[typ](self.options)
return handler.generate(element)
# Lists
def handle_lista(self, element, attrs={}):
ltype = element.attrib.get('typ', 'punkt')
if ltype == 'slowniczek':
- self.options = {'slowniczek': True}
+ surl = element.attrib.get('href', None)
+ sxml = None
+ if surl:
+ sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
+ self.options = {'slowniczek': True, 'slowniczek_xml': sxml }
return '', '
'
-### 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']
-
+
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), '' % listtag
def handle_punkt(self, element):
@@ -128,33 +136,80 @@ class EduModule(Xmill):
else:
return '""", u"
"
+
+ def handle_tabela(self, element):
+ has_frames = int(element.attrib.get("ramki", "0"))
+ if has_frames: frames_c = "framed"
+ else: frames_c = ""
+ return u"""
+
@@ -165,32 +220,60 @@ class Excercise(EduModule):
pre = pre + qpre
post = qpost + post
return pre, post
-
+
def handle_pytanie(self, element):
"""This will handle element, when there is no
"""
+ 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 = ''
- return '
-
+
+ "
+ else:
+ return u"""
+
+
"
@@ -198,7 +281,7 @@ class Wybor(Excercise):
return super(Wybor, self).handle_punkt(element)
-class Uporzadkuj(Excercise):
+class Uporzadkuj(Exercise):
def handle_pytanie(self, element):
"""
Overrides the returned content default handle_pytanie
@@ -217,49 +300,98 @@ Overrides the returned content default handle_pytanie
""
-class Luki(Excercise):
+class Luki(Exercise):
+ 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'%s' % (i, luka_html)
+ self.words_html = '
' def handle_punkt(self, element): - print "in punkt %s %s" % (element.attrib, self.options) - if self.options['subject']: - return '' % element.attrib, ' '
+ self.piece_counter += 1
+ if self.options['handles']:
+ return '%s' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), ' '
+ else:
+ return '' % (element.attrib['rozw'], self.piece_counter), ' '
+
elif self.options['predicate']:
- print etree.tostring(element, encoding=unicode)
- return '' % element.attrib, ' '
+ if self.options['min']:
+ placeholders = u'' * self.options['min']
+ else:
+ placeholders = u''
+ return '' % element.attrib, ' '
+
else:
return super(Przyporzadkuj, self).handle_punkt(element)
-class PrawdaFalsz(Excercise):
+class PrawdaFalsz(Exercise):
def handle_punkt(self, element):
if 'rozw' in element.attrib:
return u'''
@@ -271,6 +403,24 @@ class PrawdaFalsz(Excercise):
return super(PrawdaFalsz, self).handle_punkt(element)
+class EduModuleFormat(Format):
+ def __init__(self, wldoc, **kwargs):
+ super(EduModuleFormat, self).__init__(wldoc, **kwargs)
+
+ def build(self):
+ edumod = EduModule({'provider': self.wldoc.provider, 'urlmapper': self})
+
+ html = edumod.generate(self.wldoc.edoc.getroot())
+
+ return IOFile.from_string(html.encode('utf-8'))
+
+ def url_for_material(self, slug, fmt=None):
+ # No briliant idea for an API here.
+ if fmt:
+ return "%s.%s" % (slug, fmt)
+ return slug
+
+
def transform(wldoc, stylesheet='edumed', options=None, flags=None):
"""Transforms the WL document to XHTML.
@@ -278,8 +428,5 @@ 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.
"""
- edumod = EduModule(options)
-# from pdb import set_trace; set_trace()
- html = edumod.generate(wldoc.edoc.getroot())
-
- return OutputFile.from_string(html.encode('utf-8'))
+ edumodfor = EduModuleFormat(wldoc)
+ return edumodfor.build()
' %\
- (self.question_counter, solution_s), \
- "
"
+ handles = element.attrib.get('uchwyty', None)
+ if handles:
+ add_class += ' handles handles-%s' % handles
+ self.options = {'handles': handles}
+
+ minimum = element.attrib.get('min', None)
+ if minimum: minimum_s = ' data-minimum="%d"' % int(minimum)
+ else: minimum_s = ''
+
+ return '' %\
+ (add_class, self.question_counter, solution_s + minimum_s), \
+ "
"
-class Wybor(Excercise):
+class Wybor(Exercise):
+ def handle_cwiczenie(self, element):
+ pre, post = super(Wybor, self).handle_cwiczenie(element)
+ is_single_choice = True
+ for p in element.xpath(".//pytanie"):
+ solutions = re.split(r"[, ]+", p.attrib['rozw'])
+ if len(solutions) != 1:
+ is_single_choice = False
+ break
+ self.options = {'single': is_single_choice}
+ return pre, post
+
def handle_punkt(self, element):
- if self.options['excercise'] and element.attrib.get('nazwa', None):
+ if self.options['exercise'] and element.attrib.get('nazwa', None):
qc = self.question_counter
self.piece_counter += 1
no = self.piece_counter
eid = "q%(qc)d_%(no)d" % locals()
aname = element.attrib.get('nazwa', None)
- return u"""
+ if self.options['single']:
+ return u"""
%s
' % 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):
- return '' % element.text
+ self.piece_counter += 1
+ return '' % 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):
- return '' % element.attrib, ''
+ self.piece_counter += 1
+ return '' \
+ % self.piece_counter, ''
-class Przyporzadkuj(Excercise):
+class Przyporzadkuj(Exercise):
+ def handle_pytanie(self, element):
+ pre, post = super(Przyporzadkuj, self).handle_pytanie(element)
+ minimum = element.attrib.get("min", None)
+ if minimum:
+ self.options = {"min": int(minimum)}
+ return pre, post
+
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'],
'class': 'predicate'
- }
+ }
self.options = {'predicate': True}
elif 'cel' in lista.attrib:
attrs = {
'data-target': lista.attrib['cel'],
'class': 'subject'
- }
- self.options = {'subject': True}
+ }
+ self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib}
else:
attrs = {}
pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
return pre, post + '' def handle_punkt(self, element): - print "in punkt %s %s" % (element.attrib, self.options) - if self.options['subject']: - return '
- ' + placeholders + '