From e5a5efb2e119bb57d8609410f489062f332e04d4 Mon Sep 17 00:00:00 2001
From: plutonik <plutonik@gmx.net>
Date: Wed, 22 Nov 2017 16:04:18 +0100
Subject: [PATCH] feat(search): Parameterize administrations filters #292

* create include for administrations filters
* delete hard coded filters from template
---
 modules/search.xqm                        | 91 +++++++++++++++++++++++
 pages/search/_filter-administrations.html | 14 ++++
 pages/search/search-result.html           | 48 +-----------
 3 files changed, 109 insertions(+), 44 deletions(-)
 create mode 100644 pages/search/_filter-administrations.html

diff --git a/modules/search.xqm b/modules/search.xqm
index 08c97f3a1..f9b3384dd 100644
--- a/modules/search.xqm
+++ b/modules/search.xqm
@@ -249,6 +249,97 @@ function search:select-volumes-link($node, $model, $q as xs:string?, $volume-id
         app:fix-this-link($link, $model)
 };
 
+(: ================= Administrations ================= :)
+
+(:~
+ : Generates HTML attributes "value" and "id"
+ : @return  HTML attributes
+~:)
+declare
+%templates:wrap
+function search:administration-input-attributes($node, $model) {
+    let $administration-id := $model?administration/id
+    return
+        (
+            attribute value { $administration-id },
+            attribute id { $administration-id }
+        )
+};
+
+(:~
+ : Generates an HTML <label> attribute "for" and adds a label text
+ : @return  HTML
+~:)
+declare
+%templates:wrap
+function search:administration-label($node, $model) {
+    let $administration-id := $model?administration/id
+    return
+        attribute for { $administration-id },
+        search:administration-label-string($node, $model)
+};
+
+(:~
+ : The string containing the administration title
+ : @return  String
+~:)
+declare
+%templates:replace
+function search:administration-label-string($node, $model) {
+    $model?administration/label/string()
+};
+
+(:~
+ : Load the administrations
+ :)
+declare function search:load-administrations ($node, $model) {
+    let $content := map { "administrations":
+        (
+            <administration>
+                <id>pre_truman</id>
+                <label>Pre-Truman Volumes</label>
+            </administration>,
+            <administration>
+                <id>truman</id>
+                <label>Truman Administration</label>
+            </administration>,
+            <administration>
+                <id>eisenhower</id>
+                <label>Eisenhower Administration</label>
+            </administration>,
+            <administration>
+                <id>kennedy</id>
+                <label>Kennedy Administration</label>
+            </administration>,
+            <administration>
+                <id>johnson</id>
+                <label>Johnson Administration</label>
+            </administration>,
+            <administration>
+                <id>nixon</id>
+                <label>Nixon Administration</label>
+            </administration>,
+            <administration>
+                <id>ford</id>
+                <label>Ford Administration</label>
+            </administration>,
+            <administration>
+                <id>carter</id>
+                <label>Carter Administration</label>
+            </administration>,
+            <administration>
+                <id>reagan</id>
+                <label>Reagan Administration</label>
+            </administration>
+        )
+    }
+    let $html := templates:process($node/*, map:new(($model, $content)))
+    return
+        $html
+};
+
+(: ================= SEARCH RESULTS ================= :)
+
 declare %private function search:filter-results($out, $in) {
 
     if (count($out) = $search:MAX_HITS_SHOWN or empty($in)) then
diff --git a/pages/search/_filter-administrations.html b/pages/search/_filter-administrations.html
new file mode 100644
index 000000000..dec6c4bae
--- /dev/null
+++ b/pages/search/_filter-administrations.html
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form method="get" action="$app/search" class="filter-form main-form" id="administrationsFilter">
+    <fieldset class="filter-sidebar" data-template="search:load-administrations">
+        <legend class="sr-only">Select Administrations</legend>
+        <ul class="hsg-search-inputs-vertical">
+            <li data-template="templates:each" data-template-from="administrations" data-template-to="administration">
+                <input class="hsg-search-input" type="checkbox" name="administration" data-template="search:administration-input-attributes"/>
+                <label class="hsg-search-input-label" data-template="search:administration-label">
+                    <span data-template="search:administration-label-string"/>
+                </label>
+            </li>
+        </ul>
+    </fieldset>
+</form>
diff --git a/pages/search/search-result.html b/pages/search/search-result.html
index 7fe8e65b9..4f7ea2f18 100644
--- a/pages/search/search-result.html
+++ b/pages/search/search-result.html
@@ -34,51 +34,11 @@ <h3 class="hsg-sidebar-title">Sections</h3>
                 </fieldset>
             </div>
 
-            <!-- filter administrations -->
             <form method="get" action="?" class="filter-form" id="formFilters">
-                <div>
-                    <fieldset class="filter-sidebar">
-                        <legend class="hsg-sidebar-title">Administrations</legend>
-                        <div class="hsg-search-inputs-vertical">
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="pre_truman"/>
-                                Pre-Truman Volumes
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="truman"/>
-                                Truman Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="eisenhower"/>
-                                Eisenhower Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="kennedy"/>
-                                Kennedy Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="johnson"/>
-                                Johnson Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="nixon"/>
-                                Nixon Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="ford"/>
-                                Ford Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="carter"/>
-                                Carter Administration
-                            </label>
-                            <label class="hsg-search-input-label">
-                                <input type="checkbox" name="administration" value="reagan"/>
-                                Reagan Administration
-                            </label>
-                        </div>
-                    </fieldset>
-                </div>
+
+            <!-- filter administrations -->
+            <h3 class="hsg-sidebar-title">Administrations</h3>
+            <div data-template="templates:include" data-template-path="pages/search/_filter-administrations.html"/>
 
                 <!-- filter volumes -->
                 <div>