[PoC] F680s

caseworker/activities/views.py

@@ -99,7 +99,7 @@ def get_context_data(self, **kwargs):
             "filtering_by": list(self.request.GET.keys()),
             "queue": self.queue,
             "team_filters": self.get_team_filters(),
-            "tabs": self.get_standard_application_tabs(),
+            "tabs": self.get_tabs_by_case_type(self.case.sub_type),
             "current_tab": "cases:activities:notes-and-timeline",
             "activities": get_activity(self.request, self.case_id, activity_filters=self.request.GET),
         }

caseworker/advice/constants.py

@@ -4,10 +4,12 @@
     "Refuse": "refused",
     "Conflicting": "given conflicting advice",
     "No Licence Required": "no licence required",
+    "F680": "F680 Approval",
 }
 
 
 TEAM_DECISION_APPROVED = "has approved"
+TEAM_DECISION_APPROVED_F680 = "has approved this F680 application"
 TEAM_DECISION_APPROVED_REFUSED = "has approved and refused"
 TEAM_DECISION_PROVISO = "has approved with licence conditions"
 TEAM_DECISION_REFUSED = "has refused"

caseworker/advice/services.py

@@ -124,7 +124,7 @@ def filter_current_user_advice(all_advice, user_id):
         advice
         for advice in all_advice
         if advice["level"] == constants.AdviceLevel.USER
-        and advice["type"]["key"] in ["approve", "proviso", "refuse"]
+        and advice["type"]["key"] in ["approve", "proviso", "refuse", "f680"]
         and (advice["user"]["id"] == user_id)
     ]
 
@@ -343,9 +343,15 @@ def get_advice_subjects(case, countries=None):
 
 
 def post_approval_advice(request, case, data, level="user-advice"):
