From 88468461fdc56b2b87823cbf8d11fdcb715bf6aa Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Fri, 29 Jun 2018 11:11:50 +0100 Subject: [PATCH] Massive progress, following sorting the data import problem --- env/dev/clj/youyesyet/dev_middleware.clj | 15 +- env/dev/clj/youyesyet/env.clj | 6 +- resources/sql/queries.auto.sql | 156 +++++++++--------- resources/sql/youyesyet.postgres.sql | 2 +- .../templates/auto/application-index.html | 2 +- .../auto/form-addresses-Address.html | 14 +- .../auto/form-authorities-Authority.html | 4 +- .../auto/form-canvassers-Canvasser.html | 14 +- .../auto/form-districts-District.html | 6 +- .../auto/form-dwellings-Dwelling.html | 6 +- .../templates/auto/form-electors-Elector.html | 10 +- .../form-followupactions-Followupaction.html | 10 +- .../form-followupmethods-Followupmethod.html | 4 +- ...form-followuprequests-Followuprequest.html | 4 +- .../templates/auto/form-genders-Gender.html | 4 +- .../auto/form-intentions-Intention.html | 2 +- .../templates/auto/form-issues-Issue.html | 8 +- .../templates/auto/form-options-Option.html | 4 +- resources/templates/auto/form-roles-Role.html | 6 +- resources/templates/auto/form-teams-Team.html | 10 +- .../templates/auto/form-visits-Visit.html | 6 +- .../auto/list-addresses-Addresses.html | 2 +- .../auto/list-authorities-Authorities.html | 2 +- .../auto/list-canvassers-Canvassers.html | 2 +- .../auto/list-districts-Districts.html | 2 +- .../auto/list-dwellings-Dwellings.html | 2 +- .../auto/list-electors-Electors.html | 2 +- .../list-followupactions-Followupactions.html | 2 +- .../list-followupmethods-Followupmethods.html | 2 +- ...ist-followuprequests-Followuprequests.html | 2 +- .../templates/auto/list-genders-Genders.html | 2 +- .../auto/list-intentions-Intentions.html | 2 +- .../templates/auto/list-issues-Issues.html | 2 +- .../templates/auto/list-options-Options.html | 2 +- .../templates/auto/list-roles-Roles.html | 2 +- .../templates/auto/list-teams-Teams.html | 2 +- .../templates/auto/list-visits-Visits.html | 2 +- src/clj/youyesyet/handler.clj | 3 +- src/clj/youyesyet/routes/auto.clj | 100 ++++------- src/clj/youyesyet/routes/auto_json.clj | 2 +- 40 files changed, 201 insertions(+), 229 deletions(-) diff --git a/env/dev/clj/youyesyet/dev_middleware.clj b/env/dev/clj/youyesyet/dev_middleware.clj index d64d5d5..e3881c8 100644 --- a/env/dev/clj/youyesyet/dev_middleware.clj +++ b/env/dev/clj/youyesyet/dev_middleware.clj @@ -1,10 +1,13 @@ (ns youyesyet.dev-middleware - (:require [ring.middleware.reload :refer [wrap-reload]] + (:require +;; [ring.middleware.reload :refer [wrap-reload]] [selmer.middleware :refer [wrap-error-page]] - [prone.middleware :refer [wrap-exceptions]])) + [prone.middleware :refer [wrap-exceptions]] + )) (defn wrap-dev [handler] - (-> handler - wrap-reload - wrap-error-page - wrap-exceptions)) + (-> handler +;; wrap-reload + wrap-error-page + wrap-exceptions + )) diff --git a/env/dev/clj/youyesyet/env.clj b/env/dev/clj/youyesyet/env.clj index 87bfa55..ef35fd0 100644 --- a/env/dev/clj/youyesyet/env.clj +++ b/env/dev/clj/youyesyet/env.clj @@ -1,7 +1,8 @@ (ns youyesyet.env (:require [selmer.parser :as parser] [clojure.tools.logging :as log] - [youyesyet.dev-middleware :refer [wrap-dev]])) + [youyesyet.dev-middleware :refer [wrap-dev]] + )) (def defaults {:init @@ -11,4 +12,5 @@ :stop (fn [] (log/info "\n-=[youyesyet has shut down successfully]=-")) - :middleware wrap-dev}) + :middleware wrap-dev + }) diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql index 9de72ba..0f482c4 100644 --- a/resources/sql/queries.auto.sql +++ b/resources/sql/queries.auto.sql @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- File queries.sql -- --- autogenerated by adl.to-hugsql-queries at 2018-06-19T18:51:50.013Z +-- autogenerated by adl.to-hugsql-queries at 2018-06-29T10:10:58.177Z -- -- See [Application Description -- Language](https://github.com/simon-brooke/adl). @@ -728,15 +728,15 @@ ORDER BY lv_visits.address_id, -- :name search-strings-address :? :1 -- :doc selects existing address records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_addresses -WHERE -address LIKE '%params.address%' - OR postcode = params.postcode - OR phone LIKE '%params.phone%' - OR district_id = params.district_id - OR latitude = params.latitude - OR longitude = params.longitude - OR locality = params.locality - OR id = params.id +WHERE false + --~ (if (:address params) "OR address LIKE '%:address%'") + --~ (if (:postcode params) "OR postcode LIKE '%:postcode%'") + --~ (if (:phone params) "OR phone LIKE '%:phone%'") + --~ (if (:district_id params) "OR district_id = :district_id") + --~ (if (:latitude params) "OR latitude = :latitude") + --~ (if (:longitude params) "OR longitude = :longitude") + --~ (if (:locality params) "OR locality = :locality") + --~ (if (:id params) "OR id = :id") ORDER BY lv_addresses.address, lv_addresses.postcode, lv_addresses.id @@ -746,24 +746,24 @@ ORDER BY lv_addresses.address, -- :name search-strings-authority :? :1 -- :doc selects existing authority records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_authorities -WHERE -id LIKE '%params.id%' +WHERE false + --~ (if (:id params) "OR id LIKE '%:id%'") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-canvasser :? :1 -- :doc selects existing canvasser records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_canvassers -WHERE -username LIKE '%params.username%' - OR fullname LIKE '%params.fullname%' - OR elector_id = params.elector_id - OR address_id = params.address_id - OR phone LIKE '%params.phone%' - OR email LIKE '%params.email%' - OR authority_id = params.authority_id - OR authorised = params.authorised - OR id = params.id +WHERE false + --~ (if (:username params) "OR username LIKE '%:username%'") + --~ (if (:fullname params) "OR fullname LIKE '%:fullname%'") + --~ (if (:elector_id params) "OR elector_id = :elector_id") + --~ (if (:address_id params) "OR address_id = :address_id") + --~ (if (:phone params) "OR phone LIKE '%:phone%'") + --~ (if (:email params) "OR email LIKE '%:email%'") + --~ (if (:authority_id params) "OR authority_id = :authority_id") + --~ (if (:authorised params) "OR authorised = :authorised") + --~ (if (:id params) "OR id = :id") ORDER BY lv_canvassers.username, lv_canvassers.fullname, lv_canvassers.email, @@ -774,9 +774,9 @@ ORDER BY lv_canvassers.username, -- :name search-strings-district :? :1 -- :doc selects existing district records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_districts -WHERE -name LIKE '%params.name%' - OR id = params.id +WHERE false + --~ (if (:name params) "OR name LIKE '%:name%'") + --~ (if (:id params) "OR id = :id") ORDER BY lv_districts.name, lv_districts.id --~ (if (:offset params) "OFFSET :offset ") @@ -785,10 +785,10 @@ ORDER BY lv_districts.name, -- :name search-strings-dwelling :? :1 -- :doc selects existing dwelling records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_dwellings -WHERE -address_id = params.address_id - OR sub_address LIKE '%params.sub-address%' - OR id = params.id +WHERE false + --~ (if (:address_id params) "OR address_id = :address_id") + --~ (if (:sub-address params) "OR sub_address LIKE '%:sub-address%'") + --~ (if (:id params) "OR id = :id") ORDER BY lv_dwellings.address_id, lv_dwellings.sub_address, lv_dwellings.id @@ -798,13 +798,13 @@ ORDER BY lv_dwellings.address_id, -- :name search-strings-elector :? :1 -- :doc selects existing elector records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_electors -WHERE -name LIKE '%params.name%' - OR dwelling_id = params.dwelling_id - OR phone LIKE '%params.phone%' - OR email LIKE '%params.email%' - OR gender = params.gender - OR id = params.id +WHERE false + --~ (if (:name params) "OR name LIKE '%:name%'") + --~ (if (:dwelling_id params) "OR dwelling_id = :dwelling_id") + --~ (if (:phone params) "OR phone LIKE '%:phone%'") + --~ (if (:email params) "OR email LIKE '%:email%'") + --~ (if (:gender params) "OR gender = :gender") + --~ (if (:id params) "OR id = :id") ORDER BY lv_electors.name, lv_electors.phone, lv_electors.email, @@ -816,13 +816,13 @@ ORDER BY lv_electors.name, -- :name search-strings-followupaction :? :1 -- :doc selects existing followupaction records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_followupactions -WHERE -request_id = params.request_id - OR actor = params.actor - OR date = 'params.date' - OR notes LIKE '%params.notes%' - OR closed = params.closed - OR id = params.id +WHERE false + --~ (if (:request_id params) "OR request_id = :request_id") + --~ (if (:actor params) "OR actor = :actor") + --~ (if (:date params) "OR date = ':date'") + --~ (if (:notes params) "OR notes LIKE '%:notes%'") + --~ (if (:closed params) "OR closed = :closed") + --~ (if (:id params) "OR id = :id") ORDER BY lv_followupactions.date, lv_followupactions.notes, lv_followupactions.id @@ -832,20 +832,20 @@ ORDER BY lv_followupactions.date, -- :name search-strings-followupmethod :? :1 -- :doc selects existing followupmethod records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_followupmethods -WHERE -id LIKE '%params.id%' +WHERE false + --~ (if (:id params) "OR id LIKE '%:id%'") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-followuprequest :? :1 -- :doc selects existing followuprequest records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_followuprequests -WHERE -elector_id = params.elector_id - OR visit_id = params.visit_id - OR issue_id = params.issue_id - OR method_id = params.method_id - OR id = params.id +WHERE false + --~ (if (:elector_id params) "OR elector_id = :elector_id") + --~ (if (:visit_id params) "OR visit_id = :visit_id") + --~ (if (:issue_id params) "OR issue_id = :issue_id") + --~ (if (:method_id params) "OR method_id = :method_id") + --~ (if (:id params) "OR id = :id") ORDER BY lv_followuprequests.elector_id, lv_followuprequests.visit_id, lv_followuprequests.issue_id, @@ -856,46 +856,46 @@ ORDER BY lv_followuprequests.elector_id, -- :name search-strings-gender :? :1 -- :doc selects existing gender records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_genders -WHERE -id LIKE '%params.id%' +WHERE false + --~ (if (:id params) "OR id LIKE '%:id%'") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-intention :? :1 -- :doc selects existing intention records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_intentions -WHERE -visit_id = params.visit_id - OR elector_id = params.elector_id - OR option_id = params.option_id - OR Id = params.Id +WHERE false + --~ (if (:visit_id params) "OR visit_id = :visit_id") + --~ (if (:elector_id params) "OR elector_id = :elector_id") + --~ (if (:option_id params) "OR option_id = :option_id") + --~ (if (:Id params) "OR Id = :Id") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-issue :? :1 -- :doc selects existing issue records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_issues -WHERE -url LIKE '%params.url%' - OR current = params.current - OR id LIKE '%params.id%' +WHERE false + --~ (if (:url params) "OR url LIKE '%:url%'") + --~ (if (:current params) "OR current = :current") + --~ (if (:id params) "OR id LIKE '%:id%'") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-option :? :1 -- :doc selects existing option records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_options -WHERE -id LIKE '%params.id%' +WHERE false + --~ (if (:id params) "OR id LIKE '%:id%'") --~ (if (:offset params) "OFFSET :offset ") --~ (if (:limit params) "LIMIT :limit" "LIMIT 100") -- :name search-strings-role :? :1 -- :doc selects existing role records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_roles -WHERE -name LIKE '%params.name%' - OR id = params.id +WHERE false + --~ (if (:name params) "OR name LIKE '%:name%'") + --~ (if (:id params) "OR id = :id") ORDER BY lv_roles.name, lv_roles.id --~ (if (:offset params) "OFFSET :offset ") @@ -904,12 +904,12 @@ ORDER BY lv_roles.name, -- :name search-strings-team :? :1 -- :doc selects existing team records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_teams -WHERE -name LIKE '%params.name%' - OR district_id = params.district_id - OR latitude = params.latitude - OR longitude = params.longitude - OR id = params.id +WHERE false + --~ (if (:name params) "OR name LIKE '%:name%'") + --~ (if (:district_id params) "OR district_id = :district_id") + --~ (if (:latitude params) "OR latitude = :latitude") + --~ (if (:longitude params) "OR longitude = :longitude") + --~ (if (:id params) "OR id = :id") ORDER BY lv_teams.name, lv_teams.id --~ (if (:offset params) "OFFSET :offset ") @@ -918,11 +918,11 @@ ORDER BY lv_teams.name, -- :name search-strings-visit :? :1 -- :doc selects existing visit records having any string field matching the parameter of the same name by substring match SELECT * FROM lv_visits -WHERE -address_id = params.address_id - OR canvasser_id = params.canvasser_id - OR date = 'params.date' - OR id = params.id +WHERE false + --~ (if (:address_id params) "OR address_id = :address_id") + --~ (if (:canvasser_id params) "OR canvasser_id = :canvasser_id") + --~ (if (:date params) "OR date = ':date'") + --~ (if (:id params) "OR id = :id") ORDER BY lv_visits.address_id, lv_visits.date, lv_visits.id diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql index 6ca584c..1bc4b7d 100644 --- a/resources/sql/youyesyet.postgres.sql +++ b/resources/sql/youyesyet.postgres.sql @@ -5,7 +5,7 @@ -- -- auto-generated by [Application Description Language framework] -- --- (https://github.com/simon-brooke/adl) at 20180619T185151.055Z +-- (https://github.com/simon-brooke/adl) at 20180629T101059.126Z -- -- -- A web-app intended to be used by canvassers campaigning for a diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html index b1c7666..1edf694 100644 --- a/resources/templates/auto/application-index.html +++ b/resources/templates/auto/application-index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html index ac19037..a6d8011 100644 --- a/resources/templates/auto/form-addresses-Address.html +++ b/resources/templates/auto/form-addresses-Address.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of addresses address {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -65,7 +65,7 @@ You are not permitted to view address of addresses postcode {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -83,7 +83,7 @@ You are not permitted to view postcode of addresses phone {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -124,7 +124,7 @@ You are not permitted to view district_id of addresses latitude {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -142,7 +142,7 @@ You are not permitted to view latitude of addresses longitude {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html index ba66240..6b4756b 100644 --- a/resources/templates/auto/form-authorities-Authority.html +++ b/resources/templates/auto/form-authorities-Authority.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-canvassers-Canvasser.html b/resources/templates/auto/form-canvassers-Canvasser.html index 8ca174a..baa9afa 100644 --- a/resources/templates/auto/form-canvassers-Canvasser.html +++ b/resources/templates/auto/form-canvassers-Canvasser.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of canvassers username {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -65,7 +65,7 @@ You are not permitted to view username of canvassers fullname {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -129,7 +129,7 @@ You are not permitted to view address_id of canvassers phone {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -147,7 +147,7 @@ You are not permitted to view phone of canvassers email {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -188,7 +188,7 @@ You are not permitted to view authority_id of canvassers authorised {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html index 7ca8ef3..75a5ca2 100644 --- a/resources/templates/auto/form-districts-District.html +++ b/resources/templates/auto/form-districts-District.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin admin %} - + {% else %} {% ifmemberof public admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of districts name {% ifmemberof admin admin %} - + {% else %} {% ifmemberof public admin canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-dwellings-Dwelling.html b/resources/templates/auto/form-dwellings-Dwelling.html index 4df6725..9fce23f 100644 --- a/resources/templates/auto/form-dwellings-Dwelling.html +++ b/resources/templates/auto/form-dwellings-Dwelling.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -70,7 +70,7 @@ You are not permitted to view address_id of dwellings sub-address {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html index 6ebac98..63c2281 100644 --- a/resources/templates/auto/form-electors-Elector.html +++ b/resources/templates/auto/form-electors-Elector.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of electors name {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -88,7 +88,7 @@ You are not permitted to view dwelling_id of electors phone {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -106,7 +106,7 @@ You are not permitted to view phone of electors email {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html index 1e41b25..5e2c3a2 100644 --- a/resources/templates/auto/form-followupactions-Followupaction.html +++ b/resources/templates/auto/form-followupactions-Followupaction.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof issueexperts canvassers analysts issueeditors admin %} @@ -93,7 +93,7 @@ You are not permitted to view actor of followupactions date {% ifmemberof admin %} - + {% else %} {% ifmemberof issueexperts canvassers analysts issueeditors admin %} @@ -111,7 +111,7 @@ You are not permitted to view date of followupactions notes {% ifmemberof admin %} - + {% else %} {% ifmemberof issueexperts canvassers analysts issueeditors admin %} @@ -129,7 +129,7 @@ You are not permitted to view notes of followupactions closed {% ifmemberof admin %} - + {% else %} {% ifmemberof issueexperts canvassers analysts issueeditors admin %} diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html index 7e2eb2e..990d86a 100644 --- a/resources/templates/auto/form-followupmethods-Followupmethod.html +++ b/resources/templates/auto/form-followupmethods-Followupmethod.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-followuprequests-Followuprequest.html b/resources/templates/auto/form-followuprequests-Followuprequest.html index 0edcbf9..e728eaa 100644 --- a/resources/templates/auto/form-followuprequests-Followuprequest.html +++ b/resources/templates/auto/form-followuprequests-Followuprequest.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html index 7113f50..75f2d8c 100644 --- a/resources/templates/auto/form-genders-Gender.html +++ b/resources/templates/auto/form-genders-Gender.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-intentions-Intention.html b/resources/templates/auto/form-intentions-Intention.html index 084901d..5092d37 100644 --- a/resources/templates/auto/form-intentions-Intention.html +++ b/resources/templates/auto/form-intentions-Intention.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html index 682ea18..2b84f42 100644 --- a/resources/templates/auto/form-issues-Issue.html +++ b/resources/templates/auto/form-issues-Issue.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof issueeditors admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of issues url {% ifmemberof issueeditors admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -65,7 +65,7 @@ You are not permitted to view url of issues current {% ifmemberof issueeditors admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html index 90bc5ad..f59aa32 100644 --- a/resources/templates/auto/form-options-Option.html +++ b/resources/templates/auto/form-options-Option.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-roles-Role.html b/resources/templates/auto/form-roles-Role.html index 2a8b4d8..5f71430 100644 --- a/resources/templates/auto/form-roles-Role.html +++ b/resources/templates/auto/form-roles-Role.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of roles name {% ifmemberof admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html index af9e574..0a0d09d 100644 --- a/resources/templates/auto/form-teams-Team.html +++ b/resources/templates/auto/form-teams-Team.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -47,7 +47,7 @@ You are not permitted to view id of teams name {% ifmemberof teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -88,7 +88,7 @@ You are not permitted to view district_id of teams latitude {% ifmemberof teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -152,7 +152,7 @@ You are not permitted to view organisers of teams longitude {% ifmemberof teamorganisers admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html index 1804624..e07cca1 100644 --- a/resources/templates/auto/form-visits-Visit.html +++ b/resources/templates/auto/form-visits-Visit.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} @@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).--> id {% ifmemberof admin admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers issueexperts analysts issueeditors admin %} @@ -93,7 +93,7 @@ You are not permitted to view canvasser_id of visits date {% ifmemberof admin admin %} - + {% else %} {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers issueexperts analysts issueeditors admin %} diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html index 2d6d337..829be5b 100644 --- a/resources/templates/auto/list-addresses-Addresses.html +++ b/resources/templates/auto/list-addresses-Addresses.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html index 3271ca8..d20fe9d 100644 --- a/resources/templates/auto/list-authorities-Authorities.html +++ b/resources/templates/auto/list-authorities-Authorities.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-canvassers-Canvassers.html b/resources/templates/auto/list-canvassers-Canvassers.html index 01549e9..c9719e0 100644 --- a/resources/templates/auto/list-canvassers-Canvassers.html +++ b/resources/templates/auto/list-canvassers-Canvassers.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html index e25f1f2..982e2d4 100644 --- a/resources/templates/auto/list-districts-Districts.html +++ b/resources/templates/auto/list-districts-Districts.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-dwellings-Dwellings.html b/resources/templates/auto/list-dwellings-Dwellings.html index aad96d1..4d633ca 100644 --- a/resources/templates/auto/list-dwellings-Dwellings.html +++ b/resources/templates/auto/list-dwellings-Dwellings.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-electors-Electors.html b/resources/templates/auto/list-electors-Electors.html index 0c4ebb3..383fce7 100644 --- a/resources/templates/auto/list-electors-Electors.html +++ b/resources/templates/auto/list-electors-Electors.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-followupactions-Followupactions.html b/resources/templates/auto/list-followupactions-Followupactions.html index bba3be3..26697ec 100644 --- a/resources/templates/auto/list-followupactions-Followupactions.html +++ b/resources/templates/auto/list-followupactions-Followupactions.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html index 3949d0b..74c7b37 100644 --- a/resources/templates/auto/list-followupmethods-Followupmethods.html +++ b/resources/templates/auto/list-followupmethods-Followupmethods.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-followuprequests-Followuprequests.html b/resources/templates/auto/list-followuprequests-Followuprequests.html index 4889980..55a4b48 100644 --- a/resources/templates/auto/list-followuprequests-Followuprequests.html +++ b/resources/templates/auto/list-followuprequests-Followuprequests.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html index ebc8cf6..8ce6cc1 100644 --- a/resources/templates/auto/list-genders-Genders.html +++ b/resources/templates/auto/list-genders-Genders.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-intentions-Intentions.html b/resources/templates/auto/list-intentions-Intentions.html index fb8d0d6..c90c0c9 100644 --- a/resources/templates/auto/list-intentions-Intentions.html +++ b/resources/templates/auto/list-intentions-Intentions.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html index ccab390..622cbae 100644 --- a/resources/templates/auto/list-issues-Issues.html +++ b/resources/templates/auto/list-issues-Issues.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-options-Options.html b/resources/templates/auto/list-options-Options.html index ed3dac1..bb735be 100644 --- a/resources/templates/auto/list-options-Options.html +++ b/resources/templates/auto/list-options-Options.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-roles-Roles.html b/resources/templates/auto/list-roles-Roles.html index abe6b54..76cdc21 100644 --- a/resources/templates/auto/list-roles-Roles.html +++ b/resources/templates/auto/list-roles-Roles.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-teams-Teams.html b/resources/templates/auto/list-teams-Teams.html index 64a7f4a..613cff7 100644 --- a/resources/templates/auto/list-teams-Teams.html +++ b/resources/templates/auto/list-teams-Teams.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/resources/templates/auto/list-visits-Visits.html b/resources/templates/auto/list-visits-Visits.html index 9101021..f37ba72 100644 --- a/resources/templates/auto/list-visits-Visits.html +++ b/resources/templates/auto/list-visits-Visits.html @@ -1,5 +1,5 @@ {% extends "base.html" %} - {% block head %} diff --git a/src/clj/youyesyet/handler.clj b/src/clj/youyesyet/handler.clj index 909dea4..8361e69 100644 --- a/src/clj/youyesyet/handler.clj +++ b/src/clj/youyesyet/handler.clj @@ -81,5 +81,4 @@ :title "page not found"}))))) -(def app #'app-routes) -;; (middleware/wrap-base #'app-routes)) +(def app (middleware/wrap-base #'app-routes)) diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj index e881916..50f81f8 100644 --- a/src/clj/youyesyet/routes/auto.clj +++ b/src/clj/youyesyet/routes/auto.clj @@ -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", diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj index 42ea3a3..81a300d 100644 --- a/src/clj/youyesyet/routes/auto_json.clj +++ b/src/clj/youyesyet/routes/auto_json.clj @@ -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]