From a1429d351b16bf1c2569ecb2744ef3b5c977d483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 17:57:55 +0100
Subject: [PATCH 01/16] RLPPTM: commission verification (WIP)

---
 VERSION                                    |   2 +-
 modules/templates/RLPPTM/commission.py     | 158 ++++++++++++++++++++-
 modules/templates/RLPPTM/customise/org.py  |   7 +
 modules/templates/RLPPTM/helpers.py        |   2 +-
 modules/templates/RLPPTM/views/verify.html | 109 ++++++++++++++
 static/scripts/S3/s3.ui.qrinput.js         |   1 +
 static/themes/RLP/verify.css               |  34 +++++
 7 files changed, 310 insertions(+), 3 deletions(-)
 create mode 100644 modules/templates/RLPPTM/views/verify.html
 create mode 100644 static/themes/RLP/verify.css

diff --git a/VERSION b/VERSION
index d5679d9e7..41a146750 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5539-ga248498b6 (2022-11-25 08:42:03)
+nursix-dev-5540-g8a409e27e (2022-11-29 17:57:55)
diff --git a/modules/templates/RLPPTM/commission.py b/modules/templates/RLPPTM/commission.py
index 362be7278..73c097d61 100644
--- a/modules/templates/RLPPTM/commission.py
+++ b/modules/templates/RLPPTM/commission.py
@@ -28,6 +28,7 @@
 import base64
 import datetime
 import hashlib
+import json
 import os
 import secrets
 
@@ -48,7 +49,7 @@
 
 from gluon import current
 
-from core import s3_str
+from core import CRUDMethod, JSONERRORS, s3_str
 
 # Fonts we use in this layout
 NORMAL = "Helvetica"
@@ -376,6 +377,41 @@ def issue_note(self):
                                      vhash = self.vhash,
                                      )
 
