From 55135d7d2e53f38fbd1f4f3f7c996aca38762473 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Tue, 17 Jul 2018 22:31:06 +0100 Subject: [PATCH] Most of the followup action workflow done. --- package-lock.json | 197 +++++++++++++++++- resources/templates/issue-expert/list.html | 146 +++++++++++++ resources/templates/issue-expert/request.html | 184 ++++++++++++---- src/clj/youyesyet/routes/issue_experts.clj | 51 ++++- 4 files changed, 523 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17b97dd..14992a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,10 +2,199 @@ "requires": true, "lockfileVersion": 1, "dependencies": { - "bower": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz", - "integrity": "sha1-54dqB23rgTf30GUl3F6MZtuC8oo=" + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "enhanced-resolve": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz", + "integrity": "sha1-oRXDJQS2MC6Fp2Jp16V8zdli41k=", + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.3.0", + "object-assign": "^4.0.1", + "tapable": "^0.2.3" + } + }, + "errno": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", + "requires": { + "prr": "~1.0.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "memory-fs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz", + "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "tapable": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", + "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=" + }, + "tern": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz", + "integrity": "sha1-gJyHqCbhEklDmM+IlPfC0bNGTrc=", + "requires": { + "acorn": "^4.0.9", + "enhanced-resolve": "^2.2.2", + "glob": "^7.1.1", + "minimatch": "^3.0.3", + "resolve-from": "2.0.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" } } } diff --git a/resources/templates/issue-expert/list.html b/resources/templates/issue-expert/list.html index e69de29..629fc72 100644 --- a/resources/templates/issue-expert/list.html +++ b/resources/templates/issue-expert/list.html @@ -0,0 +1,146 @@ +{% extends "base.html" %} + + + +{% block back-links %} +
+
+ +Previous + +
+
+ +{% endblock %} +{% block big-links %} +
+
+ +Next + +
+{% ifmemberof %} +
+ +Add a new Followuprequest + +
+{% endifmemberof %} +
+ +{% endblock %} +{% block content %} +
+{% csrf-field %} + + + + + + + + + + + + + + + + + + + + + + +{% for record in records %} + + + + + + + + +{% endfor %} + +
+Id + +Elector_id + +Visit_id + +Issue_id + +Method_id + +  +
+ + + + + + + + + + + +
+{{ record.id }} + + +{{ record.elector_id_expanded }} + + + +{{ record.visit_id_expanded }} + + + +{{ record.issue_id_expanded }} + + + +{{ record.method_id_expanded }} + + + +View + +
+
+ +{% endblock %} +{% block extra-script %} + + var form = document.getElementById('list-followuprequests-Followuprequests'); + var ow = document.getElementById('offset'); + var lw = document.getElementById('limit'); + form.addEventListener('submit', function() { + ow.value='0'; + }); + + var prevSelector = document.getElementById('prev-selector'); + if (prevSelector != null) { + prevSelector.addEventListener('click', function () { + if (parseInt(ow.value)===0) { + window.location = '{{servlet-context}}/admin'; + } else { + ow.value=(parseInt(ow.value)-parseInt(lw.value)); + console.log('Updated offset to ' + ow.value); + form.submit(); + } + }); + } + + document.getElementById('next-selector').addEventListener('click', function () { + ow.value=(parseInt(ow.value)+parseInt(lw.value)); + console.log('Updated offset to ' + ow.value); + form.submit(); + }); +{% endblock %} diff --git a/resources/templates/issue-expert/request.html b/resources/templates/issue-expert/request.html index 5e18b1f..51ea0a0 100644 --- a/resources/templates/issue-expert/request.html +++ b/resources/templates/issue-expert/request.html @@ -1,55 +1,157 @@ {% extends "base.html" %} - + {% block extra-head %} - + {% script "/js/lib/node_modules/simplemde/dist/simplemde.min.js" %} + {% style "/js/lib/node_modules/simplemde/dist/simplemde.min.css" %} {% endblock %} {% block content %}
-
-{% csrf-field %} -

- -{% ifmemberof admin %} - -{% else %} -{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} - -{{record.id}} - -{% else %} - -You are not permitted to view id of followupmethods - -{% endifmemberof %} -{% endifmemberof %} -

