diff --git a/edivorce/apps/core/migrations/0014_auto_20170325_0510.py b/edivorce/apps/core/migrations/0014_auto_20170325_0510.py new file mode 100644 index 00000000..cca369a4 --- /dev/null +++ b/edivorce/apps/core/migrations/0014_auto_20170325_0510.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0013_auto_20170322_2055'), + ] + + operations = [ + migrations.RemoveField( + model_name='formquestions', + name='legal_form', + ), + migrations.RemoveField( + model_name='formquestions', + name='question', + ), + migrations.RemoveField( + model_name='legalform', + name='questions', + ), + migrations.DeleteModel( + name='FormQuestions', + ), + migrations.DeleteModel( + name='LegalForm', + ), + ] diff --git a/edivorce/apps/core/models.py b/edivorce/apps/core/models.py index bb7e1882..4d62618b 100644 --- a/edivorce/apps/core/models.py +++ b/edivorce/apps/core/models.py @@ -1,4 +1,3 @@ -from django.contrib.auth.models import User from django.contrib import admin from django.db import models from django.utils import timezone @@ -61,60 +60,6 @@ class Question(models.Model): return '%s: %s' % (self.key, self.name) -@python_2_unicode_compatible -class LegalForm(models.Model): - """ - A defined legal filing composed of a template and mapped response values - """ - - key = models.TextField(primary_key=True) - """ Form ID (e.g., 'f1') """ - - name = models.TextField() - """ Full name of form (e.g., 'Notice of Joint Family Claim') """ - - questions = models.ManyToManyField(Question, through='FormQuestions') - """ Responses needed to complete the form, mapped through the question """ - - order = models.PositiveIntegerField(default=0) - """ Convenience for listing these in the admin """ - - class Meta: - verbose_name_plural = 'Legal Forms' - ordering = ('order', ) - - def __str__(self): - return '%s: %s' % (str(self.key).upper(), self.name) - - -@python_2_unicode_compatible -class FormQuestions(models.Model): - """ - Through class mapping questions to forms using their responses. - - This is an explicitly defined through model mainly to provide an opening - for a transformational step on rendering per form. The presence of a - mapping here is for including the user's data during template rendering, - not to logically connect/require the question be present or used. - """ - - legal_form = models.ForeignKey(LegalForm) - """ The LegalForm """ - - question = models.ForeignKey(Question) - """ The Question """ - - transformation = models.TextField() - """ Transformations done on the value as part of rendering it in a form """ - # placeholder for code or flags need to modified to fit into a form - - class Meta: - verbose_name_plural = 'Form Questions' - - def __str__(self): - return '%s -> %s' % (self.legal_form.key.upper(), self.question.key) - - @python_2_unicode_compatible class UserResponse(models.Model): """ @@ -139,6 +84,4 @@ class UserResponse(models.Model): admin.site.register(BceidUser) admin.site.register(Question) -admin.site.register(LegalForm) admin.site.register(UserResponse) -admin.site.register(FormQuestions) diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index 8b5f1e79..b920d4aa 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -7,7 +7,6 @@ handler500 = 'core.views.main.server_error' urlpatterns = [ url(r'^guide$', styleguide.guide), - # url(r'^f/(?P.*)', main.serve), url(r'^api/response$', api.UserResponseHandler.as_view()), url(r'^login', main.login, name="login"), url(r'^bceid', localdev.bceid, name="bceid"), diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index 97139288..2ad05c1f 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -11,16 +11,6 @@ from ..utils.user_response import get_responses_from_db, get_responses_from_db_g from edivorce.apps.core.utils.question_step_mapping import list_of_registries -# @bceid_required -# def serve(request, path): -# if path[0:2] == 'f/': -# path = path[2:0] -# if (len(path) > 4 and path[-5:] != '.html') or len(path) == 0: -# path += '/intro.html' -# if path[:1] == '/': -# path = path[1:] -# return render(request, path) - def home(request): """ This is the homepage diff --git a/edivorce/fixtures/LegalForm.json b/edivorce/fixtures/LegalForm.json deleted file mode 100644 index 589fddad..00000000 --- a/edivorce/fixtures/LegalForm.json +++ /dev/null @@ -1,82 +0,0 @@ -[ -{ - "fields": { - "name": "Notice Of Joint Family Claim", - "order": 1 - }, - "model": "core.legalform", - "pk": "f1" -}, -{ - "fields": { - "name": "Affidavit Of Personal Service", - "order": 15 - }, - "model": "core.legalform", - "pk": "f15" -}, -{ - "fields": { - "name": "Requisition", - "order": 17 - }, - "model": "core.legalform", - "pk": "f17" -}, -{ - "fields": { - "name": "Notice Of Family Claim", - "order": 3 - }, - "model": "core.legalform", - "pk": "f3" -}, -{ - "fields": { - "name": "Requisition", - "order": 35 - }, - "model": "core.legalform", - "pk": "f35" -}, -{ - "fields": { - "name": "Certificate Of Pleadings", - "order": 36 - }, - "model": "core.legalform", - "pk": "f36" -}, -{ - "fields": { - "name": "Child Support Affidavit", - "order": 37 - }, - "model": "core.legalform", - "pk": "f37" -}, -{ - "fields": { - "name": "Affidavit - Desk Order Divorce", - "order": 38 - }, - "model": "core.legalform", - "pk": "f38" -}, -{ - "fields": { - "name": "Final Order", - "order": 52 - }, - "model": "core.legalform", - "pk": "f52" -}, -{ - "fields": { - "name": "Certificate Of Divorce", - "order": 56 - }, - "model": "core.legalform", - "pk": "f56" -} -]