+    @staticmethod
+    def parse_vcode(vcode):
+
+        msg = "invalid verification code"
+
+        if isinstance(vcode, str):
+            vcode = vcode.encode("utf-8")
+
+        try:
+            parsed = base64.b64decode(vcode).decode("utf-8")
+        except Exception as e:
+            raise ValueError(msg) from e
+
+        parsed = parsed.split("|")
+        if not parsed or len(parsed) != 5:
+            raise ValueError(msg)
+
+        parse_date = current.calendar.parse_date
+        try:
+            start, end = parse_date(parsed[2]), parse_date(parsed[3])
+        except Exception:
+            start, end = None, None
+
+        try:
+            uuid = UUID(parsed[1]).urn
+        except ValueError:
+            uuid = parsed[1]
+
+        return {"provider_id": parsed[0],
+                "uuid": uuid,
+                "start": start,
+                "end": end,
+                "vhash": hashlib.sha256(vcode).hexdigest().lower()
+                }
+
 # =============================================================================
 class CommissionDocTemplate(BaseDocTemplate):
     """
@@ -795,4 +831,124 @@ def draw_page_number(self, page_count):
                              "%d / %d" % (self._pageNumber, page_count),
                              )
 
+# =============================================================================
+class VerifyCommission(CRUDMethod):
+
+    def apply_method(self, r, **attr):
+        """
+            Report test facility information
+
+            Args:
+                r: the CRUDRequest instance
+                attr: controller attributes
+        """
+
+        if r.http == "GET":
+            output = self.form(r, **attr)
+
+        elif r.http == "POST":
+            if r.representation == "json":
+                output = self.verify(r, **attr)
+            else:
+                r.error(415, current.ERROR.BAD_FORMAT)
+        else:
+            r.error(405, current.ERROR.BAD_METHOD)
+
+        return output
+
+    def form(self, r, **attr):
+
+        T = current.T
+
+        response = current.response
+        settings = current.deployment_settings
+
+        from core import S3QRInput, ICON, CustomController
+        from gluon import IS_NOT_EMPTY, BUTTON, INPUT, DIV
+
+        hidden_input = INPUT(_type="hidden", _name="vcode", _id="vcode")
+        scan_button = BUTTON(ICON("fa fa-qrcode"),
+                             "",
+                             _title = "Scan QR Code",
+                             _type = "button",
+                             _class = "primary button qrscan-btn wide-button",
+                             )
+        widget = DIV(hidden_input, scan_button, _class="qrinput")
+        S3QRInput.inject_script("vcode", {})
+
+        CustomController._view("RLPPTM", "verify.html")
+        return {"widget": widget}
+
+
+    def verify(self, r, **attr):
+
+        # Read the body JSON of the request
+        # Must be {"vcode": "..."}
+        body = r.body
+        body.seek(0)
+        try:
+            s = body.read().decode("utf-8")
+        except (ValueError, AttributeError, UnicodeDecodeError):
+            r.error(400, current.ERROR.BAD_REQUEST)
+        try:
+            ref = json.loads(s)
+        except JSONERRORS:
+            r.error(400, current.ERROR.BAD_REQUEST)
+
+        vcode = ref.get("vcode")
+        if not vcode:
+            r.error(400, current.ERROR.BAD_REQUEST)
+
+        provider_id = ref.get("id")
+
+        response = current.response
+        if response:
+            response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return json.dumps(self._verify(vcode, provider_id=provider_id),
+                          separators = (",", ":"),
+                          ensure_ascii = False,
+                          )
+
+    @staticmethod
+    def _verify(vcode, provider_id=None):
+
+        commission, output = None, {}
+        try:
+            parsed = ProviderCommission.parse_vcode(vcode)
+        except ValueError:
+            signature = "INVALID"
+        else:
+            table = current.s3db.org_commission
+            record = current.db(table.uuid == parsed["uuid"]).select(table.id,
+                                                                     table.deleted,
+                                                                     limitby = (0, 1),
+                                                                     ).first()
+            if not record:
+                signature = "NOT FOUND"
+            elif record.deleted:
+                signature = "DELETED"
+            else:
+                signature = "VALID"
+                commission = ProviderCommission(record.id)
+
+        if commission:
+            # Verify the hash
+            record = commission.commission
+            if record.vhash != parsed["vhash"]:
+                signature = "INVALID"
+            elif provider_id and provider_id != commission.provider_id:
+                signature = "PROVIDER ID MISMATCH"
+            else:
+                output.update(
+                    {"organisation": commission.organisation_name,
+                     "organisation_id": commission.provider_id,
+                     "start": record.date.isoformat() if record.date else "0000-00-00",
+                     "end": record.end_date.isoformat() if record.end_date else "0000-00-00",
+                     "status": record.status,
+                     })
+
+        output["signature"] = signature
+
+        return output
+
 # END =========================================================================
diff --git a/modules/templates/RLPPTM/customise/org.py b/modules/templates/RLPPTM/customise/org.py
index b7c04303e..30a5fa5f2 100644
--- a/modules/templates/RLPPTM/customise/org.py
+++ b/modules/templates/RLPPTM/customise/org.py
@@ -1162,6 +1162,13 @@ def org_facility_resource(r, tablename):
                        report_options = report_options,
                        )
 
+    # Custom method to verify commissions
+    from ..commission import VerifyCommission
+    s3db.set_method("org_facility",
+                    method = "verify",
+                    action = VerifyCommission,
+                    )
+
     # Custom method to produce KV report
     from ..helpers import TestFacilityInfo
     s3db.set_method("org_facility",
diff --git a/modules/templates/RLPPTM/helpers.py b/modules/templates/RLPPTM/helpers.py
index 4cbcd90f4..836a4408a 100644
--- a/modules/templates/RLPPTM/helpers.py
+++ b/modules/templates/RLPPTM/helpers.py
@@ -394,7 +394,7 @@ def restrict_data_formats(r):
     allowed = ("html", "iframe", "popup", "aadata", "plain", "geojson", "pdf", "xlsx")
     if r.record:
         allowed += ("card",)
-    if r.method in ("report", "timeplot", "filter", "lookup", "info", "validate"):
+    if r.method in ("report", "timeplot", "filter", "lookup", "info", "validate", "verify"):
         allowed += ("json",)
     elif r.method == "options":
         allowed += ("s3json",)
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
new file mode 100644
index 000000000..e922f75de
--- /dev/null
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="{{=T.accepted_language or "en"}}" dir="{{=s3.direction}}" class="no-js">{{# class="no-js" needed for modernizr }}
+<head>{{theme_styles=response.s3.theme_styles}}
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+{{# Always force latest IE rendering engine (even in intranet) & Chrome Frame }}
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+<title>{{try:}}{{=title}}{{except:}}{{=response.title or settings.get_system_name_short()}}{{pass}}</title>
+{{if response.refresh:}}{{=XML(response.refresh)}}{{pass}}
+{{# http://dev.w3.org/html5/markup/meta.name.html }}
+<meta name="application-name" content="{{=appname}}" />
+{{# Set your site up with Google: http://google.com/webmasters }}
+{{# <meta name="google-site-verification" content="" /> }}
+{{a="""<!--  Mobile Viewport Fix
+ j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
+ device-width: Occupy full width of the screen in its current orientation
+ initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
+ maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
+--> """}}
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+{{# Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references }}
+<link rel="shortcut icon" href="/{{=appname}}/static/themes/{{=theme_styles}}/favicon.ico" type="image/x-icon" />
+{{# <link rel="apple-touch-icon" href="/=appname/static/favicon.png" /> }}
+{{# All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects }}{{# This kills the map in IE8: VML.js }}
+{{#<script src="/=appname/static/scripts/modernizr.min.js"></script>}}
+{{for sheet in s3.external_stylesheets:}}
+ <link href="{{=sheet}}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" />
+{{pass}}
+{{include "foundation.css.html"}}
+<link id="ext-styles" disabled="disabled">
+{{for sheet in s3.stylesheets:}}
+ <link href="/{{=appname}}/static/styles/{{=sheet}}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" />
+{{pass}}
+{{if s3.debug:}}{{=s3base.s3_include_debug_css()}}{{else:}}
+ {{# Built by /static/scripts/tools/build.sahana.py }}
+ <link href="/{{=appname}}/static/themes/{{=theme_styles}}/eden.min.css" rel="stylesheet" type="text/css" />
+ <link href="/{{=appname}}/static/themes/{{=theme_styles}}/verify.css" rel="stylesheet" type="text/css" />
+{{pass}}
+{{include "scripts_top.html"}}
+</head>
+<body class='{{=s3.direction}}'>
+ <main>
+  <div class='row main-content'>
+   <div class='medium-12 columns' id='content'>
+    <div class='row'>
+     <div class='medium-8 medium-centered columns' id='alert-space'>
+      {{if response.error:}}<div class='alert alert-error'>{{=response.error}}</div>{{pass}}
+      {{if response.warning:}}<div class='alert alert-warning'>{{=response.warning}}</div>{{pass}}
+      {{if response.information:}}<div class='alert alert-info'>{{=response.information}}</div>{{pass}}
+      {{if response.confirmation:}}<div class='alert alert-success'>{{=response.confirmation}}</div>{{pass}}
+      {{if response.flash:}}<div class='alert alert-success'>{{=response.flash}}</div>{{pass}}
+     </div>
+    </div>
+    <div class='row'>
+     <div class='small-12 columns'>
+      <div class="data-empty">
+       <h3>{{=T("Verify Commission")}}</h3>
+      </div>
+      <div class="data">
+       <h3>{{=T("Commission Details")}}</h3>
+       <label>
+        <span>{{=T("Verification Code")}}</span>
+        <div class="data-value">{{=T("valid")}}</div>
+       </label>
+       <label>
+        <span>{{=T("Organization ID")}}</span>
+        <div class="data-value">000000000000</div>
+       </label>
+       <label>
+        <span>{{=T("Name")}}</span>
+        <div class="data-value">Example Organization</div>
+       </label>
+       <label>
+        <span>{{=T("Valid From")}}</span>
+        <div class="data-value">00.00.0000</div>
+       </label>
+       <label>
+        <span>{{=T("Valid Until")}}</span>
+        <div class="data-value">00.00.0000</div>
+       </label>
+       <label>
+        <span>{{=T("Status")}}</span>
+        <div class="data-value">aktuell</div>
+       </label>
+      </div>
+      <div class="scan">
+       {{try:}}{{=widget}}{{except:}}{{pass}}
+      </div>
+      <div class="reset">
+       <button type="button" class='primary button wide-button'><i class='fa fa-undo'></i></button>
+      </div>
+      <div class="loading inline-throbber"></div>
+     </div>
+   </div>
+  </div>
+ </main>
+ <footer>
+  <div id='footer'>
+   <div class='small-6 columns text-left'>
+    {{=A(T("Back to %(appname)s") % {"appname": settings.get_system_name_short()}, _href=URL(c="default", f="index"), _class="action-lnk")}}
+   </div>
+   <div class='small-6 columns'>
+    <div class="username text-right">{{if auth.is_logged_in():}}{{=auth.user.email}}{{else:}}{{=T("anonymous user")}}{{pass}}<i class='fa fa-user'></i></div>
+   </div>
+  </div>
+ </footer>
+{{include "scripts.html"}}
+{{include "foundation.js.html"}}
+</body>
+</html>
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index d9aeb1809..b4daad591 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -128,6 +128,7 @@
                         dialog.dialog('open');
                         scanner = new QrScanner(videoInput.get(0),
                             function(result) {
+                                navigator.vibrate(100);
                                 videoInput.hide();
                                 success.show();
                                 $el.val(result).trigger('change' + self.eventNamespace);
diff --git a/static/themes/RLP/verify.css b/static/themes/RLP/verify.css
new file mode 100644
index 000000000..50ade6111
--- /dev/null
+++ b/static/themes/RLP/verify.css
@@ -0,0 +1,34 @@
+main {
+    min-height: 80%
+}
+.scan, .loading, .reset {
+    position: absolute;
+    top: 2rem;
+    right: 1rem;
+}
+.wide-button {
+    vertical-align: top;
+    padding: 0.4rem 0.8rem;
+    margin: 0 0.5rem;
+}
+.wide-button .fa {
+    font-size: 16px;
+    margin: 0 0.2rem;
+    vertical-align: middle;
+}
+.data, .data-empty {
+    position: absolute;
+    top: 2rem;
+    left: 2rem;
+    min-height: 70%;
+}
+.data label {
+    font-size: 0.7rem;
+}
+.data .data-value {
+    font-size: 0.9rem;
+    font-weight: bold;
+}
+.loading, .reset, .data {
+    display: none;
+}

From 58be0f9cc624ebe64d601259ca7bd703ef8f66d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:26:42 +0100
Subject: [PATCH 02/16] Minify

---
 VERSION                                | 2 +-
 static/scripts/S3/s3.ui.qrinput.min.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 41a146750..a185ce523 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5540-g8a409e27e (2022-11-29 17:57:55)
+nursix-dev-5541-ga1429d351 (2022-11-29 19:26:42)
diff --git a/static/scripts/S3/s3.ui.qrinput.min.js b/static/scripts/S3/s3.ui.qrinput.min.js
index 35489d19b..b960ea6a1 100644
--- a/static/scripts/S3/s3.ui.qrinput.min.js
+++ b/static/scripts/S3/s3.ui.qrinput.min.js
@@ -4,5 +4,5 @@
 */
 (function(a,n){var h=0;a.widget("s3.qrInput",{options:{workerPath:null},_create:function(){this.id=h;h+=1;this.eventNamespace=".qrInput"},_init:function(){this.container=a(this.element).closest(".qrinput");this.scanButton=a(".qrscan-btn",this.container);this.options.workerPath&&(QrScanner.WORKER_PATH=this.options.workerPath);this.refresh()},_destroy:function(){var c=this.scanner,b=this.videoInput;c&&(c.destroy(),this.scanner=null);b&&(b.remove(),this.videoInput=null);a.Widget.prototype.destroy.call(this)},
 refresh:function(){var c=a(this.element),b=this;this._unbindEvents();a(".error_wrapper",this.container).appendTo(this.container);b.scanButton.length&&QrScanner.hasCamera().then(function(d){var g=b.scanButton;if(d){g.prop("disabled",!1);var e;d=a('<div class="qrinput-scan">');var k=a('<div class="qrinput-success">').html('<i class="fa fa-check">').hide().appendTo(d),f=a("<video>").appendTo(d);f.css({width:"300",height:"300"});var l=d.dialog({title:"Scan QR Code",autoOpen:!1,modal:!0,classes:{"ui-dialog":"qrinput-dialog"},
-close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){f.hide();k.show();c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},1E3)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),b=this.eventNamespace,d=this;a(".clear-btn",
-c.closest(".qrinput")).on("click"+b,function(){d._clearInput()});return!0},_unbindEvents:function(){var c=a(this.element),b=this.eventNamespace;a(".clear-btn",c.closest(".qrinput")).off(b);return!0}})})(jQuery);
+close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){navigator.vibrate(100);f.hide();k.show();c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},1E3)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),b=this.eventNamespace,
+d=this;a(".clear-btn",c.closest(".qrinput")).on("click"+b,function(){d._clearInput()});return!0},_unbindEvents:function(){var c=a(this.element),b=this.eventNamespace;a(".clear-btn",c.closest(".qrinput")).off(b);return!0}})})(jQuery);

From b80d6a151959a2833064ea01453f118e99995922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:27:33 +0100
Subject: [PATCH 03/16] Fix

---
 VERSION                                    | 2 +-
 modules/templates/RLPPTM/views/verify.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index a185ce523..02c1aae92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5541-ga1429d351 (2022-11-29 19:26:42)
+nursix-dev-5542-g58be0f9cc (2022-11-29 19:27:33)
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index e922f75de..f65fed0a5 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -33,9 +33,9 @@
 {{if s3.debug:}}{{=s3base.s3_include_debug_css()}}{{else:}}
  {{# Built by /static/scripts/tools/build.sahana.py }}
  <link href="/{{=appname}}/static/themes/{{=theme_styles}}/eden.min.css" rel="stylesheet" type="text/css" />
- <link href="/{{=appname}}/static/themes/{{=theme_styles}}/verify.css" rel="stylesheet" type="text/css" />
 {{pass}}
 {{include "scripts_top.html"}}
+ <link href="/{{=appname}}/static/themes/{{=theme_styles}}/verify.css" rel="stylesheet" type="text/css" />
 </head>
 <body class='{{=s3.direction}}'>
  <main>

From 07c9520edcd3b1b51d9440c127c079909df3a5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:34:11 +0100
Subject: [PATCH 04/16] QRInput vibration switch to pattern

---
 VERSION                            | 2 +-
 static/scripts/S3/s3.ui.qrinput.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 02c1aae92..728bcdfee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5542-g58be0f9cc (2022-11-29 19:27:33)
+nursix-dev-5543-gb80d6a151 (2022-11-29 19:34:11)
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index b4daad591..e273b750a 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -128,9 +128,9 @@
                         dialog.dialog('open');
                         scanner = new QrScanner(videoInput.get(0),
                             function(result) {
-                                navigator.vibrate(100);
                                 videoInput.hide();
                                 success.show();
+                                navigator.vibrate([100]);
                                 $el.val(result).trigger('change' + self.eventNamespace);
                                 setTimeout(function() {
                                     dialog.dialog('close');

From a15445d4fc67e500e2cd1e6bdfa36084af2b600a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:41:37 +0100
Subject: [PATCH 05/16] Try fix issue with multiple result calls

---
 VERSION                            | 2 +-
 static/scripts/S3/s3.ui.qrinput.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 728bcdfee..34c11de93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5543-gb80d6a151 (2022-11-29 19:34:11)
+nursix-dev-5544-g07c9520ed (2022-11-29 19:41:37)
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index e273b750a..750192171 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -128,6 +128,7 @@
                         dialog.dialog('open');
                         scanner = new QrScanner(videoInput.get(0),
                             function(result) {
+                                scanner.stop();
                                 videoInput.hide();
                                 success.show();
                                 navigator.vibrate([100]);

From b2b8a87f38687295d71e75d635e0ef0bbdd72bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:47:41 +0100
Subject: [PATCH 06/16] Investigating the fix

---
 VERSION                            | 2 +-
 static/scripts/S3/s3.ui.qrinput.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 34c11de93..b06f1322d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5544-g07c9520ed (2022-11-29 19:41:37)
+nursix-dev-5545-ga15445d4f (2022-11-29 19:47:41)
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index 750192171..e1805c0c0 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -131,7 +131,9 @@
                                 scanner.stop();
                                 videoInput.hide();
                                 success.show();
-                                navigator.vibrate([100]);
+                                window.navigator.vibrate(0);
+                                window.navigator.vibrate(100);
+                                alert("testing");
                                 $el.val(result).trigger('change' + self.eventNamespace);
                                 setTimeout(function() {
                                     dialog.dialog('close');

From 5883b306977e9ee792e9a6b37ad0fa56d6aece3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 19:50:04 +0100
Subject: [PATCH 07/16] Revert

---
 VERSION                            | 2 +-
 static/scripts/S3/s3.ui.qrinput.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index b06f1322d..ed8ef0477 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5545-ga15445d4f (2022-11-29 19:47:41)
+nursix-dev-5546-gb2b8a87f3 (2022-11-29 19:50:04)
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index e1805c0c0..cbbe167bc 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -131,9 +131,7 @@
                                 scanner.stop();
                                 videoInput.hide();
                                 success.show();
-                                window.navigator.vibrate(0);
-                                window.navigator.vibrate(100);
-                                alert("testing");
+                                window.navigator.vibrate(30);
                                 $el.val(result).trigger('change' + self.eventNamespace);
                                 setTimeout(function() {
                                     dialog.dialog('close');

From 7ea8a4b3886719b927dd2ac0c6a7f2fce1de2b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 20:35:37 +0100
Subject: [PATCH 08/16] Add script to verify commissions

---
 VERSION                                    |  2 +-
 modules/templates/RLPPTM/commission.py     |  8 ++-
 modules/templates/RLPPTM/views/verify.html | 13 ++--
 static/themes/RLP/js/verify.js             | 70 ++++++++++++++++++++++
 4 files changed, 84 insertions(+), 9 deletions(-)
 create mode 100644 static/themes/RLP/js/verify.js

diff --git a/VERSION b/VERSION
index ed8ef0477..a0347da77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5546-gb2b8a87f3 (2022-11-29 19:50:04)
+nursix-dev-5547-g5883b3069 (2022-11-29 20:35:37)
diff --git a/modules/templates/RLPPTM/commission.py b/modules/templates/RLPPTM/commission.py
index 73c097d61..6f3cea645 100644
--- a/modules/templates/RLPPTM/commission.py
+++ b/modules/templates/RLPPTM/commission.py
@@ -864,9 +864,13 @@ def form(self, r, **attr):
         settings = current.deployment_settings
 
         from core import S3QRInput, ICON, CustomController
-        from gluon import IS_NOT_EMPTY, BUTTON, INPUT, DIV
+        from gluon import IS_NOT_EMPTY, BUTTON, INPUT, DIV, URL
 
-        hidden_input = INPUT(_type="hidden", _name="vcode", _id="vcode")
+        hidden_input = INPUT(_type="hidden",
+                             _name="vcode",
+                             _id="vcode",
+                             data = {"url": URL(c="org", f="facility", args=["verify.json"])},
+                             )
         scan_button = BUTTON(ICON("fa fa-qrcode"),
                              "",
                              _title = "Scan QR Code",
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index f65fed0a5..7cc2f2e07 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -59,27 +59,27 @@ <h3>{{=T("Verify Commission")}}</h3>
        <h3>{{=T("Commission Details")}}</h3>
        <label>
         <span>{{=T("Verification Code")}}</span>
-        <div class="data-value">{{=T("valid")}}</div>
+        <div id='verification-result' class="data-value"></div>
        </label>
        <label>
         <span>{{=T("Organization ID")}}</span>
-        <div class="data-value">000000000000</div>
+        <div id='provider-id' class="data-value"></div>
        </label>
        <label>
         <span>{{=T("Name")}}</span>
-        <div class="data-value">Example Organization</div>
+        <div id='provider-name' class="data-value"></div>
        </label>
        <label>
         <span>{{=T("Valid From")}}</span>
-        <div class="data-value">00.00.0000</div>
+        <div id='start-date' class="data-value"></div>
        </label>
        <label>
         <span>{{=T("Valid Until")}}</span>
-        <div class="data-value">00.00.0000</div>
+        <div id='end-date' class="data-value">00.00.0000</div>
        </label>
        <label>
         <span>{{=T("Status")}}</span>
-        <div class="data-value">aktuell</div>
+        <div id='commission-status' class="data-value"></div>
        </label>
       </div>
       <div class="scan">
@@ -105,5 +105,6 @@ <h3>{{=T("Commission Details")}}</h3>
  </footer>
 {{include "scripts.html"}}
 {{include "foundation.js.html"}}
+<script src="/{{=appname}}/static/themes/RLP/js/verify.js"></script>
 </body>
 </html>
diff --git a/static/themes/RLP/js/verify.js b/static/themes/RLP/js/verify.js
new file mode 100644
index 000000000..80560e46f
--- /dev/null
+++ b/static/themes/RLP/js/verify.js
@@ -0,0 +1,70 @@
+/**
+ * Commission verification - client-side logic
+ *
+ * @copyright 2022 (c) AHSS
+ * @license MIT
+ */
+(function($, undefined) {
+
+    "use strict";
+
+    var reset = function() {
+        $('.data, .reset, .throbber').hide();
+        $('.scan, .data-empty').removeClass('hide').show();
+        $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #commission-status').text('--');
+    };
+
+    var showPending = function() {
+        $('.data, .reset, .scan').hide();
+        $('.data-empty, .loading').removeClass('hide').show();
+    };
+
+    var showResult = function() {
+        $('.data-empty, .loading, .scan').hide();
+        $('.data, .reset').removeClass('hide').show();
+    };
+
+    var verify = function() {
+
+        showPending();
+
+        var input = $('#vcode'),
+            ajaxURL = input.data('url'),
+            vCode = input.val();
+
+        if (!ajaxURL || !vCode) {
+            reset();
+            return;
+        }
+
+        // Send code to backend via Ajax
+        $.ajaxS3({
+            'url': ajaxURL,
+            'type': 'POST',
+            'dataType': 'json',
+            'data': JSON.stringify({vcode: vCode}),
+            'contentType': 'application/json; charset=utf-8',
+            'success': function(response) {
+                $('#verification-result').text(response.signature);
+                $('#provider-id').text(response.organisation_id);
+                $('#provider-name').text(response.organisation);
+                $('#start-date').text(response.start);
+                $('#end-date').text(response.end);
+                $('#commission-status').text(response.status);
+                showResult();
+            },
+            'error': function () {
+                alert('error!');
+                reset();
+            }
+        });
+    };
+
+    $(function() {
+
+        reset();
+        $('#vcode').off('.qrInput').on('change.qrInput', verify);
+        $('.reset').off('.verification').on('click.verification', reset);
+    });
+
+})(jQuery);

From 4b6247ccb82cb0b340e7ce40be2ea231d66fbaee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 20:52:46 +0100
Subject: [PATCH 09/16] Commission verification: basically functional

---
 VERSION                                    |  2 +-
 languages/de.py                            |  1 +
 modules/templates/RLPPTM/views/verify.html |  3 ---
 static/scripts/S3/s3.ui.qrinput.js         |  2 +-
 static/scripts/S3/s3.ui.qrinput.min.js     |  4 ++--
 static/themes/RLP/js/verify.js             | 12 ++++++------
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/VERSION b/VERSION
index a0347da77..c1762af12 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5547-g5883b3069 (2022-11-29 20:35:37)
+nursix-dev-5548-g7ea8a4b38 (2022-11-29 20:52:46)
diff --git a/languages/de.py b/languages/de.py
index 8033e2e63..7ab3fa53a 100644
--- a/languages/de.py
+++ b/languages/de.py
@@ -6408,6 +6408,7 @@
 'Vehicles are assets with some extra details.': 'Fahrzeuge sind Anlagen, die mit einigen speziellen Funktionen ausgestattet sind',
 'Vehicles': 'Fahrzeuge',
 'Venue': 'Örtlichkeit',
+'Verification Code': 'Verifizierungscode',
 'Verification Details': 'Verifizierungsdetails',
 'Verification Email sent - please check your email to validate. If you do not receive this email please check your junk email or spam filters': 'Bestätigungs-Email gesendet - Bitte prüfen Sie ihren Posteingang zur Bestätigung. Falls Sie die Email nicht erhalten haben, überprüfen Sie bitte Ihrem SPAM-Ordner bzw. -Filter.',
 'Verification Status': 'Prüfstatus',
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index 7cc2f2e07..1df3e1797 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -85,9 +85,6 @@ <h3>{{=T("Commission Details")}}</h3>
       <div class="scan">
        {{try:}}{{=widget}}{{except:}}{{pass}}
       </div>
-      <div class="reset">
-       <button type="button" class='primary button wide-button'><i class='fa fa-undo'></i></button>
-      </div>
       <div class="loading inline-throbber"></div>
      </div>
    </div>
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index cbbe167bc..a8f6057dc 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -135,7 +135,7 @@
                                 $el.val(result).trigger('change' + self.eventNamespace);
                                 setTimeout(function() {
                                     dialog.dialog('close');
-                                }, 1000);
+                                }, 400);
                             },
                             function( /* error */ ) {
                                 // TODO handle error
diff --git a/static/scripts/S3/s3.ui.qrinput.min.js b/static/scripts/S3/s3.ui.qrinput.min.js
index b960ea6a1..7a883ce4c 100644
--- a/static/scripts/S3/s3.ui.qrinput.min.js
+++ b/static/scripts/S3/s3.ui.qrinput.min.js
@@ -4,5 +4,5 @@
 */
 (function(a,n){var h=0;a.widget("s3.qrInput",{options:{workerPath:null},_create:function(){this.id=h;h+=1;this.eventNamespace=".qrInput"},_init:function(){this.container=a(this.element).closest(".qrinput");this.scanButton=a(".qrscan-btn",this.container);this.options.workerPath&&(QrScanner.WORKER_PATH=this.options.workerPath);this.refresh()},_destroy:function(){var c=this.scanner,b=this.videoInput;c&&(c.destroy(),this.scanner=null);b&&(b.remove(),this.videoInput=null);a.Widget.prototype.destroy.call(this)},
 refresh:function(){var c=a(this.element),b=this;this._unbindEvents();a(".error_wrapper",this.container).appendTo(this.container);b.scanButton.length&&QrScanner.hasCamera().then(function(d){var g=b.scanButton;if(d){g.prop("disabled",!1);var e;d=a('<div class="qrinput-scan">');var k=a('<div class="qrinput-success">').html('<i class="fa fa-check">').hide().appendTo(d),f=a("<video>").appendTo(d);f.css({width:"300",height:"300"});var l=d.dialog({title:"Scan QR Code",autoOpen:!1,modal:!0,classes:{"ui-dialog":"qrinput-dialog"},
-close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){navigator.vibrate(100);f.hide();k.show();c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},1E3)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),b=this.eventNamespace,
-d=this;a(".clear-btn",c.closest(".qrinput")).on("click"+b,function(){d._clearInput()});return!0},_unbindEvents:function(){var c=a(this.element),b=this.eventNamespace;a(".clear-btn",c.closest(".qrinput")).off(b);return!0}})})(jQuery);
+close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){e.stop();f.hide();k.show();window.navigator.vibrate(30);c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},400)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),
+b=this.eventNamespace,d=this;a(".clear-btn",c.closest(".qrinput")).on("click"+b,function(){d._clearInput()});return!0},_unbindEvents:function(){var c=a(this.element),b=this.eventNamespace;a(".clear-btn",c.closest(".qrinput")).off(b);return!0}})})(jQuery);
diff --git a/static/themes/RLP/js/verify.js b/static/themes/RLP/js/verify.js
index 80560e46f..83408a5a0 100644
--- a/static/themes/RLP/js/verify.js
+++ b/static/themes/RLP/js/verify.js
@@ -9,19 +9,19 @@
     "use strict";
 
     var reset = function() {
-        $('.data, .reset, .throbber').hide();
-        $('.scan, .data-empty').removeClass('hide').show();
+        $('.data, .loading').hide();
+        $('.data-empty, .scan').removeClass('hide').show();
         $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #commission-status').text('--');
     };
 
     var showPending = function() {
-        $('.data, .reset, .scan').hide();
+        $('.data, .scan').hide();
         $('.data-empty, .loading').removeClass('hide').show();
     };
 
     var showResult = function() {
-        $('.data-empty, .loading, .scan').hide();
-        $('.data, .reset').removeClass('hide').show();
+        $('.data-empty, .loading').hide();
+        $('.data, .scan').removeClass('hide').show();
     };
 
     var verify = function() {
@@ -63,8 +63,8 @@
     $(function() {
 
         reset();
+        $('.qrscan-btn').off('.verification').on('click.verification', reset);
         $('#vcode').off('.qrInput').on('change.qrInput', verify);
-        $('.reset').off('.verification').on('click.verification', reset);
     });
 
 })(jQuery);

From d5594b30b673d56753fddc8ba2f25803e3188fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 21:14:15 +0100
Subject: [PATCH 10/16] Minor tweaks

---
 VERSION                                | 2 +-
 languages/de.py                        | 1 +
 modules/templates/RLPPTM/commission.py | 4 ++--
 static/scripts/S3/s3.ui.qrinput.js     | 2 +-
 static/scripts/S3/s3.ui.qrinput.min.js | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index c1762af12..deab0a5b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5548-g7ea8a4b38 (2022-11-29 20:52:46)
+nursix-dev-5549-g4b6247ccb (2022-11-29 21:14:15)
diff --git a/languages/de.py b/languages/de.py
index 7ab3fa53a..b31d4d8cf 100644
--- a/languages/de.py
+++ b/languages/de.py
@@ -6414,6 +6414,7 @@
 'Verification Status': 'Prüfstatus',
 'Verified': 'Verifiziert',
 'Verified?': 'Geprüft?',
+'Verify Commission': 'Beauftragung prüfen',
 'Verify Password': 'Passwort-Kontrolle',
 'Verify password': 'Passwortprüfung',
 'Very Good': 'Sehr gut',
diff --git a/modules/templates/RLPPTM/commission.py b/modules/templates/RLPPTM/commission.py
index 6f3cea645..e922218e8 100644
--- a/modules/templates/RLPPTM/commission.py
+++ b/modules/templates/RLPPTM/commission.py
@@ -928,9 +928,9 @@ def _verify(vcode, provider_id=None):
                                                                      limitby = (0, 1),
                                                                      ).first()
             if not record:
-                signature = "NOT FOUND"
+                signature = "RECORD NOT FOUND"
             elif record.deleted:
-                signature = "DELETED"
+                signature = "RECORD DELETED"
             else:
                 signature = "VALID"
                 commission = ProviderCommission(record.id)
diff --git a/static/scripts/S3/s3.ui.qrinput.js b/static/scripts/S3/s3.ui.qrinput.js
index a8f6057dc..8a8365879 100644
--- a/static/scripts/S3/s3.ui.qrinput.js
+++ b/static/scripts/S3/s3.ui.qrinput.js
@@ -131,7 +131,7 @@
                                 scanner.stop();
                                 videoInput.hide();
                                 success.show();
-                                window.navigator.vibrate(30);
+                                window.navigator.vibrate(100);
                                 $el.val(result).trigger('change' + self.eventNamespace);
                                 setTimeout(function() {
                                     dialog.dialog('close');
diff --git a/static/scripts/S3/s3.ui.qrinput.min.js b/static/scripts/S3/s3.ui.qrinput.min.js
index 7a883ce4c..fff1a37df 100644
--- a/static/scripts/S3/s3.ui.qrinput.min.js
+++ b/static/scripts/S3/s3.ui.qrinput.min.js
@@ -4,5 +4,5 @@
 */
 (function(a,n){var h=0;a.widget("s3.qrInput",{options:{workerPath:null},_create:function(){this.id=h;h+=1;this.eventNamespace=".qrInput"},_init:function(){this.container=a(this.element).closest(".qrinput");this.scanButton=a(".qrscan-btn",this.container);this.options.workerPath&&(QrScanner.WORKER_PATH=this.options.workerPath);this.refresh()},_destroy:function(){var c=this.scanner,b=this.videoInput;c&&(c.destroy(),this.scanner=null);b&&(b.remove(),this.videoInput=null);a.Widget.prototype.destroy.call(this)},
 refresh:function(){var c=a(this.element),b=this;this._unbindEvents();a(".error_wrapper",this.container).appendTo(this.container);b.scanButton.length&&QrScanner.hasCamera().then(function(d){var g=b.scanButton;if(d){g.prop("disabled",!1);var e;d=a('<div class="qrinput-scan">');var k=a('<div class="qrinput-success">').html('<i class="fa fa-check">').hide().appendTo(d),f=a("<video>").appendTo(d);f.css({width:"300",height:"300"});var l=d.dialog({title:"Scan QR Code",autoOpen:!1,modal:!0,classes:{"ui-dialog":"qrinput-dialog"},
-close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){e.stop();f.hide();k.show();window.navigator.vibrate(30);c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},400)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),
+close:function(){e&&(e.stop(),e.destroy(),e=null)}});g.on("click",function(){f.show();k.hide();l.dialog("open");e=new QrScanner(f.get(0),function(m){e.stop();f.hide();k.show();window.navigator.vibrate(100);c.val(m).trigger("change"+b.eventNamespace);setTimeout(function(){l.dialog("close")},400)},function(){});e.start()})}else g.prop("disabled",!0)});this._bindEvents()},_clearInput:function(){a(this.element).val("").trigger("change"+this.eventNamespace)},_bindEvents:function(){var c=a(this.element),
 b=this.eventNamespace,d=this;a(".clear-btn",c.closest(".qrinput")).on("click"+b,function(){d._clearInput()});return!0},_unbindEvents:function(){var c=a(this.element),b=this.eventNamespace;a(".clear-btn",c.closest(".qrinput")).off(b);return!0}})})(jQuery);

From da695586ea2c661c3dfa20dd58cf79db8b5428a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 21:46:48 +0100
Subject: [PATCH 11/16] Include status date

---
 VERSION                                    | 2 +-
 modules/templates/RLPPTM/commission.py     | 7 +++++--
 modules/templates/RLPPTM/views/verify.html | 6 +++++-
 static/themes/RLP/js/verify.js             | 5 +++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index deab0a5b0..082bc790b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5549-g4b6247ccb (2022-11-29 21:14:15)
+nursix-dev-5550-gd5594b30b (2022-11-29 21:46:48)
diff --git a/modules/templates/RLPPTM/commission.py b/modules/templates/RLPPTM/commission.py
index e922218e8..b3a64180b 100644
--- a/modules/templates/RLPPTM/commission.py
+++ b/modules/templates/RLPPTM/commission.py
@@ -95,6 +95,7 @@ def commission(self):
                                            table.date,
                                            table.end_date,
                                            table.status,
+                                           table.status_date,
                                            table.cnote,
                                            table.vhash,
                                            limitby = (0, 1),
@@ -943,12 +944,14 @@ def _verify(vcode, provider_id=None):
             elif provider_id and provider_id != commission.provider_id:
                 signature = "PROVIDER ID MISMATCH"
             else:
+                dtfmt = lambda dt: dt.isoformat() if dt else "--"
                 output.update(
                     {"organisation": commission.organisation_name,
                      "organisation_id": commission.provider_id,
-                     "start": record.date.isoformat() if record.date else "0000-00-00",
-                     "end": record.end_date.isoformat() if record.end_date else "0000-00-00",
+                     "start": dtfmt(record.date),
+                     "end": dtfmt(record.end_date),
                      "status": record.status,
+                     "status_date": dtfmt(record.status_date),
                      })
 
         output["signature"] = signature
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index 1df3e1797..dd78a18c2 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -79,7 +79,11 @@ <h3>{{=T("Commission Details")}}</h3>
        </label>
        <label>
         <span>{{=T("Status")}}</span>
-        <div id='commission-status' class="data-value"></div>
+        <div id='status' class="data-value"></div>
+       </label>
+       <label>
+        <span>{{=T("Status updated on")}}</span>
+        <div id='status-date' class="data-value"></div>
        </label>
       </div>
       <div class="scan">
diff --git a/static/themes/RLP/js/verify.js b/static/themes/RLP/js/verify.js
index 83408a5a0..9f3f7c468 100644
--- a/static/themes/RLP/js/verify.js
+++ b/static/themes/RLP/js/verify.js
@@ -11,7 +11,7 @@
     var reset = function() {
         $('.data, .loading').hide();
         $('.data-empty, .scan').removeClass('hide').show();
-        $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #commission-status').text('--');
+        $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #commission-status, #status-date').text('--');
     };
 
     var showPending = function() {
@@ -50,7 +50,8 @@
                 $('#provider-name').text(response.organisation);
                 $('#start-date').text(response.start);
                 $('#end-date').text(response.end);
-                $('#commission-status').text(response.status);
+                $('#status').text(response.status);
+                $('#status-date').text(response.status_date);
                 showResult();
             },
             'error': function () {

From 666ef4b8e8ac9e9e73d60bdc85fac85e51eda014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 21:48:49 +0100
Subject: [PATCH 12/16] Bug fix

---
 VERSION                                    | 2 +-
 modules/templates/RLPPTM/views/verify.html | 2 +-
 static/themes/RLP/js/verify.js             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 082bc790b..d2c21226b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5550-gd5594b30b (2022-11-29 21:46:48)
+nursix-dev-5551-gda695586e (2022-11-29 21:48:49)
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index dd78a18c2..f1ce0351d 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -75,7 +75,7 @@ <h3>{{=T("Commission Details")}}</h3>
        </label>
        <label>
         <span>{{=T("Valid Until")}}</span>
-        <div id='end-date' class="data-value">00.00.0000</div>
+        <div id='end-date' class="data-value"></div>
        </label>
        <label>
         <span>{{=T("Status")}}</span>
diff --git a/static/themes/RLP/js/verify.js b/static/themes/RLP/js/verify.js
index 9f3f7c468..25f32fe09 100644
--- a/static/themes/RLP/js/verify.js
+++ b/static/themes/RLP/js/verify.js
@@ -11,7 +11,7 @@
     var reset = function() {
         $('.data, .loading').hide();
         $('.data-empty, .scan').removeClass('hide').show();
-        $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #commission-status, #status-date').text('--');
+        $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #status, #status-date').text('--');
     };
 
     var showPending = function() {

From 0b6740985a34832ff2a27930e60148239fcb1b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Tue, 29 Nov 2022 21:51:49 +0100
Subject: [PATCH 13/16] Minor tweak

---
 VERSION                                    | 2 +-
 modules/templates/RLPPTM/views/verify.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index d2c21226b..201fe5f9c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5551-gda695586e (2022-11-29 21:48:49)
+nursix-dev-5552-g666ef4b8e (2022-11-29 21:51:49)
diff --git a/modules/templates/RLPPTM/views/verify.html b/modules/templates/RLPPTM/views/verify.html
index f1ce0351d..91b18fa71 100644
--- a/modules/templates/RLPPTM/views/verify.html
+++ b/modules/templates/RLPPTM/views/verify.html
@@ -97,7 +97,7 @@ <h3>{{=T("Commission Details")}}</h3>
  <footer>
   <div id='footer'>
    <div class='small-6 columns text-left'>
-    {{=A(T("Back to %(appname)s") % {"appname": settings.get_system_name_short()}, _href=URL(c="default", f="index"), _class="action-lnk")}}
+    {{=A("%(appname)s" % {"appname": settings.get_system_name_short()}, _href=URL(c="default", f="index"), _class="action-lnk")}}
    </div>
    <div class='small-6 columns'>
     <div class="username text-right">{{if auth.is_logged_in():}}{{=auth.user.email}}{{else:}}{{=T("anonymous user")}}{{pass}}<i class='fa fa-user'></i></div>

From 9e35450711176b0429784b7cfc6c55cb851d51c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Wed, 30 Nov 2022 14:42:30 +0100
Subject: [PATCH 14/16] RLPPTM: proper representation/localization of
 commission data in verification UI

---
 VERSION                                |   2 +-
 modules/templates/RLPPTM/commission.py | 172 ++++++++++++++++++++-----
 static/themes/RLP/js/verify.js         |  32 ++++-
 3 files changed, 164 insertions(+), 42 deletions(-)

diff --git a/VERSION b/VERSION
index 201fe5f9c..67dcb7282 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5552-g666ef4b8e (2022-11-29 21:51:49)
+nursix-dev-5553-g0b6740985 (2022-11-30 14:42:30)
diff --git a/modules/templates/RLPPTM/commission.py b/modules/templates/RLPPTM/commission.py
index b3a64180b..db5815a9e 100644
--- a/modules/templates/RLPPTM/commission.py
+++ b/modules/templates/RLPPTM/commission.py
@@ -47,11 +47,11 @@
 from reportlab.lib.utils import ImageReader
 from reportlab.platypus import BaseDocTemplate, Frame, KeepTogether, PageTemplate, Paragraph
 
-from gluon import current
+from gluon import current, BUTTON, DIV, INPUT, URL
+from core import CRUDMethod, CustomController, ICON, JSONERRORS, S3QRInput, \
+                 s3_str
 
-from core import CRUDMethod, JSONERRORS, s3_str
-
-# Fonts we use in this layout
+# Fonts used in CommissionDocTemplate
 NORMAL = "Helvetica"
 BOLD = "Helvetica-Bold"
 
@@ -358,7 +358,7 @@ def pdf(self):
     # -------------------------------------------------------------------------
     def issue_note(self):
         """