-{% ifmemberof admin %} -

- - -

-{% endifmemberof %} -{% ifmemberof admin %} -

- - -

-{% endifmemberof %} -
+
+ {% csrf-field %} + +

+ + {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %} + + {{elector.name}} ({{elector.gender}}) + + {% else %} + + You are not permitted to view elector of followuprequests + + {% endifmemberof %} +

+

+ + {% ifmemberof issueexperts analysts issueeditors admin %} + + by {{visit.canvasser_id_expanded}} at {{visit.date}} + + {% else %} + + You are not permitted to view visit of followuprequests + + {% endifmemberof %} +

+

+ + {% ifmemberof issueexperts admin %} +

+ {{issue.brief|safe}} +
+ {% else %} + + You are not permitted to view issue of followuprequests + + {% endifmemberof %} +

+

+ + {% ifmemberof issueexperts admin %} + + {% ifequal record.method_id "Phone" %}{{elector.phone}}{% endifequal %} + {% ifequal record.method_id "eMail" %}{{elector.email}}{% endifequal %} + + {% else %} + + You are not permitted to view method of followuprequests + + {% endifmemberof %} +

+ {% if actions|length > 0 %} +

+ + + + + + + + + + + {% for action in actions %} + + + + + + + + + {% endfor %} + +
+ Actor + + Date + + Closed? +
{{action.actor}}{{action.date}}{{action.closed}}
{{action.notes|safe}}
+

+ {% endif %} +

+ + {% ifmemberof admin issueexperts %} + + {% endifmemberof %} +

+

+ + {% ifmemberof admin issueexperts %} + + {% endifmemberof %} +

+ + {% ifmemberof admin issueexperts %} +

+ + +

+ {% endifmemberof %} +
{% endblock %} {% block extra-tail %} - {% endblock %} diff --git a/src/clj/youyesyet/routes/issue_experts.clj b/src/clj/youyesyet/routes/issue_experts.clj index f157133..8a54566 100644 --- a/src/clj/youyesyet/routes/issue_experts.clj +++ b/src/clj/youyesyet/routes/issue_experts.clj @@ -1,6 +1,7 @@ (ns ^{:doc "Routes/pages available to issue experts." :author "Simon Brooke"} youyesyet.routes.issue-experts - (:require [adl-support.utils :refer [safe-name]] + (:require [adl-support.core :as support] + [adl-support.utils :refer [safe-name]] [clojure.java.io :as io] [clojure.string :as s] [clojure.tools.logging :as log] @@ -40,7 +41,7 @@ (defn list-page [request] (layout/render - "auto/list-followuprequests-Followuprequests.html" + "issue-expert/list.html" (:session request) (let [user (:user (:session request))] {:title "Open requests" @@ -49,14 +50,44 @@ (defn followup-request-page [request] - (layout/render - "issue-expert/request.html" - (:session request) - {:title "Open requests" - :user (:user (:session request)) - :request (db/get-followuprequest - db/*db* - {:id (:id (keywordize-keys (:params request)))})})) + (let + [params (support/massage-params + (keywordize-keys (:params request)) + (keywordize-keys (:form-params request)) + #{:id}) + id (:id (keywordize-keys params)) + record (db/get-followuprequest db/*db* {:id id}) + elector (if + record + (first + (db/search-strings-electors + db/*db* {:id (:elector_id record)}))) + visit (if + record + (first + (db/search-strings-visits + db/*db* {:id (:visit_id record)})))] + (layout/render + "issue-expert/request.html" + (:session request) + {:title (str "Request from " (:name elector) " at " (:date visit)) + :user (:user (:session request)) + :visit visit + :actions (map + ;; HTML-ise the notes in each action record + #(merge % {:notes (md-to-html-string (:notes %))}) + (db/list-followupactions-by-followuprequest + db/*db* {:id id})) + :record record + :elector elector + :issue (let + [raw-issue (if + record + (db/get-issue db/*db* {:id (:issue_id record)}))] + (if raw-issue + (merge + raw-issue + {:brief (md-to-html-string (:brief raw-issue))})))}))) (defroutes issue-expert-routes