+    advice_type = "approve"
+    if data["proviso"]:
+        advice_type = "proviso"
+    elif case.sub_type == "f680_clearance":
+        advice_type = "f680"
+
     json = [
         {
-            "type": "proviso" if data.get("proviso", False) else "approve",
+            "type": advice_type,
             "text": data["approval_reasons"],
             "proviso": data.get("proviso", ""),
             "note": data.get("instructions_to_exporter", ""),

caseworker/advice/templatetags/advice_tags.py

@@ -220,5 +220,7 @@ def _add_team_decisions(grouped_advice):
                 team_advice["decision"] = constants.TEAM_DECISION_PROVISO
             elif decisions == {"Refuse"}:
                 team_advice["decision"] = constants.TEAM_DECISION_REFUSED
+            elif decisions == {"F680"}:
+                team_advice["decision"] = constants.TEAM_DECISION_APPROVED_F680
             else:
                 team_advice["decision"] = constants.TEAM_DECISION_APPROVED_REFUSED

caseworker/advice/views/views.py

@@ -319,7 +319,7 @@ def get_context(self, **kwargs):
             "security_approvals_classified_display": self.security_approvals_classified_display,
             "assessed_trigger_list_goods": self.assessed_trigger_list_goods,
             "unassessed_trigger_list_goods": self.unassessed_trigger_list_goods,
-            "tabs": self.get_standard_application_tabs(),
+            "tabs": self.get_tabs_by_case_type(self.case.sub_type),
             "current_tab": "cases:advice_view",
             **services.get_advice_tab_context(
                 self.case,
@@ -687,6 +687,10 @@ def get_context(self, **kwargs):
         lu_countersign_required = False
         finalise_case = False
 
+        # Hack to ensure that F680 cases can be finalised by MOD-ECJU
+        if user_team_alias == services.MOD_ECJU_TEAM and self.case.case_type["reference"]["key"] == "f680":
+            finalise_case = True
+
         if user_team_alias == services.LICENSING_UNIT_TEAM:
             rejected_lu_countersignature = self.rejected_countersign_advice()
             lu_countersign_required = self.get_lu_countersign_required(rejected_lu_countersignature)

caseworker/cases/forms/finalise_case.py

@@ -46,8 +46,12 @@ def approve_licence_form(queue_pk, case_id, is_open_licence, editable_duration,
     )
 
 
-def deny_licence_form(queue_pk, case_id, is_open_licence, nlr):
-    if nlr:
+def deny_licence_form(queue_pk, case_id, is_open_licence, nlr, is_case_f680):
+    # This F680 approval is a hack to show the corrent information to the user when using the bespoke F680 approval advice type
+    # as F680 is not a licence unsure as to to whether deny licence is the correct path for this eventually
+    if is_case_f680:
+        description = "You'll be approving this F680 application"
+    elif nlr:
         description = "You'll be informing the exporter that no licence is required"
     else:
         description = "You'll be denying the case"

caseworker/cases/views/advice.py

@@ -166,6 +166,7 @@ def get(self, request, *args, **kwargs):
         approve = False
         all_nlr = False
         is_case_open = case_type == CaseType.OPEN.value
+        is_case_f680 = case_type == "f680_clearance"
 
         if is_case_open:
             approve = get_open_licence_decision(request, str(kwargs["pk"])) == "approve"
@@ -203,6 +204,7 @@ def get(self, request, *args, **kwargs):
                     case_id,
                     is_case_open,
                     all_nlr,
+                    is_case_f680,
                 ),
             )
 

caseworker/cases/views/main.py

@@ -116,6 +116,27 @@ def get_standard_application_tabs(self):
 
         return tabs
 
+    def get_f680_application_tabs(self):
+        tabs = [
+            Tabs.QUICK_SUMMARY,
+            Tabs.DETAILS,
+            Tabs.ECJU_QUERIES,
+            Tabs.DOCUMENTS,
+        ]
+        tabs.append(self.get_notes_and_timelines_tab())
+        tabs.append(self.get_advice_tab())
+
+        return tabs
+
+    def get_tabs_by_case_type(self, case_type):
+        # TODO: this is pretty naff - the problem is that the place we choose tabs based on case type
+        #   is over in cases.helpers.case:CaseView.  We need to make this more DRY.
+        tabs_by_case_type = {
+            "f680_clearance": self.get_f680_application_tabs(),
+            "standard": self.get_standard_application_tabs(),
+        }
+        return tabs_by_case_type[case_type]
+
     def get_advice_tab(self):
         data, _ = get_gov_user(self.request, str(self.request.session["lite_api_user_id"]))
         return Tab(
@@ -283,15 +304,18 @@ def get_gifting_clearance_application(self):
         self.additional_context = self.get_advice_additional_context()
 
     def get_f680_clearance_application(self):
-        self.tabs = self.get_tabs()
-        self.tabs.insert(1, Tabs.LICENCES)
-        self.tabs.append(Tabs.ADVICE)
+        self.tabs = self.get_f680_application_tabs()
         self.slices = [
             Slices.GOODS,
             Slices.DESTINATIONS,
+            conditional(self.case.data["denial_matches"], Slices.DENIAL_MATCHES),
+            conditional(self.case.data["sanction_matches"], Slices.SANCTION_MATCHES),
+            conditional(self.case.data["end_user"], Slices.END_USER_DOCUMENTS),
+            Slices.LOCATIONS,
             Slices.F680_DETAILS,
             Slices.END_USE_DETAILS,
             Slices.SUPPORTING_DOCUMENTS,
+            Slices.FREEDOM_OF_INFORMATION,
         ]
         self.additional_context = self.get_advice_additional_context()
 

caseworker/queues/views/forms.py

@@ -25,6 +25,15 @@ class CasesFiltersForm(forms.Form):
         widget=forms.TextInput(attrs={"id": "case_reference"}),
         required=False,
     )
+    case_type = forms.ChoiceField(
+        label="Case type",
+        choices=(
+            ("", ""),
+            ("siel", "SIEL"),
+            ("f680", "F680"),
+        ),
+        required=False,
+    )
     export_type = forms.ChoiceField(
         label="Permanent or temporary",
         choices=(
@@ -216,6 +225,7 @@ def __init__(self, queue, filters_data, all_flags, all_cles, all_regimes, countr
 
         case_filters = [
             "case_reference",
+            "case_type",
             "status",
             "sub_status",
             Field("case_officer", css_class="single-select-filter"),

caseworker/templates/case/slices/f680-details.html

@@ -1,79 +1,60 @@
-{% load humanize %}
-
-<table class="govuk-table">
-	<thead class="govuk-table__head">
-		<tr class="govuk-table__row">
-			<th class="govuk-table__header" scope="col">#</th>
-			<th class="govuk-table__header" scope="col">Question</th>
-			<th class="govuk-table__header" scope="col">Answer</th>
-		</tr>
-	</thead>
-	<tbody class="govuk-table__body">
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">1.</td>
-			<th class="govuk-table__header" scope="row">Has electronic warfare requirement</th>
-			<td class="govuk-table__cell">{{ case.data.electronic_warfare_requirement|friendly_boolean }}</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">2.</td>
-			<th class="govuk-table__header" scope="row">Is expedited</th>
-			<td class="govuk-table__cell">
-				<p class="govuk-body govuk-!-margin-0">{{ case.data.expedited|friendly_boolean }}</p>
-				{% if case.data.expedited_date %}
-					<p class="govuk-hint govuk-!-margin-top-1 govuk-!-margin-bottom-0">{{ case.data.expedited_date }}</p>
-				{% endif %}
-			</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">3.</td>
-			<th class="govuk-table__header" scope="row">Has foreign technology</th>
-			<td class="govuk-table__cell">
-				<p class="govuk-body govuk-!-margin-0">{{ case.data.foreign_technology|friendly_boolean }}</p>
-				{% if case.data.foreign_technology_description %}
-					<p class="govuk-hint govuk-!-margin-top-1 govuk-!-margin-bottom-0">
-						{{ case.data.foreign_technology_description }}
-					</p>
-				{% endif %}
-			</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">4.</td>
-			<th class="govuk-table__header" scope="row">Is locally manufactured</th>
-			<td class="govuk-table__cell">
-				<p class="govuk-body govuk-!-margin-0">{{ case.data.locally_manufactured|friendly_boolean }}</p>
-				{% if case.data.locally_manufactured_description %}
-					<p class="govuk-hint govuk-!-margin-top-1 govuk-!-margin-bottom-0" data-max-length="200">
-						{{ case.data.locally_manufactured_description }}
-					</p>
-				{% endif %}
-			</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">5.</td>
-			<th class="govuk-table__header" scope="row">MTCR type</th>
-			<td class="govuk-table__cell">{{ case.data.mtcr_type.value }}</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">6.</td>
-			<th class="govuk-table__header" scope="row">Has UK service equipment</th>
-			<td class="govuk-table__cell">{{ case.data.uk_service_equipment|friendly_boolean }}</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">7.</td>
-			<th class="govuk-table__header" scope="row">UK service equipment</th>
-			<td class="govuk-table__cell">
-				<p class="govuk-body govuk-!-margin-0">{{ case.data.uk_service_equipment_type.value }}</p>
-				{% if case.data.uk_service_equipment_description %}
-					<p class="govuk-hint govuk-!-margin-top-1 govuk-!-margin-bottom-0" data-max-length="200">
-						{{ case.data.uk_service_equipment_description }}
-					</p>
-				{% endif %}
-			</td>
-		</tr>
-		<tr class="govuk-table__row">
-			<td class="govuk-table__cell govuk-table__cell--line-number">8.</td>
-			<th class="govuk-table__header" scope="row">Prospect value</th>
-			<td class="govuk-table__cell">£{{ case.data.prospect_value|intcomma }}</td>
-		</tr>
-	</tbody>
-</table>
+<dl class="govuk-summary-list">
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Select the types of clearance you need</dt>
+        <dd class="govuk-summary-list__value">
+            {% for item in case.data.clearances %}
+                {% if not forloop.last %}
+                    {{ item.value }},
+                {% else %}
+                    {{ item.value }}
+                {% endif %}
+            {% endfor %}
+        </dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Do you need the F680 clearance in less than 30 days due to exceptional circumstances?</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.exceptional_circumstances|friendly_boolean }}</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Is there any foreign technology or information involved in the release?</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.foreign_technology_information|friendly_boolean }}</dd>
+    </div>
+    {% if case.data.foreign_technology_information %}
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">Foreign technology details</dt>
+            <dd class="govuk-summary-list__value">{{ case.data.foreign_technology_information_details }}</dd>
+        </div>
+    {% endif %}
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Is local assembly or manufacture required?</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.is_local_assembly_manufacture|friendly_boolean }}</dd>
+    </div>
+    {% if case.data.is_local_assembly_manufacture %}
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">Local assembly manufacture details</dt>
+            <dd class="govuk-summary-list__value">{{ case.data.is_local_assembly_manufacture_details }}</dd>
+        </div>
+    {% endif %}
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Do you believe the products are rated under the Missile Technology Control Regime (MTCR)</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.product_mtcr_rating_type|sentence_case }}</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Is there is a requirement to release UK MOD owned EW data or information in support of this export</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.ew_data|friendly_boolean }}</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Is the equipment or a version of it due to enter service with the UK armed forces?</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.armed_forces_usage|friendly_boolean }}</dd>
+    </div>
+    {% if case.data.armed_forces_usage %}
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">Armed forces usage details</dt>
+            <dd class="govuk-summary-list__value">{{ case.data.armed_forces_usage_details }}</dd>
+        </div>
+    {% endif %}
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Select how the product is funded</dt>
+        <dd class="govuk-summary-list__value">{{ case.data.product_funding }}</dd>
+    </div>
+</dl>

