Support open part in questions of type 'wybor'

diff --git a/wtem/admin.py b/wtem/admin.py
index 037ed37..99877fd 100644 (file)
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -29,6 +29,28 @@ class SubmissionFormBase(forms.ModelForm):
         exclude = ('answers', 'marks', 'contact') + readonly_fields
 
 
         exclude = ('answers', 'marks', 'contact') + readonly_fields
 
 

+def get_open_answer(answers, exercise):
+    def get_option(options, id):
+        for option in options:
+            if option['id'] == int(id):
+                return option
+
+    exercise_id = str(exercise['id'])
+    answer = answers[exercise_id]
+    if exercise['type'] == 'open':
+        toret = answer
+    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'])
+        toret += u'\nCzesc otwarta (%s):\n\n' % ' '.join(exercise['open_part'])
+        toret += answer['open_part']
+
+    return toret
+
+

 def get_form(request, submission):
     fields = dict()
     if submission.answers:
 def get_form(request, submission):
     fields = dict()
     if submission.answers:


@@ -37,12 +59,12 @@ def get_form(request, submission):
         for exercise in exercises:
             if exercise not in user_exercises:
                 continue
         for exercise in exercises:
             if exercise not in user_exercises:
                 continue

-            if exercise['type'] == 'open':
+            if exercise['type'] == 'open' or exercise.get('open_part', None):

                 answer_field_name = 'exercise_%s' % exercise['id']
                 mark_field_name = 'markof_%s_by_%s' % (exercise['id'], request.user.id)
                 fields[answer_field_name] = forms.CharField(
                     widget = forms.Textarea(attrs={'readonly':True}),
                 answer_field_name = 'exercise_%s' % exercise['id']
                 mark_field_name = 'markof_%s_by_%s' % (exercise['id'], request.user.id)
                 fields[answer_field_name] = forms.CharField(
                     widget = forms.Textarea(attrs={'readonly':True}),

-                    initial = answers[str(exercise['id'])],
+                    initial = get_open_answer(answers, exercise),

                     label = 'Rozwiązanie zadania %s' % exercise['id']
                 )
 
                     label = 'Rozwiązanie zadania %s' % exercise['id']
                 )
 

diff --git a/wtem/static/wtem/wtem.js b/wtem/static/wtem/wtem.js
index 5056b73..5253e03 100644 (file)
--- a/wtem/static/wtem/wtem.js
+++ b/wtem/static/wtem/wtem.js
@@ -27,10 +27,18 @@ $(function() {
 
     var handlers = {
         edumed: function(el) {
 
     var handlers = {
         edumed: function(el) {

-            var exercise = el.data('exercise');
+            var exercise = el.data('exercise'),
+                to_push = {},
+                open_part;

             if(exercise.get_answers) {
             if(exercise.get_answers) {

-                push_answer(el, exercise.get_answers()[0]);
+                to_push.closed_part = exercise.get_answers()[0];

             }
             }

+            open_part = el.find('.open_part')
+            if(open_part.length) {
+                to_push.open_part = open_part.find('textarea').val();
+            }
+
+            push_answer(el, to_push);

         },
 
         open: function(el) {
         },
 
         open: function(el) {

diff --git a/wtem/templates/wtem/exercises/edumed_wybor.html b/wtem/templates/wtem/exercises/edumed_wybor.html
index 031c718..d94995d 100644 (file)
--- a/wtem/templates/wtem/exercises/edumed_wybor.html
+++ b/wtem/templates/wtem/exercises/edumed_wybor.html
@@ -21,4 +21,17 @@
         </ol>
     </div>
 
         </ol>
     </div>
 

+    {% if exercise.open_part %}
+    <div class="open_part">
+        <div class="description">
+            {% for para in exercise.open_part %}
+                <p class="paragraph">
+                    {{para}}
+                </p>
+            {% endfor %}
+        </div>
+        <textarea style="width: 100%; margin-top:10px;" rows="10"></textarea>
+    </div>
+    {% endif %}
+

 </div>
\ No newline at end of file
 </div>
\ No newline at end of file