Browse Source

Inline documentation cleanup

pull/160/head
Mike Olund 8 years ago
parent
commit
8e42caf0f7
5 changed files with 17 additions and 15 deletions
  1. +4
    -7
      edivorce/apps/core/models.py
  2. +1
    -2
      edivorce/apps/core/serializer.py
  3. +1
    -1
      edivorce/apps/core/urls.py
  4. +8
    -5
      edivorce/apps/core/views/pdf.py
  5. +3
    -0
      edivorce/apps/core/views/styleguide.py

+ 4
- 7
edivorce/apps/core/models.py View File

@ -23,14 +23,10 @@ class BceidUser(models.Model):
return 'BCeID User %s' % self.user_guid return 'BCeID User %s' % self.user_guid
@python_2_unicode_compatible @python_2_unicode_compatible
class Question(models.Model): class Question(models.Model):
""" """
Questions being asked of the user, later assembled into LegalForms.
NOTE: The content and interaction of the question is defined in the
template; the name and description field here are for admin use.
Questions being asked of the user.
""" """
key = models.TextField(primary_key=True) key = models.TextField(primary_key=True)
@ -46,12 +42,13 @@ class Question(models.Model):
""" Convenience for listing these in the admin """ """ Convenience for listing these in the admin """
required = models.TextField(blank=True) required = models.TextField(blank=True)
""" 'Required', 'Conditional', or '' [blank = not required] """
conditional_target = models.TextField(blank=True) conditional_target = models.TextField(blank=True)
""" For conditionally required questions, this is the other question that it is conditional upon """
reveal_response = models.TextField(blank=True) reveal_response = models.TextField(blank=True)
""" The value of the other question that makes this question required """
class Meta: class Meta:
ordering = ('summary_order', ) ordering = ('summary_order', )


+ 1
- 2
edivorce/apps/core/serializer.py View File

@ -1,5 +1,5 @@
from rest_framework import serializers from rest_framework import serializers
from .models import Question, UserResponse, User
from .models import UserResponse
class UserResponseSerializer(serializers.ModelSerializer): class UserResponseSerializer(serializers.ModelSerializer):
@ -13,7 +13,6 @@ class UserResponseSerializer(serializers.ModelSerializer):
def create(self, validated_data): def create(self, validated_data):
response = UserResponse(**validated_data) response = UserResponse(**validated_data)
response.save() response.save()
return response return response
def update(self, instance, validated_data): def update(self, instance, validated_data):


+ 1
- 1
edivorce/apps/core/urls.py View File

@ -6,7 +6,7 @@ handler404 = 'core.views.main.page_not_found'
handler500 = 'core.views.main.server_error' handler500 = 'core.views.main.server_error'
urlpatterns = [ urlpatterns = [
url(r'^guide$', styleguide.guide),
# url(r'^guide$', styleguide.guide),
url(r'^api/response$', api.UserResponseHandler.as_view()), url(r'^api/response$', api.UserResponseHandler.as_view()),
url(r'^login', main.login, name="login"), url(r'^login', main.login, name="login"),
url(r'^bceid', localdev.bceid, name="bceid"), url(r'^bceid', localdev.bceid, name="bceid"),


+ 8
- 5
edivorce/apps/core/views/pdf.py View File

@ -11,24 +11,27 @@ from ..utils.user_response import get_responses_from_db
@bceid_required @bceid_required
def form(request, form_number): def form(request, form_number):
"""
View for rendering PDF's and previews
"""
user = BceidUser.objects.get(user_guid=request.bceid_user.guid) user = BceidUser.objects.get(user_guid=request.bceid_user.guid)
responses = get_responses_from_db(user) responses = get_responses_from_db(user)
if form_number == "38_claimant1": if form_number == "38_claimant1":
form_number = "38" form_number = "38"
responses = add_claimant_info(responses, '_you')
responses = __add_claimant_info(responses, '_you')
elif form_number == "38_claimant2": elif form_number == "38_claimant2":
form_number = "38" form_number = "38"
responses = add_claimant_info(responses, '_spouse')
responses = __add_claimant_info(responses, '_spouse')
return render_form(request, 'form%s' % form_number,
return __render_form(request, 'form%s' % form_number,
{ {
"css_root": settings.WEASYPRINT_CSS_LOOPBACK, "css_root": settings.WEASYPRINT_CSS_LOOPBACK,
"responses" : responses "responses" : responses
}) })
def render_form(request, form_name, context):
def __render_form(request, form_name, context):
output_as_html = request.GET.get('html', None) is not None output_as_html = request.GET.get('html', None) is not None
@ -54,7 +57,7 @@ def render_form(request, form_name, context):
return response return response
def add_claimant_info(responses, claimant):
def __add_claimant_info(responses, claimant):
claimant_info = {} claimant_info = {}
for key in responses: for key in responses:
if key.endswith(claimant): if key.endswith(claimant):


+ 3
- 0
edivorce/apps/core/views/styleguide.py View File

@ -2,4 +2,7 @@ from django.shortcuts import render
def guide(request): def guide(request):
"""
Visual design styles
"""
return render(request, 'styleguide/guide.html') return render(request, 'styleguide/guide.html')

Loading…
Cancel
Save