core/summaries/formatters.py

@@ -715,6 +715,37 @@ def document_formatter(document, url, link_text=None):
 }
 
 
+F680_GOOD_DETAILS_FORMATTERS = {
+    "is-good-controlled": key_value_formatter,
+    "control-list-entries": comma_separated_list(itemgetter("rating")),
+    "is-pv-graded": mapping_formatter(
+        {
+            "yes": "Yes",
+            "no": "No",
+        }
+    ),
+}
+
+F680_GOOD_DETAILS_ON_APPLICATION_FORMATTERS = {
+    "number-of-items": integer,
+    "total-value": money_formatter,
+}
+
+F680_GOOD_DETAILS_LABELS = {
+    "name": "Give the product a descriptive name",
+    "is-good-controlled": "Do you know the product's control list entry?",
+    "control-list-entries": "Enter the control list entry",
+    "is-pv-graded": "Does the product have a government security grading or classification?",
+    "product-description": "Describe the product and what it is designed to do",
+}
+
+
+F680_GOOD_DETAILS_ON_APPLICATION_LABELS = {
+    "number-of-items": "Number of items",
+    "total-value": "Total value",
+}
+
+
 def add_edit_links(
     summary,
     edit_links,

core/summaries/reducers.py

@@ -745,3 +745,24 @@ def technology_on_application_reducer(good_on_application):
     )
     summary += is_onward_exported_reducer(good_on_application)
     return summary
+
+
+def f680_good_details_reducer(good):
+    summary = (
+        (
+            "name",
+            good["name"],
+        ),
+    )
+    summary += is_good_controlled_reducer(good)
+    summary += is_pv_graded_reducer(good)
+
+    return summary
+
+
+def f680_good_details_on_application_reducer(good_on_application):
+    summary = (
+        ("number-of-items", good_on_application["quantity"]),
+        ("total-value", Decimal(good_on_application["value"])),
+    )
+    return summary