Minor changes to ADL and to logging.

This commit is contained in:
Simon Brooke 2018-07-17 09:04:15 +01:00
parent a610eca59d
commit e53361a3a5
3 changed files with 406 additions and 395 deletions

View file

@ -68,7 +68,7 @@
;; than me so there's almost certainly a reason it doesn't. ;; than me so there's almost certainly a reason it doesn't.
[template session & [params]] [template session & [params]]
(let [user (:user session)] (let [user (:user session)]
(log/debug (str "layout/render: template: '" template "'; session: '" session "'; params: '" params "'")) (log/debug (str "layout/render: template: '" template "'"))
(content-type (content-type
(ok (ok
(parser/render-file (parser/render-file

File diff suppressed because it is too large Load diff

View file

@ -29,7 +29,7 @@
<documentation>See <documentation>See
https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/488478/Bulk_Data_Transfer_-_additional_validation_valid_from_12_November_2015.pdf, https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/488478/Bulk_Data_Transfer_-_additional_validation_valid_from_12_November_2015.pdf,
section 3</documentation> section 3</documentation>
<help locale="en-GB">A valid postcode.</help> <help locale="en_GB.UTF-8">A valid postcode.</help>
</typedef> </typedef>
<group name="public"> <group name="public">
<documentation>All users</documentation> <documentation>All users</documentation>
@ -78,62 +78,67 @@
campaign.</documentation> campaign.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" immutable="true" distinct="system"> <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property size="64" required="true" type="string" name="name" column="name" distinct="user"> <property size="64" required="true" type="string" name="name" column="name" distinct="user">
<prompt prompt="Name" locale="en-GB"/> <prompt prompt="Name" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="dwelling_id" column="dwelling_id" entity="dwellings" farkey="id"> <property required="true" type="entity" name="dwelling_id" column="dwelling_id" entity="dwellings" farkey="id">
<prompt prompt="Home" locale="en-GB"/> <prompt prompt="Home" locale="en_GB.UTF-8"/>
</property> </property>
<property size="16" type="string" name="phone" column="phone"> <property size="16" type="string" name="phone" column="phone">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</property> </property>
<property size="128" type="string" name="email" column="email"> <property size="128" type="string" name="email" column="email">
<prompt prompt="Email" locale="en-GB"/> <prompt prompt="Email" locale="en_GB.UTF-8"/>
</property> </property>
<property name="gender" type="entity" column="gender" entity="genders" farkey="id" default="Unknown"> <property name="gender" type="entity" column="gender" entity="genders" farkey="id" default="Unknown">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</property>
<property name="signature" type="text">
<documentation>The signature of this elector, captured as SVG text,
as evidence they have consented to us holding data on them.
Null if they have not.</documentation>
</property> </property>
<list properties="listed" name="Electors"> <list properties="listed" name="Electors">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="Name" locale="en-GB"/> <prompt prompt="Name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="dwelling_id"> <field property="dwelling_id">
<prompt prompt="Home" locale="en-GB"/> <prompt prompt="Home" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</field> </field>
<field property="email"> <field property="email">
<prompt prompt="eMail" locale="en-GB"/> <prompt prompt="eMail" locale="en_GB.UTF-8"/>
</field> </field>
<field property="gender"> <field property="gender">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Elector"> <form properties="listed" name="Elector">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="Name" locale="en-GB"/> <prompt prompt="Name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="dwelling_id"> <field property="dwelling_id">
<prompt prompt="Home" locale="en-GB"/> <prompt prompt="Home" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</field> </field>
<field property="email"> <field property="email">
<prompt prompt="eMail" locale="en-GB"/> <prompt prompt="eMail" locale="en_GB.UTF-8"/>
</field> </field>
<field property="gender"> <field property="gender">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -151,17 +156,17 @@
electors.</documentation> electors.</documentation>
<key> <key>
<property name="id" type="string" size="32" distinct="all"> <property name="id" type="string" size="32" distinct="all">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<list properties="listed" name="Genders"> <list properties="listed" name="Genders">
<field property="id"> <field property="id">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Gender"> <form properties="listed" name="Gender">
<field property="id"> <field property="id">
<prompt prompt="Gender" locale="en-GB"/> <prompt prompt="Gender" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -183,11 +188,11 @@
would be one address with many dwellings.</documentation> would be one address with many dwellings.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" immutable="true" distinct="system"> <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user"> <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
<prompt prompt="Building Address" locale="en-GB"/> <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
</property> </property>
<property required="false" type="string" size="32" name="sub-address" distinct="user"> <property required="false" type="string" size="32" name="sub-address" distinct="user">
<documentation> <documentation>
@ -198,24 +203,24 @@
</property> </property>
<list properties="listed" name="Dwellings"> <list properties="listed" name="Dwellings">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="Building Address" locale="en-GB"/> <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="sub-address"> <field property="sub-address">
<prompt prompt="Sub address" locale="en-GB"/> <prompt prompt="Sub address" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Dwelling"> <form properties="listed" name="Dwelling">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="Building Address" locale="en-GB"/> <prompt prompt="Building Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="sub-address"> <field property="sub-address">
<prompt prompt="Sub address (e.g. flat number)" locale="en-GB"/> <prompt prompt="Sub address (e.g. flat number)" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -233,26 +238,26 @@
dwellings.</documentation> dwellings.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" immutable="true" distinct="system"> <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="string" name="address" column="address" size="256" distinct="user"> <property required="true" type="string" name="address" column="address" size="256" distinct="user">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</property> </property>
<property type="defined" typedef="postcode" name="postcode" column="postcode" size="16" distinct="user"> <property type="defined" typedef="postcode" name="postcode" column="postcode" size="16" distinct="user">
<prompt prompt="Postcode" locale="en-GB"/> <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
</property> </property>
<property type="string" name="phone" column="phone" size="16"> <property type="string" name="phone" column="phone" size="16">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</property> </property>
<property type="entity" name="district_id" column="district_id" entity="districts" farkey="id"> <property type="entity" name="district_id" column="district_id" entity="districts" farkey="id">
<prompt prompt="District" locale="en-GB"/> <prompt prompt="District" locale="en_GB.UTF-8"/>
</property> </property>
<property type="real" name="latitude" column="latitude"> <property type="real" name="latitude" column="latitude">
<prompt prompt="Latitude" locale="en-GB"/> <prompt prompt="Latitude" locale="en_GB.UTF-8"/>
</property> </property>
<property type="real" name="longitude" column="longitude"> <property type="real" name="longitude" column="longitude">
<prompt prompt="Longitude" locale="en-GB"/> <prompt prompt="Longitude" locale="en_GB.UTF-8"/>
</property> </property>
<!-- property name="dwellings" type="link" entity="dwelling"/ --> <!-- property name="dwellings" type="link" entity="dwelling"/ -->
<property type="integer" name="locality" column="locality"> <property type="integer" name="locality" column="locality">
@ -269,48 +274,48 @@
</property> </property>
<list properties="listed" name="Addresses"> <list properties="listed" name="Addresses">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address"> <field property="address">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="postcode"> <field property="postcode">
<prompt prompt="Postcode" locale="en-GB"/> <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</field> </field>
<field property="district_id"> <field property="district_id">
<prompt prompt="District" locale="en-GB"/> <prompt prompt="District" locale="en_GB.UTF-8"/>
</field> </field>
<field property="latitude"> <field property="latitude">
<prompt prompt="Latitude" locale="en-GB"/> <prompt prompt="Latitude" locale="en_GB.UTF-8"/>
</field> </field>
<field property="longitude"> <field property="longitude">
<prompt prompt="Longitude" locale="en-GB"/> <prompt prompt="Longitude" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Address"> <form properties="listed" name="Address">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address"> <field property="address">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="postcode"> <field property="postcode">
<prompt prompt="Postcode" locale="en-GB"/> <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="Phone" locale="en-GB"/> <prompt prompt="Phone" locale="en_GB.UTF-8"/>
</field> </field>
<field property="district_id"> <field property="district_id">
<prompt prompt="District" locale="en-GB"/> <prompt prompt="District" locale="en_GB.UTF-8"/>
</field> </field>
<field property="latitude"> <field property="latitude">
<prompt prompt="Latitude" locale="en-GB"/> <prompt prompt="Latitude" locale="en_GB.UTF-8"/>
</field> </field>
<field property="longitude"> <field property="longitude">
<prompt prompt="Longitude" locale="en-GB"/> <prompt prompt="Longitude" locale="en_GB.UTF-8"/>
</field> </field>
<auxlist property="dwellings"> <auxlist property="dwellings">
<field name="sub-address"/> <field name="sub-address"/>
@ -331,18 +336,18 @@
which opinions were recorded.</documentation> which opinions were recorded.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" distinct="system"> <property required="true" type="integer" name="id" column="id" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<!-- TODO: should visit be keyed against dwelling rather than address? --> <!-- 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"> <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" 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" locale="en-GB"/> <prompt prompt="Canvasser" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="timestamp" name="date" column="date" default="now()" distinct="user"> <property required="true" type="timestamp" name="date" column="date" default="now()" distinct="user">
<prompt prompt="Date" locale="en-GB"/> <prompt prompt="Date" locale="en_GB.UTF-8"/>
</property> </property>
<permission group="canvassers" permission="noedit"> <permission group="canvassers" permission="noedit">
<documentation>But only in their immediate <documentation>But only in their immediate
@ -355,30 +360,30 @@
<permission group="admin" permission="noedit"/> <permission group="admin" permission="noedit"/>
<list properties="listed" name="Visits"> <list properties="listed" name="Visits">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="canvasser_id"> <field property="canvasser_id">
<prompt prompt="Canvasser" locale="en-GB"/> <prompt prompt="Canvasser" locale="en_GB.UTF-8"/>
</field> </field>
<field property="date"> <field property="date">
<prompt prompt="Date" locale="en-GB"/> <prompt prompt="Date" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Visit"> <form properties="listed" name="Visit">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="Address" locale="en-GB"/> <prompt prompt="Address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="canvasser_id"> <field property="canvasser_id">
<prompt prompt="Canvasser" locale="en-GB"/> <prompt prompt="Canvasser" locale="en_GB.UTF-8"/>
</field> </field>
<field property="date"> <field property="date">
<prompt prompt="Date" locale="en-GB"/> <prompt prompt="Date" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission permission="none" group="public"/> <permission permission="none" group="public"/>
@ -397,7 +402,7 @@
the system.</documentation> the system.</documentation>
<key> <key>
<property required="true" type="string" name="id" column="id" size="32" distinct="all" immutable="true"> <property required="true" type="string" name="id" column="id" size="32" distinct="all" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property name="request-token-uri" type="string" size="256" required="true"/> <property name="request-token-uri" type="string" size="256" required="true"/>
@ -407,14 +412,14 @@
<property name="consumer-secret" type="string" size="256" required="true"/> <property name="consumer-secret" type="string" size="256" required="true"/>
<list name="Authorities" properties="listed"> <list name="Authorities" properties="listed">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field># </field>#
<field property="request-token-uri"/> <field property="request-token-uri"/>
<field property="access-token-uri"/> <field property="access-token-uri"/>
<field property="authorize-uri"/></list> <field property="authorize-uri"/></list>
<form properties="listed" name="Authority"> <form properties="listed" name="Authority">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="request-token-uri"/> <field property="request-token-uri"/>
<field property="access-token-uri"/> <field property="access-token-uri"/>
@ -443,45 +448,45 @@
about which they may have questions.</documentation> about which they may have questions.</documentation>
<key> <key>
<property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all"> <property required="true" type="string" name="id" column="id" size="32" immutable="true" distinct="all">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property type="string" name="url" column="url" size="256"> <property type="string" name="url" column="url" size="256">
<prompt prompt="url" locale="en-GB"/> <prompt prompt="url" locale="en_GB.UTF-8"/>
</property> </property>
<property name="current" type="boolean" default="true"> <property name="current" type="boolean" default="true">
<prompt prompt="Is current?" locale="en-GB"/> <prompt prompt="Is current?" locale="en_GB.UTF-8"/>
</property> </property>
<property type="text" name="brief"> <property type="text" name="brief">
<prompt prompt="Brief response to issue" locale="en-GB"/> <prompt prompt="Brief response to issue" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" name="experts" entity="canvassers"/> <property type="link" name="experts" entity="canvassers"/>
<list properties="listed" name="Issues"> <list properties="listed" name="Issues">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="url"> <field property="url">
<prompt prompt="url" locale="en-GB"/> <prompt prompt="url" locale="en_GB.UTF-8"/>
</field> </field>
<field property="current"> <field property="current">
<prompt prompt="Is current?" locale="en-GB"/> <prompt prompt="Is current?" locale="en_GB.UTF-8"/>
</field> </field>
<field property="brief"> <field property="brief">
<prompt prompt="Brief response to issue" locale="en-GB"/> <prompt prompt="Brief response to issue" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Issue"> <form properties="listed" name="Issue">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="url"> <field property="url">
<prompt prompt="url" locale="en-GB"/> <prompt prompt="url" locale="en_GB.UTF-8"/>
</field> </field>
<field property="current"> <field property="current">
<prompt prompt="Is current?" locale="en-GB"/> <prompt prompt="Is current?" locale="en_GB.UTF-8"/>
</field> </field>
<field property="brief"> <field property="brief">
<prompt prompt="Brief response to issue" locale="en-GB"/> <prompt prompt="Brief response to issue" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -503,13 +508,13 @@
</property> </property>
</key> </key>
<property required="true" type="entity" entity="visits" farkey="id" name="visit_id" column="visit_id"> <property required="true" type="entity" entity="visits" farkey="id" name="visit_id" column="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</property> </property>
<property type="entity" entity="electors" farkey="id" name="elector_id" column="elector_id"> <property type="entity" entity="electors" farkey="id" name="elector_id" column="elector_id">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" entity="options" farkey="id" name="option_id" column="option_id"> <property required="true" type="entity" entity="options" farkey="id" name="option_id" column="option_id">
<prompt prompt="option_id" locale="en-GB"/> <prompt prompt="option_id" locale="en_GB.UTF-8"/>
</property> </property>
<property name="locality" type="integer" required="true"> <property name="locality" type="integer" required="true">
<documentation>The locality at which the intention was <documentation>The locality at which the intention was
@ -526,13 +531,13 @@
<permission group="admin" permission="noedit"/> <permission group="admin" permission="noedit"/>
<list properties="listed" name="Intentions"> <list properties="listed" name="Intentions">
<field property="visit_id"> <field property="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="elector_id"> <field property="elector_id">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="option_id"> <field property="option_id">
<prompt prompt="option_id" locale="en-GB"/> <prompt prompt="option_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="locality"> <field property="locality">
<documentation>The locality at which the intention was <documentation>The locality at which the intention was
@ -543,13 +548,13 @@
</list> </list>
<form properties="listed" name="Intention"> <form properties="listed" name="Intention">
<field property="visit_id"> <field property="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="elector_id"> <field property="elector_id">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="option_id"> <field property="option_id">
<prompt prompt="option_id" locale="en-GB"/> <prompt prompt="option_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="locality"> <field property="locality">
<documentation>The locality at which the intention was <documentation>The locality at which the intention was
@ -567,48 +572,48 @@
interviewing electors.</documentation> interviewing electors.</documentation>
<key> <key>
<property type="integer" name="id" column="id" distinct="system" immutable="true"> <property type="integer" name="id" column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="string" name="username" column="username" size="32" distinct="all"> <property required="true" type="string" name="username" column="username" size="32" distinct="all">
<prompt prompt="username" locale="en-GB"/> <prompt prompt="username" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="string" name="fullname" column="fullname" size="64" distinct="user"> <property required="true" type="string" name="fullname" column="fullname" size="64" distinct="user">
<prompt prompt="fullname" locale="en-GB"/> <prompt prompt="fullname" locale="en_GB.UTF-8"/>
</property> </property>
<property name="avatar" type="image"> <property name="avatar" type="image">
<documentation>An image of the canvasser, so that other members of their <documentation>An image of the canvasser, so that other members of their
team can recognise them.</documentation> team can recognise them.</documentation>
<prompt prompt="Avatar" locale="en-GB"/> <prompt prompt="Avatar" locale="en_GB.UTF-8"/>
</property> </property>
<property name="bio" type="text"> <property name="bio" type="text">
<documentation>Information the canvasser supplies about themselves; an introduction.</documentation> <documentation>Information the canvasser supplies about themselves; an introduction.</documentation>
<prompt prompt="Bio" locale="en-GB"/> <prompt prompt="Bio" locale="en_GB.UTF-8"/>
</property> </property>
<property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id"> <property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id">
<prompt prompt="Electoral roll entry" locale="en-GB"/> <prompt prompt="Electoral roll entry" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user"> <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
<prompt prompt="address" locale="en-GB"/> <prompt prompt="address" locale="en_GB.UTF-8"/>
</property> </property>
<property type="string" name="phone" column="phone" size="16" distinct="user"> <property type="string" name="phone" column="phone" size="16" distinct="user">
<prompt prompt="phone" locale="en-GB"/> <prompt prompt="phone" locale="en_GB.UTF-8"/>
</property> </property>
<property type="string" name="email" column="email" size="128" distinct="user"> <property type="string" name="email" column="email" size="128" distinct="user">
<prompt prompt="email" locale="en-GB"/> <prompt prompt="email" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="authority_id" entity="authorities" farkey="id"> <property required="true" type="entity" name="authority_id" entity="authorities" farkey="id">
<prompt prompt="authority_id" locale="en-GB"/> <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
</property> </property>
<property type="boolean" name="authorised" column="authorised"> <property type="boolean" name="authorised" column="authorised">
<prompt prompt="authorised" locale="en-GB"/> <prompt prompt="authorised" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" name="roles" entity="roles" farkey="role_id"> <property type="link" name="roles" entity="roles" farkey="role_id">
<prompt prompt="Roles" locale="en-GB"/> <prompt prompt="Roles" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" name="expertise" entity="issues"> <property type="link" name="expertise" entity="issues">
<documentation>Only relevant to issue experts.</documentation> <documentation>Only relevant to issue experts.</documentation>
<prompt prompt="Expertise" locale="en-GB"/> <prompt prompt="Expertise" locale="en_GB.UTF-8"/>
</property> </property>
<permission group="canvassers" permission="edit"> <permission group="canvassers" permission="edit">
<documentation>But only their own record</documentation> <documentation>But only their own record</documentation>
@ -622,56 +627,56 @@
</permission> </permission>
<list properties="listed" name="Canvassers"> <list properties="listed" name="Canvassers">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="username"> <field property="username">
<prompt prompt="username" locale="en-GB"/> <prompt prompt="username" locale="en_GB.UTF-8"/>
</field> </field>
<field property="fullname"> <field property="fullname">
<prompt prompt="fullname" locale="en-GB"/> <prompt prompt="fullname" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="address" locale="en-GB"/> <prompt prompt="address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="authority_id"> <field property="authority_id">
<prompt prompt="authority_id" locale="en-GB"/> <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="authorised"> <field property="authorised">
<prompt prompt="authorised" locale="en-GB"/> <prompt prompt="authorised" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Canvasser"> <form properties="listed" name="Canvasser">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="username"> <field property="username">
<prompt prompt="username" locale="en-GB"/> <prompt prompt="username" locale="en_GB.UTF-8"/>
</field> </field>
<field property="fullname"> <field property="fullname">
<prompt prompt="fullname" locale="en-GB"/> <prompt prompt="fullname" locale="en_GB.UTF-8"/>
</field> </field>
<field property="avatar"/> <field property="avatar"/>
<field property="bio"/> <field property="bio"/>
<field property="elector_id"> <field property="elector_id">
<prompt prompt="Electoral roll entry" locale="en-GB"/> <prompt prompt="Electoral roll entry" locale="en_GB.UTF-8"/>
</field> </field>
<field property="address_id"> <field property="address_id">
<prompt prompt="address" locale="en-GB"/> <prompt prompt="address" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="phone" locale="en-GB"/> <prompt prompt="phone" locale="en_GB.UTF-8"/>
</field> </field>
<field property="email"> <field property="email">
<prompt prompt="email" locale="en-GB"/> <prompt prompt="email" locale="en_GB.UTF-8"/>
</field> </field>
<field property="authority_id"> <field property="authority_id">
<prompt prompt="authority_id" locale="en-GB"/> <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="authorised"> <field property="authorised">
<prompt prompt="authorised" locale="en-GB"/> <prompt prompt="authorised" locale="en_GB.UTF-8"/>
</field> </field>
<field property="roles"> <field property="roles">
<prompt prompt="Roles" locale="en-GB"/> <prompt prompt="Roles" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="edit"> <permission group="canvassers" permission="edit">
@ -692,53 +697,53 @@
expert</documentation> expert</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" distinct="system" immutable="true"> <property required="true" type="integer" name="id" column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id" distinct="user"> <property required="true" type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id" distinct="user">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="visit_id" column="visit_id" entity="visits" farkey="id" distinct="user"> <property required="true" type="entity" name="visit_id" column="visit_id" entity="visits" farkey="id" distinct="user">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="issue_id" column="issue_id" entity="issues" farkey="id" distinct="user"> <property required="true" type="entity" name="issue_id" column="issue_id" entity="issues" farkey="id" distinct="user">
<prompt prompt="issue_id" locale="en-GB"/> <prompt prompt="issue_id" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" name="method_id" column="method_id" entity="followupmethods" farkey="id"> <property required="true" type="entity" name="method_id" column="method_id" entity="followupmethods" farkey="id">
<prompt prompt="method_id" locale="en-GB"/> <prompt prompt="method_id" locale="en_GB.UTF-8"/>
</property> </property>
<list properties="listed" name="Followuprequests"> <list properties="listed" name="Followuprequests">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="elector_id"> <field property="elector_id">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="visit_id"> <field property="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="issue_id"> <field property="issue_id">
<prompt prompt="issue_id" locale="en-GB"/> <prompt prompt="issue_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="method_id"> <field property="method_id">
<prompt prompt="method_id" locale="en-GB"/> <prompt prompt="method_id" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Followuprequest"> <form properties="listed" name="Followuprequest">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="elector_id"> <field property="elector_id">
<prompt prompt="elector_id" locale="en-GB"/> <prompt prompt="elector_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="visit_id"> <field property="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="issue_id"> <field property="issue_id">
<prompt prompt="issue_id" locale="en-GB"/> <prompt prompt="issue_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="method_id"> <field property="method_id">
<prompt prompt="method_id" locale="en-GB"/> <prompt prompt="method_id" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="noedit"/> <permission group="canvassers" permission="noedit"/>
@ -757,32 +762,32 @@
may be a member.</documentation> may be a member.</documentation>
<key> <key>
<property type="integer" name="id" column="id" immutable="true" distinct="system"> <property type="integer" name="id" column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="string" name="name" column="name" size="64" distinct="all" immutable="true"> <property required="true" type="string" name="name" column="name" size="64" distinct="all" immutable="true">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" entity="canvassers" name="members"> <property type="link" entity="canvassers" name="members">
<prompt prompt="Members" locale="en-GB"/> <prompt prompt="Members" locale="en_GB.UTF-8"/>
</property> </property>
<list properties="listed" name="Roles"> <list properties="listed" name="Roles">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Role"> <form properties="listed" name="Role">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="members"> <field property="members">
<prompt prompt="Members" locale="en-GB"/> <prompt prompt="Members" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -798,26 +803,26 @@
<entity table="teams" name="teams" magnitude="4" volatility="4"> <entity table="teams" name="teams" magnitude="4" volatility="4">
<key> <key>
<property type="integer" name="id" column="id" distinct="system" immutable="true"> <property type="integer" name="id" column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="string" name="name" column="name" size="64" distinct="user"> <property required="true" type="string" name="name" column="name" size="64" distinct="user">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" entity="districts" farkey="id" name="district_id" column="district_id"> <property required="true" type="entity" entity="districts" farkey="id" name="district_id" column="district_id">
<prompt prompt="district_id" locale="en-GB"/> <prompt prompt="district_id" locale="en_GB.UTF-8"/>
</property> </property>
<property type="real" name="latitude" column="latitude"> <property type="real" name="latitude" column="latitude">
<prompt prompt="latitude" locale="en-GB"/> <prompt prompt="latitude" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" entity="canvassers" name="members"> <property type="link" entity="canvassers" name="members">
<prompt prompt="Members" locale="en-GB"/> <prompt prompt="Members" locale="en_GB.UTF-8"/>
</property> </property>
<property type="link" entity="canvassers" name="organisers"> <property type="link" entity="canvassers" name="organisers">
<prompt prompt="Organisers" locale="en-GB"/> <prompt prompt="Organisers" locale="en_GB.UTF-8"/>
</property> </property>
<property type="real" name="longitude" column="longitude"> <property type="real" name="longitude" column="longitude">
<prompt prompt="longitude" locale="en-GB"/> <prompt prompt="longitude" locale="en_GB.UTF-8"/>
</property> </property>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
<permission group="teamorganisers" permission="edit"> <permission group="teamorganisers" permission="edit">
@ -831,69 +836,69 @@
</permission> </permission>
<list properties="listed" name="Teams"> <list properties="listed" name="Teams">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="district_id"> <field property="district_id">
<prompt prompt="district_id" locale="en-GB"/> <prompt prompt="district_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="latitude"> <field property="latitude">
<prompt prompt="latitude" locale="en-GB"/> <prompt prompt="latitude" locale="en_GB.UTF-8"/>
</field> </field>
<field property="longitude"> <field property="longitude">
<prompt prompt="longitude" locale="en-GB"/> <prompt prompt="longitude" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Team"> <form properties="listed" name="Team">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="district_id"> <field property="district_id">
<prompt prompt="district_id" locale="en-GB"/> <prompt prompt="district_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="latitude"> <field property="latitude">
<prompt prompt="latitude" locale="en-GB"/> <prompt prompt="latitude" locale="en_GB.UTF-8"/>
</field> </field>
<field property="members"> <field property="members">
<prompt prompt="Members" locale="en-GB"/> <prompt prompt="Members" locale="en_GB.UTF-8"/>
</field> </field>
<field property="organisers"> <field property="organisers">
<prompt prompt="Organisers" locale="en-GB"/> <prompt prompt="Organisers" locale="en_GB.UTF-8"/>
</field> </field>
<field property="longitude"> <field property="longitude">
<prompt prompt="longitude" locale="en-GB"/> <prompt prompt="longitude" locale="en_GB.UTF-8"/>
</field> </field>
<auxlist property="organisers"> <auxlist property="organisers">
<prompt prompt="Organisers" locale="en-GB"/> <prompt prompt="Organisers" locale="en_GB.UTF-8"/>
<field property="id"> <field property="id">
</field> </field>
<field property="fullname"> <field property="fullname">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="email"> <field property="email">
<prompt prompt="email" locale="en-GB"/> <prompt prompt="email" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="phone" locale="en-GB"/> <prompt prompt="phone" locale="en_GB.UTF-8"/>
</field> </field>
</auxlist> </auxlist>
<auxlist property="members"> <auxlist property="members">
<prompt prompt="Members" locale="en-GB"/> <prompt prompt="Members" locale="en_GB.UTF-8"/>
<field property="id"> <field property="id">
</field> </field>
<field property="fullname"> <field property="fullname">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
<field property="email"> <field property="email">
<prompt prompt="email" locale="en-GB"/> <prompt prompt="email" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone"> <field property="phone">
<prompt prompt="phone" locale="en-GB"/> <prompt prompt="phone" locale="en_GB.UTF-8"/>
</field> </field>
</auxlist> </auxlist>
<auxlist property="events"> <auxlist property="events">
@ -921,7 +926,7 @@
</property> </property>
</key> </key>
<property required="true" type="string" name="name" column="name" size="64" distinct="user"> <property required="true" type="string" name="name" column="name" size="64" distinct="user">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</property> </property>
<property name="teams" type="link" entity="teams"/> <property name="teams" type="link" entity="teams"/>
<property name="date" type="date" distinct="user"/> <property name="date" type="date" distinct="user"/>
@ -935,8 +940,8 @@
<permission permission="read" group="analysts"/> <permission permission="read" group="analysts"/>
<permission permission="read" group="issueeditors"/> <permission permission="read" group="issueeditors"/>
<permission permission="all" group="admin"/> <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"/></field><field property="teams"/><field property="date"/><field property="time"/><field property="decription"/><field property="cancelled"/></form> <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"/></field><field property="date"/><field property="time"/><field property="decription"/><field property="cancelled"/></list> <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>
</entity> </entity>
<!-- <!--
entity districts already has a key - not generating one entity districts already has a key - not generating one
@ -947,28 +952,28 @@
maps.</documentation> maps.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" immutable="true" distinct="system"> <property required="true" type="integer" name="id" column="id" immutable="true" distinct="system">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="string" name="name" column="name" size="64" distinct="user"> <property required="true" type="string" name="name" column="name" size="64" distinct="user">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</property> </property>
<permission group="public" permission="read"/> <permission group="public" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
<list properties="listed" name="Districts"> <list properties="listed" name="Districts">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="District"> <form properties="listed" name="District">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="name"> <field property="name">
<prompt prompt="name" locale="en-GB"/> <prompt prompt="name" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -986,59 +991,59 @@
requests.</documentation> requests.</documentation>
<key> <key>
<property required="true" type="integer" name="id" column="id" distinct="system" immutable="true"> <property required="true" type="integer" name="id" column="id" distinct="system" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<property required="true" type="entity" name="request_id" column="request_id" entity="followuprequests" farkey="id"> <property required="true" type="entity" name="request_id" column="request_id" entity="followuprequests" farkey="id">
<prompt prompt="request_id" locale="en-GB"/> <prompt prompt="request_id" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" type="entity" 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"/> <prompt prompt="actor" locale="en_GB.UTF-8"/>
</property> </property>
<property required="true" default="now()" type="timestamp" name="date" column="date" distinct="user"> <property required="true" default="now()" type="timestamp" name="date" column="date" distinct="user">
<prompt prompt="date" locale="en-GB"/> <prompt prompt="date" locale="en_GB.UTF-8"/>
</property> </property>
<property type="text" name="notes" column="notes" distinct="user"> <property type="text" name="notes" column="notes" distinct="user">
<prompt prompt="notes" locale="en-GB"/> <prompt prompt="notes" locale="en_GB.UTF-8"/>
</property> </property>
<property type="boolean" name="closed" column="closed" default="false"> <property type="boolean" name="closed" column="closed" default="false">
<prompt prompt="closed" locale="en-GB"/> <prompt prompt="closed" locale="en_GB.UTF-8"/>
</property> </property>
<list properties="listed" name="Followupactions"> <list properties="listed" name="Followupactions">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="request_id"> <field property="request_id">
<prompt prompt="request_id" locale="en-GB"/> <prompt prompt="request_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="actor"> <field property="actor">
<prompt prompt="actor" locale="en-GB"/> <prompt prompt="actor" locale="en_GB.UTF-8"/>
</field> </field>
<field property="date"> <field property="date">
<prompt prompt="date" locale="en-GB"/> <prompt prompt="date" locale="en_GB.UTF-8"/>
</field> </field>
<field property="closed"> <field property="closed">
<prompt prompt="closed" locale="en-GB"/> <prompt prompt="closed" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Followupaction"> <form properties="listed" name="Followupaction">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="request_id"> <field property="request_id">
<prompt prompt="request_id" locale="en-GB"/> <prompt prompt="request_id" locale="en_GB.UTF-8"/>
</field> </field>
<field property="actor"> <field property="actor">
<prompt prompt="actor" locale="en-GB"/> <prompt prompt="actor" locale="en_GB.UTF-8"/>
</field> </field>
<field property="date"> <field property="date">
<prompt prompt="date" locale="en-GB"/> <prompt prompt="date" locale="en_GB.UTF-8"/>
</field> </field>
<field property="notes"> <field property="notes">
<prompt prompt="notes" locale="en-GB"/> <prompt prompt="notes" locale="en_GB.UTF-8"/>
</field> </field>
<field property="closed"> <field property="closed">
<prompt prompt="closed" locale="en-GB"/> <prompt prompt="closed" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="issueexperts" permission="noedit"/> <permission group="issueexperts" permission="noedit"/>
@ -1059,17 +1064,17 @@
canvassed on</documentation> canvassed on</documentation>
<key> <key>
<property required="true" type="string" name="id" column="id" size="32" distinct="all" immutable="true"> <property required="true" type="string" name="id" column="id" size="32" distinct="all" immutable="true">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<list properties="listed" name="Options"> <list properties="listed" name="Options">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Option"> <form properties="listed" name="Option">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>
@ -1086,17 +1091,17 @@
<documentation>Methods which may be used to follow up a followup request. Reference data.</documentation> <documentation>Methods which may be used to follow up a followup request. Reference data.</documentation>
<key> <key>
<property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all"> <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</property> </property>
</key> </key>
<list properties="listed" name="Followupmethods"> <list properties="listed" name="Followupmethods">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
</list> </list>
<form properties="listed" name="Followupmethod"> <form properties="listed" name="Followupmethod">
<field property="id"> <field property="id">
<prompt prompt="id" locale="en-GB"/> <prompt prompt="id" locale="en_GB.UTF-8"/>
</field> </field>
</form> </form>
<permission group="canvassers" permission="read"/> <permission group="canvassers" permission="read"/>