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

Probably a bad merge I'll regret

Browse source
This commit is contained in:
Simon Brooke 2018-07-21 12:21:10 +01:00
parent 912d417cb6
commit d53c633527
2 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
resources/sql/youyesyet.postgres.sql
View file

@ -5,7 +5,7 @@
-- --
-- auto-generated by [Application Description Language framework] -- auto-generated by [Application Description Language framework]
-- --
-- (https://github.com/simon-brooke/adl) at 20180718T215811.044Z -- (https://github.com/simon-brooke/adl) at 20180721T111020.637Z
-- --
-- A web-app intended to be used by canvassers -- A web-app intended to be used by canvassers
-- campaigning for a 'Yes' vote in the second independence -- campaigning for a 'Yes' vote in the second independence
@ -72,7 +72,7 @@ CREATE TABLE addresses
( (
id SERIAL NOT NULL PRIMARY KEY, id SERIAL NOT NULL PRIMARY KEY,
address VARCHAR(256) NOT NULL, address VARCHAR(256) NOT NULL,
postcode VARCHAR(16) CONSTRAINT pattern_14 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'), postcode VARCHAR(16) CONSTRAINT pattern_7470 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'),
phone VARCHAR(16), phone VARCHAR(16),
district_id INTEGER, district_id INTEGER,
latitude DOUBLE PRECISION, latitude DOUBLE PRECISION,
@ -985,33 +985,31 @@ ALTER TABLE ln_roles_canvassers_roles ADD CONSTRAINT ri_ln_roles_canvassers_role
ON DELETE NO ACTION ; ON DELETE NO ACTION ;
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- link table joining events with teams -- link table joining roles with canvassers
------------------------------------------------------------------------ ------------------------------------------------------------------------
CREATE TABLE ln_teams_events_teams CREATE TABLE ln_members_roles_canvassers
( (
event_id INTEGER, role_id INTEGER,
team_id INTEGER canvasser_id INTEGER
); );
GRANT SELECT ON ln_teams_events_teams TO admin, GRANT SELECT ON ln_members_roles_canvassers TO admin,
analysts, analysts,
canvassers, canvassers,
issueeditors, issueeditors,
issueexperts, issueexperts,
teamorganisers ; teamorganisers ;
GRANT INSERT ON ln_teams_events_teams TO admin, GRANT INSERT ON ln_members_roles_canvassers TO admin ;
teamorganisers ; GRANT UPDATE ON ln_members_roles_canvassers TO admin ;
GRANT UPDATE ON ln_teams_events_teams TO admin, GRANT DELETE ON ln_members_roles_canvassers TO admin ;
teamorganisers ;
GRANT DELETE ON ln_teams_events_teams TO admin ;
ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_events_event_id ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_canvassers_canvasser_id
FOREIGN KEY( event_id ) FOREIGN KEY( canvasser_id )
REFERENCES events(id) REFERENCES canvassers(id)
ON DELETE NO ACTION ; ON DELETE NO ACTION ;
ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_teams_team_id ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_roles_role_id
FOREIGN KEY( team_id ) FOREIGN KEY( role_id )
REFERENCES teams(id) REFERENCES roles(id)
ON DELETE NO ACTION ; ON DELETE NO ACTION ;
------------------------------------------------------------------------ ------------------------------------------------------------------------

41
youyesyet.canonical.adl.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4.1//EN" <!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4.1//EN"
"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" --> "http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" --><application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/"
<application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/" name="youyesyet" version="0.1.1"> xmlns:html="http://www.w3.org/1999/xhtml"
<!-- xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/"
name="youyesyet"
version="0.1.1"><!--
*************************************************************************** ***************************************************************************
* *
* Application Description Language Framework * Application Description Language Framework
@ -31,8 +32,8 @@
section 3</documentation> section 3</documentation>
<help locale="en_GB.UTF-8">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>
</group> </group>
<group name="canvassers" parent="public"> <group name="canvassers" parent="public">
<documentation>All users of the canvasser app Able to read and <documentation>All users of the canvasser app Able to read and
@ -69,7 +70,7 @@
records; able to add and update reference data records; able to add and update reference data
generally.</documentation> generally.</documentation>
</group> </group>
<!-- <!--
entity electors already has a key - not generating one entity electors already has a key - not generating one
--> -->
<entity table="electors" name="electors" magnitude="6" volatility="5"> <entity table="electors" name="electors" magnitude="6" volatility="5">
@ -136,7 +137,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity genders already has a key - not generating one entity genders already has a key - not generating one
--> -->
<entity table="genders" name="genders" magnitude="1" volatility="6"> <entity table="genders" name="genders" magnitude="1" volatility="6">
@ -164,7 +165,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity dwellings already has a key - not generating one entity dwellings already has a key - not generating one
--> -->
<entity table="dwellings" name="dwellings" magnitude="6" volatility="6"> <entity table="dwellings" name="dwellings" magnitude="6" volatility="6">
@ -212,7 +213,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity addresses already has a key - not generating one entity addresses already has a key - not generating one
--> -->
<entity table="addresses" name="addresses" magnitude="6" volatility="6"> <entity table="addresses" name="addresses" magnitude="6" volatility="6">
@ -298,7 +299,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity visits already has a key - not generating one entity visits already has a key - not generating one
--> -->
<entity table="visits" name="visits" magnitude="7" volatility="2"> <entity table="visits" name="visits" magnitude="7" volatility="2">
@ -361,7 +362,7 @@
<permission permission="read" group="issueeditors"/> <permission permission="read" group="issueeditors"/>
<permission permission="all" group="admin"/> <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
--> -->
<entity table="authorities" name="authorities" magnitude="2" volatility="7"> <entity table="authorities" name="authorities" magnitude="2" volatility="7">
@ -405,7 +406,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity issues already has a key - not generating one entity issues already has a key - not generating one
--> -->
<entity table="issues" name="issues" magnitude="1" volatility="3"> <entity table="issues" name="issues" magnitude="1" volatility="3">
@ -648,7 +649,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity followuprequests already has a key - not generating one entity followuprequests already has a key - not generating one
--> -->
<entity table="followuprequests" name="followuprequests" magnitude="7" volatility="2"> <entity table="followuprequests" name="followuprequests" magnitude="7" volatility="2">
@ -709,7 +710,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="noedit"/> <permission group="admin" permission="noedit"/>
</entity> </entity>
<!-- <!--
entity roles already has a key - not generating one entity roles already has a key - not generating one
--> -->
<entity table="roles" name="roles" magnitude="1" volatility="7"> <entity table="roles" name="roles" magnitude="1" volatility="7">
@ -750,7 +751,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity teams already has a key - not generating one entity teams already has a key - not generating one
--> -->
<entity table="teams" name="teams" magnitude="4" volatility="4"> <entity table="teams" name="teams" magnitude="4" volatility="4">
@ -926,7 +927,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity followupactions already has a key - not generating one entity followupactions already has a key - not generating one
--> -->
<entity table="followupactions" name="followupactions" magnitude="7" volatility="0"> <entity table="followupactions" name="followupactions" magnitude="7" volatility="0">
@ -996,7 +997,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity options already has a key - not generating one entity options already has a key - not generating one
--> -->
<entity table="options" name="options" magnitude="1" volatility="7"> <entity table="options" name="options" magnitude="1" volatility="7">
@ -1024,7 +1025,7 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
<!-- <!--
entity followupmethods already has a key - not generating one entity followupmethods already has a key - not generating one
--> -->
<entity table="followupmethods" name="followupmethods" magnitude="1" volatility="7"> <entity table="followupmethods" name="followupmethods" magnitude="1" volatility="7">
@ -1051,4 +1052,4 @@
<permission group="issueeditors" permission="read"/> <permission group="issueeditors" permission="read"/>
<permission group="admin" permission="all"/> <permission group="admin" permission="all"/>
</entity> </entity>
</application> </application>