Now actually pulling data from server, but some regressions.
The map isn't rendering, and there's something wrong with options. But a lot is working.
This commit is contained in:
parent
d4f0f4aa5c
commit
3a49e50a51
59 changed files with 1263 additions and 3166 deletions
|
|
@ -1,10 +1,10 @@
|
|||
------------------------------------------------------------------------
|
||||
-- File queries.sql
|
||||
--
|
||||
-- autogenerated by adl.to-hugsql-queries at 2018-07-01T22:15:28.111Z
|
||||
--
|
||||
-- See [Application Description
|
||||
-- Language](https://github.com/simon-brooke/adl).
|
||||
-- File queries.sql
|
||||
--
|
||||
-- autogenerated by adl.to-hugsql-queries at 2018-07-03T12:23:50.486Z
|
||||
--
|
||||
-- See [Application Description
|
||||
-- Language](https://github.com/simon-brooke/adl).
|
||||
------------------------------------------------------------------------
|
||||
|
||||
-- :name create-address! :! :n
|
||||
|
|
@ -143,9 +143,11 @@ returning Id
|
|||
-- :doc creates a new issue record
|
||||
INSERT INTO issues (url,
|
||||
current,
|
||||
brief,
|
||||
id)
|
||||
VALUES (:url,
|
||||
:current,
|
||||
:brief,
|
||||
:id)
|
||||
returning id
|
||||
|
||||
|
|
@ -405,7 +407,7 @@ ORDER BY lv_addresses.address,
|
|||
|
||||
-- :name list-addresses-by-district :? :*
|
||||
-- :doc lists all existing address records related to a given district
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_addresses, addresses
|
||||
WHERE lv_addresses.id = addresses.id
|
||||
AND addresses.district_id = :id
|
||||
|
|
@ -433,7 +435,7 @@ ORDER BY lv_canvassers.username,
|
|||
|
||||
-- :name list-canvassers-by-address :? :*
|
||||
-- :doc lists all existing canvasser records related to a given address
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_canvassers, canvassers
|
||||
WHERE lv_canvassers.id = canvassers.id
|
||||
AND canvassers.address_id = :id
|
||||
|
|
@ -446,7 +448,7 @@ ORDER BY lv_canvassers.username,
|
|||
|
||||
-- :name list-canvassers-by-authority :? :*
|
||||
-- :doc lists all existing canvasser records related to a given authority
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_canvassers, canvassers
|
||||
WHERE lv_canvassers.id = canvassers.id
|
||||
AND canvassers.authority_id = :id
|
||||
|
|
@ -459,7 +461,7 @@ ORDER BY lv_canvassers.username,
|
|||
|
||||
-- :name list-canvassers-by-elector :? :*
|
||||
-- :doc lists all existing canvasser records related to a given elector
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_canvassers, canvassers
|
||||
WHERE lv_canvassers.id = canvassers.id
|
||||
AND canvassers.elector_id = :id
|
||||
|
|
@ -472,7 +474,7 @@ ORDER BY lv_canvassers.username,
|
|||
|
||||
-- :name list-canvassers-by-role :? :*
|
||||
-- :doc links all existing canvasser records related to a given role
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM canvassers, ln_canvassers_roles
|
||||
WHERE canvassers.id = ln_canvassers_roles.canvasser_id
|
||||
AND ln_canvassers_roles.role_id = :id
|
||||
|
|
@ -502,7 +504,7 @@ ORDER BY lv_dwellings.address_id,
|
|||
|
||||
-- :name list-dwellings-by-address :? :*
|
||||
-- :doc lists all existing dwelling records related to a given address
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_dwellings, dwellings
|
||||
WHERE lv_dwellings.id = dwellings.id
|
||||
AND dwellings.address_id = :id
|
||||
|
|
@ -523,7 +525,7 @@ ORDER BY lv_electors.name,
|
|||
|
||||
-- :name list-electors-by-dwelling :? :*
|
||||
-- :doc lists all existing elector records related to a given dwelling
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_electors, electors
|
||||
WHERE lv_electors.id = electors.id
|
||||
AND electors.dwelling_id = :id
|
||||
|
|
@ -535,7 +537,7 @@ ORDER BY lv_electors.name,
|
|||
|
||||
-- :name list-electors-by-gender :? :*
|
||||
-- :doc lists all existing elector records related to a given gender
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_electors, electors
|
||||
WHERE lv_electors.id = electors.id
|
||||
AND electors.gender = :id
|
||||
|
|
@ -556,7 +558,7 @@ ORDER BY lv_followupactions.date,
|
|||
|
||||
-- :name list-followupactions-by-canvasser :? :*
|
||||
-- :doc lists all existing followupaction records related to a given canvasser
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followupactions, followupactions
|
||||
WHERE lv_followupactions.id = followupactions.id
|
||||
AND followupactions.actor = :id
|
||||
|
|
@ -566,7 +568,7 @@ ORDER BY lv_followupactions.date,
|
|||
|
||||
-- :name list-followupactions-by-followuprequest :? :*
|
||||
-- :doc lists all existing followupaction records related to a given followuprequest
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followupactions, followupactions
|
||||
WHERE lv_followupactions.id = followupactions.id
|
||||
AND followupactions.request_id = :id
|
||||
|
|
@ -592,7 +594,7 @@ ORDER BY lv_followuprequests.elector_id,
|
|||
|
||||
-- :name list-followuprequests-by-elector :? :*
|
||||
-- :doc lists all existing followuprequest records related to a given elector
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followuprequests, followuprequests
|
||||
WHERE lv_followuprequests.id = followuprequests.id
|
||||
AND followuprequests.elector_id = :id
|
||||
|
|
@ -603,7 +605,7 @@ ORDER BY lv_followuprequests.elector_id,
|
|||
|
||||
-- :name list-followuprequests-by-followupmethod :? :*
|
||||
-- :doc lists all existing followuprequest records related to a given followupmethod
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followuprequests, followuprequests
|
||||
WHERE lv_followuprequests.id = followuprequests.id
|
||||
AND followuprequests.method_id = :id
|
||||
|
|
@ -614,7 +616,7 @@ ORDER BY lv_followuprequests.elector_id,
|
|||
|
||||
-- :name list-followuprequests-by-issue :? :*
|
||||
-- :doc lists all existing followuprequest records related to a given issue
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followuprequests, followuprequests
|
||||
WHERE lv_followuprequests.id = followuprequests.id
|
||||
AND followuprequests.issue_id = :id
|
||||
|
|
@ -625,7 +627,7 @@ ORDER BY lv_followuprequests.elector_id,
|
|||
|
||||
-- :name list-followuprequests-by-visit :? :*
|
||||
-- :doc lists all existing followuprequest records related to a given visit
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_followuprequests, followuprequests
|
||||
WHERE lv_followuprequests.id = followuprequests.id
|
||||
AND followuprequests.visit_id = :id
|
||||
|
|
@ -648,21 +650,21 @@ SELECT DISTINCT * FROM lv_intentions
|
|||
|
||||
-- :name list-intentions-by-elector :? :*
|
||||
-- :doc lists all existing intention records related to a given elector
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_intentions, intentions
|
||||
WHERE lv_intentions.Id = intentions.Id
|
||||
AND intentions.elector_id = :id
|
||||
|
||||
-- :name list-intentions-by-option :? :*
|
||||
-- :doc lists all existing intention records related to a given option
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_intentions, intentions
|
||||
WHERE lv_intentions.Id = intentions.Id
|
||||
AND intentions.option_id = :id
|
||||
|
||||
-- :name list-intentions-by-visit :? :*
|
||||
-- :doc lists all existing intention records related to a given visit
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_intentions, intentions
|
||||
WHERE lv_intentions.Id = intentions.Id
|
||||
AND intentions.visit_id = :id
|
||||
|
|
@ -689,7 +691,7 @@ ORDER BY lv_roles.name,
|
|||
|
||||
-- :name list-roles-by-canvasser :? :*
|
||||
-- :doc links all existing role records related to a given canvasser
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM roles, ln_canvassers_roles
|
||||
WHERE roles.id = ln_canvassers_roles.role_id
|
||||
AND ln_canvassers_roles.canvasser_id = :id
|
||||
|
|
@ -706,7 +708,7 @@ ORDER BY lv_teams.name,
|
|||
|
||||
-- :name list-teams-by-canvasser :? :*
|
||||
-- :doc links all existing team records related to a given canvasser
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM teams, ln_canvassers_teams
|
||||
WHERE teams.id = ln_canvassers_teams.team_id
|
||||
AND ln_canvassers_teams.canvasser_id = :id
|
||||
|
|
@ -715,7 +717,7 @@ ORDER BY teams.name,
|
|||
|
||||
-- :name list-teams-by-district :? :*
|
||||
-- :doc lists all existing team records related to a given district
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_teams, teams
|
||||
WHERE lv_teams.id = teams.id
|
||||
AND teams.district_id = :id
|
||||
|
|
@ -733,7 +735,7 @@ ORDER BY lv_visits.address_id,
|
|||
|
||||
-- :name list-visits-by-address :? :*
|
||||
-- :doc lists all existing visit records related to a given address
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_visits, visits
|
||||
WHERE lv_visits.id = visits.id
|
||||
AND visits.address_id = :id
|
||||
|
|
@ -743,7 +745,7 @@ ORDER BY lv_visits.address_id,
|
|||
|
||||
-- :name list-visits-by-canvasser :? :*
|
||||
-- :doc lists all existing visit records related to a given canvasser
|
||||
SELECT *
|
||||
SELECT *
|
||||
FROM lv_visits, visits
|
||||
WHERE lv_visits.id = visits.id
|
||||
AND visits.canvasser_id = :id
|
||||
|
|
@ -912,6 +914,7 @@ SELECT DISTINCT * FROM lv_issues
|
|||
WHERE false
|
||||
--~ (if (:url params) "OR url LIKE '%:url%'")
|
||||
--~ (if (:current params) "OR current = :current")
|
||||
--~ (if (:brief params) "OR brief LIKE '%:brief%'")
|
||||
--~ (if (:id params) "OR id LIKE '%:id%'")
|
||||
--~ (if (:offset params) "OFFSET :offset ")
|
||||
--~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
|
||||
|
|
@ -1055,6 +1058,7 @@ WHERE intentions.Id = :Id
|
|||
UPDATE issues
|
||||
SET url = :url,
|
||||
current = :current,
|
||||
brief = :brief,
|
||||
id = :id
|
||||
WHERE issues.id = :id
|
||||
|
||||
|
|
@ -1079,4 +1083,4 @@ UPDATE visits
|
|||
SET address_id = :address_id,
|
||||
canvasser_id = :canvasser_id,
|
||||
date = :date
|
||||
WHERE visits.id = :id
|
||||
WHERE visits.id = :id
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
--
|
||||
-- auto-generated by [Application Description Language framework]
|
||||
--
|
||||
-- (https://github.com/simon-brooke/adl) at 20180701T221532.672Z
|
||||
-- (https://github.com/simon-brooke/adl) at 20180703T122351.367Z
|
||||
--
|
||||
--
|
||||
-- A web-app intended to be used by canvassers campaigning for a
|
||||
|
|
@ -338,7 +338,8 @@ CREATE TABLE issues
|
|||
(
|
||||
id VARCHAR(32) NOT NULL PRIMARY KEY,
|
||||
url VARCHAR(256),
|
||||
current BOOLEAN DEFAULT true
|
||||
current BOOLEAN DEFAULT true,
|
||||
brief TEXT
|
||||
);
|
||||
GRANT SELECT ON issues TO admin,
|
||||
analysts,
|
||||
|
|
@ -676,6 +677,7 @@ GRANT SELECT ON lv_intentions TO admin,
|
|||
CREATE VIEW lv_issues AS
|
||||
SELECT issues.url,
|
||||
issues.current,
|
||||
issues.brief,
|
||||
issues.id
|
||||
FROM issues
|
||||
;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue