From 316c57745be17218d26f553aad314e903fbfc144 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Thu, 4 Oct 2018 19:16:24 +0100
Subject: [PATCH] Multi-select menus now working

Major change, there may be regressions.
---
 resources/sql/queries.sql         | 10 ----------
 src/clj/youyesyet/routes/rest.clj |  3 ++-
 youyesyet.adl.xml                 | 29 ++++++++++++++++++++---------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index ff0f3b5..e5404bf 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -75,16 +75,6 @@ FROM addresses, visits
 WHERE visits.address_id = addresses.id
 AND visits.id = :id
 
--- I don't know why this next one isn't autogenerating, but it isn't and it's critical.
-
--- :name list-roles-by-canvasser :? :*
--- :doc links all existing canvasser records related to a given role
-SELECT DISTINCT roles.*
-FROM roles, ln_canvassers_roles
-WHERE roles.id = ln_canvassers_roles.role_id
-	AND ln_canvassers_roles.canvasser_id = :id
-ORDER BY roles.name,
-	roles.id
 
 -- :name list-elector-intentions :? :*
 -- :doc short form of `list-intentions-by-elector`, returning far less data, for use in `youyesyet.routes.rest/get-local-data`, q.v.
diff --git a/src/clj/youyesyet/routes/rest.clj b/src/clj/youyesyet/routes/rest.clj
index 351926e..39851bd 100644
--- a/src/clj/youyesyet/routes/rest.clj
+++ b/src/clj/youyesyet/routes/rest.clj
@@ -72,7 +72,8 @@
                           (db/list-elector-intentions db/*db* {:id (:id e)})))
                       (db/list-electors-by-dwelling db/*db* {:id (:id d)}))))
                 (db/list-dwellings-by-address db/*db* {:id (:id a)}))))
-          addresses)))
+          addresses)
+        ))
     :ttl/threshold
     90000))
 
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 820514d..78d310d 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -188,6 +188,7 @@ version="0.1.1">
         building.
       </documentation>
     </property>
+    <property type="list" name="electors" entity="electors"/>
     <list properties="listed" name="Dwellings">
       <field property="address_id">
         <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
@@ -297,9 +298,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
-    entity visits already has a key - not generating one
-    -->
+
   <entity table="visits" name="visits" magnitude="7"
   volatility="2">
     <documentation>All visits made by canvassers to dwellings in
@@ -363,9 +362,7 @@ version="0.1.1">
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
   </entity>
-  <!--
-    entity authorities already has a key - not generating one
-    -->
+
   <entity table="authorities" name="authorities" magnitude="2"
   volatility="7">
     <documentation>Authorities which may authenticate canvassers to
@@ -413,6 +410,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
+
   <entity table="issues" name="issues" magnitude="1"
   volatility="3">
     <documentation>Issues believed to be of interest to electors,
@@ -776,9 +774,22 @@ version="0.1.1">
       <field property="name">
         <prompt prompt="name" locale="en_GB.UTF-8"/>
       </field>
-      <field property="members">
-        <prompt prompt="Members" locale="en_GB.UTF-8"/>
-      </field>
+      <auxlist property="members"
+               canadd="false"
+               onselect="form-canvassers-Canvasser">
+        <prompt prompt="Organisers" locale="en_GB.UTF-8"/>
+        <field property="id">
+        </field>
+        <field property="fullname">
+          <prompt prompt="name" locale="en_GB.UTF-8"/>
+        </field>
+        <field property="email">
+          <prompt prompt="email" locale="en_GB.UTF-8"/>
+        </field>
+        <field property="phone">
+          <prompt prompt="phone" locale="en_GB.UTF-8"/>
+        </field>
+      </auxlist>
     </form>
     <permission group="canvassers" permission="read"/>
     <permission group="teamorganisers" permission="read"/>