Skip to content

Commit

Permalink
Merge branch 'dev' into LTD-4719-assign-case-officer
Browse files Browse the repository at this point in the history
  • Loading branch information
Tllew authored Feb 27, 2024
2 parents 984781f + bd8d5f7 commit 6461fc7
Show file tree
Hide file tree
Showing 32 changed files with 641 additions and 702 deletions.
67 changes: 34 additions & 33 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 0 additions & 125 deletions caseworker/cases/forms/compliance.py

This file was deleted.

2 changes: 0 additions & 2 deletions caseworker/cases/helpers/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class Slices:
OPEN_GENERAL_LICENCE = Slice("case/slices/open-general-licence.html")
COMPLIANCE_LICENCES = Slice("case/slices/compliance-licences.html")
OPEN_LICENCE_RETURNS = Slice("case/slices/open-licence-returns.html", cases.OpenLicenceReturns.TITLE)
COMPLIANCE_VISITS = Slice("case/slices/compliance-visits.html", "Visit reports")
COMPLIANCE_VISIT_DETAILS = Slice("case/slices/compliance-visit-details.html")
FREEDOM_OF_INFORMATION = Slice("case/slices/freedom-of-information.html", "Freedom of Information")
APPEAL_DETAILS = Slice("case/slices/appeal-details.html", "Appeal")

Expand Down
56 changes: 0 additions & 56 deletions caseworker/cases/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,62 +373,6 @@ def get_blocking_flags(request, case_pk):
return data.json()


def get_compliance_licences(request, case_id, reference, page):
data = client.get(
request,
f"/compliance/{case_id}/licences/?reference={reference}&page={page}",
)
return data.json()


def post_create_compliance_visit(request, case_id):
data = client.post(request, f"/compliance/site/{case_id}/visit/", data={})
return data


def get_compliance_visit_case(request, case_id):
data = client.get(request, f"/compliance/visit/{case_id}")
return data.json()


def patch_compliance_visit_case(request, case_id, json):
if "visit_date_day" in json:
json["visit_date"] = format_date(json, "visit_date_")
data = client.patch(request, f"/compliance/visit/{case_id}", data=json)
return data.json(), data.status_code


def get_compliance_people_present(request, case_id):
data = client.get(request, f"/compliance/visit/{case_id}/people-present/?disable_pagination=True")
return data.json()


def post_compliance_person_present(request, case_id, json):
data = client.post(request, f"/compliance/visit/{case_id}/people-present/", data=json)

# Translate errors to be more user friendly, from
# {'errors': [{}, {'name': ['This field may not be blank.'], 'job_title': ['This field may not be blank.']}, ...]}
# to
# {'errors': {'name-2': ['This field may not be blank'], 'job-title-2': ['This field may not be blank'], ...}}
# This allows the errors to specify the specific textbox input for name/job-title inputs allowing the users
# to see the exact field it didn't validate on.
if "errors" in data.json():
errors = data.json()["errors"]
translated_errors = {}

index = 1
for error in errors:
if error:
if "name" in error:
translated_errors[f"name-{index}"] = [f"{index}. " + error.pop("name")[0]]
if "job_title" in error:
translated_errors[f"job-title-{index}"] = [f"{index}. " + error.pop("job_title")[0]]
index += 1

return {**json, "errors": translated_errors}, data.status_code
return data.json(), data.status_code


def get_case_sub_statuses(request, case_id):
response = client.get(request, f"/applications/{case_id}/sub-statuses/")
response.raise_for_status()
Expand Down
10 changes: 0 additions & 10 deletions caseworker/cases/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
generate_document,
ecju,
goods,
compliance,
external_data,
case_assignments,
queries,
Expand Down Expand Up @@ -116,15 +115,6 @@
name="reissue_ogl",
),
path("good/<uuid:good_pk>/", goods.GoodDetails.as_view(), name="good"),
# Compliance
path("create-visit-report/", compliance.CreateVisitReport.as_view(), name="create_visit_report"),
path("visit-report/", compliance.VisitReportDetails.as_view(), name="visit_report"),
path("people-present/", compliance.PeoplePresent.as_view(), name="people_present"),
path("overview/", compliance.Overview.as_view(), name="overview"),
path("inspection/", compliance.Inspection.as_view(), name="inspection"),
path("compliance-licence/", compliance.ComplianceWithLicences.as_view(), name="compliance_with_licences"),
path("knowledge-people/", compliance.KnowledgePeople.as_view(), name="knowledge_of_people"),
path("knowledge-products/", compliance.KnowledgeProduct.as_view(), name="knowledge_of_products"),
path("denials/", main.Denials.as_view(), name="denials"),
path("activities/", include("caseworker.activities.urls")),
# tabs
Expand Down
Loading

0 comments on commit 6461fc7

Please sign in to comment.