I think I'm ready for public alpha.

resources/public/css/yyy-common.css

@@ -42,7 +42,7 @@ del {
 }
 
 div.content, form, p, pre, h1, h2, h3, h4, h5 {
-  padding: 0.25em 5%;
+  padding: 0.25em 2.5%;
 }
 
 dl, menu, ol, table, ul {
@@ -346,7 +346,7 @@ th {
 /* desktops and laptops, primarily. Adapted to mouse; targets may be small */
 @media all and (min-device-width: 1025px) {
   #content {
-    width: 80%;
+    width: 90%;
     float: right;
     padding-bottom: 5em;
   }

resources/sql/youyesyet.postgres.sql

@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180717T075810.523Z
+--	(https://github.com/simon-brooke/adl) at 20180718T215811.044Z 
 --	
 --	A web-app intended to be used by canvassers
 --	  campaigning for a 'Yes' vote in the second independence
@@ -806,7 +806,7 @@ GRANT SELECT ON lv_teams TO admin,
 CREATE VIEW lv_visits AS
 SELECT addresses.address ||', '|| addresses.postcode AS address_id_expanded,
 	visits.address_id,
-	canvassers.username ||', '|| canvassers.fullname ||', ' || canvassers.phone ||', '|| canvassers.email AS canvasser_id_expanded,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS canvasser_id_expanded,
 	visits.canvasser_id,
 	visits.date,
 	visits.id

src/clj/youyesyet/routes/roles.clj

@@ -67,8 +67,8 @@
   (GET "/roles/admin" request (route/restricted (admins-page request)))
   (GET "/roles/analysts" request (route/restricted (analysts-page request)))
   (GET "/roles/canvassers" request (route/restricted (canvassers-page request)))
-  (GET "/roles/issue_editors" request (route/restricted (auto/list-issues-Issues request)))
+  (GET "/roles/issueeditors" request (route/restricted (auto/list-issues-Issues request)))
-  (GET "/roles/issue_experts" request (route/restricted (expert/list-page request)))
+  (GET "/roles/issueexperts" request (route/restricted (expert/list-page request)))
   (GET "/roles/team_organisers" request (route/restricted (auto/list-teams-Teams request)))
   (GET "/roles" request (route/restricted (roles-page request))))
 

youyesyet.adl.xml

@@ -99,24 +99,12 @@ version="0.1.1">
       Null if they have not.</documentation>
     </property>
     <list properties="listed" name="Electors">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="Name" locale="en_GB.UTF-8"/>
       </field>
       <field property="dwelling_id">
         <prompt prompt="Home" locale="en_GB.UTF-8"/>
       </field>
-      <field property="phone">
-        <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="email">
-        <prompt prompt="eMail" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="gender">
-        <prompt prompt="Gender" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Elector">
       <field property="id">
@@ -203,9 +191,6 @@ version="0.1.1">
       </documentation>
     </property>
     <list properties="listed" name="Dwellings">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
       </field>
@@ -214,9 +199,6 @@ version="0.1.1">
       </field>
     </list>
     <form properties="listed" name="Dwelling">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
       </field>
@@ -277,27 +259,15 @@ version="0.1.1">
       users.</documentation>
     </property>
     <list properties="listed" name="Addresses">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address">
         <prompt prompt="Address" locale="en_GB.UTF-8"/>
       </field>
       <field property="postcode">
         <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
       </field>
-      <field property="phone">
-        <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-      </field>
       <field property="district_id">
         <prompt prompt="District" locale="en_GB.UTF-8"/>
       </field>
-      <field property="latitude">
-        <prompt prompt="Latitude" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="longitude">
-        <prompt prompt="Longitude" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Address">
       <field property="id">
@@ -369,9 +339,6 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Visits">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Address" locale="en_GB.UTF-8"/>
       </field>
@@ -430,10 +397,8 @@ version="0.1.1">
     <list name="Authorities" properties="listed">
       <field property="id">
         <prompt prompt="id" locale="en_GB.UTF-8"/>
-    </field>#
+      </field>
-    <field property="request-token-uri"/>
+    </list>
-    <field property="access-token-uri"/>
-    <field property="authorize-uri"/></list>
     <form properties="listed" name="Authority">
       <field property="id">
         <prompt prompt="id" locale="en_GB.UTF-8"/>
@@ -550,13 +515,13 @@ version="0.1.1">
     <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Intentions">
       <field property="visit_id">
-        <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="visit" locale="en_GB.UTF-8"/>
       </field>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="elector" locale="en_GB.UTF-8"/>
       </field>
       <field property="option_id">
-        <prompt prompt="option_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="option" locale="en_GB.UTF-8"/>
       </field>
       <field property="locality">
         <documentation>The locality at which the intention was
@@ -654,9 +619,6 @@ version="0.1.1">
       <documentation>All canvassers</documentation>
     </permission>
     <list properties="listed" name="Canvassers">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="username">
         <prompt prompt="username" locale="en_GB.UTF-8"/>
       </field>
@@ -666,9 +628,6 @@ version="0.1.1">
       <field property="address_id">
         <prompt prompt="address" locale="en_GB.UTF-8"/>
       </field>
-      <field property="authority_id">
-        <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="authorised">
         <prompt prompt="authorised" locale="en_GB.UTF-8"/>
       </field>
@@ -746,20 +705,17 @@ version="0.1.1">
       <prompt prompt="method_id" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Followuprequests">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="elector" locale="en_GB.UTF-8"/>
       </field>
       <field property="visit_id">
-        <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="visit" locale="en_GB.UTF-8"/>
       </field>
       <field property="issue_id">
-        <prompt prompt="issue_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="issue" locale="en_GB.UTF-8"/>
       </field>
       <field property="method_id">
-        <prompt prompt="method_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="method" locale="en_GB.UTF-8"/>
       </field>
     </list>
     <form properties="listed" name="Followuprequest">
@@ -805,9 +761,6 @@ version="0.1.1">
       <prompt prompt="Members" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Roles">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
@@ -869,21 +822,12 @@ version="0.1.1">
       <documentation>All groups</documentation>
     </permission>
     <list properties="listed" name="Teams">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
       <field property="district_id">
         <prompt prompt="district_id" locale="en_GB.UTF-8"/>
       </field>
-      <field property="latitude">
-        <prompt prompt="latitude" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="longitude">
-        <prompt prompt="longitude" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Team">
       <field property="id">
@@ -974,7 +918,12 @@ version="0.1.1">
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
     <form properties="all" name="Events"/>
-    <list properties="all" name="Events"/>
+    <list properties="listed" name="Events">
+      <field property="name"><prompt prompt="name" locale="en_GB.UTF-8"/></field>
+      <field property="date"/>
+      <field property="time"/>
+      <field property="cancelled"/>
+    </list>
   </entity>
   <entity table="districts" name="districts" magnitude="4"
   volatility="7">
@@ -994,17 +943,11 @@ version="0.1.1">
     <permission group="public" permission="read"/>
     <permission group="admin" permission="all"/>
     <list properties="listed" name="Districts">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
     </list>
     <form properties="listed" name="District">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
@@ -1048,11 +991,8 @@ version="0.1.1">
       <prompt prompt="closed" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Followupactions">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="request_id">
-        <prompt prompt="request_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="Request" locale="en_GB.UTF-8"/>
       </field>
       <field property="actor">
         <prompt prompt="actor" locale="en_GB.UTF-8"/>
@@ -1094,9 +1034,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+
-    entity options already has a key - not generating one
-    -->
   <entity table="options" name="options" magnitude="1"
   volatility="7">
     <documentation>Options in the election or referendum being

youyesyet.canonical.adl.xml

@@ -102,24 +102,12 @@
       Null if they have not.</documentation>
     </property>
     <list properties="listed" name="Electors">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="Name" locale="en_GB.UTF-8"/>
       </field>
       <field property="dwelling_id">
         <prompt prompt="Home" locale="en_GB.UTF-8"/>
       </field>
-      <field property="phone">
-        <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="email">
-        <prompt prompt="eMail" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="gender">
-        <prompt prompt="Gender" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Elector">
       <field property="id">
@@ -202,9 +190,6 @@
       </documentation>
     </property>
     <list properties="listed" name="Dwellings">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
       </field>
@@ -213,9 +198,6 @@
       </field>
     </list>
     <form properties="listed" name="Dwelling">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
       </field>
@@ -273,27 +255,15 @@
       users.</documentation>
     </property>
     <list properties="listed" name="Addresses">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address">
         <prompt prompt="Address" locale="en_GB.UTF-8"/>
       </field>
       <field property="postcode">
         <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
       </field>
-      <field property="phone">
-        <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-      </field>
       <field property="district_id">
         <prompt prompt="District" locale="en_GB.UTF-8"/>
       </field>
-      <field property="latitude">
-        <prompt prompt="Latitude" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="longitude">
-        <prompt prompt="Longitude" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Address">
       <field property="id">
@@ -359,9 +329,6 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Visits">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="address_id">
         <prompt prompt="Address" locale="en_GB.UTF-8"/>
       </field>
@@ -413,10 +380,8 @@
     <list name="Authorities" properties="listed">
       <field property="id">
         <prompt prompt="id" locale="en_GB.UTF-8"/>
-    </field>#
+      </field>
-    <field property="request-token-uri"/>
+    </list>
-    <field property="access-token-uri"/>
-    <field property="authorize-uri"/></list>
     <form properties="listed" name="Authority">
       <field property="id">
         <prompt prompt="id" locale="en_GB.UTF-8"/>
@@ -531,13 +496,13 @@
     <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Intentions">
       <field property="visit_id">
-        <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="visit" locale="en_GB.UTF-8"/>
       </field>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="elector" locale="en_GB.UTF-8"/>
       </field>
       <field property="option_id">
-        <prompt prompt="option_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="option" locale="en_GB.UTF-8"/>
       </field>
       <field property="locality">
         <documentation>The locality at which the intention was
@@ -626,9 +591,6 @@
       <documentation>All canvassers</documentation>
     </permission>
     <list properties="listed" name="Canvassers">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="username">
         <prompt prompt="username" locale="en_GB.UTF-8"/>
       </field>
@@ -638,9 +600,6 @@
       <field property="address_id">
         <prompt prompt="address" locale="en_GB.UTF-8"/>
       </field>
-      <field property="authority_id">
-        <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="authorised">
         <prompt prompt="authorised" locale="en_GB.UTF-8"/>
       </field>
@@ -713,20 +672,17 @@
       <prompt prompt="method_id" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Followuprequests">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="elector" locale="en_GB.UTF-8"/>
       </field>
       <field property="visit_id">
-        <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="visit" locale="en_GB.UTF-8"/>
       </field>
       <field property="issue_id">
-        <prompt prompt="issue_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="issue" locale="en_GB.UTF-8"/>
       </field>
       <field property="method_id">
-        <prompt prompt="method_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="method" locale="en_GB.UTF-8"/>
       </field>
     </list>
     <form properties="listed" name="Followuprequest">
@@ -772,9 +728,6 @@
       <prompt prompt="Members" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Roles">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
@@ -835,21 +788,12 @@
       <documentation>All groups</documentation>
     </permission>
     <list properties="listed" name="Teams">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
       <field property="district_id">
         <prompt prompt="district_id" locale="en_GB.UTF-8"/>
       </field>
-      <field property="latitude">
-        <prompt prompt="latitude" locale="en_GB.UTF-8"/>
-      </field>
-      <field property="longitude">
-        <prompt prompt="longitude" locale="en_GB.UTF-8"/>
-      </field>
     </list>
     <form properties="listed" name="Team">
       <field property="id">
@@ -941,7 +885,12 @@
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
     <form properties="listed" name="Events"><field property="id"><generator action="native"/></field><field property="name"><prompt prompt="name" locale="en_GB.UTF-8"/></field><field property="teams"/><field property="date"/><field property="time"/><field property="decription"/><field property="cancelled"/></form>
-    <list properties="listed" name="Events"><field property="id"><generator action="native"/></field><field property="name"><prompt prompt="name" locale="en_GB.UTF-8"/></field><field property="date"/><field property="time"/><field property="decription"/><field property="cancelled"/></list>
+    <list properties="listed" name="Events">
+      <field property="name"><prompt prompt="name" locale="en_GB.UTF-8"/></field>
+      <field property="date"/>
+      <field property="time"/>
+      <field property="cancelled"/>
+    </list>
   </entity>
   <!--
     entity districts already has a key - not generating one
@@ -961,17 +910,11 @@
     <permission group="public" permission="read"/>
     <permission group="admin" permission="all"/>
     <list properties="listed" name="Districts">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
     </list>
     <form properties="listed" name="District">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
@@ -1010,11 +953,8 @@
       <prompt prompt="closed" locale="en_GB.UTF-8"/>
     </property>
     <list properties="listed" name="Followupactions">
-      <field property="id">
-        <prompt prompt="id" locale="en_GB.UTF-8"/>
-      </field>
       <field property="request_id">
-        <prompt prompt="request_id" locale="en_GB.UTF-8"/>
+        <prompt prompt="Request" locale="en_GB.UTF-8"/>
       </field>
       <field property="actor">
         <prompt prompt="actor" locale="en_GB.UTF-8"/>