-            Issue a commissioning note as PDF document in the record, and
+            Issues a commissioning note as PDF document in the record, and
             store the hash for verification of the document
         """
 
@@ -378,8 +378,22 @@ def issue_note(self):
                                      vhash = self.vhash,
                                      )
 
+    # -------------------------------------------------------------------------
     @staticmethod
     def parse_vcode(vcode):
+        """
+            Parses a commission note verification code (counterpart to vcode)
+
+            Args:
+                vcode - the verification code (str|bytes)
+
+            Returns:
+                Details of the code for verification purposes, including
+                verification hash, as dict
+
+            Raises:
+                ValueError - for invalid verification codes
+        """
 
         msg = "invalid verification code"
 
@@ -413,6 +427,55 @@ def parse_vcode(vcode):
                 "vhash": hashlib.sha256(vcode).hexdigest().lower()
                 }
 
+    # -------------------------------------------------------------------------
+    def json(self, represent=False):
+        """
+            Returns the commission details as JSON-serializable dict,
+            for use in verification methods
+
+            Args:
+                represent: include represented data
+
+            Returns:
+                dict
+        """
+
+        record = self.commission
+
+        dtfmt = lambda dt: dt.isoformat() if dt else "--"
+        output = {"data": {"organisation": self.organisation_name,
+                           "organisation_id": self.provider_id,
+                           "start": dtfmt(record.date),
+                           "end": dtfmt(record.end_date),
+                           "status": record.status,
+                           "status_date": dtfmt(record.status_date),
+                           },
+                  }
+
+        if represent:
+            represented = {"organisation": self.organisation_name,
+                           "organisation_id": self.provider_id,
+                           }
+
+            # Record details
+            fields = {"start": "date",
+                      "end": "end_date",
+                      "status": "status",
+                      "status_date": "status_date",
+                      }
+            table = current.s3db.org_commission
+            for k, fn in fields.items():
+                field = table[fn]
+                value = field.represent(record[fn])
+                if hasattr(value, "xml") and callable(value.xml):
+                    value = s3_str(value.xml())
+                else:
+                    value = s3_str(value) if value else "--"
+                represented[k] = value
+            output["repr"] = represented
+
+        return output
+
 # =============================================================================
 class CommissionDocTemplate(BaseDocTemplate):
     """
