Much UI work, significant improvement.

youyesyet.adl.xml

@@ -82,16 +82,14 @@ version="0.1.1">
     column="dwelling_id" entity="dwellings" farkey="id">
       <prompt prompt="Home" locale="en-GB"/>
     </property>
-    <property size="16" type="string" name="phone" column="phone"
-    distinct="user">
+    <property size="16" type="string" name="phone" column="phone">
       <prompt prompt="Phone" locale="en-GB"/>
     </property>
-    <property size="128" type="string" name="email" column="email"
-    distinct="user">
+    <property size="128" type="string" name="email" column="email">
       <prompt prompt="Email" locale="en-GB"/>
     </property>
     <property name="gender" type="entity" column="gender"
-    entity="genders" farkey="id" default="Unknown" distinct="user">
+    entity="genders" farkey="id" default="Unknown">
       <prompt prompt="Gender" locale="en-GB"/>
     </property>
     <list properties="listed" name="Electors">
@@ -170,9 +168,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
-    entity dwellings already has a key - not generating one
-    -->
+
   <entity table="dwellings" name="dwellings" magnitude="6"
   volatility="6">
     <documentation>All dwellings within addresses in the system; a
@@ -229,9 +225,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
-    entity addresses already has a key - not generating one
-    -->
+
   <entity table="addresses" name="addresses" magnitude="6"
   volatility="6">
     <documentation>Addresses of all buildings which contain
@@ -263,6 +257,7 @@ version="0.1.1">
     <property type="real" name="longitude" column="longitude">
       <prompt prompt="Longitude" locale="en-GB"/>
     </property>
+    <!-- property name="dwellings" type="link" entity="dwelling"/ -->
     <property type="integer" name="locality" column="locality">
       <documentation>Locality indexing; see issue #44. Note that
       this property should be generated automatically from the
@@ -320,6 +315,9 @@ version="0.1.1">
       <field property="longitude">
         <prompt prompt="Longitude" locale="en-GB"/>
       </field>
+      <auxlist property="dwellings">
+        <field name="sub-address"/>
+      </auxlist>
     </form>
     <permission group="canvassers" permission="read"/>
     <permission group="teamorganisers" permission="read"/>
@@ -341,6 +339,7 @@ version="0.1.1">
         <prompt prompt="id" locale="en-GB"/>
       </property>
     </key>
+    <!-- TODO: should visit be keyed against dwelling rather than address? -->
     <property required="true" type="entity" name="address_id"
     column="address_id" entity="addresses" farkey="id"
     distinct="user">
@@ -362,7 +361,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Visits">
       <field property="id">
         <prompt prompt="id" locale="en-GB"/>
@@ -542,7 +541,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="none"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="none"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Intentions">
       <field property="visit_id">
         <prompt prompt="visit_id" locale="en-GB"/>
@@ -608,12 +607,12 @@ version="0.1.1">
     </property>
     <property type="entity" name="elector_id" column="elector_id"
     entity="electors" farkey="id">
-      <prompt prompt="elector_id" locale="en-GB"/>
+      <prompt prompt="Electoral roll entry" locale="en-GB"/>
     </property>
     <property required="true" type="entity" name="address_id"
     column="address_id" entity="addresses" farkey="id"
     distinct="user">
-      <prompt prompt="address_id" locale="en-GB"/>
+      <prompt prompt="address" locale="en-GB"/>
     </property>
     <property type="string" name="phone" column="phone" size="16"
     distinct="user">
@@ -658,17 +657,8 @@ version="0.1.1">
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
-      <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
-      </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
-      </field>
-      <field property="phone">
-        <prompt prompt="phone" locale="en-GB"/>
-      </field>
-      <field property="email">
-        <prompt prompt="email" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="authority_id">
         <prompt prompt="authority_id" locale="en-GB"/>
@@ -687,11 +677,13 @@ version="0.1.1">
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
+      <field property="avatar"/>
+      <field property="bio"/>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
+        <prompt prompt="Electoral roll entry" locale="en-GB"/>
       </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="phone">
         <prompt prompt="phone" locale="en-GB"/>
@@ -786,7 +778,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
   </entity>
 
   <entity table="roles" name="roles" magnitude="1" volatility="7">
@@ -913,7 +905,7 @@ version="0.1.1">
         <prompt prompt="Organisers" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -927,7 +919,7 @@ version="0.1.1">
         <prompt prompt="Members" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -1062,9 +1054,6 @@ version="0.1.1">
       <field property="date">
         <prompt prompt="date" locale="en-GB"/>
       </field>
-      <field property="notes">
-        <prompt prompt="notes" locale="en-GB"/>
-      </field>
       <field property="closed">
         <prompt prompt="closed" locale="en-GB"/>
       </field>
@@ -1134,6 +1123,7 @@ version="0.1.1">
     -->
   <entity table="followupmethods" name="followupmethods"
   magnitude="1" volatility="7">
+    <documentation>Methods which may be used to follow up a followup request. Reference data.</documentation>
     <key>
       <property required="true" type="string" size="32" name="id"
       column="id" immutable="true" distinct="all">