simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

#46, #50: Further improvements on list generation

Browse source
This commit is contained in:
Simon Brooke 2018-06-11 10:10:23 +01:00
parent 88b693acc5
commit 98695e41dc
6 changed files with 165 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
resources/sql/queries.auto.sql
View file

@ -1,6 +1,6 @@
-- File queries.sql
-- autogenerated by adl.to-hugsql-queries at
-- 2018-06-05T12:33:53.043Z
-- 2018-06-11T00:58:48.917Z
-- See [Application Description Language](https://github.com/simon-brooke/adl).
@ -36,8 +36,7 @@ INSERT INTO canvassers (username,
phone,
email,
authority_id,
authorised,
roles)
authorised)
VALUES (:username,
:fullname,
:elector_id,
@ -45,8 +44,7 @@ VALUES (:username,
:phone,
:email,
:authority_id,
:authorised,
:roles)
:authorised)
returning id
-- :name create-district! :! :n
@ -494,10 +492,11 @@ ORDER BY canvassers.username,
canvassers.id
-- :name list-canvassers-by-role :? :*
-- :doc lists all existing canvasser records related to a given role
-- :doc links all existing canvasser records related to a given role
SELECT *
FROM canvassers
WHERE canvassers.roles = :id
WHERE canvassers.roles = link_canvassers_roles.canvasser_id
AND link_canvassers_roles.role_id = :id
ORDER BY canvassers.username,
canvassers.fullname,
canvassers.email,
@ -699,6 +698,15 @@ ORDER BY roles.name,
--~ (if (:offset params) "OFFSET :offset ")
--~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
-- :name list-roles-by-canvasser :? :*
-- :doc links all existing role records related to a given canvasser
SELECT *
FROM roles
WHERE roles.members = link_roles_canvassers.role_id
AND link_roles_canvassers.canvasser_id = :id
ORDER BY roles.name,
roles.id
-- :name list-teammemberships :? :*
-- :doc lists all existing teammembership records
SELECT * FROM teammemberships
@ -743,6 +751,15 @@ ORDER BY teams.name,
--~ (if (:offset params) "OFFSET :offset ")
--~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
-- :name list-teams-by-canvasser :? :*
-- :doc links all existing team records related to a given canvasser
SELECT *
FROM teams
WHERE teams.members = link_teams_canvassers.team_id
AND link_teams_canvassers.canvasser_id = :id
ORDER BY teams.name,
teams.id
-- :name list-teams-by-district :? :*
-- :doc lists all existing team records related to a given district
SELECT *
@ -967,8 +984,7 @@ SET username = :username,
phone = :phone,
email = :email,
authority_id = :authority_id,
authorised = :authorised,
roles = :roles
authorised = :authorised
WHERE canvassers.id = :id
-- :name update-district! :! :n

9
resources/templates/base-authenticated.html
View file

@ -1,8 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
<link rel="stylesheet" type="text/css" href="css/yyy-site.css" />
<link rel="stylesheet" type="text/css" href="css/spinner.css" />
@ -11,6 +11,7 @@
</head>
<body>
{% block whole-page %}
{% block top %}
<header>
<div id="nav">
<img id="nav-icon" src="img/threelines.png" alt="Menu"/>
@ -31,7 +32,7 @@
{{title}}
</h1>
</header>
{% endblock %}
<div id="main-container" class="container">
<div id="big-links">
{% block big-links %}
@ -45,6 +46,7 @@
<a href="javascript:history.back()" id="back-link">Back</a>
</div>
</div>
{% block foot %}
<footer>
<div id="credits">
<div>
@ -62,6 +64,7 @@
</div>
</footer>
{% endblock %}
{% endblock %}
<script type="text/javascript">
var context = "{{servlet-context}}";
var csrfToken = "{{csrf-token}}";

38
src/clj/youyesyet/routes/auto_json_routes.clj
View file

