py_tasks_melange: comparison app/soc/views/models/survey.py

equal deleted inserted replaced

-:ecc16ffe174b
+:d612b48e6e12
 from soc.models.survey_record import SurveyRecord
 from soc.models.user import User
 from soc.views import out_of_band
 from soc.views.helper import access
 from soc.views.helper import decorators
+from soc.views.helper import forms as forms_helper
 from soc.views.helper import redirects
 from soc.views.helper import responses
 from soc.views.helper import surveys
 from soc.views.helper import widgets
 from soc.views.models import base
 'user': user_entity}
 return record_logic.getForFields(filter, unique=True)
 def takeGet(self, request, template, context, params, entity, record,
+form_data=None, **kwargs):
+"""Handles the GET request for the Survey's take page.
+Args:
+template: the template used for this view
+entity: the Survey entity
+record: a SurveyRecord entity
+form_data: dict with form data that will be used for validation
+rest: see base.View.public()
+"""
+survey_form = surveys.SurveyForm(survey_content=entity.survey_content,
+survey_record=record,
+survey_logic=self._params['logic'])
+# fetch field contents and pass request data, if any
+survey_form.getFields(post_dict=form_data)
+# validate request data
+if form_data and not survey_form.is_valid():
+survey_form.full_clean()
+context['survey_form'] = survey_form
+return self._constructResponse(request, entity=None, context=context,
+form=survey_form, params=params, template=template)
+# fill context with the survey and additional information
+context['survey_form'] = survey_form
+self.setHelpAndStatus(context, entity, record)
+# call the hook method
+self._takeGet(request, template, context, params, entity, record, **kwargs)
+return responses.respond(request, template, context)
+def _takeGet(self, request, template, context, params, entity, record,
 **kwargs):
-"""Handles the GET request for the Survey's take page.
+"""Hook for the GET request for the Survey's take page.
+This method is called just before the GET page is shown.
 Args:
 template: the template used for this view
 entity: the Survey entity
 record: a SurveyRecord entity
 rest: see base.View.public()
 """
+pass
-survey_form = surveys.SurveyForm(survey_content=entity.survey_content,
-survey_record=record,
+def takePost(self, request, template, context, params, entity, record,
-survey_logic=self._params['logic'])
+**kwargs):
+"""Handles the POST request for the Survey's take page.
-survey_form.getFields()
-# fill context with the survey and additional information
-context['survey_form'] = survey_form
-self.setHelpAndStatus(context, entity, record)
-# call the hook method
-self._takeGet(request, template, context, params, entity, record, **kwargs)
-return responses.respond(request, template, context)
-def _takeGet(self, request, template, context, params, entity, record,
-**kwargs):
-"""Hook for the GET request for the Survey's take page.
-This method is called just before the GET page is shown.
 Args:
 template: the template used for this view
 entity: the Survey entity
 record: a SurveyRecord entity
 rest: see base.View.public()
 """
-pass
-def takePost(self, request, template, context, params, entity, record,
-**kwargs):
-"""Handles the POST request for the Survey's take page.
-Args:
-template: the template used for this view
-entity: the Survey entity
-record: a SurveyRecord entity
-rest: see base.View.public()
-"""
 survey_logic = params['logic']
 record_logic = survey_logic.getRecordLogic()
-# TODO: check the validity of the form data
+# create a form to validate
-properties = surveys.getSurveyResponseFromPost(entity, request.POST)
+survey_form = surveys.SurveyForm(survey_content=entity.survey_content,
+survey_record=None,
+survey_logic=self._params['logic'])
+# fill form with request data
+survey_form.getFields(post_dict=request.POST)
+if not survey_form.is_valid():
+# redirect to takeGet so we can handle errors
+return self.takeGet(request, template, context, params, entity, record,
+form_data=properties)
+# retrieve the data from the form
+_, properties = forms_helper.collectCleanedFields(survey_form)
 # add the required SurveyRecord properties
 properties['user'] = user_logic.getForCurrentAccount()
 properties['survey'] = entity
 """Get help_text and status for template use.
 Args:
 context: the context for the view to update
 survey: a Survey entity
 survey_record: a SurveyRecordEntity
 """
 if not survey.survey_end:
 survey_end_text = ""
 else:

changeset 2501	d612b48e6e12
parent 2497	996f381d458c
child 2502	2e096acc8720