X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/9b0b4bb5608959a7d56f3548bd99e478baa44af6..a9bafa65589ccfdd04ea69eb09e637ab75387981:/wtem/admin.py?ds=sidebyside
diff --git a/wtem/admin.py b/wtem/admin.py
index 0047e9d..d4b6682 100644
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -32,12 +32,12 @@ class AttachmentWidget(forms.Widget):
a_tag = '%s' % (value, value)
else:
a_tag = 'brak'
- return mark_safe(('' + a_tag) % (name, value))
+ return mark_safe(('' % (name, value)) + a_tag)
class SubmissionFormBase(forms.ModelForm):
class Meta:
model = Submission
- exclude = ('answers', 'marks', 'contact') + readonly_fields
+ exclude = ('answers', 'marks', 'contact', 'end_time') + readonly_fields
def get_open_answer(answers, exercise):
@@ -59,9 +59,10 @@ def get_open_answer(answers, exercise):
if exercise['type'] == 'edumed_wybor':
ok = set(map(str, exercise['answer'])) == set(map(str,answer['closed_part']))
toret = u'Czesc testowa [%s]:\n' % ('poprawna' if ok else 'niepoprawna')
- for selected in answer['closed_part']:
- option = get_option(exercise['options'], selected)
- toret += '%s: %s\n' % (selected, option['text'])
+ if len(answer['closed_part']):
+ for selected in answer['closed_part']:
+ option = get_option(exercise['options'], selected)
+ toret += '%s: %s\n' % (selected, option['text'])
else:
toret += u'\n'
toret += u'\nCzesc otwarta (%s):\n\n' % ' '.join(exercise['open_part'])