Considerable progress on the issue experts workflow, not perfect yet.

resources/sql/queries.sql

@@ -67,6 +67,13 @@ WHERE canvasser_id = :id
 ORDER BY date desc
 LIMIT 1
 
+--:name get-locality-for-visit :? :1
+--:doc returns the locality of the address of this visit
+SELECT addresses.locality
+FROM addresses, visits
+WHERE visits.address_id = addresses.id
+AND visits.id = :id
+
 -- I don't know why this next one isn't autogenerating, but it isn't and it's critical.
 
 -- :name list-roles-by-canvasser :? :*

resources/sql/youyesyet.postgres.overrides.sql

@@ -0,0 +1,25 @@
+------------------------------------------------------------------------
+--	convenience view lv_followupactions of entity followupactions for
+--	lists, et cetera
+--  ADL is not yet correctly chaining tables when generating convenience
+--  views, so the auto-generated convenience view is a horrible
+--  cross-product join
+------------------------------------------------------------------------
+DROP VIEW lv_followupactions;
+CREATE VIEW lv_followupactions AS
+SELECT electors.name ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
+	followupactions.request_id,
+	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS actor_expanded,
+	followupactions.actor,
+	followupactions.date,
+	followupactions.notes,
+	followupactions.closed,
+	followupactions.id
+FROM followuprequests, visits, canvassers, addresses, followupactions, issues, electors
+WHERE followupactions.request_id = followuprequests.id
+  AND followuprequests.elector_id = electors.id
+  AND followuprequests.visit_id = visits.id
+  AND followuprequests.issue_id = issues.id
+  AND visits.address_id = addresses.id
+	AND followupactions.actor = canvassers.id
+;

resources/templates/issue-expert/request.html

@@ -13,16 +13,19 @@
   <form action='{{servlet-context}}/issue-expert/followup-action' method='POST'>
     {% csrf-field %}
     <input id='id' name='id' type='hidden' value='{{record.id}}'/>
+    <input id='request_id' name='request_id' type='hidden' value='{{record.id}}'/>
+    <input id='elector_id' name='elector_id' type='hidden' value='{{record.elector_id}}'/>
+    <input id='visit_id' name='visit_id' type='hidden' value='{{record.visit_id}}'/>
     <p class='widget'>
       <label for='elector_id'>
         Elector
       </label>
       {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
-      <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
+      <span id='elector' name='elector' class='pseudo-widget disabled'>
         {{elector.name}} ({{elector.gender}})
       </span>
       {% else %}
-      <span id='elector_id' name='elector_id' class='pseudo-widget not-authorised'>
+      <span id='elector' name='elector' class='pseudo-widget not-authorised'>
         You are not permitted to view elector of followuprequests
       </span>
       {% endifmemberof %}
@@ -121,7 +124,21 @@
         <input id='closed' name='closed' type='checkbox' maxlength='' size='16'/>
       {% endifmemberof %}
     </p>
-
+    <p class='widget'>
+      <label for='intention'>
+        What is the elector's voting intention now?
+      </label>
+      {% ifmemberof admin issueexperts %}
+      <select id='option_id' name='option_id'>
+        <option value="">Not stated</option>
+        {% for option in options %}
+        <img src="{{servlet-context}}/img/option/{{option.id}}-{% ifequal record.option_id option.id %}selected{% else %}unselected{% endifequal %}.png" alt="{{option.id}}"/>
+        <option value='{{option.id}}' {% ifequal record.option_id option.id%}selected='selected'{% endifequal %} style="background-image: url('{{servlet-context}}/img/option/{{option.id}}-{% ifequal record.option_id option.id %}selected{% else %}unselected{% endifequal %}.png')">
+           {{option.id}}</option>
+        {% endfor %}
+      </select>
+      {% endifmemberof %}
+    </p>
     {% ifmemberof admin issueexperts %}
     <p class='widget action-safe'>
     <label for='save-button' class='action-safe'>