Adds radio buttons to switch the award year

app/assets/javascripts/admin/applications-filter.js.coffee

@@ -123,4 +123,13 @@ filterApplicationsDropdowns = () ->
                           .length
       $(this).closest(".applications-filter").find("label[data-value='select_all'] input").prop("checked", unselected is 0)
 
+  # On clicking the award year radio
+  $(document).on "click", ".applications-filter .input__award-years input[type='radio']", (e) ->
+    e.stopPropagation()
+    # if other selected, show dropdown of years, otherwise get form answers for current year or all years
+    if $(this).attr('id') == "other"
+      $(this).closest(".applications-filter").find(".other-years-dropdown").removeClass("hide")
+    else
+      window.location = $(this).data('url')
+
 $(document).ready(ready)

app/assets/stylesheets/admin/base.scss

@@ -929,11 +929,11 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     margin: 0;
     padding: 0;
     border: none;
-    background: transparent;
-    background-image: image-url("icon-search.png");
+    background: #1C1C1B;
+    background-image: image-url("icon-search-white.png");
     background-repeat: no-repeat;
     background-position: center center;
-    background-size: pxToRem(15) pxToRem(21);
+    background-size: pxToRem(18) pxToRem(18);
     text-align: left !important;
     text-indent: -9999px;
     white-space: nowrap;
@@ -943,7 +943,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     z-index: 1000;
 
     @include is-retina {
-      background-image: image-url("icon-search@2.png");
+      background-image: image-url("icon-search-white.png");
     }
 
     .lte-ie7 & {
@@ -2000,6 +2000,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 }
 
+.award-year-radios {
+  padding-left: 15px;
+}
+
 .award-year-container {
   position: relative;
 

app/assets/stylesheets/admin/page-applications.scss

@@ -24,6 +24,35 @@
     }
   }
 
+  .search-input__hint {
+    padding-bottom: pxToRem(20);
+  }
+
+  .search-input__hint + .search-input {
+    top: pxToRem(10);
+  }
+
+  .input__award-years {
+    display: inline-block;
+
+    input {
+      margin-right: pxToRem(10);
+      width: 20px;
+      height: 20px;
+      margin-top: -2px;
+      vertical-align: middle;
+    }
+
+    label {
+      margin-right: pxToRem(20);
+      font-weight: normal;
+    }
+
+    .dropdown {
+      width: pxToRem(200);
+    }
+  }
+
   .dropdown {
     position: relative;
     display: inline-block;
@@ -557,7 +586,7 @@
       display: inline;
     }
   }
-  
+
   .alert ~ form > .form-edit-link {
     display: flex;
     float: right;

app/controllers/admin/form_answers_controller.rb

@@ -21,10 +21,10 @@ class Admin::FormAnswersController < Admin::BaseController
   end
 
   expose(:target_scope) do
-    if params[:year].to_s == "all_years"
-      FormAnswer.all
-    else
+    if AwardYear.admin_switch.key?(params[:year].to_i)
       @award_year.form_answers
+    else
+      FormAnswer.all
     end
   end
 

app/views/admin/form_answers/index.html.slim

@@ -7,6 +7,7 @@ h1.admin-page-heading
     .col-md-4.col-sm-5.col-xs-12
       .applications-filter
         = f.label :query, "Search", class: "search-input__label"
+        = f.hint "By company name, reference number or category", class: "search-input__hint"
         .form-group.search-input
           = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }
           = f.input :query, label: false, input_html: { class: "form-control", type: "search", aria: { label: 'Search applications' }}

app/views/assessor/form_answers/index.html.slim

@@ -7,6 +7,7 @@ h1.admin-page-heading
     .col-md-4.col-sm-5.col-xs-12
       .applications-filter
         = f.label :query, "Search", class: "search-input__label"
+        = f.hint "By company name, reference number or category", class: "search-input__hint"
         .form-group.search-input
           = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }, id: "award_year", tabindex: "-1"
           = text_field_tag :award_type, params[:award_type], class: "visuallyhidden", aria: { hidden: true }, tabindex: "-1"

app/views/shared/form_answers/_admin_award_year.html.slim

@@ -0,0 +1,32 @@
+- current_year = AwardYear.current.year
+- selected_year = params[:year] ? params[:year].to_i : current_year
+- other_years = AwardYear.admin_switch.keys
+
+fieldset.award-year-z-index.applications-filter.award-year-radios
+  label.applications-filter__label
+    ' Award year
+  .input__award-years
+    input type="radio" id="current_year" name="year" value="#{current_year}" data-url="#{url_for(params.permit(:controller, :action).merge(year: current_year))}" checked=(current_year == params[:year].to_i || (namespace_name == :assessor && !params[:year]))
+    label for="current_year"
+      | Current year
+    input type="radio" id="all_years" name="year" value="all_years" data-url="#{url_for(params.permit(:controller, :action).merge(year: :all_years))}" checked=(params[:year].to_s == 'all_years' || (namespace_name == :admin && !params[:year]))
+    label for="all_years"
+      | All years
+    input type="radio" id="other" name="year" value="other" checked=(current_year != selected_year && other_years.include?(params[:year].to_i))
+    label for="other"
+      | Other
+
+    .dropdown.other-years-dropdown class="#{(current_year != selected_year && other_years.include?(params[:year].to_i) ? '' : 'hide')}"
+      a.dropdown-toggle.btn.btn-block.btn-default href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+        - current_year_text = params[:year].to_s == "all_years" || !params[:year] ? "All Years" : "#{selected_year - 1} - #{selected_year}"
+
+        = current_year_text
+        span.caret-container
+          span.caret
+      ul.dropdown-menu.dropdown-menu-right
+        li class="#{'active' if params[:year].to_s == 'all_years' || !params[:year]}"
+          = link_to "All Years", url_for(params.permit(:controller, :action).merge(year: :all_years))
+
+        - AwardYear.admin_switch.each do |year, label|
+          li class="#{'active' if label == current_year_text}"
+            = link_to label, url_for(params.permit(:controller, :action).merge(year: year))

app/views/shared/form_answers/_top_statuses_filters.html.slim

@@ -1,5 +1,6 @@
 .row
-  = render "layouts/vertical_admin_award_year"
+  = render "shared/form_answers/admin_award_year"
+.row
   .col-lg-4.col-md-5.col-sm-7.applications-filter.status-filter
     = f.simple_fields_for [:filters, @search.filters] do |g|
       = g.input :status,