diff options
Diffstat (limited to 'ctrack')
-rw-r--r-- | ctrack/caf/managers.py | 3 | ||||
-rw-r--r-- | ctrack/caf/models.py | 2 | ||||
-rw-r--r-- | ctrack/caf/urls.py | 8 | ||||
-rw-r--r-- | ctrack/caf/views.py | 5 | ||||
-rw-r--r-- | ctrack/register/forms.py | 8 | ||||
-rw-r--r-- | ctrack/register/models.py | 2 | ||||
-rw-r--r-- | ctrack/register/urls.py | 2 | ||||
-rw-r--r-- | ctrack/register/views.py | 4 |
8 files changed, 15 insertions, 19 deletions
diff --git a/ctrack/caf/managers.py b/ctrack/caf/managers.py index 4d8c134..ce36534 100644 --- a/ctrack/caf/managers.py +++ b/ctrack/caf/managers.py @@ -1,5 +1,4 @@ -from django.db import connection -from django.db import models +from django.db import connection, models import ctrack.caf.models as caf_models # to deal with circular import import ctrack.organisations.models as org_models diff --git a/ctrack/caf/models.py b/ctrack/caf/models.py index a2015eb..6957448 100644 --- a/ctrack/caf/models.py +++ b/ctrack/caf/models.py @@ -1,8 +1,8 @@ from django.db import models +from django.urls.base import reverse from ctrack.caf.managers import ApplicableSystemManager from ctrack.organisations.models import Organisation, Person -from django.urls.base import reverse # from ctrack.register.models import EngagementEvent diff --git a/ctrack/caf/urls.py b/ctrack/caf/urls.py index 557c2f0..ddb83ed 100644 --- a/ctrack/caf/urls.py +++ b/ctrack/caf/urls.py @@ -2,12 +2,12 @@ from django.urls import path from django.views.decorators.cache import cache_page from ctrack.caf.views import ( - ListCAF, - ListApplicableSystem, - caf_detail_view, - ApplicableSystemDetail, ApplicableSystemCreateFromOrg, + ApplicableSystemDetail, + ListApplicableSystem, + ListCAF, applicable_system_create_from_caf, + caf_detail_view, ) app_name = "caf" diff --git a/ctrack/caf/views.py b/ctrack/caf/views.py index 6cf3945..f748b49 100644 --- a/ctrack/caf/views.py +++ b/ctrack/caf/views.py @@ -6,10 +6,7 @@ from django.urls import reverse, reverse_lazy from django.views.generic import DetailView, FormView, ListView from ctrack.assessments.models import CAFAssessmentOutcomeScore -from ctrack.caf.forms import ( - ApplicableSystemCreateFromCafForm, - ApplicableSystemCreateFromOrgForm, -) +from ctrack.caf.forms import ApplicableSystemCreateFromCafForm, ApplicableSystemCreateFromOrgForm from ctrack.caf.models import CAF, ApplicableSystem from ctrack.organisations.models import Organisation diff --git a/ctrack/register/forms.py b/ctrack/register/forms.py index 2afc1a1..9f8aec5 100644 --- a/ctrack/register/forms.py +++ b/ctrack/register/forms.py @@ -1,18 +1,18 @@ from crispy_forms.helper import FormHelper -from crispy_forms.layout import Button, ButtonHolder, Layout, Submit, Hidden, Field +from crispy_forms.layout import Button, ButtonHolder, Field, Hidden, Layout, Submit from django import forms from django.core.exceptions import ValidationError from django.shortcuts import get_object_or_404 from django.urls import reverse from ctrack.caf.models import CAF -from ctrack.organisations.models import Person, Organisation +from ctrack.organisations.models import Organisation, Person from ctrack.register.models import ( + CAFSingleDateEvent, + CAFTwinDateEvent, EngagementEvent, EngagementType, - CAFSingleDateEvent, SingleDateTimeEvent, - CAFTwinDateEvent, ) diff --git a/ctrack/register/models.py b/ctrack/register/models.py index 118dfae..932dd69 100644 --- a/ctrack/register/models.py +++ b/ctrack/register/models.py @@ -1,7 +1,7 @@ import datetime from datetime import date as std_date from enum import Enum, auto -from typing import Optional, Dict +from typing import Dict, Optional from django.contrib.auth import get_user_model from django.db import models diff --git a/ctrack/register/urls.py b/ctrack/register/urls.py index 1cdd92f..81ea445 100644 --- a/ctrack/register/urls.py +++ b/ctrack/register/urls.py @@ -2,8 +2,8 @@ from django.urls import path from ctrack.register.views import ( EngagementEventCreate, - EngagementEventDelete, EngagementEventCreateFromCaf, + EngagementEventDelete, SingleDateTimeEventCreate, ) diff --git a/ctrack/register/views.py b/ctrack/register/views.py index 3fd8f1f..f5d37b4 100644 --- a/ctrack/register/views.py +++ b/ctrack/register/views.py @@ -2,11 +2,11 @@ from django.contrib.auth import get_user_model from django.contrib.auth.mixins import LoginRequiredMixin from django.http import HttpResponseRedirect from django.urls import reverse_lazy -from django.views.generic import FormView, DeleteView, CreateView +from django.views.generic import CreateView, DeleteView, FormView from ctrack.caf.models import CAF from ctrack.organisations.models import Organisation -from ctrack.register.forms import EngagementEventCreateForm, CreateSimpleDateTimeEventForm +from ctrack.register.forms import CreateSimpleDateTimeEventForm, EngagementEventCreateForm from ctrack.register.models import EngagementEvent, SingleDateTimeEvent |