@@ -834,10 +897,11 @@ def draw_page_number(self, page_count):
 
 # =============================================================================
 class VerifyCommission(CRUDMethod):
+    """ Method to verify commission note signatures """
 
     def apply_method(self, r, **attr):
         """
-            Report test facility information
+            Handles requests for this method
 
             Args:
                 r: the CRUDRequest instance
@@ -845,7 +909,7 @@ def apply_method(self, r, **attr):
         """
 
         if r.http == "GET":
-            output = self.form(r, **attr)
+            output = self.form()
 
         elif r.http == "POST":
             if r.representation == "json":
@@ -857,24 +921,31 @@ def apply_method(self, r, **attr):
 
         return output
 
-    def form(self, r, **attr):
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def form():
+        """
+            Provides an interactive UI for commission note signature
+            verification
 
-        T = current.T
+            Returns:
+                QR widget for the view
 
-        response = current.response
-        settings = current.deployment_settings
+            Note:
+                - uses templates/RLPPTM/views/verify.html
+                - injects the required JS for QR scanning
+        """
 
-        from core import S3QRInput, ICON, CustomController
-        from gluon import IS_NOT_EMPTY, BUTTON, INPUT, DIV, URL
+        ajax_url = URL(c="org", f="facility", args=["verify.json"], vars={"repr": 1})
 
