From 649082871b80055ba69986daa19163ad8834c35c Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Fri, 27 Dec 2019 12:22:43 +0000
Subject: [PATCH] ADL builds; application does not yet run.

---
 .gitignore          | 16 ++++++++++++++
 README.md           |  7 +++---
 pastoralist.adl.xml | 52 +++++++++++++++++++++++++++++++++++++--------
 project.clj         |  2 +-
 4 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4cb69a..eccf1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,19 @@ pom.xml.asc
 .lein-failures
 .nrepl-port
 .cpcache/
+
+pastoralist.canonical.adl.xml
+
+resources/sql/pastoralist.postgres.sql
+
+resources/sql/queries.auto.sql
+
+src/clj/pastoralist/cache.clj
+
+src/clj/pastoralist/routes/auto.clj
+
+src/clj/pastoralist/routes/auto_json.clj
+
+resources/templates/auto/
+
+log/
diff --git a/README.md b/README.md
index 938eb42..a577970 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 generated using Luminus version "3.54"
 
-FIXME
+A web-app intended to be used by pastoralists in managing
+pastures, grazing, and animals.
 
 ## Prerequisites
 
@@ -14,8 +15,8 @@ You will need [Leiningen][1] 2.0 or above installed.
 
 To start a web server for the application, run:
 
-    lein run 
+    lein run
 
 ## License
 
-Copyright © 2019 FIXME
+Copyright © 2019 Simon Brooke (simon@journeyman.cc)
diff --git a/pastoralist.adl.xml b/pastoralist.adl.xml
index f5df9cb..8f87077 100644
--- a/pastoralist.adl.xml
+++ b/pastoralist.adl.xml
@@ -55,7 +55,7 @@ version="0.0.1">
       <prompt prompt="Area in Ha" locale="en_GB.UTF-8"/>
     </property>
     <property name="holding" type="entity" entity="holding" required="true"/>
-    <property name="geometry" type="entity" entity="polygon" required="true">
+    <!-- property name="geometry" type="entity" entity="polygon" required="true">
       <documentation>
         Polygon is a first-class datatype in PostGIS, but ADL does not yet
         support this. Solutions:
@@ -67,7 +67,7 @@ version="0.0.1">
         should not be edited; rather it should be marked inactive, and new
         pasture record(s) created.
       </documentation>
-    </property>
+    </property -->
     <property name="subdivision-of" type="entity" entity="pasture"/>
     <property name="is-active" type="boolean" default="true">
       <documentation>Records are not normally deleted from this system because
@@ -108,6 +108,7 @@ version="0.0.1">
     <property name="animal-identifier" type="string" size="64" distinct="user" required="true">
       <prompt prompt="Ear-tag Number" locale="en_GB.UTF-8"/>
     </property>
+    <property name="name" type="string" size="64" distinct="user"/>
     <property name="gender" type="entity" entity="gender" required="true"/>
     <property name="species" type="entity" entity="species" required="true"/>
     <property name="breed" type="entity" entity="breed"/>
@@ -157,13 +158,46 @@ version="0.0.1">
     <property name="notes" type="text"/>
   </entity>
 
+  <entity name="event-type" magnitude="3" volatility="5">
+    <key>
+      <property required="true" type="integer" name="id"
+                column="id" immutable="true" distinct="system">
+        <generator action="native"/>
+      </property>
+    </key>
+    <property name="summary" type="string" size="80"/>
+    <property name="description" type="text"/>
+    <property name="n-holdings" type="integer" default="1">
+      <documentation>
+        Number of holdings affected by this event type; if an animal movement on
+        or off, for example, it will be two, otherwise normally one.
+      </documentation>
+      <prompt prompt="No. of Holdings Affected" locale="en_GB.UTF-8"/>
+    </property>
+    <property name="n-pastures" type="integer" default="1">
+      <documentation>
+        Number of pastures affected by this event type; if an animal movement between
+        pastures, for example, it will be two, otherwise normally one.
+      </documentation>
+      <prompt prompt="No. of Pastures Affected" locale="en_GB.UTF-8"/>
+    </property>
+    <property name="n-animals" type="integer" default="1">
+      <documentation>
+        Number of animals affected by this event type. If a value greater than 10
+        is recorded, that will be treated as 'many'. TODO: not comfortable that
+        that is the right way to handle 'many'.
+      </documentation>
+      <prompt prompt="No. of Animals Affected" locale="en_GB.UTF-8"/>
+    </property>
+  </entity>
+
   <entity name="user" magnitude="6" volatility="3">
     <key>
-      <property required="true" type="string" name="username"
+      <property required="true" type="string" name="username" size="32"
                 column="username" immutable="true" distinct="all"/>
     </key>
-        <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.UTF-8"/>
     </property>
     <property name="avatar" type="image" size="256">
@@ -176,20 +210,20 @@ version="0.0.1">
       <prompt prompt="Bio" locale="en_GB.UTF-8"/>
     </property>
     <property type="string" name="phone" column="phone" size="16"
-    distinct="user">
+              distinct="user">
       <documentation>Does a canvasser record need a phone field? There is a phone
         field on the elector record. I suppose, for under-16 canvassers, there may
         be no elector record.</documentation>
       <prompt prompt="phone" locale="en_GB.UTF-8"/>
     </property>
     <property type="string" name="email" column="email" size="128"
-    distinct="user">
+              distinct="user">
       <prompt prompt="email" locale="en_GB.UTF-8"/>
     </property>
-    <property required="true" type="entity" name="authority_id"
+    <!-- property required="true" type="entity" name="authority_id"
     entity="authorities" farkey="id">
       <prompt prompt="authority_id" locale="en_GB.UTF-8"/>
-    </property>
+    </property -->
     <property type="boolean" name="authorised" column="authorised">
       <prompt prompt="authorised" locale="en_GB.UTF-8"/>
     </property>
diff --git a/project.clj b/project.clj
index 53c0e08..445a74e 100644
--- a/project.clj
+++ b/project.clj
@@ -3,7 +3,7 @@
   :description "FIXME: write description"
   :url "http://example.com/FIXME"
 
-  :dependencies [[adl-support "0.1.6"]
+  :dependencies [[adl-support "0.1.7-SNAPSHOT"]
                  [ch.qos.logback/logback-classic "1.2.3"]
                  [cheshire "5.9.0"]
                  [clj-oauth "1.5.5"]