List views now work

src/clj/youyesyet/routes/auto.clj

@@ -1,13 +1,13 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180614T175643.413Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180615T084444.957Z"
  (:require
+  [clojure.java.io :as io]
+  [compojure.core :refer [defroutes GET POST]]
+  [hugsql.core :as hugsql]
   [noir.response :as nresponse]
   [noir.util.route :as route]
-  [compojure.core :refer [defroutes GET POST]]
   [ring.util.http-response :as response]
-  [clojure.java.io :as io]
-  [hugsql.core :as hugsql]
   [youyesyet.layout :as l]
   [youyesyet.db.core :as db]
   [youyesyet.routes.manual :as m]))
@@ -38,7 +38,11 @@
    (resolve-template "list-electors-Electors.html")
    {:title "Electors",
     :params p,
-    :records (db/search-strings-elector p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-elector db/*db* p)
+     (db/list-electors db/*db* {}))})))
 
 (defn
  form-electors-Elector
@@ -58,7 +62,11 @@
    (resolve-template "list-genders-Genders.html")
    {:title "Genders",
     :params p,
-    :records (db/search-strings-gender p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-gender db/*db* p)
+     (db/list-genders db/*db* {}))})))
 
 (defn
  form-genders-Gender
@@ -78,7 +86,11 @@
    (resolve-template "list-dwellings-Dwellings.html")
    {:title "Dwellings",
     :params p,
-    :records (db/search-strings-dwelling p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-dwelling db/*db* p)
+     (db/list-dwellings db/*db* {}))})))
 
 (defn
  form-dwellings-Dwelling
@@ -98,7 +110,11 @@
    (resolve-template "list-addresses-Addresses.html")
    {:title "Addresses",
     :params p,
-    :records (db/search-strings-address p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-address db/*db* p)
+     (db/list-addresses db/*db* {}))})))
 
 (defn
  form-addresses-Address
@@ -116,7 +132,13 @@
   [p (:form-params r)]
   (l/render
    (resolve-template "list-visits-Visits.html")
-   {:title "Visits", :params p, :records (db/search-strings-visit p)})))
+   {:title "Visits",
+    :params p,
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-visit db/*db* p)
+     (db/list-visits db/*db* {}))})))
 
 (defn
  form-visits-Visit
@@ -136,7 +158,11 @@
    (resolve-template "list-authorities-Authorities.html")
    {:title "Authorities",
     :params p,
-    :records (db/search-strings-authority p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-authority db/*db* p)
+     (db/list-authorities db/*db* {}))})))
 
 (defn
  form-authorities-Authority
@@ -154,7 +180,13 @@
   [p (:form-params r)]
   (l/render
    (resolve-template "list-issues-Issues.html")
-   {:title "Issues", :params p, :records (db/search-strings-issue p)})))
+   {:title "Issues",
+    :params p,
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-issue db/*db* p)
+     (db/list-issues db/*db* {}))})))
 
 (defn
  form-issues-Issue
@@ -174,7 +206,11 @@
    (resolve-template "list-intentions-Intentions.html")
    {:title "Intentions",
     :params p,
-    :records (db/search-strings-intention p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-intention db/*db* p)
+     (db/list-intentions db/*db* {}))})))
 
 (defn
  form-intentions-Intention
@@ -194,7 +230,11 @@
    (resolve-template "list-canvassers-Canvassers.html")
    {:title "Canvassers",
     :params p,
-    :records (db/search-strings-canvasser p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-canvasser db/*db* p)
+     (db/list-canvassers db/*db* {}))})))
 
 (defn
  form-canvassers-Canvasser
@@ -214,7 +254,11 @@
    (resolve-template "list-followuprequests-Followuprequests.html")
    {:title "Followuprequests",
     :params p,
-    :records (db/search-strings-followuprequest p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-followuprequest db/*db* p)
+     (db/list-followuprequests db/*db* {}))})))
 
 (defn
  form-followuprequests-Followuprequest
@@ -234,7 +278,13 @@
   [p (:form-params r)]
   (l/render
    (resolve-template "list-roles-Roles.html")
-   {:title "Roles", :params p, :records (db/search-strings-role p)})))
+   {:title "Roles",
+    :params p,
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-role db/*db* p)
+     (db/list-roles db/*db* {}))})))
 
 (defn
  form-roles-Role
@@ -252,7 +302,13 @@
   [p (:form-params r)]
   (l/render
    (resolve-template "list-teams-Teams.html")
-   {:title "Teams", :params p, :records (db/search-strings-team p)})))
+   {:title "Teams",
+    :params p,
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-team db/*db* p)
+     (db/list-teams db/*db* {}))})))
 
 (defn
  form-teams-Team
@@ -272,7 +328,11 @@
    (resolve-template "list-districts-Districts.html")
    {:title "Districts",
     :params p,
-    :records (db/search-strings-district p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-district db/*db* p)
+     (db/list-districts db/*db* {}))})))
 
 (defn
  form-districts-District
@@ -292,7 +352,11 @@
    (resolve-template "list-followupactions-Followupactions.html")
    {:title "Followupactions",
     :params p,
-    :records (db/search-strings-followupaction p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-followupaction db/*db* p)
+     (db/list-followupactions db/*db* {}))})))
 
 (defn
  form-followupactions-Followupaction
@@ -314,7 +378,11 @@
    (resolve-template "list-options-Options.html")
    {:title "Options",
     :params p,
-    :records (db/search-strings-option p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-option db/*db* p)
+     (db/list-options db/*db* {}))})))
 
 (defn
  form-options-Option
@@ -334,7 +402,11 @@
    (resolve-template "list-followupmethods-Followupmethods.html")
    {:title "Followupmethods",
     :params p,
-    :records (db/search-strings-followupmethod p)})))
+    :records
+    (if
+     (not (empty? (remove nil? (vals p))))
+     (db/search-strings-followupmethod db/*db* p)
+     (db/list-followupmethods db/*db* {}))})))
 
 (defn
  form-followupmethods-Followupmethod

src/clj/youyesyet/routes/auto_json.clj

@@ -1,13 +1,13 @@
 (ns
  youyesyet.routes.auto-json
- "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180614T175642.456Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180615T084443.981Z"
  (:require
+  [clojure.java.io :as io]
+  [compojure.core :refer [defroutes GET POST]]
+  [hugsql.core :as hugsql]
   [noir.response :as nresponse]
   [noir.util.route :as route]
-  [compojure.core :refer [defroutes GET POST]]
   [ring.util.http-response :as response]
-  [clojure.java.io :as io]
-  [hugsql.core :as hugsql]
   [youyesyet.db.core :as db]))