#3467

- fix issue with date option check being cleared when checking facets item other than date

Author: temi

grails-app/views/home/_projectFinder.gsp

@@ -13,7 +13,7 @@
 <g:elseif test="${results?.hits?.total?:0 > 0}">
     <div class="row">
         <div id="facetsCol" class="bg-white" style="display:none;">
-            <g:set var="reqParams" value="query,sort,order,max,fq,fromDate,toDate"/>
+            <g:set var="reqParams" value="query,sort,order,max,fq,fromDate,toDate,isFilterByCompletedProjects"/>
             <div class="visible-phone pull-right" style="margin-top: 5px;">
                 <a href="#" id="toggleFacetDisplay" rel="facetsContent" role="button" class="btn btn-sm btn-inverse" style="color:white;">
                     <span>show</span> options&nbsp;

src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy

@@ -109,8 +109,22 @@ class ProjectExplorerSpec extends StubbedCasSpec {
             projects.size() == 1
         }
 
+        when: "We organisation facet is selected, date option selection should remain checked"
+        at ProjectExplorer
+        organisationFacet.click()
+        waitFor {
+            organisationFacetItems.displayed
+        }
+        organisationFacetItems[0].click()
+
+        then:
+        dateOption.value() == "true"
+
         when: "We clear dates"
         at ProjectExplorer
+        waitFor {
+            clearDatesBtn.displayed
+        }
         clearDatesBtn.click()
 
         then:

src/integration-test/groovy/pages/ProjectExplorer.groovy

@@ -63,6 +63,8 @@ class ProjectExplorer extends ReloadablePage {
         dateOption(required: false, wait: true) { $("#isFilterByCompletedProjectsOption", dynamic: true) }
         dateFacet(required: false) { $("#projectDates", dynamic: true) }
         clearDatesBtn(required: false) { $("#facet-dates .clearDates", dynamic: true) }
+        organisationFacet(required: false) { $("#organisationFacet", dynamic: true) }
+        organisationFacetItems(required: false) { $("#facet-organisationFacet > div > ul > li > a", dynamic: true) }
         inputText{ $("#keywords")}
 
         dashboardContent (required: false) {$("div#dashboard-content")}