CDPT-1110 Changes to disable functionality (#703)

* empty

* Remove permanent maintenance mode (#702)

* CDPT-1112 Remove enhanced check details (#704)

* CDPT-1114 Update DBS wording (#705)

* CDPT-1111 Remove content and link to add more convictions (#706)

* CDPT-1116 Update notification banner (#707)

* Update military community order rehab periods (#708)

* CDPT-1113 Disclaimers (#709)

* Add back link (#710)

* Add instructions

* CDPT-1133 Fix multiple sentence bug (#711)

* CDPT-1145 Add military reprimand (#712)

* Disable backoffice in production (#714)

* CDPT-1153 Remove bail tag pages (#713)

Author: vertism

app/controllers/application_controller.rb

@@ -2,8 +2,6 @@ class ApplicationController < ActionController::Base
   include SecurityHandling
   include ErrorHandling
 
-  before_action :maintenance_mode
-
   # This is required to get request attributes in to the production logs.
   # See the various lograge configurations in `production.rb`.
   def append_info_to_payload(payload)
@@ -51,8 +49,4 @@ def initialize_disclosure_check(attributes = {})
       session[:disclosure_check_id] = disclosure_check.id
     end
   end
-
-  def maintenance_mode
-    render "errors/maintenance" if Rails.env.production?
-  end
 end

app/controllers/backoffice/reports_controller.rb

@@ -1,5 +1,7 @@
 module Backoffice
   class ReportsController < ApplicationController
+    before_action :check_environment
+
     RESULTS_LIMIT = 50
 
     def index
@@ -23,5 +25,9 @@ def completed_reports
     def sort_by_sentences?
       params[:sentences].presence
     end
+
+    def check_environment
+      redirect_to root_path if Rails.env.production?
+    end
   end
 end

app/controllers/home_controller.rb

@@ -1,8 +1,12 @@
 class HomeController < ApplicationController
-  before_action :existing_disclosure_check_warning, :reset_disclosure_check_session
+  before_action :existing_disclosure_check_warning
 
   def index
-    redirect_to steps_check_kind_path
+    if params[:new] == "y"
+      redirect_to steps_check_kind_path
+    else
+      @continue_link ||= edit_steps_check_kind_path # rubocop:disable Naming/MemoizedInstanceVariableName
+    end
   end
 
 private
@@ -13,8 +17,10 @@ def in_progress_enough?
   end
 
   def existing_disclosure_check_warning
-    return unless in_progress_enough? && !params.key?(:new)
-
-    redirect_to warning_reset_session_path
+    if in_progress_enough? && !params.key?(:new)
+      @continue_link = warning_reset_session_path
+    else
+      reset_disclosure_check_session
+    end
   end
 end

app/controllers/steps/conviction/conviction_bail_controller.rb

@@ -40,13 +40,4 @@ def motoring_fine?
       ConvictionType::ADULT_MOTORING_FINE,
     ].include?(self)
   end
-
-  def bailable_offense?
-    [
-      ConvictionType::DETENTION,
-      ConvictionType::DETENTION_TRAINING_ORDER,
-      ConvictionType::ADULT_PRISON_SENTENCE,
-      ConvictionType::ADULT_SUSPENDED_PRISON_SENTENCE,
-    ].include?(self)
-  end
 end

app/controllers/steps/conviction/conviction_bail_days_controller.rb

@@ -35,8 +35,6 @@ def persist!
           conviction_subtype:,
           # The following are dependent attributes that need to be reset if form changes
           known_date: nil,
-          conviction_bail: nil,
-          conviction_bail_days: nil,
           conviction_length: nil,
           conviction_length_type: nil,
           compensation_paid: nil,

app/decorators/conviction_decorator.rb

@@ -11,7 +11,6 @@ def question_attributes
       :conviction_date,
       :known_date,
       [:conviction_length, i18n_conviction_length],
-      :conviction_bail_days,
       :compensation_payment_date,
       :motoring_endorsement,
       :schedule18_over_4_years,
@@ -22,7 +21,6 @@ def editable_attributes
     {
       known_date: ->(id) { edit_steps_conviction_known_date_path(check_id: id, next_step: :cya) },
       conviction_length: ->(id) { edit_steps_conviction_conviction_length_type_path(check_id: id) },
-      conviction_bail_days: ->(id) { edit_steps_conviction_conviction_bail_days_path(check_id: id, next_step: :cya) },
       compensation_payment_date: ->(id) { edit_steps_conviction_compensation_payment_date_path(check_id: id, next_step: :cya) },
       motoring_endorsement: ->(id) { edit_steps_conviction_motoring_endorsement_path(check_id: id, next_step: :cya) },
       schedule18_over_4_years: ->(id) { edit_steps_conviction_conviction_schedule18_path(check_id: id) },

app/forms/steps/conviction/conviction_bail_days_form.rb

@@ -22,12 +22,6 @@ def motoring?
     conviction_checks.map(&:conviction).compact.any?(&:motoring?)
   end
 
-  def time_on_bail?
-    conviction_checks.any? do |disclosure_check|
-      disclosure_check.conviction_bail_days.to_i.positive?
-    end
-  end
-
   def scope
     :results
   end

app/forms/steps/conviction/conviction_bail_form.rb

@@ -10,16 +10,11 @@ def initialize(check_group)
       end
 
       def spent_date
-        return ResultsVariant::NEVER_SPENT if expiry_dates.include?(ResultsVariant::NEVER_SPENT)
-        return ResultsVariant::INDEFINITE  if expiry_dates.include?(ResultsVariant::INDEFINITE)
-
-        # Pick the latest date in the collection
-        # If there is only one sentence then it returns that date
-        expiry_dates.max
+        max_expiry(expiry_dates)
       end
 
       def spent_date_without_relevant_orders
-        non_relevant_expiry_dates.max
+        max_expiry(non_relevant_expiry_dates)
       end
 
       def spent?
@@ -44,6 +39,15 @@ def conviction?
 
     private
 
+      def max_expiry(expiry_dates)
+        return ResultsVariant::NEVER_SPENT if expiry_dates.include?(ResultsVariant::NEVER_SPENT)
+        return ResultsVariant::INDEFINITE  if expiry_dates.include?(ResultsVariant::INDEFINITE)
+
+        # Pick the latest date in the collection
+        # If there is only one sentence then it returns that date
+        expiry_dates.max
+      end
+
       def disclosure_checks
         @disclosure_checks ||= check_group.disclosure_checks.completed
       end

app/forms/steps/conviction/conviction_subtype_form.rb

@@ -1,7 +1,6 @@
 module Calculators
   class SentenceCalculator < BaseCalculator
     UPPER_LIMIT_MONTHS = Float::INFINITY
-    BAIL_OFFSET = -1.0
 
     class Detention < SentenceCalculator
       def rehabilitation_period
@@ -43,7 +42,7 @@ def expiry_date
       if disclosure_check.schedule18_over_4_years?
         ResultsVariant::NEVER_SPENT
       else
-        conviction_end_date.advance(rehabilitation_period).advance(bail_offset)
+        conviction_end_date.advance(rehabilitation_period)
       end
     end
 
@@ -60,13 +59,5 @@ def valid?
     def conviction_end_date
       super.advance(days: -1)
     end
-
-    # Each full day spent on bail with a tag offsets the value of `BAIL_OFFSET`
-    # from the sentence length (after the rehabilitation period has been applied).
-    # Attribute can be blank or nil, but `#to_i` makes it safe.
-    #
-    def bail_offset
-      { days: disclosure_check.conviction_bail_days.to_i * BAIL_OFFSET }
-    end
   end
 end

app/presenters/conviction_result_presenter.rb

@@ -9,10 +9,8 @@ def destination
       edit(:conviction_subtype)
     when :conviction_subtype
       after_conviction_subtype
-    when :conviction_bail_days, :motoring_endorsement
+    when :motoring_endorsement
       known_date_question
-    when :conviction_bail
-      after_conviction_bail
     when :known_date
       after_known_date
     when :conviction_length_type
@@ -58,7 +56,6 @@ def after_conviction_length
   end
 
   def after_conviction_subtype
-    return edit(:conviction_bail)      if conviction.bailable_offense?
     return edit(:compensation_paid)    if conviction.compensation?
     return edit(:motoring_endorsement) if conviction.motoring_fine?
 
@@ -83,12 +80,6 @@ def after_compensation_paid
     show(:compensation_not_paid)
   end
 
-  def after_conviction_bail
-    return edit(:conviction_bail_days) if step_value(:conviction_bail).inquiry.yes?
-
-    known_date_question
-  end
-
   def known_date_question
     edit(:known_date)
   end

app/presenters/results_presenter.rb

@@ -61,9 +61,10 @@ def initialize(raw_value, params = {})
     COMPENSATION_TO_A_VICTIM           = new(:compensation_to_a_victim,         parent: FINANCIAL, relevant_order: true, calculator_class: Calculators::CompensationCalculator),
 
     DISMISSAL                          = new(:dismissal,                        parent: MILITARY, skip_length: true, calculator_class: Calculators::AdditionCalculator::StartPlusSixMonths),
-    OVERSEAS_COMMUNITY_ORDER           = new(:overseas_community_order,         parent: MILITARY, calculator_class: Calculators::AdditionCalculator::PlusSixMonths),
-    SERVICE_COMMUNITY_ORDER            = new(:service_community_order,          parent: MILITARY, calculator_class: Calculators::AdditionCalculator::PlusSixMonths),
+    OVERSEAS_COMMUNITY_ORDER           = new(:overseas_community_order,         parent: MILITARY, relevant_order: true, no_drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
+    SERVICE_COMMUNITY_ORDER            = new(:service_community_order,          parent: MILITARY, relevant_order: true, no_drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
     SERVICE_DETENTION                  = new(:service_detention,                parent: MILITARY, calculator_class: Calculators::AdditionCalculator::PlusSixMonths),
+    REPRIMAND                          = new(:reprimand,                        parent: MILITARY, skip_length: true, calculator_class: Calculators::AdditionCalculator::StartPlusSixMonths),
 
     REPARATION_ORDER                   = new(:reparation_order,                 parent: PREVENTION_REPARATION, relevant_order: true, no_drag_through: true, skip_length: true, calculator_class: Calculators::ImmediatelyCalculator),
     RESTRAINING_ORDER                  = new(:restraining_order,                parent: PREVENTION_REPARATION, relevant_order: true, no_drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
@@ -95,9 +96,10 @@ def initialize(raw_value, params = {})
     ADULT_COMPENSATION_TO_A_VICTIM      = new(:adult_compensation_to_a_victim,     parent: ADULT_FINANCIAL, relevant_order: true, calculator_class: Calculators::CompensationCalculator),
 
     ADULT_DISMISSAL                     = new(:adult_dismissal,                    parent: ADULT_MILITARY, skip_length: true, calculator_class: Calculators::AdditionCalculator::StartPlusTwelveMonths),
-    ADULT_OVERSEAS_COMMUNITY_ORDER      = new(:adult_overseas_community_order,     parent: ADULT_MILITARY, calculator_class: Calculators::AdditionCalculator::PlusTwelveMonths),
-    ADULT_SERVICE_COMMUNITY_ORDER       = new(:adult_service_community_order,      parent: ADULT_MILITARY, calculator_class: Calculators::AdditionCalculator::PlusTwelveMonths),
+    ADULT_OVERSEAS_COMMUNITY_ORDER      = new(:adult_overseas_community_order,     parent: ADULT_MILITARY, relevant_order: true, no_drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
+    ADULT_SERVICE_COMMUNITY_ORDER       = new(:adult_service_community_order,      parent: ADULT_MILITARY, relevant_order: true, no_drag_through: true, calculator_class: Calculators::AdditionCalculator::PlusZeroMonths),
     ADULT_SERVICE_DETENTION             = new(:adult_service_detention,            parent: ADULT_MILITARY, calculator_class: Calculators::AdditionCalculator::PlusTwelveMonths),
+    ADULT_REPRIMAND                     = new(:adult_reprimand,                    parent: ADULT_MILITARY, skip_length: true, calculator_class: Calculators::AdditionCalculator::StartPlusTwelveMonths),
 
     ADULT_DISQUALIFICATION              = new(:adult_disqualification,             parent: ADULT_MOTORING, relevant_order: true, no_drag_through: true, calculator_class: Calculators::DisqualificationCalculator::Adults),
     ADULT_MOTORING_FINE                 = new(:adult_motoring_fine,                parent: ADULT_MOTORING, skip_length: true, calculator_class: Calculators::Motoring::Adult::Fine),

app/services/calculators/multiples/proceedings.rb

@@ -1,37 +1,36 @@
 <% title '' %>
 
+<%= step_header(path: ExternalUrl.govuk_service_start_page) %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <h1 class="govuk-heading-xl">
-      <%= service_name %>
+      This tool is being updated
     </h1>
 
-    <p class="govuk-body-l">
-      Answer some questions about your caution or conviction to find out whether you need to tell people about it.
-      You'll need to know the type of caution or conviction you got, and when.
-    </p>
+    <div class="govuk-body">
+      Whilst we work on the updates the tool cannot be used for checking the combined rehabilitation period for more than one conviction.
+    </div>
 
     <div class="govuk-body">
-      You won't be asked for any personally identifiable information such as your name or email address.
+      You will, however, be able to check the rehabilitation period for a conviction that has multiple sentences, for example, a prison sentence + an order + a fine.
     </div>
 
-    <p class="govuk-body">
-      You do not need to tell people about a spent caution or conviction if they ask for a basic criminal record check.
-      You can read more
-      <a class="govuk-link" href="https://www.gov.uk/guidance/telling-people-about-your-criminal-record#introduction" rel="external">about when cautions and convictions are spent</a>.
-    </p>
+    <div class="govuk-body">
+      If you receive another conviction during a rehabilitation period, both your original and subsequent offences may remain unspent for the duration of whichever rehabilitation period is longer.
+    </div>
 
-    <p class="govuk-body">
-      You cannot use this checker if you:
-    </p>
+    <div class="govuk-body">
+      To find out how having more than one conviction can impact rehabilitation periods please see guidance on the
+      <a class="govuk-link" href="https://www.gov.uk/government/publications/new-guidance-on-the-rehabilitation-of-offenders-act-1974/guidance-on-the-rehabilitation-of-offenders-act-1974-and-the-exceptions-order-1975#what-happens-if-someone-receives-another-caution-or-conviction-before-their-first-conviction-becomes-spent" rel="external">Rehabilitation of Offenders Act 1974</a>.
+    </div>
 
-    <ul class="govuk-list govuk-list--bullet">
-      <li>were given more than one caution or sentence as part of a conviction</li>
-      <li>want to check a caution or conviction given outside England and Wales</li>
-    </ul>
+    <div class="govuk-body">
+      Click continue to check your caution or conviction.
+    </div>
 
-    <%= link_to edit_steps_check_kind_path, class: 'govuk-button govuk-button--start govuk-!-margin-top-2', data: { module: 'govuk-button' }, role: 'button', draggable: false do %>
-      Start now
+    <%= link_to @continue_link, class: 'govuk-button govuk-button--start govuk-!-margin-top-2', data: { module: 'govuk-button' }, role: 'button', draggable: false do %>
+      Continue
       <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
         <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
       </svg>

app/services/calculators/sentence_calculator.rb

@@ -8,10 +8,7 @@
   </div>
   <div class="govuk-notification-banner__content">
     <p class="govuk-notification-banner__heading">
-      <%= t '.content_paragraph_1' %>
-    </p>
-    <p class="govuk-notification-banner__heading">
-      <%= t '.content_paragraph_2_html' %>
+      <%= t '.content_paragraph_html' %>
     </p>
   </div>
 </div>

app/services/conviction_decision_tree.rb

@@ -0,0 +1 @@
+<p class="govuk-body-l">You can add more cautions or convictions now if you need to check more than one.</p>

app/value_objects/conviction_type.rb

@@ -0,0 +1,10 @@
+<h2 class="govuk-heading-l govuk-!-margin-top-8">Next steps</h2>
+
+<p class="govuk-body">
+  Whilst we work on the updates the tool cannot be used for checking the combined rehabilitation period for more than one conviction.
+</p>
+
+<p class="govuk-body">
+  To find out how having more than one conviction can impact rehabilitation periods please see guidance on the
+  <a class="govuk-link" rel="external" target="_blank" href="https://www.gov.uk/government/publications/new-guidance-on-the-rehabilitation-of-offenders-act-1974/guidance-on-the-rehabilitation-of-offenders-act-1974-and-the-exceptions-order-1975#what-happens-if-someone-receives-another-caution-or-conviction-before-their-first-conviction-becomes-spent">Rehabilitation of Offenders Act 1974</a>.
+</p>

app/views/home/index.en.html.erb

@@ -0,0 +1,9 @@
+<h2 class="govuk-heading-l govuk-!-margin-top-8">Next steps</h2>
+
+<p class="govuk-body">
+  You must enter all cautions and convictions to get accurate results.
+</p>
+
+<%= button_to checks_path,
+              class: 'govuk-button govuk-button--secondary',
+              data: { module: 'govuk-button', 'prevent-double-click': true } do; 'Add a caution or conviction'; end  %>