diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 52a6aef..e8b8642 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -56,7 +56,7 @@
All users of the canvasser app Able to read and add canvassing data in a limited
radius around their current position.
-
+
Organisers of canvassing teams Able to see and modify data on the canvassers in
the team(s) they organise; able to add canvassers to their team; able to update canvassers in
their team, including resetting passwords and locking accounts; able to see canvass data over
@@ -106,6 +106,13 @@
+
+
+
+
+
+
+
All genders which may be assigned to electors.
@@ -116,6 +123,13 @@
+
+
+
+
+
+
+
All dwellings within addresses in the system; a dwelling is a house, flat or appartment in which electors live.
@@ -124,12 +138,19 @@
-
+
-
+
+
+
+
+
+
+
+
Addresses of all buildings which contain dwellings.
@@ -161,6 +182,13 @@
+
+
+
+
+
+
+
All visits made by canvassers to dwellings in which opinions were recorded.
@@ -170,20 +198,27 @@
+ entity="addresses" farkey="id" distinct="user">
-
+
+
+
+
+
+
+
+
Authorities which may authenticate canvassers to the system.
@@ -194,6 +229,13 @@
+
+
+
+
+
+
+
Issues believed to be of interest to electors, about which they may have questions.
@@ -210,6 +252,13 @@
+
+
+
+
+
+
+
Link table.
@@ -227,6 +276,13 @@
+
+
+
+
+
+
+
Primary users of the system: those actually interviewing electors.
@@ -261,7 +317,7 @@
-
+
@@ -275,6 +331,13 @@
+
+
+
+
+
+
+
Requests for a followup with an issue expert
@@ -284,15 +347,15 @@
+ farkey="id" distinct="user">
+ farkey="id" distinct="user">
+ farkey="id" distinct="user">
-
-
- Link table
-
-
-
-
-
-
+
+
+
+
+
+
+
A role (essentially, the same as a group, but application layer rather than database layer) of which a user may be a member.
@@ -328,6 +387,13 @@
+
+
+
+
+
+
+
@@ -360,6 +426,13 @@
+
+
+
+
+
+
+
Electoral districts
@@ -375,17 +448,13 @@
-
-
- Link table
-
-
-
-
-
-
+
+
+
+
+
+
+
Actions taken on followup requests.
@@ -418,6 +487,13 @@
+
+
+
+
+
+
+
Link table
@@ -433,6 +509,13 @@
entity="followupmethods" farkey="id">
+
+
+
+
+
+
+
Options in the election or referendum being canvassed on
@@ -443,17 +526,13 @@
-
-
- Link table
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -463,5 +542,12 @@
+
+
+
+
+
+
+
diff --git a/youyesyet.canonical.adl.xml b/youyesyet.canonical.adl.xml
index 62a75e9..3333478 100644
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@@ -64,7 +64,7 @@
All users of the canvasser app Able to read and add canvassing data in a limited
radius around their current position.
-
+
Organisers of canvassing teams Able to see and modify data on the canvassers in
the team(s) they organise; able to add canvassers to their team; able to update canvassers in
their team, including resetting passwords and locking accounts; able to see canvass data over
@@ -115,6 +115,13 @@
+
+
+
+
+
+
+
All genders which may be assigned to electors.
@@ -123,13 +130,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -151,12 +158,19 @@
-
+
-
+
+
+
+
+
+
+
+
-
- Link table
-
-
-
-
- Auto-generated abstract primary key
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- Link table
-
-
-
-
- Auto-generated abstract primary key
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- Link table
-
-
-
-
- Auto-generated abstract primary key
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+