-        hidden_input = INPUT(_type="hidden",
-                             _name="vcode",
-                             _id="vcode",
-                             data = {"url": URL(c="org", f="facility", args=["verify.json"])},
+        hidden_input = INPUT(_type = "hidden",
+                             _name = "vcode",
+                             _id = "vcode",
+                             data = {"url": ajax_url},
                              )
         scan_button = BUTTON(ICON("fa fa-qrcode"),
                              "",
-                             _title = "Scan QR Code",
+                             _title = current.T("Scan QR Code"),
                              _type = "button",
                              _class = "primary button qrscan-btn wide-button",
                              )
@@ -884,11 +955,35 @@ def form(self, r, **attr):
         CustomController._view("RLPPTM", "verify.html")
         return {"widget": widget}
 
-
+    # -------------------------------------------------------------------------
     def verify(self, r, **attr):
+        """
+            Handles requests to verify a commission note signature
+
+            Args:
+                r: the CRUDRequest instance
+                attr: controller attributes
+
+            Returns:
+                a JSON response, format
+                {"signature": VALID|INVALID|RECORD NOT FOUND|RECORD DELETED|PROVIDER MISMATCH,
+                 "data": {
+                    "organisation": organisation name,
+                    "organisation_id": provider ID (value of the OrgID tag),
+                    "start": start date of commission,
+                    "end": end date of commission,
+                    "status": current commission status,
+                    "status_date": date of the status,
+                    },
+                 "repr": {
+                    - same as data, but with represented/localized values
+                    - only with ?repr=1 URL parameter
+                    }
+                 }
+        """
 
         # Read the body JSON of the request
-        # Must be {"vcode": "..."}
+        # Expected format {"vcode": "...", "id": "..."}, with id optional
         body = r.body
         body.seek(0)
         try:
@@ -905,17 +1000,35 @@ def verify(self, r, **attr):
             r.error(400, current.ERROR.BAD_REQUEST)
 
         provider_id = ref.get("id")
+        represent = r.get_vars.get("repr") == "1"
 
         response = current.response
         if response:
             response.headers["Content-Type"] = "application/json; charset=utf-8"
-        return json.dumps(self._verify(vcode, provider_id=provider_id),
+
+        return json.dumps(self._verify(vcode,
+                                       provider_id = provider_id,
+                                       represent = represent,
+                                       ),
                           separators = (",", ":"),
                           ensure_ascii = False,
                           )
 
+    # -------------------------------------------------------------------------
     @staticmethod
-    def _verify(vcode, provider_id=None):
+    def _verify(vcode, provider_id=None, represent=False):
+        """
+            Verifies a commission note signature
+
+            Args:
+                vcode: the signature (QR code)
+                provider_id: verify in the context of this provider
+                represent: return represented/localized data
+
+            Returns:
+                the verification result including commission data,
+                as a JSON-serializable dict
+        """
 
         commission, output = None, {}
         try:
@@ -938,21 +1051,12 @@ def _verify(vcode, provider_id=None):
 
         if commission:
             # Verify the hash
-            record = commission.commission
-            if record.vhash != parsed["vhash"]:
+            if commission.commission.vhash != parsed["vhash"]:
                 signature = "INVALID"
             elif provider_id and provider_id != commission.provider_id:
-                signature = "PROVIDER ID MISMATCH"
+                signature = "PROVIDER MISMATCH"
             else:
-                dtfmt = lambda dt: dt.isoformat() if dt else "--"
-                output.update(
-                    {"organisation": commission.organisation_name,
-                     "organisation_id": commission.provider_id,
-                     "start": dtfmt(record.date),
-                     "end": dtfmt(record.end_date),
-                     "status": record.status,
-                     "status_date": dtfmt(record.status_date),
-                     })
+                output.update(commission.json(represent=represent))
 
         output["signature"] = signature
 
diff --git a/static/themes/RLP/js/verify.js b/static/themes/RLP/js/verify.js
index 25f32fe09..8b11c7bfe 100644
--- a/static/themes/RLP/js/verify.js
+++ b/static/themes/RLP/js/verify.js
@@ -11,6 +11,7 @@
     var reset = function() {
         $('.data, .loading').hide();
         $('.data-empty, .scan').removeClass('hide').show();
+        $('#verification-result').css({color: ''});
         $('#verification-result, #provider-id, #provider-name, #start-date, #end-date, #status, #status-date').text('--');
     };
 
@@ -44,18 +45,35 @@
             'dataType': 'json',
             'data': JSON.stringify({vcode: vCode}),
             'contentType': 'application/json; charset=utf-8',
+            'timeout' : 5000,
+            'retryLimit': 0,
             'success': function(response) {
+
+                // Prefer represented over raw data
+                var data = response.repr;
+                if (data === undefined) {
+                    data = response.data;
+                }
+
+                // Update the data display
                 $('#verification-result').text(response.signature);
-                $('#provider-id').text(response.organisation_id);
-                $('#provider-name').text(response.organisation);
-                $('#start-date').text(response.start);
-                $('#end-date').text(response.end);
-                $('#status').text(response.status);
-                $('#status-date').text(response.status_date);
+
+                if (response.signature == 'VALID') {
+                    $('#verification-result').css({color: ''});
+                    $('#provider-id').html(data.organisation_id);
+                    $('#provider-name').html(data.organisation);
+                    $('#start-date').html(data.start);
+                    $('#end-date').html(data.end);
+                    $('#status').html(data.status);
+                    $('#status-date').html(data.status_date);
+                } else {
+                    $('#verification-result').css({color: '#db1b1b'});
+                    $('#provider-id, #provider-name, #start-date, #end-date, #status, #status-date').text('--');
+                }
                 showResult();
             },
             'error': function () {
-                alert('error!');
+                // ajaxS3 does the error reporting
                 reset();
             }
         });

