From 59b387dd84433a8b811c651e12e7b13089e3e679 Mon Sep 17 00:00:00 2001 From: Murilo Dal Ri Date: Wed, 7 Jun 2023 14:11:02 +0100 Subject: [PATCH] Amend with latest requests --- .../content_change_requests_controller.rb | 1 - .../support/requests/content_change_request.rb | 2 +- .../ticket/content_change_request_ticket.rb | 5 ----- app/models/zendesk/zendesk_ticket.rb | 14 ++++++++++++++ .../_request_details.html.erb | 18 +----------------- spec/features/content_change_requests_spec.rb | 13 +++++++------ 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/app/controllers/content_change_requests_controller.rb b/app/controllers/content_change_requests_controller.rb index 861c5d4d1..6ac5085a0 100644 --- a/app/controllers/content_change_requests_controller.rb +++ b/app/controllers/content_change_requests_controller.rb @@ -19,7 +19,6 @@ def content_change_request_params :reason_for_change, :subject_area, :details_of_change, - :why_is_change_needed, :url, :related_urls, requester_attributes: %i[email name collaborator_emails], diff --git a/app/models/support/requests/content_change_request.rb b/app/models/support/requests/content_change_request.rb index 263c5e798..5f808a647 100644 --- a/app/models/support/requests/content_change_request.rb +++ b/app/models/support/requests/content_change_request.rb @@ -5,7 +5,7 @@ module Requests class ContentChangeRequest < Request include WithTimeConstraint - attr_accessor :title, :reason_for_change, :subject_area, :details_of_change, :why_is_change_needed, :url, :related_urls + attr_accessor :title, :reason_for_change, :subject_area, :details_of_change, :url, :related_urls validates :details_of_change, presence: true diff --git a/app/models/zendesk/ticket/content_change_request_ticket.rb b/app/models/zendesk/ticket/content_change_request_ticket.rb index 2eefa4d20..434a86a73 100644 --- a/app/models/zendesk/ticket/content_change_request_ticket.rb +++ b/app/models/zendesk/ticket/content_change_request_ticket.rb @@ -37,11 +37,6 @@ def comment_snippets field: :details_of_change, label: "Details of what should be added, amended or removed", ), - Zendesk::LabelledSnippet.new( - on: @request, - field: :why_is_change_needed, - label: "Why is this change needed", - ), ] end end diff --git a/app/models/zendesk/zendesk_ticket.rb b/app/models/zendesk/zendesk_ticket.rb index e91e459a2..513397dfe 100644 --- a/app/models/zendesk/zendesk_ticket.rb +++ b/app/models/zendesk/zendesk_ticket.rb @@ -29,6 +29,18 @@ def needed_by_date end end + def not_before_time + if value?(:time_constraint) && value?(:not_before_time, @request.time_constraint) + @request.time_constraint.not_before_time + end + end + + def needed_by_time + if value?(:time_constraint) && value?(:needed_by_time, @request.time_constraint) + @request.time_constraint.needed_by_time + end + end + def tags %w[govt_form] end @@ -49,7 +61,9 @@ def base_comment_snippets if value?(:time_constraint) [ Zendesk::LabelledSnippet.new(on: self, field: :needed_by_date, label: "Needed by date"), + Zendesk::LabelledSnippet.new(on: self, field: :needed_by_time, label: "Needed by time"), Zendesk::LabelledSnippet.new(on: self, field: :not_before_date, label: "Not before date"), + Zendesk::LabelledSnippet.new(on: self, field: :not_before_time, label: "Not before time"), Zendesk::LabelledSnippet.new(on: @request.time_constraint, field: :time_constraint_reason, label: "Reason for time constraint"), ] else diff --git a/app/views/content_change_requests/_request_details.html.erb b/app/views/content_change_requests/_request_details.html.erb index 095df788a..cb0527ddd 100644 --- a/app/views/content_change_requests/_request_details.html.erb +++ b/app/views/content_change_requests/_request_details.html.erb @@ -119,7 +119,7 @@

Make sure you:

-
- - <%= f.label :why_is_change_needed do %> - Why is this change needed? * - <% end %> - -
-

Explain why users need new or different information, including any problems with existing content.

- -

Provide evidence to support the changes, such as user feedback, user research, analytics, call centre feedback or policy change.

- - <%= f.text_area :why_is_change_needed, required: true, class: "input-md-6 form-control", rows: 16, cols: 50, aria: { - describedby: "why-is-change-needed-hint" - } %> - -
<%= render partial: "support/attachment_instructions" %> diff --git a/spec/features/content_change_requests_spec.rb b/spec/features/content_change_requests_spec.rb index 6442e5a3a..aba0b2c16 100644 --- a/spec/features/content_change_requests_spec.rb +++ b/spec/features/content_change_requests_spec.rb @@ -23,9 +23,15 @@ "[Needed by date] 31-12-#{next_year} +[Needed by time] +13:00 + [Not before date] 01-12-#{next_year} +[Not before time] +18:00 + [Reason for time constraint] New law @@ -39,10 +45,7 @@ http://gov.uk/X [Details of what should be added, amended or removed] -Out of date XX YY - -[Why is this change needed] -Because of XX YY", +Out of date XX YY", }, ) @@ -51,7 +54,6 @@ reason_for_change: "Factual inaccuracy", subject_area: "Benefits", details_of_change: "Out of date XX YY", - why_is_change_needed: "Because of XX YY", url: "http://gov.uk/X", related_urls: "http://gov.uk/welsh", needed_by_date: "31-12-#{next_year}", @@ -93,7 +95,6 @@ def user_makes_a_content_change_request(details) select details[:subject_area], from: "What’s the subject area?" unless details[:subject_area].nil? fill_in "Which URLs are affected?", with: details[:url] fill_in "Tell us about the content that needs to be created, updated or is causing a problem for users?", with: details[:details_of_change] - fill_in "Why is this change needed?", with: details[:why_is_change_needed] user_fills_out_time_constraints(details)