simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Simon Brooke 2018-06-14 21:37:12 +01:00
parent bfb5a67266 eb1c35489b
commit 14abdb0dce
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
youyesyet.adl.xml
View file

@ -130,7 +130,12 @@
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<entity name="dwellings" magnitude="6"> <entity name="dwellings" magnitude="6">
<documentation>All dwellings within addresses in the system; a dwelling is a house, flat or appartment in which electors live.</documentation> <documentation>All dwellings within addresses in the system; a dwelling is a
house, flat or appartment in which electors live. Every address should have
at least one dwelling; essentially, an address maps onto a street door and
dwellings map onto what's behind that door. So a tenement or a block of flats
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"/>
@ -243,6 +248,13 @@
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
<list name="Visits" properties="all"/> <list name="Visits" properties="all"/>
<form name="Visit" properties="all"/> <form name="Visit" properties="all"/>
<permission permission="none" group="public"/>
<permission permission="noedit" group="canvassers"/>
<permission permission="noedit" group="teamorganisers"/>
<permission permission="read" group="issueexperts"/>
<permission permission="read" group="analysts"/>
<permission permission="read" group="issueeditors"/>
<permission permission="all" group="admin"/>
</entity> </entity>
<entity name="authorities" magnitude="2"> <entity name="authorities" magnitude="2">
<documentation>Authorities which may authenticate canvassers to the system.</documentation> <documentation>Authorities which may authenticate canvassers to the system.</documentation>
@ -283,7 +295,7 @@
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<entity name="intentions" magnitude="6"> <entity name="intentions" magnitude="6">
<documentation>Link table.</documentation> <documentation>Intentions of electors to vote for options elicited in visits.</documentation>
<property required="true" type="entity" entity="visits" farkey="id" name="visit_id" <property required="true" type="entity" entity="visits" farkey="id" name="visit_id"
column="visit_id"> column="visit_id">
<prompt prompt="visit_id" locale="en-GB"/> <prompt prompt="visit_id" locale="en-GB"/>
@ -456,6 +468,13 @@
</permission> </permission>
<list name="Teams" properties="all"/> <list name="Teams" properties="all"/>
<form name="Team" properties="all"/> <form name="Team" properties="all"/>
<permission permission="none" group="public"/>
<permission permission="read" group="canvassers"/>
<permission permission="edit" group="teamorganisers"/>
<permission permission="read" group="issueexperts"/>
<permission permission="read" group="analysts"/>
<permission permission="read" group="issueeditors"/>
<permission permission="all" group="admin"/>
</entity> </entity>
<entity name="districts" magnitude="4"> <entity name="districts" magnitude="4">
<documentation>Electoral districts: TODO: Shape (polygon) information will need to be added, for use in maps.</documentation> <documentation>Electoral districts: TODO: Shape (polygon) information will need to be added, for use in maps.</documentation>

7
youyesyet.canonical.adl.xml
View file

@ -262,6 +262,13 @@
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
<list properties="listed" name="Visits"><field property="id"><prompt prompt="id" locale="en-GB"/></field><field property="address_id"><prompt prompt="address_id" locale="en-GB"/></field><field property="canvasser_id"><prompt prompt="canvasser_id" locale="en-GB"/></field><field property="date"><prompt prompt="date" locale="en-GB"/></field></list> <list properties="listed" name="Visits"><field property="id"><prompt prompt="id" locale="en-GB"/></field><field property="address_id"><prompt prompt="address_id" locale="en-GB"/></field><field property="canvasser_id"><prompt prompt="canvasser_id" locale="en-GB"/></field><field property="date"><prompt prompt="date" locale="en-GB"/></field></list>
<form properties="listed" name="Visit"><field property="id"><prompt prompt="id" locale="en-GB"/></field><field property="address_id"><prompt prompt="address_id" locale="en-GB"/></field><field property="canvasser_id"><prompt prompt="canvasser_id" locale="en-GB"/></field><field property="date"><prompt prompt="date" locale="en-GB"/></field></form> <form properties="listed" name="Visit"><field property="id"><prompt prompt="id" locale="en-GB"/></field><field property="address_id"><prompt prompt="address_id" locale="en-GB"/></field><field property="canvasser_id"><prompt prompt="canvasser_id" locale="en-GB"/></field><field property="date"><prompt prompt="date" locale="en-GB"/></field></form>
<permission permission="none" group="public"/>
<permission permission="noedit" group="canvassers"/>
<permission permission="noedit" group="teamorganisers"/>
<permission permission="read" group="issueexperts"/>
<permission permission="read" group="analysts"/>
<permission permission="read" group="issueeditors"/>
<permission permission="all" group="admin"/>
</entity> </entity>
<!-- <!--
entity authorities already has a key - not generating one entity authorities already has a key - not generating one