Much UI work, significant improvement.
This commit is contained in:
parent
9c3af4c936
commit
5356f65ca3
44 changed files with 1865 additions and 1213 deletions
|
|
@ -1,7 +1,7 @@
|
|||
------------------------------------------------------------------------
|
||||
-- File queries.sql
|
||||
--
|
||||
-- autogenerated by adl.to-hugsql-queries at 2018-07-09T20:55:32.719Z
|
||||
-- autogenerated by adl.to-hugsql-queries at 2018-07-10T15:25:22.228Z
|
||||
--
|
||||
-- See [Application Description
|
||||
-- Language](https://github.com/simon-brooke/adl).
|
||||
|
|
@ -343,9 +343,6 @@ ORDER BY dwellings.address_id,
|
|||
SELECT * FROM electors
|
||||
WHERE electors.id = :id
|
||||
ORDER BY electors.name,
|
||||
electors.phone,
|
||||
electors.email,
|
||||
electors.gender,
|
||||
electors.id
|
||||
|
||||
-- :name get-event :? :1
|
||||
|
|
@ -561,9 +558,6 @@ ORDER BY lv_dwellings.address_id,
|
|||
-- :doc lists all existing elector records
|
||||
SELECT DISTINCT * FROM lv_electors
|
||||
ORDER BY lv_electors.name,
|
||||
lv_electors.phone,
|
||||
lv_electors.email,
|
||||
lv_electors.gender,
|
||||
lv_electors.id
|
||||
--~ (if (:offset params) "OFFSET :offset ")
|
||||
--~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
|
||||
|
|
@ -575,9 +569,6 @@ FROM lv_electors, electors
|
|||
WHERE lv_electors.id = electors.id
|
||||
AND electors.dwelling_id = :id
|
||||
ORDER BY lv_electors.name,
|
||||
lv_electors.phone,
|
||||
lv_electors.email,
|
||||
lv_electors.gender,
|
||||
lv_electors.id
|
||||
|
||||
-- :name list-electors-by-gender :? :*
|
||||
|
|
@ -587,9 +578,6 @@ FROM lv_electors, electors
|
|||
WHERE lv_electors.id = electors.id
|
||||
AND electors.gender = :id
|
||||
ORDER BY lv_electors.name,
|
||||
lv_electors.phone,
|
||||
lv_electors.email,
|
||||
lv_electors.gender,
|
||||
lv_electors.id
|
||||
|
||||
-- :name list-events :? :*
|
||||
|
|
@ -916,9 +904,6 @@ WHERE false
|
|||
--~ (if (:gender params) "OR gender LIKE '%:gender%'")
|
||||
--~ (if (:id params) "OR id = :id")
|
||||
ORDER BY lv_electors.name,
|
||||
lv_electors.phone,
|
||||
lv_electors.email,
|
||||
lv_electors.gender,
|
||||
lv_electors.id
|
||||
--~ (if (:offset params) "OFFSET :offset ")
|
||||
--~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
--
|
||||
-- auto-generated by [Application Description Language framework]
|
||||
--
|
||||
-- (https://github.com/simon-brooke/adl) at 20180709T205533.789Z
|
||||
-- (https://github.com/simon-brooke/adl) at 20180710T152523.324Z
|
||||
--
|
||||
-- A web-app intended to be used by canvassers
|
||||
-- campaigning for a 'Yes' vote in the second independence
|
||||
|
|
@ -281,6 +281,9 @@ GRANT DELETE ON followupactions TO admin ;
|
|||
|
||||
------------------------------------------------------------------------
|
||||
-- primary table followupmethods for entity followupmethods
|
||||
--
|
||||
-- Methods which may be used to follow up a followup request. Reference
|
||||
-- data.
|
||||
------------------------------------------------------------------------
|
||||
CREATE TABLE followupmethods
|
||||
(
|
||||
|
|
@ -318,8 +321,8 @@ GRANT SELECT ON followuprequests TO admin,
|
|||
teamorganisers ;
|
||||
GRANT INSERT ON followuprequests TO admin,
|
||||
canvassers ;
|
||||
GRANT UPDATE ON followuprequests TO admin ;
|
||||
GRANT DELETE ON followuprequests TO admin ;
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------
|
||||
-- primary table genders for entity genders
|
||||
|
|
@ -360,8 +363,8 @@ GRANT SELECT ON intentions TO admin,
|
|||
canvassers ;
|
||||
GRANT INSERT ON intentions TO admin,
|
||||
canvassers ;
|
||||
GRANT UPDATE ON intentions TO admin ;
|
||||
GRANT DELETE ON intentions TO admin ;
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------
|
||||
-- primary table issues for entity issues
|
||||
|
|
@ -530,7 +533,7 @@ SELECT canvassers.username,
|
|||
canvassers.fullname,
|
||||
canvassers.avatar,
|
||||
canvassers.bio,
|
||||
electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
|
||||
electors.name AS elector_id_expanded,
|
||||
canvassers.elector_id,
|
||||
addresses.address ||', '|| addresses.postcode AS address_id_expanded,
|
||||
canvassers.address_id,
|
||||
|
|
@ -540,7 +543,7 @@ SELECT canvassers.username,
|
|||
canvassers.authority_id,
|
||||
canvassers.authorised,
|
||||
canvassers.id
|
||||
FROM canvassers, authorities, addresses, genders, electors
|
||||
FROM canvassers, authorities, addresses, electors
|
||||
WHERE canvassers.elector_id = electors.id
|
||||
AND canvassers.address_id = addresses.id
|
||||
AND canvassers.authority_id = authorities.id
|
||||
|
|
@ -633,7 +636,7 @@ GRANT SELECT ON lv_events TO admin,
|
|||
-- lists, et cetera
|
||||
------------------------------------------------------------------------
|
||||
CREATE VIEW lv_followupactions AS
|
||||
SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
|
||||
SELECT electors.name ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
|
||||
followupactions.request_id,
|
||||
canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS actor_expanded,
|
||||
followupactions.actor,
|
||||
|
|
@ -641,7 +644,7 @@ SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| ge
|
|||
followupactions.notes,
|
||||
followupactions.closed,
|
||||
followupactions.id
|
||||
FROM followuprequests, visits, canvassers, addresses, followupactions, genders, issues, electors
|
||||
FROM followuprequests, visits, canvassers, addresses, followupactions, issues, electors
|
||||
WHERE followupactions.request_id = followuprequests.id
|
||||
AND followupactions.actor = canvassers.id
|
||||
;
|
||||
|
|
@ -671,7 +674,7 @@ GRANT SELECT ON lv_followupmethods TO admin,
|
|||
-- lists, et cetera
|
||||
------------------------------------------------------------------------
|
||||
CREATE VIEW lv_followuprequests AS
|
||||
SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
|
||||
SELECT electors.name AS elector_id_expanded,
|
||||
followuprequests.elector_id,
|
||||
addresses.address ||', '|| addresses.postcode ||', '|| visits.date AS visit_id_expanded,
|
||||
followuprequests.visit_id,
|
||||
|
|
@ -680,7 +683,7 @@ SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| ge
|
|||
followupmethods.id AS method_id_expanded,
|
||||
followuprequests.method_id,
|
||||
followuprequests.id
|
||||
FROM followuprequests, visits, addresses, genders, issues, electors, followupmethods
|
||||
FROM followuprequests, visits, addresses, issues, electors, followupmethods
|
||||
WHERE followuprequests.elector_id = electors.id
|
||||
AND followuprequests.visit_id = visits.id
|
||||
AND followuprequests.issue_id = issues.id
|
||||
|
|
@ -714,13 +717,13 @@ GRANT SELECT ON lv_genders TO admin,
|
|||
CREATE VIEW lv_intentions AS
|
||||
SELECT addresses.address ||', '|| addresses.postcode ||', '|| visits.date AS visit_id_expanded,
|
||||
intentions.visit_id,
|
||||
electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
|
||||
electors.name AS elector_id_expanded,
|
||||
intentions.elector_id,
|
||||
options.id AS option_id_expanded,
|
||||
intentions.option_id,
|
||||
intentions.locality,
|
||||
intentions.id
|
||||
FROM visits, intentions, addresses, genders, electors, options
|
||||
FROM visits, intentions, addresses, electors, options
|
||||
WHERE intentions.visit_id = visits.id
|
||||
AND intentions.elector_id = electors.id
|
||||
AND intentions.option_id = options.id
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue