Index: trunk/quiz/templates/verb.html =================================================================== diff -u -r8 -r10 --- trunk/quiz/templates/verb.html (.../verb.html) (revision 8) +++ trunk/quiz/templates/verb.html (.../verb.html) (revision 10) @@ -1,10 +1,28 @@ -quiz verb : {{ form.verb.value }} +quiz verb : {{ form.verb }} + {% ifequal request.method "GET" %}
+ {% else %} + + {% endifequal %} {% csrf_token %} - {{ form.as_ul }} - + {% ifequal request.method "GET" %} +
  • {{ form.simple_past.label_tag }} {{ form.simple_past }}
    • + {% if form.simple_past.help_text %} +

    {{ form.simple_past.help_text|safe }}

    + {% endif %} + + {% else %} +
  • {{ form.simple_past.label_tag }} {{ form.simple_past.value }} + {% if form.result.simple_past.ok %} +
    + {% else %} +
    {{ form.result.simple_past.correct_answer }} + {% endif %} +
    • + + {% endifequal %}
    Index: trunk/quiz/db.sqlite3 =================================================================== diff -u -r8 -r10 Binary files differ Index: trunk/quiz/quizapp/forms.py =================================================================== diff -u -r8 -r10 --- trunk/quiz/quizapp/forms.py (.../forms.py) (revision 8) +++ trunk/quiz/quizapp/forms.py (.../forms.py) (revision 10) @@ -1,11 +1,23 @@ from django import forms class VerbQuizForm(forms.Form): - verb = forms.CharField(widget=forms.HiddenInput()) simple_past = forms.CharField(label='Preterit', max_length=100) past_participle = forms.CharField(label='Participe passe', max_length=100) translation = forms.CharField(label='Traduction', max_length=100) + verb="" + result={ + 'simple_past':{'ok':0}, + 'past_participle':{'ok':0}, + 'translation':{'ok':0}, + } + def process_answer(self, request): + if request.POST['simple_past'] == 'arose': + self.result['simple_past']['ok'] = 1 + else: + self.result['simple_past']['ok'] = 0 + self.result['simple_past']['correct_answer'] = 'arose' + class VerbQuizResultForm(forms.Form): verb = forms.CharField(widget=forms.HiddenInput()) simple_past = forms.CharField(label='Preterit', max_length=100) Index: trunk/quiz/quizapp/views.py =================================================================== diff -u -r9 -r10 --- trunk/quiz/quizapp/views.py (.../views.py) (revision 9) +++ trunk/quiz/quizapp/views.py (.../views.py) (revision 10) @@ -39,15 +39,19 @@ def get(self, request, *args, **kwargs): form = self.form_class(initial=self.initial) - print(request.session.get('num_visits', 0)) + form.verb = "arise" + print("GET", request.session.get('num_visits', 0)) return render(request, self.template_name, {'form': form}) def post(self, request, *args, **kwargs): form = self.form_class(request.POST) + # form.show() + print("POST", request.POST) + form.process_answer(request) if form.is_valid(): # print(form.cleaned_data) - return HttpResponseRedirect("/verb_result") + return HttpResponseRedirect("/verb") return render(request, self.template_name, {'form': form})