From 37fcdfb2629ef95bf4ad49e7ee13163c8f8e5395 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 11 Aug 2023 11:09:51 +0100
Subject: [PATCH 1/2] Add selector for help block

---
 .../custom_questions/won_international_trade_award.coffee       | 2 +-
 app/views/qae_form/_queen_award_applications_question.html.slim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
index 6176fbce27..f6a4ea90a2 100644
--- a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
+++ b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
@@ -16,7 +16,7 @@ window.WonInternationalTradeAwardQuestion = init: ->
         conditionFulfilled = true
         return false
 
-    helpBlock = container.closest("fieldset").find(".question-block")
+    helpBlock = $("#help-block")
 
     if helpBlock
       if conditionFulfilled
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index 0d1e947432..28f1dfdf51 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -136,7 +136,7 @@ a.govuk-button.govuk-button--secondary.js-button-add.if-no-js-hide href="#" aria
                          "data-entity" => "award"
 
 
-.question-block style="display: none;"
+.question-block#help-block style="display: none;"
   .govuk-form-group
     p class="govuk-body govuk-!-font-weight-bold"
       | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.

From 09c78d1828037be708db42f169818bda8f19e86d Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 17 Aug 2023 11:17:48 +0100
Subject: [PATCH 2/2] Adds message for previous winners of trade within 5 years

---
 .../won_international_trade_award.coffee      | 35 ++++++++++++-------
 ...ueen_award_applications_question.html.slim |  6 ++--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
index f6a4ea90a2..f3a60cad15 100644
--- a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
+++ b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
@@ -4,25 +4,36 @@ window.WonInternationalTradeAwardQuestion = init: ->
   do maybeDisplayAwardHelp = ->
     container = $("[data-container~=#{identifier}]")
 
-    conditionFulfilled = false
+    currentHolder = false
+    recentWinner = false
 
     rows = container.find("li")
 
     $.each rows, (_idx, row) ->
-      validations = $.map ["category", "year", "outcome"], (type) ->
+      validations = $.map ["category", "outcome"], (type) ->
         input = $(row).find("select[data-input-value~=#{type}]")
         input.val() == container.data("#{type}-value").toString()
       if (validations.every(Boolean))
-        conditionFulfilled = true
-        return false
-
-    helpBlock = $("#help-block")
-
-    if helpBlock
-      if conditionFulfilled
-        helpBlock.show()
-      else
-        helpBlock.hide()
+        yearInput = $(row).find("select[data-input-value~=year]")
+        if yearInput.val() == container.data("year-value").toString()
+          currentHolder = true
+          return false
+        else if yearInput.val() < container.data("year-value").toString() && yearInput.val() > (container.data("year-value")-5).toString()
+          recentWinner = true
+          return false
+
+    currentHolderHelpBlock = $(".help-block #current-holder")
+    recentWinnerHelpBlock = $(".help-block #recent-winner")
+
+    if currentHolder
+      currentHolderHelpBlock.removeClass("hide")
+      recentWinnerHelpBlock.addClass("hide")
+    else if recentWinner
+      recentWinnerHelpBlock.removeClass("hide")
+      currentHolderHelpBlock.addClass("hide")
+    else
+      currentHolderHelpBlock.addClass("hide")
+      recentWinnerHelpBlock.addClass("hide")
 
   $(document).on "change", "[data-container~=#{identifier}] select", ->
     maybeDisplayAwardHelp()
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index 28f1dfdf51..2652bf49d6 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -136,7 +136,9 @@ a.govuk-button.govuk-button--secondary.js-button-add.if-no-js-hide href="#" aria
                          "data-entity" => "award"
 
 
-.question-block#help-block style="display: none;"
+.question-block.help-block
   .govuk-form-group
-    p class="govuk-body govuk-!-font-weight-bold"
+    p class="govuk-body govuk-!-font-weight-bold hide" id="current-holder"
       | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.
+    p class="govuk-body govuk-!-font-weight-bold hide" id="recent-winner"
+      | As you currently hold a King's Award in International Trade, you can only apply for the Outstanding Achievement Award (3 years).