@ -56,7 +56,7 @@
list-addresses-by-district
list-authorities
list-canvassers
list-canvassers-by-addresse
list-canvassers-by-address
list-canvassers-by-authoritie
list-canvassers-by-elector
list-districts
@ -110,7 +110,7 @@
(defroutes
auto-rest-routes
(POST "/json/auto/create-addresse" request (create-address request))
(POST "/json/auto/create-address" request (create-address request))
(POST
"/json/auto/create-authority"
request
@ -162,7 +162,7 @@
request
(create-teamorganisership request))
(POST "/json/auto/create-visit" request (create-visit request))
(POST "/json/auto/delete-addresse" request (delete-address request))
(POST "/json/auto/delete-address" request (delete-address request))
(POST
"/json/auto/delete-authority"
request
@ -188,7 +188,7 @@
(POST "/json/auto/delete-issue" request (delete-issue request))
(POST "/json/auto/delete-option" request (delete-option request))
(POST "/json/auto/delete-visit" request (delete-visit request))
(POST "/json/auto/get-addresse" request (get-addresse request))
(POST "/json/auto/get-address" request (get-address request))
(POST "/json/auto/get-authority" request (get-authority request))
(POST "/json/auto/get-canvasser" request (get-canvasser request))
(POST "/json/auto/get-district" request (get-district request))
@ -216,9 +216,9 @@
(GET "/json/auto/list-authorities" request (list-authorities request))
(GET "/json/auto/list-canvassers" request (list-canvassers request))
(GET
"/json/auto/list-canvassers-by-addresse"
"/json/auto/list-canvassers-by-address"
request
(list-canvassers-by-addresse request))
(list-canvassers-by-address request))
(GET
"/json/auto/list-canvassers-by-authoritie"
request
@ -230,9 +230,9 @@
(GET "/json/auto/list-districts" request (list-districts request))
(GET "/json/auto/list-electors" request (list-electors request))
(GET
"/json/auto/list-electors-by-addresse"
"/json/auto/list-electors-by-address"
request
(list-electors-by-addresse request))
(list-electors-by-address request))
(GET
"/json/auto/list-followupactions"
request
@ -355,14 +355,14 @@
(list-teams-by-district request))
(GET "/json/auto/list-visits" request (list-visits request))
(GET
"/json/auto/list-visits-by-addresse"
"/json/auto/list-visits-by-address"
request
(list-visits-by-addresse request))
(list-visits-by-address request))
(GET
"/json/auto/list-visits-by-canvasser"
request
(list-visits-by-canvasser request))
(POST "/json/auto/update-addresse" request (update-addresse request))
(POST "/json/auto/update-address" request (update-address request))
(POST
"/json/auto/update-canvasser"
request
@ -603,10 +603,10 @@
(defn
get-addresse
get-address
"Auto-generated method to select one record from the addresses table. Expects the following key(s) to be present in `params`: (:id). Returns a map containing the following keys: (:address :district_id :id :latitude :longitude :phone :postcode)."
[{:keys [params]}]
(do (db/get-addresse params)))
(do (db/get-address params)))
(defn
@ -707,9 +707,9 @@
(defn
list-canvassers-by-addresse
list-canvassers-by-address
[{:keys [params]}]
(do (db/list-canvassers-by-addresse params)))
(do (db/list-canvassers-by-address params)))
(defn
@ -739,9 +739,9 @@
(defn
list-electors-by-addresse
list-electors-by-address
[{:keys [params]}]
(do (db/list-electors-by-addresse params)))
(do (db/list-electors-by-address params)))
(defn
@ -958,9 +958,9 @@
(defn
list-visits-by-addresse
list-visits-by-address
[{:keys [params]}]
(do (db/list-visits-by-addresse params)))
(do (db/list-visits-by-address params)))
(defn

2
src/clj/youyesyet/routes/home.clj
View file

@ -57,7 +57,7 @@
[session (:session request)
username (:user session)
user (if username (db-core/get-canvasser-by-username db-core/*db* {:username username}))
roles (if user (db-core/get-roles-by-canvasser db-core/*db* {:canvasser (:id user)}))]
roles (if user (db-core/list-roles-by-canvasser db-core/*db* {:id (:id user)}))]
(cond
roles (layout/render "roles.html"
{:title (str "Welcome " (:fullname user) ", what do you want to do?")

38
youyesyet.adl.xml
View file

@ -3,6 +3,7 @@
"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" -->
<application name="youyesyet" version="0.1.1"
xmlns="http://bowyer.journeyman.cc/adl/1.4.1/"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/">
<documentation>
A web-app intended to be used by canvassers campaigning for a 'Yes' vote in the second independence referendum.
@ -12,9 +13,34 @@
There must also be an administrative interface through which privileged users can set the system up and authorise canvassers, and a 'followup' interface through which issue-expert specialist canvassers can address particular electors' queries.
</documentation>
<content>
<head> </head>
<head>
<html:meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<html:meta name="viewport" content="width=device-width, initial-scale=1"/>
<html:link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
<html:link rel="stylesheet" type="text/css" href="css/yyy-site.css" />
<html:link rel="stylesheet" type="text/css" href="css/spinner.css" />
<html:link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
<html:title>{{site-title}}: {{title}}</html:title>
</head>
<top> </top>
<foot> </foot>
<foot>
<html:footer>
<html:div id="credits">
<html:div>
<html:img src="img/credits/ric-logo.png" width="24" height="24"/>
A project of the
<html:a href="https://radical.scot/">Radical Independence Campaign</html:a> ||
Version {{version}}
</html:div>
<html:div>
<html:img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <html:a href="http://www.luminusweb.net/">LuminusWeb</html:a> ||
<html:img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <html:a href="http://clojure.org">Clojure</html:a> ||
<html:img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <html:a href="https://github.com/simon-brooke/smeagol">Github</html:a> ||
<html:img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <html:a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</html:a>
</html:div>
</html:div>
</html:footer>
</foot>
</content>
<typedef name="postcode" type="string"
pattern="^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$" size="16">
@ -143,7 +169,7 @@
<prompt prompt="id" locale="en-GB"/>
</property>
</key>
<property required="true" type="integer" name="address_id" column="address_id"
<property required="true" type="entity" name="address_id" column="address_id"
entity="addresses" farkey="id">
<prompt prompt="address_id" locale="en-GB"/>
</property>
@ -218,7 +244,7 @@
<property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id">
<prompt prompt="elector_id" locale="en-GB"/>
</property>
<property required="true" type="integer" name="address_id" column="address_id"
<property required="true" type="entity" name="address_id" column="address_id"
entity="addresses" farkey="id">
<prompt prompt="address_id" locale="en-GB"/>
</property>
@ -369,7 +395,7 @@
entity="followuprequests" farkey="id">
<prompt prompt="request_id" locale="en-GB"/>
</property>
<property required="true" type="integer" name="actor" column="actor" entity="canvassers"
<property required="true" type="entity" name="actor" column="actor" entity="canvassers"
farkey="id">
<prompt prompt="actor" locale="en-GB"/>
</property>
@ -392,7 +418,7 @@
</entity>
<entity name="issueexpertise" magnitude="5">
<documentation>Link table</documentation>
<property required="true" type="integer" name="canvasser_id" column="canvasser_id"
<property required="true" type="entity" name="canvasser_id" column="canvasser_id"
entity="canvassers" farkey="id">
<prompt prompt="canvasser_id" locale="en-GB"/>
</property>

39
youyesyet.canonical.adl.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4.1//EN"
"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" -->
<application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/" name="youyesyet" version="0.1.1">
<application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/" name="youyesyet" version="0.1.1">
<!--
***************************************************************************
*
@ -22,9 +22,34 @@
There must also be an administrative interface through which privileged users can set the system up and authorise canvassers, and a 'followup' interface through which issue-expert specialist canvassers can address particular electors' queries.
</documentation>
<content>
<head> </head>
<head>
<html:meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<html:meta name="viewport" content="width=device-width, initial-scale=1"/>
<html:link rel="stylesheet" type="text/css" href="css/yyy-common.css"/>
<html:link rel="stylesheet" type="text/css" href="css/yyy-site.css"/>
<html:link rel="stylesheet" type="text/css" href="css/spinner.css"/>
<html:link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
<html:title>{{site-title}}: {{title}}</html:title>
</head>
<top> </top>
<foot> </foot>
<foot>
<html:footer>
<html:div id="credits">
<html:div>
<html:img src="img/credits/ric-logo.png" width="24" height="24"/>
A project of the
<html:a href="https://radical.scot/">Radical Independence Campaign</html:a> ||
Version {{version}}
</html:div>
<html:div>
<html:img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <html:a href="http://www.luminusweb.net/">LuminusWeb</html:a> ||
<html:img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <html:a href="http://clojure.org">Clojure</html:a> ||
<html:img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <html:a href="https://github.com/simon-brooke/smeagol">Github</html:a> ||
<html:img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <html:a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</html:a>
</html:div>
</html:div>
</html:footer>
</foot>
</content>
<typedef name="postcode" type="string" pattern="^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$" size="16">
<documentation>See
@ -177,7 +202,7 @@
<prompt prompt="id" locale="en-GB"/>
</property>
</key>
<property required="true" type="integer" name="address_id" column="address_id" entity="addresses" farkey="id">
<property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id">
<prompt prompt="address_id" locale="en-GB"/>
</property>
<property required="true" type="entity" name="canvasser_id" column="canvasser_id" entity="canvassers" farkey="id">
@ -294,7 +319,7 @@
<property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id">
<prompt prompt="elector_id" locale="en-GB"/>
</property>
<property required="true" type="integer" name="address_id" column="address_id" entity="addresses" farkey="id">
<property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id">
<prompt prompt="address_id" locale="en-GB"/>
</property>
<property type="string" name="phone" column="phone" size="16">
@ -484,7 +509,7 @@
<property required="true" type="entity" name="request_id" column="request_id" entity="followuprequests" farkey="id">
<prompt prompt="request_id" locale="en-GB"/>
</property>
<property required="true" type="integer" name="actor" column="actor" entity="canvassers" farkey="id">
<property required="true" type="entity" name="actor" column="actor" entity="canvassers" farkey="id">
<prompt prompt="actor" locale="en-GB"/>
</property>
<property required="true" default="" type="timestamp" name="date" column="date">
@ -517,7 +542,7 @@
</documentation>
</property>
</key>
<property required="true" type="integer" name="canvasser_id" column="canvasser_id" entity="canvassers" farkey="id">
<property required="true" type="entity" name="canvasser_id" column="canvasser_id" entity="canvassers" farkey="id">
<prompt prompt="canvasser_id" locale="en-GB"/>
</property>
<property required="true" type="entity" name="issue_id" column="issue_id" entity="issues" farkey="id">