From 829dd357129f421931d88c2d22c657e1fc03317d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Wed, 30 Nov 2022 14:59:28 +0100
Subject: [PATCH 15/16] Style fix

---
 VERSION                      | 2 +-
 static/themes/RLP/verify.css | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 67dcb7282..8b5a631bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5553-g0b6740985 (2022-11-30 14:42:30)
+nursix-dev-5554-g9e3545071 (2022-11-30 14:59:28)
diff --git a/static/themes/RLP/verify.css b/static/themes/RLP/verify.css
index 50ade6111..198b3296d 100644
--- a/static/themes/RLP/verify.css
+++ b/static/themes/RLP/verify.css
@@ -1,7 +1,7 @@
 main {
     min-height: 80%
 }
-.scan, .loading, .reset {
+.scan, .loading {
     position: absolute;
     top: 2rem;
     right: 1rem;
@@ -17,11 +17,12 @@ main {
     vertical-align: middle;
 }
 .data, .data-empty {
-    position: absolute;
-    top: 2rem;
-    left: 2rem;
+    margin: 2rem;
     min-height: 70%;
 }
+#status {
+    max-width: 12rem;
+}
 .data label {
     font-size: 0.7rem;
 }

From 3ddd33bc8d3e146c8f53e835058abfdd7369be71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Wed, 30 Nov 2022 15:21:50 +0100
Subject: [PATCH 16/16] RLPPTM: include commission details in TestFacilityInfo
 API

---
 VERSION                             |  2 +-
 modules/templates/RLPPTM/helpers.py | 32 +++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8b5a631bb..d219748fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5554-g9e3545071 (2022-11-30 14:59:28)
+nursix-dev-5555-g829dd3571 (2022-11-30 15:21:50)
diff --git a/modules/templates/RLPPTM/helpers.py b/modules/templates/RLPPTM/helpers.py
index 836a4408a..cdb96a821 100644
--- a/modules/templates/RLPPTM/helpers.py
+++ b/modules/templates/RLPPTM/helpers.py
@@ -2326,6 +2326,13 @@ def facility_info(r, **attr):
                      "name": "ORG-NAME",    - the organisation name
                      "type": "ORG-TYPE",    - the organisation type
                      "website": "URL"       - the organisation website URL
+                     "commission": [        - commissioning details
+                        {"start": YYYY-MM-DD,
+                        "end": YYYY-MM-DD,
+                        "status": CURRENT|SUSPENDED|REVOKED|EXPIRED,
+                        "status_date": YYYY-MM-DD,
+                        }, ...
+                       ]
                      },
                  "location":
                     {"L1": "L1-NAME",       - the L1 name (state)
@@ -2338,7 +2345,7 @@ def facility_info(r, **attr):
                  "report": ["start","end"], - echoed from input, ISO-format dates YYYY-MM-DD
                  "activity":
                     {"tests": NN            - the total number of tests reported for the period
-                    }
+                    },
                  }
         """
 
@@ -2431,7 +2438,8 @@ def facility_info(r, **attr):
                 ]
         query = (otable.id == facility.organisation_id) & \
                 (otable.deleted == False)
-        row = db(query).select(otable.name,
+        row = db(query).select(otable.id,
+                               otable.name,
                                otable.website,
                                ttable.name,
                                ottable.value,
@@ -2447,6 +2455,26 @@ def facility_info(r, **attr):
                        "type": orgtype.name,
                        "website": organisation.website,
                        }
+
+            # Add commission data
+            ctable = s3db.org_commission
+            query = (ctable.organisation_id == organisation.id) & \
+                    (ctable.deleted == False)
+            commissions = db(query).select(ctable.date,
+                                           ctable.end_date,
+                                           ctable.status,
+                                           ctable.status_date,
+                                           )
+            dtfmt = lambda dt: dt.isoformat() if dt else '--'
+            clist = []
+            for commission in commissions:
+                clist.append({"start": dtfmt(commission.date),
+                              "end": dtfmt(commission.end_date),
+                              "status": commission.status,
+                              "status_date": dtfmt(commission.status_date),
+                              })
+            orgdata["commission"] = clist
+
             output["organisation"] = orgdata
 
         # Look up location data