Massive progress, following sorting the data import problem

This commit is contained in:
Simon Brooke 2018-06-29 11:11:50 +01:00
parent acfaf985fa
commit 88468461fd
40 changed files with 201 additions and 229 deletions

View file

@ -81,5 +81,4 @@
:title "page not found"})))))
(def app #'app-routes)
;; (middleware/wrap-base #'app-routes))
(def app (middleware/wrap-base #'app-routes))

View file

@ -1,6 +1,6 @@
(ns
youyesyet.routes.auto
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180619T185151.309Z"
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T101059.328Z"
(:require
[adl-support.core :as support]
[clojure.java.io :as io]
@ -14,7 +14,7 @@
[youyesyet.routes.manual :as m]))
(defn
admin
index
[r]
(l/render
(support/resolve-template "application-index.html")
@ -24,8 +24,7 @@
list-addresses-Addresses
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-addresses-Addresses.html")
{:title "Addresses",
@ -40,8 +39,7 @@
form-addresses-Address
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-addresses-Address.html")
{:title "Address",
@ -54,8 +52,7 @@
list-authorities-Authorities
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-authorities-Authorities.html")
{:title "Authorities",
@ -70,8 +67,7 @@
form-authorities-Authority
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-authorities-Authority.html")
{:title "Authority",
@ -86,8 +82,7 @@
list-canvassers-Canvassers
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-canvassers-Canvassers.html")
{:title "Canvassers",
@ -102,8 +97,7 @@
form-canvassers-Canvasser
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-canvassers-Canvasser.html")
{:title "Canvasser",
@ -121,8 +115,7 @@
list-districts-Districts
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-districts-Districts.html")
{:title "Districts",
@ -137,8 +130,7 @@
form-districts-District
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-districts-District.html")
{:title "District",
@ -153,8 +145,7 @@
list-dwellings-Dwellings
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-dwellings-Dwellings.html")
{:title "Dwellings",
@ -169,8 +160,7 @@
form-dwellings-Dwelling
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-dwellings-Dwelling.html")
{:title "Dwelling",
@ -186,8 +176,7 @@
list-electors-Electors
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-electors-Electors.html")
{:title "Electors",
@ -202,8 +191,7 @@
form-electors-Elector
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-electors-Elector.html")
{:title "Elector",
@ -217,8 +205,7 @@
list-followupactions-Followupactions
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"list-followupactions-Followupactions.html")
@ -234,8 +221,7 @@
form-followupactions-Followupaction
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"form-followupactions-Followupaction.html")
@ -253,8 +239,7 @@
list-followupmethods-Followupmethods
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"list-followupmethods-Followupmethods.html")
@ -270,8 +255,7 @@
form-followupmethods-Followupmethod
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"form-followupmethods-Followupmethod.html")
@ -287,8 +271,7 @@
list-followuprequests-Followuprequests
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"list-followuprequests-Followuprequests.html")
@ -304,8 +287,7 @@
form-followuprequests-Followuprequest
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template
"form-followuprequests-Followuprequest.html")
@ -325,8 +307,7 @@
list-genders-Genders
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-genders-Genders.html")
{:title "Genders",
@ -341,8 +322,7 @@
form-genders-Gender
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-genders-Gender.html")
{:title "Gender",
@ -357,8 +337,7 @@
list-intentions-Intentions
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-intentions-Intentions.html")
{:title "Intentions",
@ -373,8 +352,7 @@
form-intentions-Intention
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-intentions-Intention.html")
{:title "Intention",
@ -392,8 +370,7 @@
list-issues-Issues
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-issues-Issues.html")
{:title "Issues",
@ -408,8 +385,7 @@
form-issues-Issue
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-issues-Issue.html")
{:title "Issue",
@ -421,8 +397,7 @@
list-options-Options
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-options-Options.html")
{:title "Options",
@ -437,8 +412,7 @@
form-options-Option
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-options-Option.html")
{:title "Option",
@ -453,8 +427,7 @@
list-roles-Roles
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-roles-Roles.html")
{:title "Roles",
@ -469,8 +442,7 @@
form-roles-Role
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-roles-Role.html")
{:title "Role",
@ -482,8 +454,7 @@
list-teams-Teams
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-teams-Teams.html")
{:title "Teams",
@ -498,8 +469,7 @@
form-teams-Team
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-teams-Team.html")
{:title "Team",
@ -512,8 +482,7 @@
list-visits-Visits
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "list-visits-Visits.html")
{:title "Visits",
@ -528,8 +497,7 @@
form-visits-Visit
[r]
(let
[p
(merge (support/query-string-to-map (:query-string r)) (:params r))]
[p (support/massage-params (:params r))]
(l/render
(support/resolve-template "form-visits-Visit.html")
{:title "Visit",

View file

@ -1,6 +1,6 @@
(ns
youyesyet.routes.auto-json
"JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180619T185150.149Z"
"JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T101058.294Z"
(:require
[adl-support.core :as support]
[clojure.java.io :as io]