Fix another copy paste error

Ignore versions for "None" models, such as where the model has subsequently been deleted (eventchecklistcrew and eventchecklistvehicle). Now it makes sense...

.github/workflows/django.yml

@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      PYTHONDONTWRITEBYTECODE: 1
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -41,8 +42,8 @@ jobs:
               pipenv run python3 manage.py makemigrations --check --dry-run
               pipenv run python3 manage.py collectstatic --noinput
       - name: Run Tests
-        run: pipenv run pytest -n auto -vv --cov
-      - uses: actions/upload-artifact@v2
+        run: pipenv run pytest -n auto --cov
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
             name: failure-screenshots ${{ matrix.test-group }}

Pipfile

@@ -19,7 +19,7 @@ cssutils = "~=1.0.2"
 dj-database-url = "~=0.5.0"
 dj-static = "~=0.0.6"
 Django = "~=3.2"
-django-debug-toolbar = "~=3.2"
+django-debug-toolbar = "~=4.0.0"
 django-filter = "~=2.4.0"
 django-ical = "~=1.7.1"
 django-recurrence = "~=1.10.3"
@@ -47,7 +47,7 @@ python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
 reportlab = "*"
-requests = "~=2.25.1"
+requests = "~=2.31.0"
 retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"
@@ -56,7 +56,7 @@ sqlparse = "~=0.4.2"
 static3 = "~=0.7.0"
 svg2rlg = "~=0.3"
 tini = "~=3.0.1"
-tornado = "~=6.1"
+tornado = "~=6.3"
 urllib3 = "~=1.26.5"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
@@ -79,7 +79,7 @@ django-hcaptcha = "*"
 pikepdf = "*"
 django-queryable-properties = "*"
 django-mass-edit = "*"
-selenium = "~=3.141.0"
+selenium = "~=4.9.1"
 
 [dev-packages]
 pycodestyle = "~=2.9.1"
@@ -93,7 +93,7 @@ pytest = "*"
 pytest-reverse = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"
 
 [dev-packages.pytest-xdist]
 extras = [ "psutil",]

Pipfile.lock

@@ -1,11 +1,11 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "2e2fb4b609c10fc42db6bbd69ca73800629fbcaceec664e1fcc79d4b37bc0eb1"
+            "sha256": "71377846d2282aa2f5352819eb31260cbbb04f41c2c3462b5c3ca2c8bc602b34"
         },
         "pipfile-spec": 6,
         "requires": {
-            "python_version": "3.9"
+            "python_version": "3.10"
         },
         "sources": [
             {
@@ -32,6 +32,22 @@
             "index": "pypi",
             "version": "==3.3.4"
         },
+        "async-generator": {
+            "hashes": [
+                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
+                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==1.10"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
+                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==23.1.0"
+        },
         "backports.tempfile": {
             "hashes": [
                 "sha256:05aa50940946f05759696156a8c39be118169a0e0f94a49d0bb106503891ff54",
@@ -169,6 +185,87 @@
             "index": "pypi",
             "version": "==4.0.0"
         },
+        "charset-normalizer": {
+            "hashes": [
+                "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6",
+                "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1",
+                "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e",
+                "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373",
+                "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62",
+                "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230",
+                "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be",
+                "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c",
+                "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0",
+                "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448",
+                "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f",
+                "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649",
+                "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d",
+                "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0",
+                "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706",
+                "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a",
+                "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59",
+                "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23",
+                "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5",
+                "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb",
+                "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e",
+                "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e",
+                "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c",
+                "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28",
+                "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d",
+                "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41",
+                "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974",
+                "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce",
+                "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f",
+                "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1",
+                "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d",
+                "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8",
+                "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017",
+                "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31",
+                "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7",
+                "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8",
+                "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e",
+                "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14",
+                "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd",
+                "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d",
+                "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795",
+                "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b",
+                "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b",
+                "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b",
+                "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203",
+                "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f",
+                "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19",
+                "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1",
+                "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a",
+                "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac",
+                "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9",
+                "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0",
+                "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137",
+                "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f",
+                "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6",
+                "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5",
+                "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909",
+                "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f",
+                "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0",
+                "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324",
+                "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755",
+                "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb",
+                "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854",
+                "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c",
+                "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60",
+                "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84",
+                "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0",
+                "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b",
+                "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1",
+                "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531",
+                "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1",
+                "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11",
+                "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326",
+                "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df",
+                "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"
+            ],
+            "markers": "python_full_version >= '3.7.0'",
+            "version": "==3.1.0"
+        },
         "configparser": {
             "hashes": [
                 "sha256:85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828",
@@ -218,11 +315,11 @@
         },
         "diff-match-patch": {
             "hashes": [
-                "sha256:8bf9d9c4e059d917b5c6312bac0c137971a32815ddbda9c682b949f2986b4d34",
-                "sha256:da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"
+                "sha256:953019cdb9c9d2c9e47b5b12bcff3cf4746fc4598eb406076fa1fc27e6a1f15c",
+                "sha256:dce43505fb7b1b317de7195579388df0746d90db07015ed47a85e5e44930ef93"
             ],
             "index": "pypi",
-            "version": "==20200713"
+            "version": "==20230430"
         },
         "dj-database-url": {
             "hashes": [
@@ -249,11 +346,11 @@
         },
         "django-debug-toolbar": {
             "hashes": [
-                "sha256:24ef1a7d44d25e60d7951e378454c6509bf536dce7e7d9d36e7c387db499bc27",
-                "sha256:879f8a4672d41621c06a4d322dcffa630fc4df056cada6e417ed01db0e5e0478"
+                "sha256:89619f6e0ea1057dca47bfc429ed99b237ef70074dabc065a7faa5f00e1459cf",
+                "sha256:bad339d68520652ddc1580c76f136fcbc3e020fd5ed96510a89a02ec81bb3fb1"
             ],
             "index": "pypi",
-            "version": "==3.8.1"
+            "version": "==4.0.0"
         },
         "django-filter": {
             "hashes": [
@@ -296,11 +393,11 @@
         },
         "django-queryable-properties": {
             "hashes": [
-                "sha256:8d702a8c8cce65f6505826c4ecc22429dda06f132c952f51ded6b208ed2586b0",
-                "sha256:ededecd103998885b2ef3d4d5a04a3d29f79b3b3c086df89448efb4b3459d7ef"
+                "sha256:4c2399847f5dd0a3eedabfc91865a0847aa58fc6cd80555151363943891ff4cd",
+                "sha256:ed2aac9168ecce664dd3c2a65cfb6fc9fd2e3aa9b2acc3a4d75a948a67b719d3"
             ],
             "index": "pypi",
-            "version": "==1.8.3"
+            "version": "==1.8.4"
         },
         "django-recurrence": {
             "hashes": [
@@ -312,11 +409,11 @@
         },
         "django-registration-redux": {
             "hashes": [
-                "sha256:5079dd36980cc0faddf91a6e991129680410611b1059d8154d064cc0146744b2",
-                "sha256:88eb98530d98a7e3451bf728c0a5f6fe7ea2f45c65ef18f619ef37b940c854f5"
+                "sha256:2213bbe8732be72724034f4146f0255a7bd666eb5a5e1b2d8d8aa633fe8af894",
+                "sha256:56fbc7b01a7f0f48812fe4d4e0729d2dac916e16f8aaed36b3f10129f2df9d0f"
             ],
             "index": "pypi",
-            "version": "==2.11"
+            "version": "==2.12"
         },
         "django-reversion": {
             "hashes": [
@@ -341,6 +438,27 @@
             "index": "pypi",
             "version": "==0.2.0"
         },
+        "exceptiongroup": {
+            "hashes": [
+                "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e",
+                "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"
+            ],
+            "markers": "python_version < '3.11'",
+            "version": "==1.1.1"
+        },
+        "freetype-py": {
+            "hashes": [
+                "sha256:3a552265b06c2cb3fa54f86ed6fcbf045d8dc8176f9475bedddf9a1b31f5402f",
+                "sha256:89cee8f4e7cf0a37b73a43a08c88703d84e3b9f9243fc665d8dc0b72a5d206a8",
+                "sha256:b95ccd52ff7e9bef34505f8af724cee114a3c3cc9cf13e0fd406fa0cc92b988a",
+                "sha256:c8f17c3ac35dc7cc9571ac37a00a6daa428a1a6d0fe6926a77d16066865ed5ef",
+                "sha256:ca7155de937af6f26bfd9f9089a6e9b01fa8f9d3040a3ddc0aeb3a53cf88f428",
+                "sha256:ccdb1616794a8ad48beaa9e29d3494e6643d24d8e925cc39263de21c062ea5a7",
+                "sha256:f9b64ce3272a5c358dcee824800a32d70997fb872a0965a557adca20fce7a5d0"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==2.3.0"
+        },
         "gunicorn": {
             "hashes": [
                 "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
@@ -349,6 +467,14 @@
             "index": "pypi",
             "version": "==20.0.4"
         },
+        "h11": {
+            "hashes": [
+                "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
+                "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.14.0"
+        },
         "html5lib": {
             "hashes": [
                 "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d",
@@ -375,11 +501,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b",
-                "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313"
+                "sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed",
+                "sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705"
             ],
             "index": "pypi",
-            "version": "==5.1.0"
+            "version": "==6.6.0"
         },
         "lxml": {
             "hashes": [
@@ -474,61 +600,80 @@
         },
         "msgpack": {
             "hashes": [
-                "sha256:002b5c72b6cd9b4bafd790f364b8480e859b4712e91f43014fe01e4f957b8467",
-                "sha256:0a68d3ac0104e2d3510de90a1091720157c319ceeb90d74f7b5295a6bee51bae",
-                "sha256:0df96d6eaf45ceca04b3f3b4b111b86b33785683d682c655063ef8057d61fd92",
-                "sha256:0dfe3947db5fb9ce52aaea6ca28112a170db9eae75adf9339a1aec434dc954ef",
-                "sha256:0e3590f9fb9f7fbc36df366267870e77269c03172d086fa76bb4eba8b2b46624",
-                "sha256:11184bc7e56fd74c00ead4f9cc9a3091d62ecb96e97653add7a879a14b003227",
-                "sha256:112b0f93202d7c0fef0b7810d465fde23c746a2d482e1e2de2aafd2ce1492c88",
-                "sha256:1276e8f34e139aeff1c77a3cefb295598b504ac5314d32c8c3d54d24fadb94c9",
-                "sha256:1576bd97527a93c44fa856770197dec00d223b0b9f36ef03f65bac60197cedf8",
-                "sha256:1e91d641d2bfe91ba4c52039adc5bccf27c335356055825c7f88742c8bb900dd",
-                "sha256:26b8feaca40a90cbe031b03d82b2898bf560027160d3eae1423f4a67654ec5d6",
-                "sha256:2999623886c5c02deefe156e8f869c3b0aaeba14bfc50aa2486a0415178fce55",
-                "sha256:2a2df1b55a78eb5f5b7d2a4bb221cd8363913830145fad05374a80bf0877cb1e",
-                "sha256:2bb8cdf50dd623392fa75525cce44a65a12a00c98e1e37bf0fb08ddce2ff60d2",
-                "sha256:2cc5ca2712ac0003bcb625c96368fd08a0f86bbc1a5578802512d87bc592fe44",
-                "sha256:35bc0faa494b0f1d851fd29129b2575b2e26d41d177caacd4206d81502d4c6a6",
-                "sha256:3c11a48cf5e59026ad7cb0dc29e29a01b5a66a3e333dc11c04f7e991fc5510a9",
-                "sha256:449e57cc1ff18d3b444eb554e44613cffcccb32805d16726a5494038c3b93dab",
-                "sha256:462497af5fd4e0edbb1559c352ad84f6c577ffbbb708566a0abaaa84acd9f3ae",
-                "sha256:4733359808c56d5d7756628736061c432ded018e7a1dff2d35a02439043321aa",
-                "sha256:48f5d88c99f64c456413d74a975bd605a9b0526293218a3b77220a2c15458ba9",
-                "sha256:49565b0e3d7896d9ea71d9095df15b7f75a035c49be733051c34762ca95bbf7e",
-                "sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250",
-                "sha256:4d5834a2a48965a349da1c5a79760d94a1a0172fbb5ab6b5b33cbf8447e109ce",
-                "sha256:4dea20515f660aa6b7e964433b1808d098dcfcabbebeaaad240d11f909298075",
-                "sha256:545e3cf0cf74f3e48b470f68ed19551ae6f9722814ea969305794645da091236",
-                "sha256:63e29d6e8c9ca22b21846234913c3466b7e4ee6e422f205a2988083de3b08cae",
-                "sha256:6916c78f33602ecf0509cc40379271ba0f9ab572b066bd4bdafd7434dee4bc6e",
-                "sha256:6a4192b1ab40f8dca3f2877b70e63799d95c62c068c84dc028b40a6cb03ccd0f",
-                "sha256:6c9566f2c39ccced0a38d37c26cc3570983b97833c365a6044edef3574a00c08",
-                "sha256:76ee788122de3a68a02ed6f3a16bbcd97bc7c2e39bd4d94be2f1821e7c4a64e6",
-                "sha256:7760f85956c415578c17edb39eed99f9181a48375b0d4a94076d84148cf67b2d",
-                "sha256:77ccd2af37f3db0ea59fb280fa2165bf1b096510ba9fe0cc2bf8fa92a22fdb43",
-                "sha256:81fc7ba725464651190b196f3cd848e8553d4d510114a954681fd0b9c479d7e1",
-                "sha256:85f279d88d8e833ec015650fd15ae5eddce0791e1e8a59165318f371158efec6",
-                "sha256:9667bdfdf523c40d2511f0e98a6c9d3603be6b371ae9a238b7ef2dc4e7a427b0",
-                "sha256:a75dfb03f8b06f4ab093dafe3ddcc2d633259e6c3f74bb1b01996f5d8aa5868c",
-                "sha256:ac5bd7901487c4a1dd51a8c58f2632b15d838d07ceedaa5e4c080f7190925bff",
-                "sha256:aca0f1644d6b5a73eb3e74d4d64d5d8c6c3d577e753a04c9e9c87d07692c58db",
-                "sha256:b17be2478b622939e39b816e0aa8242611cc8d3583d1cd8ec31b249f04623243",
-                "sha256:c1683841cd4fa45ac427c18854c3ec3cd9b681694caf5bff04edb9387602d661",
-                "sha256:c23080fdeec4716aede32b4e0ef7e213c7b1093eede9ee010949f2a418ced6ba",
-                "sha256:d5b5b962221fa2c5d3a7f8133f9abffc114fe218eb4365e40f17732ade576c8e",
-                "sha256:d603de2b8d2ea3f3bcb2efe286849aa7a81531abc52d8454da12f46235092bcb",
-                "sha256:e83f80a7fec1a62cf4e6c9a660e39c7f878f603737a0cdac8c13131d11d97f52",
-                "sha256:eb514ad14edf07a1dbe63761fd30f89ae79b42625731e1ccf5e1f1092950eaa6",
-                "sha256:eba96145051ccec0ec86611fe9cf693ce55f2a3ce89c06ed307de0e085730ec1",
-                "sha256:ed6f7b854a823ea44cf94919ba3f727e230da29feb4a99711433f25800cf747f",
-                "sha256:f0029245c51fd9473dc1aede1160b0a29f4a912e6b1dd353fa6d317085b219da",
-                "sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f",
-                "sha256:fb62ea4b62bfcb0b380d5680f9a4b3f9a2d166d9394e9bbd9666c0ee09a3645c",
-                "sha256:fcb8a47f43acc113e24e910399376f7277cf8508b27e5b88499f053de6b115a8"
+                "sha256:06f5174b5f8ed0ed919da0e62cbd4ffde676a374aba4020034da05fab67b9164",
+                "sha256:0c05a4a96585525916b109bb85f8cb6511db1c6f5b9d9cbcbc940dc6b4be944b",
+                "sha256:137850656634abddfb88236008339fdaba3178f4751b28f270d2ebe77a563b6c",
+                "sha256:17358523b85973e5f242ad74aa4712b7ee560715562554aa2134d96e7aa4cbbf",
+                "sha256:18334484eafc2b1aa47a6d42427da7fa8f2ab3d60b674120bce7a895a0a85bdd",
+                "sha256:1835c84d65f46900920b3708f5ba829fb19b1096c1800ad60bae8418652a951d",
+                "sha256:1967f6129fc50a43bfe0951c35acbb729be89a55d849fab7686004da85103f1c",
+                "sha256:1ab2f3331cb1b54165976a9d976cb251a83183631c88076613c6c780f0d6e45a",
+                "sha256:1c0f7c47f0087ffda62961d425e4407961a7ffd2aa004c81b9c07d9269512f6e",
+                "sha256:20a97bf595a232c3ee6d57ddaadd5453d174a52594bf9c21d10407e2a2d9b3bd",
+                "sha256:20c784e66b613c7f16f632e7b5e8a1651aa5702463d61394671ba07b2fc9e025",
+                "sha256:266fa4202c0eb94d26822d9bfd7af25d1e2c088927fe8de9033d929dd5ba24c5",
+                "sha256:28592e20bbb1620848256ebc105fc420436af59515793ed27d5c77a217477705",
+                "sha256:288e32b47e67f7b171f86b030e527e302c91bd3f40fd9033483f2cacc37f327a",
+                "sha256:3055b0455e45810820db1f29d900bf39466df96ddca11dfa6d074fa47054376d",
+                "sha256:332360ff25469c346a1c5e47cbe2a725517919892eda5cfaffe6046656f0b7bb",
+                "sha256:362d9655cd369b08fda06b6657a303eb7172d5279997abe094512e919cf74b11",
+                "sha256:366c9a7b9057e1547f4ad51d8facad8b406bab69c7d72c0eb6f529cf76d4b85f",
+                "sha256:36961b0568c36027c76e2ae3ca1132e35123dcec0706c4b7992683cc26c1320c",
+                "sha256:379026812e49258016dd84ad79ac8446922234d498058ae1d415f04b522d5b2d",
+                "sha256:382b2c77589331f2cb80b67cc058c00f225e19827dbc818d700f61513ab47bea",
+                "sha256:476a8fe8fae289fdf273d6d2a6cb6e35b5a58541693e8f9f019bfe990a51e4ba",
+                "sha256:48296af57cdb1d885843afd73c4656be5c76c0c6328db3440c9601a98f303d87",
+                "sha256:4867aa2df9e2a5fa5f76d7d5565d25ec76e84c106b55509e78c1ede0f152659a",
+                "sha256:4c075728a1095efd0634a7dccb06204919a2f67d1893b6aa8e00497258bf926c",
+                "sha256:4f837b93669ce4336e24d08286c38761132bc7ab29782727f8557e1eb21b2080",
+                "sha256:4f8d8b3bf1ff2672567d6b5c725a1b347fe838b912772aa8ae2bf70338d5a198",
+                "sha256:525228efd79bb831cf6830a732e2e80bc1b05436b086d4264814b4b2955b2fa9",
+                "sha256:5494ea30d517a3576749cad32fa27f7585c65f5f38309c88c6d137877fa28a5a",
+                "sha256:55b56a24893105dc52c1253649b60f475f36b3aa0fc66115bffafb624d7cb30b",
+                "sha256:56a62ec00b636583e5cb6ad313bbed36bb7ead5fa3a3e38938503142c72cba4f",
+                "sha256:57e1f3528bd95cc44684beda696f74d3aaa8a5e58c816214b9046512240ef437",
+                "sha256:586d0d636f9a628ddc6a17bfd45aa5b5efaf1606d2b60fa5d87b8986326e933f",
+                "sha256:5cb47c21a8a65b165ce29f2bec852790cbc04936f502966768e4aae9fa763cb7",
+                "sha256:6c4c68d87497f66f96d50142a2b73b97972130d93677ce930718f68828b382e2",
+                "sha256:821c7e677cc6acf0fd3f7ac664c98803827ae6de594a9f99563e48c5a2f27eb0",
+                "sha256:916723458c25dfb77ff07f4c66aed34e47503b2eb3188b3adbec8d8aa6e00f48",
+                "sha256:9e6ca5d5699bcd89ae605c150aee83b5321f2115695e741b99618f4856c50898",
+                "sha256:9f5ae84c5c8a857ec44dc180a8b0cc08238e021f57abdf51a8182e915e6299f0",
+                "sha256:a2b031c2e9b9af485d5e3c4520f4220d74f4d222a5b8dc8c1a3ab9448ca79c57",
+                "sha256:a61215eac016f391129a013c9e46f3ab308db5f5ec9f25811e811f96962599a8",
+                "sha256:a740fa0e4087a734455f0fc3abf5e746004c9da72fbd541e9b113013c8dc3282",
+                "sha256:a9985b214f33311df47e274eb788a5893a761d025e2b92c723ba4c63936b69b1",
+                "sha256:ab31e908d8424d55601ad7075e471b7d0140d4d3dd3272daf39c5c19d936bd82",
+                "sha256:ac9dd47af78cae935901a9a500104e2dea2e253207c924cc95de149606dc43cc",
+                "sha256:addab7e2e1fcc04bd08e4eb631c2a90960c340e40dfc4a5e24d2ff0d5a3b3edb",
+                "sha256:b1d46dfe3832660f53b13b925d4e0fa1432b00f5f7210eb3ad3bb9a13c6204a6",
+                "sha256:b2de4c1c0538dcb7010902a2b97f4e00fc4ddf2c8cda9749af0e594d3b7fa3d7",
+                "sha256:b5ef2f015b95f912c2fcab19c36814963b5463f1fb9049846994b007962743e9",
+                "sha256:b72d0698f86e8d9ddf9442bdedec15b71df3598199ba33322d9711a19f08145c",
+                "sha256:bae7de2026cbfe3782c8b78b0db9cbfc5455e079f1937cb0ab8d133496ac55e1",
+                "sha256:bf22a83f973b50f9d38e55c6aade04c41ddda19b00c4ebc558930d78eecc64ed",
+                "sha256:c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c",
+                "sha256:c396e2cc213d12ce017b686e0f53497f94f8ba2b24799c25d913d46c08ec422c",
+                "sha256:cb5aaa8c17760909ec6cb15e744c3ebc2ca8918e727216e79607b7bbce9c8f77",
+                "sha256:cdc793c50be3f01106245a61b739328f7dccc2c648b501e237f0699fe1395b81",
+                "sha256:d25dd59bbbbb996eacf7be6b4ad082ed7eacc4e8f3d2df1ba43822da9bfa122a",
+                "sha256:e42b9594cc3bf4d838d67d6ed62b9e59e201862a25e9a157019e171fbe672dd3",
+                "sha256:e57916ef1bd0fee4f21c4600e9d1da352d8816b52a599c46460e93a6e9f17086",
+                "sha256:ed40e926fa2f297e8a653c954b732f125ef97bdd4c889f243182299de27e2aa9",
+                "sha256:ef8108f8dedf204bb7b42994abf93882da1159728a2d4c5e82012edd92c9da9f",
+                "sha256:f933bbda5a3ee63b8834179096923b094b76f0c7a73c1cfe8f07ad608c58844b",
+                "sha256:fe5c63197c55bce6385d9aee16c4d0641684628f63ace85f73571e65ad1c1e8d"
             ],
             "index": "pypi",
-            "version": "==1.0.4"
+            "version": "==1.0.5"
+        },
+        "outcome": {
+            "hashes": [
+                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
+                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.2.0"
         },
         "packaging": {
             "hashes": [
@@ -548,45 +693,42 @@
         },
         "pikepdf": {
             "hashes": [
-                "sha256:08ca2566c3ddcb633bbfb90c9e2b7134f222ab48f642f056c266fd69a4c0844e",
-                "sha256:15eff12d7b5dc4eeeb9fbe5148d5e93cdc9f632a352d7df5191409837cdada6f",
-                "sha256:24717a49cab8cf0ccb360ae38fefe4b09e23d394086ef6da740071165a2542d8",
-                "sha256:2c1a3a1ae0d787a6819ffb9d456b0ccbf2b8d48ad8b0748f765a6a306b92184b",
-                "sha256:2c653bc771cc6065642f5a734ecb771ff16b5412cf05a5c3435072ac01f84fbe",
-                "sha256:2e9c9cc68bc123b88007b321a494ab054c3ce378ee2f77bba1b90c8bdaaad59e",
-                "sha256:32a7775f8b2117e72fa101427edf4526f0886e785146a7bfdf2a877d27f94dbf",
-                "sha256:4675c743ac873d8a1ff9d06c1d5fab15e9ca66aa1abf73fcbca4b86c976b214e",
-                "sha256:4800fd878876d9a780e2d1125e971d680a0de466440bd6bcbc54ac7cfb925fd6",
-                "sha256:5b1271b200ece3e16ffa97c76ff93c057d3676f2ecee89ae52efd5e4804874ab",
-                "sha256:5b1c975d02e75aa8a0e09679ed23f85b6eddf91ac7c85189dc18f1ef8599ce70",
-                "sha256:5b295d9579081ab46ce7bb463eccbc62e0c60cbe546f29c0a9135abd5cf76a24",
-                "sha256:5f040aa7d9327b6d9087848dc8e35d2b8515bf17a04e2bdb20f8c51931810213",
-                "sha256:62d724e37a2f004f63615513d3f877334e679dd43b6c55cdfe9b8af56ff52400",
-                "sha256:6452fa9d10b15bb60b2343b7ac08123e0c5b87f852250538d32bf556f09b8c3a",
-                "sha256:66679ee6b364b3b9659a72697e053554e2f4c231371173745b59114f00a821e5",
-                "sha256:6b21fde29bd006cb0889e05a0407f0825b5650ae22272ba70720fc68a2e44a0e",
-                "sha256:788df6789df19a381976f6644b78a65da92c5d4fd45714682a1cffb0cd3ff410",
-                "sha256:7a6de8d04df3dc4f37ddbdfdbecdb4c3d20d479699260902ec06fa531cbfbae6",
-                "sha256:80a4546f59bb38121c20fc37305a388b8f9d561c6bbcc77a3415afdd8a7ab16d",
-                "sha256:856e527970fa2516858662906173004568a38f95b46ef95c8231c529f3e71581",
-                "sha256:8874d4d38b2da71837352576c5ec10c03b2a7976124b95721564d8c456c9824b",
-                "sha256:913437609c3e5b9109a2fe1100f52bdcead4e56e8c83ca8a9c3b520cd7720016",
-                "sha256:91fd023805733163927ae04b16d48374f04f03f204f2cfa45d442b052314de83",
-                "sha256:9d9fe5e3fbd54a45fe7678c08d24c1e8347a1e48adcb4f32c6c25ef380f056ca",
-                "sha256:a98fcebb4303b8b2f5cde0d56f2406a53e74a9ad4bc1e1bc12bdc2b3dd4def1f",
-                "sha256:aa7d3831fa016634f2ead255717644ba2dddf462117b8558b783ac2ba94583bb",
-                "sha256:ae0ba99841d80107becaec6ed067b63c455f51a9bb83b0e88efd3a098753735b",
-                "sha256:b77e2e134315d25dd004b4ffbd2d5032352da164b21bc3bd92768379610fa2b5",
-                "sha256:c5a2710aacb1fa25edd77feba51dcadf85a9b735f2190e8b45edf0e1e79b5d1d",
-                "sha256:c768e55caf96024218866a5b5f95fdded2ef001b2d5463d1c89e57d07bdab928",
-                "sha256:d55b1d8eb3b17e55682b91c042c48e2d0c67be4c1e30b7e539a82e03977eed29",
-                "sha256:d57a35b3ed3f8ef98aa528d4981d1376ccc1ba64ab937f2ac2ed0aadee1d5911",
-                "sha256:e35110f69406e5b9cf6330d16106877372f6aa955fdc1a920d53babcd6a5ae3d",
-                "sha256:e3ff858d504312ea07519121d3ecdf1b5bc40541f957d2b85d271a2ca6284b70",
-                "sha256:f721cd86d8ddf0624306fcd1fed3e086387fcb2e32baeafbd1ba92a7c40c5563"
+                "sha256:0e1607fda03a53a29a4a8e3fbacbde788804c78167ff251e1c1006f89539f306",
+                "sha256:1cc8d0be5a62ed9011bb519abc34907b5965b392995043719effc4b6a00e2052",
+                "sha256:26b9bfb99265dfb6deb72574f8cd30e7ffbc2f53237988bb4e167e18d813f510",
+                "sha256:371eb23ac14e6c9947e59e5cea15ea93e61a5714c6b1f99fba948927809605ea",
+                "sha256:3c30776791fad8d57a43c392d8e190afded857c61e49dac471ab74e9e716c441",
+                "sha256:3efe4dd2cb417f42865b11e6fc9adb1b6252241bd7a8d891afcaeb2191c285c2",
+                "sha256:5155e1127dfe3aacf77a33552f128e9c04e8b61bf585ab2b155d062a524bfd06",
+                "sha256:6670efe5b9c1548d60348cdd5ce84ca363a3cde22e9cf695f1ce3b3f818e498d",
+                "sha256:677f04f02535ac398806970544c43c1e2b120d82b027437c467923a16c81d528",
+                "sha256:6790cf10da642d72703cbe887afb923daa2e0f7cb9467a79fe449dbe228f8942",
+                "sha256:6a150160f7ed97769f3c0e60de5cb031bce04e1f6708916ac1c936774a65cc0c",
+                "sha256:6dbe2b62e12ff2b47d4e56ebbe16697d0e25bc2c608f4ee5230cf179ebd2a8ab",
+                "sha256:70f1161dd22ccfcbfd1c460873c95b68b79cf234f0a4e9f37cb565bf436fd85e",
+                "sha256:7246789dd9071ebcf8c90baebe1eee34ac627e2ea22bf241eff31d32f5ca5df9",
+                "sha256:7a07f73f2aac48af46a546e285360d6e595b499075ab78c3b8ca9f5f13d9e876",
+                "sha256:99e483e037f6991be3c4c655454d57324c10ccf41960acd1edd899ebe9a314dd",
+                "sha256:9db8270c940f94d0049420f1a6c05b1f7d326d2abb20493c83f64fde3949404e",
+                "sha256:9fadd1a99754dcd925e37721485d4d1259c7ad3c9073c6b3b0ed12c6e2d2234c",
+                "sha256:ad82b836faed0376c725e19d0f8a7c7bef389e8c46683c11bbfc70410bc2e3ee",
+                "sha256:b148959f1ad51d236cf6bbc5343beef72c4c60569151221ec06b1d787909222e",
+                "sha256:b24b7520c7f40bba4f437ba5111dca99dbd0cca9d3cab0f0a33afa6150091ee3",
+                "sha256:c99838e86c0fc5a215a0588011344477e8f6ec2c5faf48ee3a9da1ba2c2cac5b",
+                "sha256:d0698a429948e613f810b487318ce88112bc71a67fd76645be140532130e6c86",
+                "sha256:d410028ef3435a459e55de520d29010ee91e4a40872d9eb2dab86e6730a24e9d",
+                "sha256:dc6a653f0f98076a1e86e4fe58fe36dcf403963ae55c65bfcd28aa1d2d9b1b18",
+                "sha256:e21bce4760c6e64c90b17601a8ce000219677adb264a3c038d2522de032169ca",
+                "sha256:e4559941b359beb0e90b7d0b8016397ab4700f075f7aa11f2561958a7ce0f8ea",
+                "sha256:ebc1b30d646ded58721a5594a5ca457e098fedfd9bcab28de79ad79a119e3537",
+                "sha256:f27a1aea4cae5484cffe4fc5fa761af11f384ca0fd4b2f9114f9ba9717fe4746",
+                "sha256:f325af78bfb63e305be7f31a3afea47fd33ba035ccb08e89d608d2e88b367349",
+                "sha256:f3c97acce9b66a41b2759dc30ef57de8f38c7239c9b0e7a5febc196b764a2567",
+                "sha256:f458c4161e76a882a15ade4125a2f92faa7e5ce120d2e6530dd995aa3308971c",
+                "sha256:f7451f176eb9828d8dd7cb3d4e00d4e0aa7f7d7d00331fe640bc20cf3328deb5"
             ],
             "index": "pypi",
-            "version": "==6.2.5"
+            "version": "==7.2.0"
         },
         "pillow": {
             "hashes": [
@@ -733,6 +875,23 @@
             "index": "pypi",
             "version": "==2.8.6"
         },
+        "pycairo": {
+            "hashes": [
+                "sha256:1a6d8e0f353062ad92954784e33dbbaf66c880c9c30e947996c542ed9748aaaf",
+                "sha256:2dec5378133778961993fb59d66df16070e03f4d491b67eb695ca9ad7a696008",
+                "sha256:3a71f758e461180d241e62ef52e85499c843bd2660fd6d87cec99c9833792bfa",
+                "sha256:564601e5f528531c6caec1c0177c3d0709081e1a2a5cccc13561f715080ae535",
+                "sha256:82e335774a17870bc038e0c2fb106c1e5e7ad0c764662023886dfcfce5bb5a52",
+                "sha256:87efd62a7b7afad9a0a420f05b6008742a6cfc59077697be65afe8dc73ae15ad",
+                "sha256:9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c",
+                "sha256:a4b1f525bbdf637c40f4d91378de36c01ec2b7f8ecc585b700a079b9ff83298e",
+                "sha256:d6bacff15d688ed135b4567965a4b664d9fb8de7417a7865bb138ad612043c9f",
+                "sha256:e7cde633986435d87a86b6118b7b6109c384266fd719ef959883e2729f6eafae",
+                "sha256:ec305fc7f2f0299df78aadec0eaf6eb9accb90eda242b5d3492544d3f2b28027"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.23.0"
+        },
         "pygments": {
             "hashes": [
                 "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435",
@@ -765,6 +924,14 @@
             "index": "pypi",
             "version": "==2.2.4"
         },
+        "pysocks": {
+            "hashes": [
+                "sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299",
+                "sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5",
+                "sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
+            ],
+            "version": "==1.7.1"
+        },
         "python-barcode": {
             "hashes": [
                 "sha256:241b34aa5c5cb6a9889882f9409b0182903a2c5d19b4218be3609cdbbd5ffdf9",
@@ -799,62 +966,19 @@
         },
         "reportlab": {
             "hashes": [
-                "sha256:07fdd968df7941c2bfb67b9bb4532f424992dfafc71b72a4e4b291ff707e6b0e",
-                "sha256:090ea99ff829d918f7b6140594373b1340a34e1e6876eddae5aa06662ec10d64",
-                "sha256:109009b02fc225882ea766a5ed8be0ef473fa1356e252a3f651a6aa89b4a195f",
-                "sha256:1dd0307b2b13b0482ac8314fd793fbbce263a428b189371addf0466784e1d597",
-                "sha256:236a6483210049205f6180d7a7595d0ca2e4ce343d83cc94ca719a4145809c6f",
-                "sha256:26c25ea4afa8b92a2c14f4edc41c8fc30505745ce84cae86538e80cacadd7ae2",
-                "sha256:2a0bc7a1d64fe754b62e175ba0cf47a630b529c0488ec9ac4e4c7655e295ea4d",
-                "sha256:2c9b0861d8f40d7a24b094b8834f6a489b9e8c70bceaa7fa98237eed229671ce",
-                "sha256:39e92fa4ab2a8f0f2cc051d9c1e3acb881340c07ef59c0c8b627861343d653c0",
-                "sha256:3a62e51a4a47616896bd0f1e9cc3fbfb174b713794a5031a34b84f69dbe01775",
-                "sha256:3fd1ffdd5204301eb4c290a5752ac62f44d2d0b262e02e35a1e5234c13e14662",
-                "sha256:498b4ec7e73426de64c6bf6ec03c5b3f10dedf5db8a9e13fdf195f95a3d065aa",
-                "sha256:4c599645af9b5b2241a23e977a82c965a59c24cd94b2600b8d34373c66cad763",
-                "sha256:4fa3cdf490f3828b055381e8c7dc7819b3e5f7a442d7af7a8f90e9806a7fff51",
-                "sha256:55a070206580e161b6bbe1a96abf816c18d4c2c225d49916654714c93d842835",
-                "sha256:666bdba4958b348460a765c48b8c0640e7085540846ed9494f47d8651604b33c",
-                "sha256:69f41295d696c822224334f0994f1f107df7efed72211d45a1118696f1427c84",
-                "sha256:6dfcf7bd6db5d80711cbbd0996b6e7a79cc414ca81457960367df11d2860f92a",
-                "sha256:71cf73f9907c444ef663ea653dbac24af07c307079572c3ff8f20ad1463af3b7",
-                "sha256:72ec333f089b4fce5a6d740ed0a1963a3994146be195722da0d8e14d4a7e1600",
-                "sha256:759495c2b8c15cb0d6b539c246896029e4cde42a896c3956f77e311c5f6b0807",
-                "sha256:7a7c3369fa618eca79f9554ce06c618a5e738e592d61d96aa09b2457ca3ea410",
-                "sha256:8b1215facead57cc5325aef4229ef886e85d270b2ba02080fb5809ce9d2b81b4",
-                "sha256:907f7cd4832bb295d0c1573de15cc5aab5988282caf2ee7a2b1276fb6cdf502b",
-                "sha256:93e229519d046491b798f2c12dbbf2f3e237e89589aa5cbb5e1d8c1a978816db",
-                "sha256:a12049314497d872f6788f811e2b331654db207937f8a2fb34ff3e3cd9897faa",
-                "sha256:a8dddc52e0e486291be0ad39184da0607fae9cc665fdba1881211de9cfc0b332",
-                "sha256:adf78ccb2defad5b6ecb2e2e9f2a672719b0a8e2278592a7d77f6c220a042388",
-                "sha256:b13cebf4e397bba14542bcd023338b6ff2c151a3a12aabca89eecbf972cb361a",
-                "sha256:b3648f3c340b6b6aabf9352341478c708cee6f00c5cd5c902311fcf4ce870f3c",
-                "sha256:b6a1b685da0b9a8000bb980e02d9d5be202d0cc539af113b661c76c051fca6f1",
-                "sha256:b777ddc57b2d3366cbc540616034cdc1089ca0a31fefc907028e1dd62a6bf16c",
-                "sha256:bb83df8f7840321d34cb5b24c972c617a8c1716c8a36e5050fff56adf5891b8c",
-                "sha256:c07ec796a2a5d44bf787f2b623b6e668a389b0cafb78af34cf74554ff3bc532b",
-                "sha256:c40e108072379ff83dd7442159ebc249d12eb8eec15b70614953fecd2c403792",
-                "sha256:c4863c49602722237e35cbce5aa91af4539cc63a671f59504d2b3f3767d898cf",
-                "sha256:c56d701f7dc662e1d3d7fe364e66fa1339eafce54a488c2d16ec0ea49dc213c2",
-                "sha256:c84afd5bef6e407c80ba9f99b6abbe3ea78e8243b0f19897a871a7bcad1f749d",
-                "sha256:cdd206883e999278d2af656f988dfcc89eb0c175ce6d75e87b713cf1e792c0c4",
-                "sha256:ce85a204f46c871c8af6fa64b9bbed165456935c1d0bfb2f570a3194f6723ddb",
-                "sha256:cee3b6ebef5e4a8654ec5f0effeb1a2bb157ad87b0ac856871d25a805c0f2f90",
-                "sha256:d4cecfb48a6cfbfe2caf0fc280cecea999699e63bc98cb02254bd87b39eff677",
-                "sha256:db62bed0774778fdf82c609cb9efd0062f2fdcd285be527d01f6be9fd9755888",
-                "sha256:f51dcb39e910a853749250c0f82aced80bca3f7315e9c4ee14349eb7cab6a3f8",
-                "sha256:f5808e1dac6b66c109d6205ce2aebf84bb89e1a1493b7e6df38932df5ebfb9cf"
+                "sha256:3ea3b2954cb434b024dac61e9f270f2a4c0f9e0cc8b2cf2e310273307b2ba05c",
+                "sha256:a1433a24cee3119fdc142487c6594d72621dd1d5d33df2d032c559aa0bb8b115"
             ],
             "index": "pypi",
-            "version": "==3.6.12"
+            "version": "==4.0.0"
         },
         "requests": {
             "hashes": [
-                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
             ],
             "index": "pypi",
-            "version": "==2.25.1"
+            "version": "==2.31.0"
         },
         "retrying": {
             "hashes": [
@@ -864,29 +988,37 @@
             "index": "pypi",
             "version": "==1.3.4"
         },
+        "rlpycairo": {
+            "hashes": [
+                "sha256:7cd1eac30fe69d98f75d67a54892f9c10534a047b9a959ef17bb3926a196e50a",
+                "sha256:a88bce206c45d2180f944b8754c6e2e9245f80506c90fdfb94c7fbdd27805c25"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.2.0"
+        },
         "selenium": {
             "hashes": [
-                "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c",
-                "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d"
+                "sha256:3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e",
+                "sha256:82aedaa85d55bc861f4c89ff9609e82f6c958e2e1e3da3ffcc36703f21d3ee16"
             ],
             "index": "pypi",
-            "version": "==3.141.0"
+            "version": "==4.9.1"
         },
         "sentry-sdk": {
             "hashes": [
-                "sha256:675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9",
-                "sha256:8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c"
+                "sha256:0bbcecda9f51936904c1030e7fef0fe693e633888f02a14d1cb68646a50e83b3",
+                "sha256:56d6d9d194c898d853a7c1dd99bed92ce82334ee1282292c15bcc967ff1a49b5"
             ],
             "index": "pypi",
-            "version": "==1.11.1"
+            "version": "==1.24.0"
         },
         "setuptools": {
             "hashes": [
-                "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b",
-                "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"
+                "sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f",
+                "sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==67.7.2"
+            "version": "==67.8.0"
         },
         "simplejson": {
             "hashes": [
@@ -963,21 +1095,36 @@
             "index": "pypi",
             "version": "==1.15.0"
         },
+        "sniffio": {
+            "hashes": [
+                "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101",
+                "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.3.0"
+        },
+        "sortedcontainers": {
+            "hashes": [
+                "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88",
+                "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"
+            ],
+            "version": "==2.4.0"
+        },
         "soupsieve": {
             "hashes": [
-                "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759",
-                "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"
+                "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8",
+                "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"
             ],
             "index": "pypi",
-            "version": "==2.3.2.post1"
+            "version": "==2.4.1"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34",
-                "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268"
+                "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3",
+                "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"
             ],
             "index": "pypi",
-            "version": "==0.4.3"
+            "version": "==0.4.4"
         },
         "static3": {
             "hashes": [
@@ -1026,28 +1173,44 @@
         },
         "tornado": {
             "hashes": [
-                "sha256:1d54d13ab8414ed44de07efecb97d4ef7c39f7438cf5e976ccd356bebb1b5fca",
-                "sha256:20f638fd8cc85f3cbae3c732326e96addff0a15e22d80f049e00121651e82e72",
-                "sha256:5c87076709343557ef8032934ce5f637dbb552efa7b21d08e89ae7619ed0eb23",
-                "sha256:5f8c52d219d4995388119af7ccaa0bcec289535747620116a58d830e7c25d8a8",
-                "sha256:6fdfabffd8dfcb6cf887428849d30cf19a3ea34c2c248461e1f7d718ad30b66b",
-                "sha256:87dcafae3e884462f90c90ecc200defe5e580a7fbbb4365eda7c7c1eb809ebc9",
-                "sha256:9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13",
-                "sha256:b8150f721c101abdef99073bf66d3903e292d851bee51910839831caba341a75",
-                "sha256:ba09ef14ca9893954244fd872798b4ccb2367c165946ce2dd7376aebdde8e3ac",
-                "sha256:d3a2f5999215a3a06a4fc218026cd84c61b8b2b40ac5296a6db1f1451ef04c1e",
-                "sha256:e5f923aa6a47e133d1cf87d60700889d7eae68988704e20c75fb2d65677a8e4b"
+                "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4",
+                "sha256:0c325e66c8123c606eea33084976c832aa4e766b7dff8aedd7587ea44a604cdf",
+                "sha256:29e71c847a35f6e10ca3b5c2990a52ce38b233019d8e858b755ea6ce4dcdd19d",
+                "sha256:4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba",
+                "sha256:5b17b1cf5f8354efa3d37c6e28fdfd9c1c1e5122f2cb56dac121ac61baa47cbe",
+                "sha256:6a0848f1aea0d196a7c4f6772197cbe2abc4266f836b0aac76947872cd29b411",
+                "sha256:7efcbcc30b7c654eb6a8c9c9da787a851c18f8ccd4a5a3a95b05c7accfa068d2",
+                "sha256:834ae7540ad3a83199a8da8f9f2d383e3c3d5130a328889e4cc991acc81e87a0",
+                "sha256:b46a6ab20f5c7c1cb949c72c1994a4585d2eaa0be4853f50a03b5031e964fc7c",
+                "sha256:c2de14066c4a38b4ecbbcd55c5cc4b5340eb04f1c5e81da7451ef555859c833f",
+                "sha256:c367ab6c0393d71171123ca5515c61ff62fe09024fa6bf299cd1339dc9456829"
             ],
             "index": "pypi",
-            "version": "==6.2"
+            "version": "==6.3.2"
+        },
+        "trio": {
+            "hashes": [
+                "sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf",
+                "sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.22.0"
+        },
+        "trio-websocket": {
+            "hashes": [
+                "sha256:0908435e4eecc49d830ae1c4d6c47b978a75f00594a2be2104d58b61a04cdb53",
+                "sha256:af13e9393f9051111300287947ec595d601758ce3d165328e7d36325135a8d62"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.10.2"
         },
         "urllib3": {
             "hashes": [
-                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
-                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
+                "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f",
+                "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"
             ],
             "index": "pypi",
-            "version": "==1.26.13"
+            "version": "==1.26.16"
         },
         "webencodings": {
             "hashes": [
@@ -1064,6 +1227,14 @@
             "index": "pypi",
             "version": "==5.2.0"
         },
+        "wsproto": {
+            "hashes": [
+                "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
+                "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
+            ],
+            "markers": "python_full_version >= '3.7.0'",
+            "version": "==1.2.0"
+        },
         "yolk": {
             "hashes": [
                 "sha256:1c07eb4001dc133c08e66e38c5d58faa7616ae804f8d0ab02dd44a1044e7ddb8"
@@ -1381,7 +1552,7 @@
                 "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df",
                 "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.1.0"
         },
         "coverage": {
@@ -1586,19 +1757,19 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71",
-                "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"
+                "sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362",
+                "sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3"
             ],
             "index": "pypi",
-            "version": "==7.2.0"
+            "version": "==7.3.1"
         },
         "pytest-cov": {
             "hashes": [
-                "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b",
-                "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"
+                "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6",
+                "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"
             ],
             "index": "pypi",
-            "version": "==4.0.0"
+            "version": "==4.1.0"
         },
         "pytest-django": {
             "hashes": [
@@ -1629,35 +1800,35 @@
                 "psutil"
             ],
             "hashes": [
-                "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c",
-                "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"
+                "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93",
+                "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"
             ],
             "index": "pypi",
-            "version": "==3.1.0"
+            "version": "==3.3.1"
         },
         "requests": {
             "hashes": [
-                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
             ],
             "index": "pypi",
-            "version": "==2.25.1"
+            "version": "==2.31.0"
         },
         "selenium": {
             "hashes": [
-                "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c",
-                "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d"
+                "sha256:3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e",
+                "sha256:82aedaa85d55bc861f4c89ff9609e82f6c958e2e1e3da3ffcc36703f21d3ee16"
             ],
             "index": "pypi",
-            "version": "==3.141.0"
+            "version": "==4.9.1"
         },
         "setuptools": {
             "hashes": [
-                "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b",
-                "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"
+                "sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f",
+                "sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==67.7.2"
+            "version": "==67.8.0"
         },
         "sniffio": {
             "hashes": [
@@ -1707,18 +1878,18 @@
         },
         "urllib3": {
             "hashes": [
-                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
-                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
+                "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f",
+                "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"
             ],
             "index": "pypi",
-            "version": "==1.26.13"
+            "version": "==1.26.16"
         },
         "wsproto": {
             "hashes": [
                 "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
                 "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==1.2.0"
         },
         "zope.component": {
@@ -1729,6 +1900,22 @@
             "index": "pypi",
             "version": "==4.6.2"
         },
+        "zope.deferredimport": {
+            "hashes": [
+                "sha256:57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1",
+                "sha256:9a0c211df44aa95f1c4e6d2626f90b400f56989180d3ef96032d708da3d23e0a"
+            ],
+            "index": "pypi",
+            "version": "==4.3.1"
+        },
+        "zope.deprecation": {
+            "hashes": [
+                "sha256:0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df",
+                "sha256:f1480b74995958b24ce37b0ef04d3663d2683e5d6debc96726eff18acf4ea113"
+            ],
+            "index": "pypi",
+            "version": "==4.4.0"
+        },
         "zope.event": {
             "hashes": [
                 "sha256:2666401939cdaa5f4e0c08cf7f20c9b21423b95e88f4675b1443973bdb080c42",
@@ -1840,6 +2027,52 @@
             ],
             "index": "pypi",
             "version": "==5.2.0"
+        },
+        "zope.proxy": {
+            "hashes": [
+                "sha256:00573dfa755d0703ab84bb23cb6ecf97bb683c34b340d4df76651f97b0bab068",
+                "sha256:092049280f2848d2ba1b57b71fe04881762a220a97b65288bcb0968bb199ec30",
+                "sha256:0cbd27b4d3718b5ec74fc65ffa53c78d34c65c6fd9411b8352d2a4f855220cf1",
+                "sha256:17fc7e16d0c81f833a138818a30f366696653d521febc8e892858041c4d88785",
+                "sha256:19577dfeb70e8a67249ba92c8ad20589a1a2d86a8d693647fa8385408a4c17b0",
+                "sha256:207aa914576b1181597a1516e1b90599dc690c095343ae281b0772e44945e6a4",
+                "sha256:219a7db5ed53e523eb4a4769f13105118b6d5b04ed169a283c9775af221e231f",
+                "sha256:2b50ea79849e46b5f4f2b0247a3687505d32d161eeb16a75f6f7e6cd81936e43",
+                "sha256:5903d38362b6c716e66bbe470f190579c530a5baf03dbc8500e5c2357aa569a5",
+                "sha256:5c24903675e271bd688c6e9e7df5775ac6b168feb87dbe0e4bcc90805f21b28f",
+                "sha256:5ef6bc5ed98139e084f4e91100f2b098a0cd3493d4e76f9d6b3f7b95d7ad0f06",
+                "sha256:61b55ae3c23a126a788b33ffb18f37d6668e79a05e756588d9e4d4be7246ab1c",
+                "sha256:63ddb992931a5e616c87d3d89f5a58db086e617548005c7f9059fac68c03a5cc",
+                "sha256:6943da9c09870490dcfd50c4909c0cc19f434fa6948f61282dc9cb07bcf08160",
+                "sha256:6ad40f85c1207803d581d5d75e9ea25327cd524925699a83dfc03bf8e4ba72b7",
+                "sha256:6b44433a79bdd7af0e3337bd7bbcf53dd1f9b0fa66bf21bcb756060ce32a96c1",
+                "sha256:6bbaa245015d933a4172395baad7874373f162955d73612f0b66b6c2c33b6366",
+                "sha256:7007227f4ea85b40a2f5e5a244479f6a6dfcf906db9b55e812a814a8f0e2c28d",
+                "sha256:74884a0aec1f1609190ec8b34b5d58fb3b5353cf22b96161e13e0e835f13518f",
+                "sha256:7d25fe5571ddb16369054f54cdd883f23de9941476d97f2b92eb6d7d83afe22d",
+                "sha256:7e162bdc5e3baad26b2262240be7d2bab36991d85a6a556e48b9dfb402370261",
+                "sha256:814d62678dc3a30f4aa081982d830b7c342cf230ffc9d030b020cb154eeebf9e",
+                "sha256:8878a34c5313ee52e20aa50b03138af8d472bae465710fb954d133a9bfd3c38d",
+                "sha256:a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792",
+                "sha256:a69f5cbf4addcfdf03dda564a671040127a6b7c34cf9fe4973582e68441b63fa",
+                "sha256:b00f9f0c334d07709d3f73a7cb8ae63c6ca1a90c790a63b5e7effa666ef96021",
+                "sha256:b6ed71e4a7b4690447b626f499d978aa13197a0e592950e5d7020308f6054698",
+                "sha256:bdf5041e5851526e885af579d2f455348dba68d74f14a32781933569a327fddf",
+                "sha256:be034360dd34e62608419f86e799c97d389c10a0e677a25f236a971b2f40dac9",
+                "sha256:cc8f590a5eed30b314ae6b0232d925519ade433f663de79cc3783e4b10d662ba",
+                "sha256:cd7a318a15fe6cc4584bf3c4426f092ed08c0fd012cf2a9173114234fe193e11",
+                "sha256:cf19b5f63a59c20306e034e691402b02055c8f4e38bf6792c23cad489162a642",
+                "sha256:cfc781ce442ec407c841e9aa51d0e1024f72b6ec34caa8fdb6ef9576d549acf2",
+                "sha256:dea9f6f8633571e18bc20cad83603072e697103a567f4b0738d52dd0211b4527",
+                "sha256:e4a86a1d5eb2cce83c5972b3930c7c1eac81ab3508464345e2b8e54f119d5505",
+                "sha256:e7106374d4a74ed9ff00c46cc00f0a9f06a0775f8868e423f85d4464d2333679",
+                "sha256:e98a8a585b5668aa9e34d10f7785abf9545fe72663b4bfc16c99a115185ae6a5",
+                "sha256:f64840e68483316eb58d82c376ad3585ca995e69e33b230436de0cdddf7363f9",
+                "sha256:f8f4b0a9e6683e43889852130595c8854d8ae237f2324a053cdd884de936aa9b",
+                "sha256:fc45a53219ed30a7f670a6d8c98527af0020e6fd4ee4c0a8fb59f147f06d816c"
+            ],
+            "index": "pypi",
+            "version": "==4.3.5"
         }
     }
 }

PyRIGS/settings.py

@@ -64,7 +64,7 @@ INSTALLED_APPS = (
     'assets',
     'training',
 
-    'debug_toolbar',
+    # 'debug_toolbar',
     'registration',
     'reversion',
     'widget_tweaks',
@@ -75,7 +75,7 @@ INSTALLED_APPS = (
 MIDDLEWARE = (
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -218,8 +218,6 @@ TIME_ZONE = 'Europe/London'
 
 FORMAT_MODULE_PATH = 'PyRIGS.formats'
 
-USE_I18N = True
-
 USE_L10N = True
 
 USE_TZ = True
@@ -264,3 +262,10 @@ TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
 AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+SECURE_HSTS_SECONDS = 3600
+SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+SECURE_CONTENT_TYPE_NOSNIFF = True
+SESSION_COOKIE_SECURE = env('SESSION_COOKIE_SECURE_ENABLED', True)
+CSRF_COOKIE_SECURE = env('CSRF_COOKIE_SECURE_ENABLED', True)
+SECURE_HSTS_PRELOAD = True

PyRIGS/tests/base.py

@@ -63,7 +63,7 @@ def screenshot_failure(func):
             if not pathlib.Path("screenshots").is_dir():
                 os.mkdir("screenshots")
             self.driver.save_screenshot(screenshot_file)
-            print("Error in test {} is at path {}".format(screenshot_name, screenshot_file), file=sys.stderr)
+            print(f"Error in test {screenshot_name} is at path {screenshot_file}", file=sys.stderr)
             raise e
 
     return wrapper_func

PyRIGS/tests/test_unit.py

@@ -59,8 +59,8 @@ class TestSampleDataGenerator(TestCase):
         assert Asset.objects.all().count() > 50
         assert Event.objects.all().count() > 100
         call_command('deleteSampleData')
-        assert Asset.objects.all().count() == 0
-        assert Event.objects.all().count() == 0
+        assert not Asset.objects.all().exists()
+        assert not Event.objects.all().exists()
 
 
 @override_settings(DEBUG=True)
@@ -76,9 +76,9 @@ def test_unauthenticated(client):  # Nothing should be available to the unauthen
                 assertTemplateUsed(response, 'login_redirect.html')
             else:
                 if "embed" in str(url):
-                    expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
+                    expected_url = f"{reverse('login_embed')}?next={request_url}"
                 else:
-                    expected_url = "{0}?next={1}".format(reverse('login'), request_url)
+                    expected_url = f"{reverse('login')}?next={request_url}"
                 assertRedirects(response, expected_url)
     call_command('deleteSampleData')
 

PyRIGS/views.py

@@ -48,6 +48,7 @@ class Index(generic.TemplateView):  # Displays the current rig count along with
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['rig_count'] = models.Event.objects.rig_count()
+        context['now'] = models.Event.objects.events_in_bounds(timezone.now(), timezone.now()).exclude(dry_hire=True).exclude(status=models.Event.CANCELLED)
         return context
 
 
@@ -133,11 +134,15 @@ class SecureAPIRequest(generic.View):
             results = []
             query = reduce(operator.and_, queries)
             objects = self.models[model].objects.filter(query)
+            # Returning unactivated or unapproved users when they are elsewhere filtered out of the default queryset leads to some *very* unexpected results
+            if model == "profile":
+                objects = objects.filter(is_active=True, is_approved=True)
             for o in objects:
+                name = o.display_name if hasattr(o, 'display_name') else o.name
                 data = {
                     'pk': o.pk,
                     'value': o.pk,
-                    'text': o.name,
+                    'text': name,
                 }
                 try:  # See if there is a valid update URL
                     data['update'] = reverse(f"{model}_update", kwargs={'pk': o.pk})
@@ -182,7 +187,7 @@ class ModalURLMixin:
             url = reverse_lazy('closemodal')
             update_url = str(reverse_lazy(update, kwargs={'pk': self.object.pk}))
             messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
-            messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
+            messages.info(self.request, f"modalobject[0]['update_url']='{update_url}'")
         else:
             url = reverse_lazy(detail, kwargs={
                 'pk': self.object.pk,

README.md

@@ -11,8 +11,9 @@ For setup information and other such helpful stuff check the [Wiki](https://gith
 - PyRIGS: Base app, stores 'global' information
 - RIGS: Rigboard stuff - event calendar etc
 - assets: Database of our kit, testing data etc
+- training: Logs in-house training within various "departments" (sound, lighting etc).
 - versioning: Our custom logic built on top of django-reversion. Semi-modular.
 - users: Our custom logic for registration and profiles. Semi-modular.
-- training: SoonTM
+
 
 [![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://forthebadge.com)

RIGS/admin.py

@@ -20,6 +20,7 @@ admin.site.register(models.VatRate, VersionAdmin)
 admin.site.register(models.Event, VersionAdmin)
 admin.site.register(models.EventItem, VersionAdmin)
 admin.site.register(models.Invoice, VersionAdmin)
+admin.site.register(models.EventCheckIn)
 
 
 @transaction.atomic()  # Copied from django-extensions. GenericForeignKey support removed as unnecessary.
@@ -153,8 +154,9 @@ class AssociateAdmin(VersionAdmin):
 
 @admin.register(models.Profile)
 class ProfileAdmin(UserAdmin, AssociateAdmin):
-    list_display = ('username', 'name', 'is_approved', 'is_staff', 'is_superuser', 'is_supervisor', 'number_of_events')
+    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login')
     list_display_links = ['username']
+    list_filter = UserAdmin.list_filter + ('is_approved',)
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {
@@ -206,3 +208,8 @@ class RiskAssessmentAdmin(VersionAdmin):
 @admin.register(models.EventChecklist)
 class EventChecklistAdmin(VersionAdmin):
     list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')
+
+
+@admin.register(models.PowerTestRecord)
+class EventChecklistAdmin(VersionAdmin):
+    list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')

RIGS/forms.py

@@ -44,7 +44,7 @@ class EventForm(forms.ModelForm):
         return simplejson.dumps(items)
 
     def __init__(self, *args, **kwargs):
-        super(EventForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.fields['items_json'].initial = self._get_items_json
         self.fields['start_date'].widget.format = '%Y-%m-%d'
@@ -121,7 +121,7 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
-                  'purchase_order', 'collector']
+                  'purchase_order', 'collector', 'forum_url']
 
 
 class BaseClientEventAuthorisationForm(forms.ModelForm):
@@ -131,7 +131,7 @@ class BaseClientEventAuthorisationForm(forms.ModelForm):
     def clean(self):
         if self.cleaned_data.get('amount') != self.instance.event.total:
             self.add_error('amount', 'The amount authorised must equal the total for the event (inc VAT).')
-        return super(BaseClientEventAuthorisationForm, self).clean()
+        return super().clean()
 
     class Meta:
         abstract = True
@@ -179,7 +179,7 @@ class EventRiskAssessmentForm(forms.ModelForm):
                 unexpected_values.append(f"<li>{self._meta.model._meta.get_field(field).help_text}</li>")
         if len(unexpected_values) > 0 and not self.cleaned_data.get('supervisor_consulted'):
             raise forms.ValidationError(f"Your answers to these questions: <ul>{''.join([str(elem) for elem in unexpected_values])}</ul> require consulting with a supervisor.", code='unusual_answers')
-        return super(EventRiskAssessmentForm, self).clean()
+        return super().clean()
 
     class Meta:
         model = models.RiskAssessment
@@ -195,91 +195,49 @@ class EventChecklistForm(forms.ModelForm):
             if field.__class__ == forms.NullBooleanField:
                 # Only display yes/no to user, the 'none' is only ever set in the background
                 field.widget = forms.CheckboxInput()
-    # Parsed from incoming form data by clean, then saved into models when the form is saved
-    items = {}
+
+    related_models = {
+        'venue': models.Venue,
+    }
+
+    class Meta:
+        model = models.EventChecklist
+        fields = '__all__'
+        exclude = ['reviewed_at', 'reviewed_by']
+
+
+class PowerTestRecordForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        for name, field in self.fields.items():
+            if field.__class__ == forms.NullBooleanField:
+                # Only display yes/no to user, the 'none' is only ever set in the background
+                field.widget = forms.CheckboxInput()
 
     related_models = {
         'venue': models.Venue,
         'power_mic': models.Profile,
     }
 
-    # Two possible formats
-    def parsedatetime(self, date_string):
-        try:
-            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S'))
-        except ValueError:
-            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M'))
-
-    # There's probably a thousand better ways to do this, but this one is mine
-    def clean(self):
-        vehicles = {key: val for key, val in self.data.items()
-                    if key.startswith('vehicle')}
-        for key in vehicles:
-            pk = int(key.split('_')[1])
-            driver_key = 'driver_' + str(pk)
-            if (self.data[driver_key] == ''):
-                raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
-            else:
-                try:
-                    item = models.EventChecklistVehicle.objects.get(pk=pk)
-                except models.EventChecklistVehicle.DoesNotExist:
-                    item = models.EventChecklistVehicle()
-
-                item.vehicle = vehicles['vehicle_' + str(pk)]
-                item.driver = models.Profile.objects.get(pk=self.data[driver_key])
-                item.full_clean('checklist')
-
-                # item does not have a database pk yet as it isn't saved
-                self.items['v' + str(pk)] = item
-
-        crewmembers = {key: val for key, val in self.data.items()
-                       if key.startswith('crewmember')}
-        other_fields = ['start', 'role', 'end']
-        for key in crewmembers:
-            pk = int(key.split('_')[1])
-
-            for field in other_fields:
-                value = self.data[f'{field}_{pk}']
-                if value == '':
-                    raise forms.ValidationError(f'Add a {field} to crewmember {pk}', code=f'{field}_mismatch')
-
-            try:
-                item = models.EventChecklistCrew.objects.get(pk=pk)
-            except models.EventChecklistCrew.DoesNotExist:
-                item = models.EventChecklistCrew()
-
-            item.crewmember = models.Profile.objects.get(pk=self.data['crewmember_' + str(pk)])
-            item.start = self.parsedatetime(self.data['start_' + str(pk)])
-            item.role = self.data['role_' + str(pk)]
-            item.end = self.parsedatetime(self.data['end_' + str(pk)])
-            item.full_clean('checklist')
-
-            # item does not have a database pk yet as it isn't saved
-            self.items['c' + str(pk)] = item
-
-        return super(EventChecklistForm, self).clean()
-
-    def save(self, commit=True):
-        checklist = super(EventChecklistForm, self).save(commit=False)
-        if (commit):
-            # Remove all existing, to be recreated from the form
-            checklist.vehicles.all().delete()
-            checklist.crew.all().delete()
-            checklist.save()
-
-            for key in self.items:
-                item = self.items[key]
-                reversion.add_to_revision(item)
-                # finish and save new database items
-                item.checklist = checklist
-                item.full_clean()
-                item.save()
-
-        self.items.clear()
-
-        return checklist
-
     class Meta:
-        model = models.EventChecklist
+        model = models.PowerTestRecord
         fields = '__all__'
         exclude = ['reviewed_at', 'reviewed_by']
+
+
+class EventCheckInForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['time'].initial = timezone.now()
+        self.fields['role'].initial = "Crew"
+
+    class Meta:
+        model = models.EventCheckIn
+        fields = '__all__'
+        exclude = ['end_time']
+
+
+class EditCheckInForm(forms.ModelForm):
+    class Meta:
+        model = models.EventCheckIn
+        fields = '__all__'

RIGS/management/commands/generateSampleRIGSData.py

@@ -278,7 +278,7 @@ class Command(BaseCommand):
                                                      suspended_structures=bool(random.getrandbits(1)),
                                                      outside=bool(random.getrandbits(1)))
                 if i == 0 or random.randint(0, 1) > 0:  # Event 1 and 1 in 10 have a Checklist
-                    models.EventChecklist.objects.create(event=new_event, power_mic=random.choice(self.profiles),
+                    models.EventChecklist.objects.create(event=new_event,
                                                          safe_parking=bool(random.getrandbits(1)),
                                                          safe_packing=bool(random.getrandbits(1)),
                                                          exits=bool(random.getrandbits(1)),
@@ -287,6 +287,4 @@ class Command(BaseCommand):
                                                          ear_plugs=bool(random.getrandbits(1)),
                                                          hs_location="Locked away safely",
                                                          extinguishers_location="Somewhere, I forgot",
-                                                         earthing=bool(random.getrandbits(1)),
-                                                         pat=bool(random.getrandbits(1)),
                                                          date=timezone.now(), venue=random.choice(self.venues))

RIGS/migrations/0046_create_powertests.py

@@ -0,0 +1,71 @@
+# Generated by Django 3.2.16 on 2023-05-08 15:58
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import versioning.versioning
+
+def migrate_old_data(apps, schema_editor):
+    EventChecklist = apps.get_model('RIGS', 'EventChecklist')
+    PowerTestRecord = apps.get_model('RIGS', 'PowerTestRecord')
+    for ec in EventChecklist.objects.all():
+        # New highscore for the most pythonic BS I've ever written.
+        PowerTestRecord.objects.create(event=ec.event, venue=ec.venue, reviewed_by=ec.reviewed_by, **{i.name:getattr(ec, i.attname) for i in PowerTestRecord._meta.get_fields() if not (i.is_relation or i.auto_created or i.name == "notes")})
+
+
+def revert(apps, schema_editor):
+    apps.get_model('RIGS', 'PowerTestRecord').objects.all().delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0045_alter_profile_is_approved'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PowerTestRecord',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='power_tests', to='RIGS.event')),
+                ('notes', models.TextField(blank=True, default='')),
+                ('venue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue')),
+                ('reviewed_at', models.DateTimeField(null=True)),
+                ('rcds', models.BooleanField(blank=True, help_text='RCDs installed where needed and tested?', null=True)),
+                ('supply_test', models.BooleanField(blank=True, help_text='Electrical supplies tested?<br><small>(using socket tester)</small>', null=True)),
+                ('earthing', models.BooleanField(blank=True, help_text='Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>', null=True)),
+                ('pat', models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True)),
+                ('source_rcd', models.BooleanField(blank=True, help_text='Source RCD protected?<br><small>(if cable is more than 3m long) </small>', null=True)),
+                ('labelling', models.BooleanField(blank=True, help_text='Appropriate and clear labelling on distribution and cabling?', null=True)),
+                ('fd_voltage_l1', models.IntegerField(blank=True, help_text='L1 - N', null=True, verbose_name='First Distro Voltage L1-N')),
+                ('fd_voltage_l2', models.IntegerField(blank=True, help_text='L2 - N', null=True, verbose_name='First Distro Voltage L2-N')),
+                ('fd_voltage_l3', models.IntegerField(blank=True, help_text='L3 - N', null=True, verbose_name='First Distro Voltage L3-N')),
+                ('fd_phase_rotation', models.BooleanField(blank=True, help_text='Phase Rotation<br><small>(if required)</small>', null=True, verbose_name='Phase Rotation')),
+                ('fd_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
+                ('fd_pssc', models.IntegerField(blank=True, help_text='Prospective Short Circuit Current', null=True, verbose_name='PSCC')),
+                ('w1_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
+                ('w1_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
+                ('w1_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
+                ('w1_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
+                ('w2_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
+                ('w2_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
+                ('w2_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
+                ('w2_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
+                ('w3_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
+                ('w3_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
+                ('w3_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
+                ('w3_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
+                ('all_rcds_tested', models.BooleanField(blank=True, help_text='All circuit RCDs tested?<br><small>(using test button)</small>', null=True)),
+                ('public_sockets_tested', models.BooleanField(blank=True, help_text='Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>', null=True)),
+                ('reviewed_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer')),
+            ],
+            options={
+                'abstract': False,
+                'ordering': ['event'],
+                'permissions': [('review_power', 'Can review Power Test Records')],
+            },
+            bases=(models.Model, versioning.versioning.RevisionMixin),
+        ),
+        migrations.RunPython(migrate_old_data, reverse_code=revert),
+    ]

RIGS/migrations/0047_auto_20230517_0944.py

@@ -0,0 +1,44 @@
+# Generated by Django 3.2.19 on 2023-05-17 08:44
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+from django.core.exceptions import ObjectDoesNotExist
+
+
+def migrate_old_data(apps, schema_editor):
+    EventChecklist = apps.get_model('RIGS', 'EventChecklist')
+    EventCheckIn = apps.get_model('RIGS', 'EventCheckIn')
+    for ec in EventChecklist.objects.all():
+        for crew in ec.crew.all():
+            try:
+                EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end, vehicle=ec.vehicles.get(driver=crew.crewmember).vehicle)
+            except ObjectDoesNotExist:
+                EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end)
+
+
+def revert(apps, schema_editor):
+    apps.get_model('RIGS', 'EventCheckIn').objects.all().delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0046_create_powertests'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EventCheckIn',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField()),
+                ('role', models.CharField(blank=True, max_length=50)),
+                ('vehicle', models.CharField(blank=True, max_length=100)),
+                ('end_time', models.DateTimeField(blank=True, null=True)),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.event')),
+                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkins', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.RunPython(migrate_old_data, reverse_code=revert),
+    ]

RIGS/migrations/0048_auto_20230518_1256.py

@@ -0,0 +1,156 @@
+# Generated by Django 3.2.19 on 2023-05-18 11:56
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0047_auto_20230517_0944'),
+    ]
+
+    operations = [
+                migrations.RemoveField(
+            model_name='eventchecklistvehicle',
+            name='checklist',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklistvehicle',
+            name='driver',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='all_rcds_tested',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='earthing',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_earth_fault',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_phase_rotation',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_pssc',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_voltage_l1',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_voltage_l2',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='fd_voltage_l3',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='labelling',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='pat',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='power_mic',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='public_sockets_tested',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='rcds',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='source_rcd',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='supply_test',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w1_description',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w1_earth_fault',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w1_polarity',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w1_voltage',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w2_description',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w2_earth_fault',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w2_polarity',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w2_voltage',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w3_description',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w3_earth_fault',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w3_polarity',
+        ),
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='w3_voltage',
+        ),
+        migrations.AddField(
+            model_name='powertestrecord',
+            name='power_mic',
+            field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='reviewed_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='reviewed_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='reviewed_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.DeleteModel(
+            name='EventChecklistCrew',
+        ),
+        migrations.DeleteModel(
+            name='EventChecklistVehicle',
+        ),
+    ]

RIGS/migrations/0049_auto_20230529_1123.py

@@ -0,0 +1,53 @@
+# Generated by Django 3.2.19 on 2023-05-29 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0048_auto_20230518_1256'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='fd_earth_fault',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='fd_pssc',
+            field=models.IntegerField(blank=True, help_text='Prospective Short Circuit Current / A', null=True, verbose_name='PSCC'),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w1_earth_fault',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w1_voltage',
+            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w2_earth_fault',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w2_voltage',
+            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w3_earth_fault',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
+        ),
+        migrations.AlterField(
+            model_name='powertestrecord',
+            name='w3_voltage',
+            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
+        ),
+    ]

RIGS/migrations/0050_event_forum_url.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.19 on 2023-06-27 11:28
+
+import RIGS.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0049_auto_20230529_1123'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='forum_url',
+            field=models.URLField(blank=True, default='', validators=[RIGS.models.validate_forum_url]),
+        ),
+    ]

RIGS/models.py

@@ -76,11 +76,16 @@ class Profile(AbstractUser):
 
     @classmethod
     def users_awaiting_approval_count(cls):
-        return Profile.objects.filter(models.Q(is_approved=False)).count()
+        # last_login = None ensures we only pick up genuinely new users, not those that have been deactivated for inactivity
+        return Profile.objects.filter(is_approved=False, last_login=None).count()
 
     def __str__(self):
         return self.name
 
+    def current_event(self):
+        q = EventCheckIn.objects.filter(person=self, end_time=None)
+        return q.latest('time') if q.exists() else None
+
 
 class ContactableManager(models.Manager):
     def search(self, query=None):
@@ -304,6 +309,14 @@ class EventManager(models.Manager):
         return qs
 
 
+def validate_forum_url(value):
+    if not value:
+        return  # Required error is done the field
+    obj = urlparse(value)
+    if obj.hostname not in ('forum.nottinghamtec.co.uk'):
+        raise ValidationError('URL must point to a location on the TEC Forum')
+
+
 @reversion.register(follow=['items'])
 class Event(models.Model, RevisionMixin):
     # Done to make it much nicer on the database
@@ -353,6 +366,8 @@ class Event(models.Model, RevisionMixin):
     auth_request_at = models.DateTimeField(null=True, blank=True)
     auth_request_to = models.EmailField(blank=True, default='')
 
+    forum_url = models.URLField(default='', blank=True, validators=[validate_forum_url])
+
     @property
     def display_id(self):
         if self.pk:
@@ -405,7 +420,15 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def hs_done(self):
-        return self.riskassessment is not None and len(self.checklists.all()) > 0
+        return self.riskassessment is not None and self.has_checklist and self.has_power
+
+    @property
+    def has_checklist(self):
+        return self.checklists.exists()
+
+    @property
+    def has_power(self):
+        return self.power_tests.exists()
 
     @property
     def has_start_time(self):
@@ -478,13 +501,22 @@ class Event(models.Model, RevisionMixin):
         else:
             return bool(self.purchase_order)
 
+    @property
+    def can_check_in(self):
+        earliest = self.earliest_time
+        if isinstance(self.earliest_time, datetime.date):
+            earliest = datetime.datetime.combine(self.start_date, datetime.time(00, 00))
+            tz = pytz.timezone(settings.TIME_ZONE)
+            earliest = tz.localize(earliest)
+        return not self.dry_hire and not self.status == Event.CANCELLED and earliest <= timezone.now()
+
     objects = EventManager()
 
     def get_absolute_url(self):
         return reverse('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return f"{self.display_id}: {self.name}"
+        return f"{self.display_id} | {self.name}"
 
     def clean(self):
         errdict = {}
@@ -689,8 +721,21 @@ def validate_url(value):
         raise ValidationError('URL must point to a location on the TEC Sharepoint')
 
 
+class ReviewableModel(models.Model):
+    reviewed_at = models.DateTimeField(null=True, blank=True)
+    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
+                                    verbose_name="Reviewer", on_delete=models.CASCADE)
+
+    class Meta:
+        abstract = True
+
+    @cached_property
+    def fieldz(self):
+        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
+
+
 @reversion.register
-class RiskAssessment(models.Model, RevisionMixin):
+class RiskAssessment(ReviewableModel, RevisionMixin):
     SMALL = (0, 'Small')
     MEDIUM = (1, 'Medium')
     LARGE = (2, 'Large')
@@ -738,10 +783,6 @@ class RiskAssessment(models.Model, RevisionMixin):
 
     # Blimey that was a lot of options
 
-    reviewed_at = models.DateTimeField(null=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
     supervisor_consulted = models.BooleanField(null=True)
 
     expected_values = {
@@ -778,10 +819,6 @@ class RiskAssessment(models.Model, RevisionMixin):
             ('review_riskassessment', 'Can review Risk Assessments')
         ]
 
-    @cached_property
-    def fieldz(self):
-        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-
     @property
     def event_size(self):
         # Confirm event size. Check all except generators, since generators entails outside
@@ -795,6 +832,12 @@ class RiskAssessment(models.Model, RevisionMixin):
     def get_event_size_display(self):
         return self.SIZES[self.event_size][1] + " Event"
 
+    def __str__(self):
+        return f"{self.pk} | {self.event}"
+
+    def get_absolute_url(self):
+        return reverse('ra_detail', kwargs={'pk': self.pk})
+
     @property
     def activity_feed_string(self):
         return str(self.event)
@@ -803,20 +846,12 @@ class RiskAssessment(models.Model, RevisionMixin):
     def name(self):
         return str(self)
 
-    def get_absolute_url(self):
-        return reverse('ra_detail', kwargs={'pk': self.pk})
 
-    def __str__(self):
-        return f"{self.pk} | {self.event}"
-
-
-@reversion.register(follow=['vehicles', 'crew'])
-class EventChecklist(models.Model, RevisionMixin):
+@reversion.register
+class EventChecklist(ReviewableModel, RevisionMixin):
     event = models.ForeignKey('Event', related_name='checklists', on_delete=models.CASCADE)
 
     # General
-    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists',
-                                  verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
     venue = models.ForeignKey('Venue', on_delete=models.CASCADE)
     date = models.DateField()
 
@@ -830,6 +865,35 @@ class EventChecklist(models.Model, RevisionMixin):
     hs_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of Safety Bag/Box")
     extinguishers_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of fire extinguishers")
 
+    inverted_fields = []
+
+    class Meta:
+        ordering = ['event']
+        permissions = [
+            ('review_eventchecklist', 'Can review Event Checklists')
+        ]
+
+    def __str__(self):
+        return f"{self.pk} - {self.event}"
+
+    @property
+    def activity_feed_string(self):
+        return str(self.event)
+
+    def get_absolute_url(self):
+        return reverse('ec_detail', kwargs={'pk': self.pk})
+
+
+@reversion.register
+class PowerTestRecord(ReviewableModel, RevisionMixin):
+    earth_fault_text = "Earth Fault Loop Impedance (Z<small>S</small>) / Ω"
+    pssc_text = "Prospective Short Circuit Current / A"
+
+    event = models.ForeignKey('Event', related_name='power_tests', on_delete=models.CASCADE)
+    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists',
+                                  verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
+    venue = models.ForeignKey('Venue', on_delete=models.CASCADE)
+    notes = models.TextField(blank=True, default='')
     # Small Electrical Checks
     rcds = models.BooleanField(blank=True, null=True, help_text="RCDs installed where needed and tested?")
     supply_test = models.BooleanField(blank=True, null=True, help_text="Electrical supplies tested?<br><small>(using socket tester)</small>")
@@ -846,77 +910,62 @@ class EventChecklist(models.Model, RevisionMixin):
     fd_voltage_l2 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L2-N", help_text="L2 - N")
     fd_voltage_l3 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L3-N", help_text="L3 - N")
     fd_phase_rotation = models.BooleanField(blank=True, null=True, verbose_name="Phase Rotation", help_text="Phase Rotation<br><small>(if required)</small>")
-    fd_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
-    fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text="Prospective Short Circuit Current")
+    fd_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
+    fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text=pssc_text)
     # Worst case points
     w1_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w1_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V")
+    w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
     w2_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w2_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V")
+    w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
     w3_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w3_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V")
+    w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
 
     all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?<br><small>(using test button)</small>")
     public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>")
 
-    reviewed_at = models.DateTimeField(null=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
-    inverted_fields = []
-
     class Meta:
         ordering = ['event']
         permissions = [
-            ('review_eventchecklist', 'Can review Event Checklists')
+            ('review_power', 'Can review Power Test Records')
         ]
 
-    @cached_property
-    def fieldz(self):
-        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
+    def __str__(self):
+        return f"{self.pk} - {self.event}"
+
+    def get_absolute_url(self):
+        return reverse('pt_detail', kwargs={'pk': self.pk})
 
     @property
     def activity_feed_string(self):
         return str(self.event)
 
-    def get_absolute_url(self):
-        return reverse('ec_detail', kwargs={'pk': self.pk})
+
+class EventCheckIn(models.Model):
+    event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)
+    person = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checkins', on_delete=models.CASCADE)
+    time = models.DateTimeField()
+    role = models.CharField(max_length=50, blank=True)
+    vehicle = models.CharField(max_length=100, blank=True)
+    end_time = models.DateTimeField(null=True, blank=True)
 
     def __str__(self):
-        return f"{self.pk} - {self.event}"
-
-
-@reversion.register
-class EventChecklistVehicle(models.Model, RevisionMixin):
-    checklist = models.ForeignKey('EventChecklist', related_name='vehicles', blank=True, on_delete=models.CASCADE)
-    vehicle = models.CharField(max_length=255)
-    driver = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='vehicles', on_delete=models.CASCADE)
-
-    reversion_hide = True
-
-    def __str__(self):
-        return f"{self.vehicle} driven by {self.driver}"
-
-
-@reversion.register
-class EventChecklistCrew(models.Model, RevisionMixin):
-    checklist = models.ForeignKey('EventChecklist', related_name='crew', blank=True, on_delete=models.CASCADE)
-    crewmember = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='crewed', on_delete=models.CASCADE)
-    role = models.CharField(max_length=255)
-    start = models.DateTimeField()
-    end = models.DateTimeField()
-
-    reversion_hide = True
+        return f"{self.person} on {self.event}"
 
     def clean(self):
-        if self.start > self.end:
-            raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.')
+        sass = " Please invent time travel and retry."
+        if self.time > timezone.now():
+            raise ValidationError("May not check in in the future." + sass)
+        if self.end_time and self.end_time < self.time:
+            raise ValidationError("May not check out before you've checked in." + sass)
 
-    def __str__(self):
-        return f"{self.crewmember} ({self.role})"
+    def get_absolute_url(self):
+        return reverse('event_detail', kwargs={'pk': self.event_id})
+
+    def active(self):
+        return end_time is not None

RIGS/templates/base_rigs.html

@@ -34,16 +34,7 @@
        </div>
     </li>
     {% if perms.RIGS.view_riskassessment %}
-    <li class="nav-item dropdown">
-      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownHS" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        H&S
-      </a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdownHS">
-        <a class="dropdown-item" href="{% url 'hs_list' %}"><span class="fas fa-eye"></span> Overview</a>
-        <a class="dropdown-item" href="{% url 'ra_list' %}"><span class="fas fa-file-medical"></span> Risk Assessments</a>
-        <a class="dropdown-item" href="{% url 'ec_list' %}"><span class="fas fa-tasks"></span> Event Checklists</a>
-      </div>
-    </li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'hs_list' %}">H&S</a></li>
     {% endif %}
     {% if perms.RIGS.view_invoice %}
     <li class="nav-item dropdown">

RIGS/templates/event_detail.html

@@ -1,6 +1,8 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 
 {% load markdown_tags %}
+{% load button from filters %}
+{% load static %}
 
 {% block content %}
 <div class="row my-3 py-3">
@@ -52,6 +54,43 @@
                 </div>
             </div>
         </div>
+        {% if event.can_check_in %}
+        <div class="col-sm-12">
+            <div class="card mt-3">
+                <div class="card-header">Crew Record</div>
+                <div class="table-responsive">
+                    <table class="table table-sm">
+                        <thead>
+                            <tr>
+                                <th scope="col">Name</th>
+                                <th scope="col">Vehicle</th>
+                                <th scope="col">Start Time</th>
+                                <th scope="col">Role</th>
+                                <th scope="col">End Time</th>
+                                <th scope="col">{% if request.user.pk is event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
+                            </tr>
+                        </thead>
+                        <tbody id="crewmembers">
+                            {% for crew in object.crew.all %}
+                            <tr>
+                                <td>{{crew.person}}</td>
+                                <td>{{crew.vehicle|default:"None"}}</td>
+                                <td>{{crew.time}}</td>
+                                <td>{{crew.role}}</td>
+                                <td>{% if crew.end_time %}{{crew.end_time}}{% else %}<span class="text-success fas fa-clock" data-toggle="tooltip" title="This person is currently checked into this event"></span>{% endif %}</td>
+                                <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
+                            </tr>
+                            {% empty %}
+                            <tr>
+                                <td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                    </div>
+            </div>
+            {% endif %}
+        </div>
         {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/event_detail_buttons.html' %}

RIGS/templates/event_form.html

@@ -209,7 +209,7 @@
                                     <div class="col-sm-9 col-md-7 col-lg-8">
                                         <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
                                         {% if venue %}
-                                            <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
+                                            <option value="{{venue.id}}" selected="selected" data-update_url="{% url 'venue_update' venue.id %}">{{ venue }}</option>
                                         {% endif %}
                                         </select>
                                     </div>
@@ -231,7 +231,7 @@
                             <label for="{{ form.start_date.id_for_label }}"
                                    class="col-sm-4 col-form-label">{{ form.start_date.label }}</label>
 
-                            <div class="col-sm-8">
+                            <div class="col-sm-10">
                                 <div class="row">
                                     <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
                                         {% render_field form.start_date class+="form-control" %}
@@ -246,7 +246,7 @@
                             <label for="{{ form.end_date.id_for_label }}"
                                    class="col-sm-4 col-form-label">{{ form.end_date.label }}</label>
 
-                            <div class="col-sm-8">
+                            <div class="col-sm-10">
                                 <div class="row">
                                     <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
                                         {% render_field form.end_date class+="form-control" %}
@@ -334,12 +334,26 @@
 
                             <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
                                 <label for="{{ form.purchase_order.id_for_label }}"
-                                       class="col-sm-4 col-fitem_tableorm-label">{{ form.purchase_order.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.purchase_order.label }}</label>
 
                                 <div class="col-sm-8">
                                     {% render_field form.purchase_order class+="form-control" %}
                                 </div>
                             </div>
+
+                            <div class="form-group" data-toggle="tooltip" title="The thread for this event on the TEC Forum">
+                                <label for="{{ form.forum_url.id_for_label }}"
+                                       class="col-sm-4 col-form-label">Forum Thread</label>
+                                <div class="col-sm-12">
+                                    <p class="small mb-0">Paste URL</p>
+                                    {% render_field form.forum_url class+="form-control" %}
+                                    {% if object.pk %}
+                                    <p class="small mb-0">or</p>
+                                    <a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread" target="_blank">
+                                    <span class="fas fa-plus"></span> <span class="hidden-xs">Create Forum Thread</span></a>
+                                    {% endif %}
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

RIGS/templates/hs/event_checklist_detail.html

@@ -9,6 +9,8 @@
     <div class="col-12 text-right my-3">
         {% button 'edit' url='ec_edit' pk=object.pk %}
         {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
+        <a href="{% url 'event_pt' object.event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
+        class="hidden-xs">Create Power Test</span></a>
         {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
     </div>
 </div>
@@ -30,21 +32,7 @@
                     </a>
                     {% endif %}
                 </dd>
-                <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
-                <dd class="col-6">
-                    {% if object.power_mic %}
-                    <a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
-                    {% else %}
-                    None
-                    {% endif %}
-                </dd>
             </dl>
-            <p>List vehicles and their drivers</p>
-            <ul>
-                {% for i in object.vehicles.all %}
-                    <li>{{i}}</li>
-                {% endfor %}
-            </ul>
         </div>
     </div>
     </div>
@@ -82,168 +70,11 @@
         </div>
     </div>
 </div>
-<div class="card mb-3">
-    <div class="card-header">Crew Record</div>
-    <div class="table-responsive">
-        <table class="table table-sm">
-            <thead>
-                <tr>
-                    <th scope="col">Crewmember</th>
-                    <th scope="col">Start Time</th>
-                    <th scope="col">Role</th>
-                    <th scope="col">End Time</th>
-                </tr>
-            </thead>
-            <tbody id="crewmemberst">
-                {% for crew in object.crew.all %}
-                <tr>
-                    <td>{{crew.crewmember}}</td>
-                    <td>{{crew.start}}</td>
-                    <td>{{crew.role}}</td>
-                    <td>{{crew.end}}</td>
-                </tr>
-                {% empty %}
-                <tr>
-                    <td colspan="4" class="text-center bg-warning">Apparently this event happened by magic...</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-</div>
-<div class="card  mb-3">
-    <div class="card-header">Power {% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
-    <div class="card-body">
-        {% if object.event.riskassessment.event_size == 0 %}
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.rcds|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'supply_test'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.supply_test|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.earthing|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.pat|yesnoi }}
-            </dd>
-        </dl>
-        {% else %}
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'source_rcd'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.source_rcd|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'labelling'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.labelling|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.earthing|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.pat|yesnoi }}
-            </dd>
-        </dl>
-        <hr>
-        <p>Tests at first distro</p>
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th scope="col" class="text-center">Test</th>
-                    <th scope="col" colspan="3" class="text-center">Value</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
-                    <th>{{ object|help_text:'fd_voltage_l1' }}</th>
-                    <th>{{ object|help_text:'fd_voltage_l2' }}</th>
-                    <th>{{ object|help_text:'fd_voltage_l3' }}</th>
-                </tr>
-                <tr>
-                   <td>{{ object.fd_voltage_l1 }}</td>
-                   <td>{{ object.fd_voltage_l2 }}</td>
-                   <td>{{ object.fd_voltage_l3 }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_phase_rotation'|safe }}</th>
-                    <td colspan="3">{{ object.fd_phase_rotation|yesnoi }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_earth_fault'|safe}}</th>
-                    <td colspan="3">{{ object.fd_earth_fault }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_pssc'}}</th>
-                    <td colspan="3">{{ object.fd_pssc }}</td>
-                </tr>
-            </tbody>
-        </table>
-        <hr>
-        <p>Tests at 'Worst Case' points (at least 1 point required)</p>
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th scope="col" class="text-center">Test</th>
-                    <th scope="col" class="text-center">Point 1</th>
-                    <th scope="col" class="text-center">Point 2</th>
-                    <th scope="col" class="text-center">Point 3</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_description'|safe}}</th>
-                    <td>{{ object.w1_description }}</td>
-                    <td>{{ object.w2_description|default:'' }}</td>
-                    <td>{{ object.w3_description|default:'' }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_polarity'|safe}}</th>
-                    <td>{{ object.w1_polarity|yesnoi }}</td>
-                    <td>{{ object.w2_polarity|default:''|yesnoi }}</td>
-                    <td>{{ object.w3_polarity|default:''|yesnoi }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_voltage'|safe}}</th>
-                    <td>{{ object.w1_voltage }}</td>
-                    <td>{{ object.w2_voltage|default:'' }}</td>
-                    <td>{{ object.w3_voltage|default:'' }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_earth_fault'|safe}}</th>
-                    <td>{{ object.w1_earth_fault }}</td>
-                    <td>{{ object.w2_earth_fault|default:'' }}</td>
-                    <td>{{ object.w3_earth_fault|default:'' }}</td>
-                </tr>
-            </tbody>
-        </table>
-        <hr>
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'all_rcds_tested'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.all_rcds_tested|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'public_sockets_tested'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.public_sockets_tested|yesnoi }}
-            </dd>
-        </dl>
-        <hr>
-        {% include 'partials/ec_power_info.html' %}
-        {% endif %}
-    </div>
-</div>
 <div class="col-12 text-right">
 {% button 'edit' url='ec_edit' pk=object.pk %}
 {% button 'view' url='event_detail' pk=object.pk text="Event" %}
+<a href="{% url 'event_pt' object.event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
+        class="hidden-xs">Create Power Test</span></a>
 {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
 </div>
 <div class="col-12 text-right">

RIGS/templates/hs/event_checklist_form.html

@@ -13,57 +13,19 @@
 {% block preload_js %}
     {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
+    <script src="{% static 'js/interaction.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-
-    <script>
-    $(document).ready(function () {
-        $('button[data-action=add]').on('click', function (event) {
-            event.preventDefault();
-            let target = $($(this).attr('data-target'));
-            let newID = Number(target.attr('data-pk'));
-            let newRow = $($(this).attr('data-clone'))
-                    .clone().attr('style', "")
-                   .attr('id', function(i, val){
-                        return val.split("_")[0] + '_' + newID;
-                   })
-                   .appendTo(target);
-            newRow.find('select,input').attr('name', function(i, val){
-                        return val.split("_")[0] + '_' + newID;
-                   })//Disabled is to prevent the hidden row being sent to the form
-                   .removeAttr('disabled');
-            newRow.find('button[data-action=delete]').attr('data-id', newID);
-            newRow.find('select').addClass('selectpicker');
-            newRow.find('.selectpicker').selectpicker('refresh');
-            $(".selectpicker").each(function(){initPicker($(this))});
-            initDatetime();
-            $(target).attr('data-pk', newID - 1);
-        });
-        $(document).on('click', 'button[data-action=delete]', function(event) {
-           event.preventDefault();
-           $(this).closest('tr').remove();
-        });
-        //Somewhat rudimentary way of ensuring people fill in completely (if it hits the database validation the whole table row disappears when the page reloads...)
-        //the not is to avoid adding it to some of bootstrap-selects extra crap
-        $('#vehiclest,#crewmemberst').on('change', 'select,input', function () {
-            $(this).closest('tr').find("select,input").not(':input[type=search]').attr('required', 'true');
-        });
-    });
-    </script>
 {% endblock %}
 
 {% block content %}
     <div class="col-12">
         {% include 'form_errors.html' %}
-        {% if edit %}
-        <form role="form" method="POST" action="{% url 'ec_edit' pk=object.pk %}">
-        {% else %}
-        <form role="form" method="POST" action="{% url 'event_ec' pk=event.pk %}">
-        {% endif %}
+
+        <form role="form" method="POST" action="{% if edit %}{% url 'ec_edit' pk=object.pk %}{% else %}{% url 'event_ec' pk=event.pk %}{% endif %}">
             <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
                value="{{event.pk}}"/>
             {% csrf_token %}
@@ -94,60 +56,12 @@
                             <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
                                 <label for="{{ form.venue.id_for_label }}"
                                 class="col-4 col-form-label">{{ form.venue.label }}</label>
-                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
                                 {% if venue %}
                                     <option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
-                                {% elif event.venue %}
-                                    <option value="{{event.venue.pk}}" selected="selected">{{ event.venue.name }}</option>
                                 {% endif %}
                                 </select>
                             </div>
-                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
-                            <label for="{{ form.power_mic.id_for_label }}"
-                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
-                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
-                                    {% if power_mic %}
-                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
-                                    {% elif event.riskassessment.power_mic %}
-                                        <option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
-                                    {% endif %}
-                                </select>
-                            </div>
-                            <p class="pt-3 font-weight-bold">List vehicles and their drivers</p>
-                            <div class="table-responsive">
-                                <table class="table table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col">Vehicle</th>
-                                            <th scope="col">Driver</th>
-                                            <th scope="col"></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody id="vehiclest" data-pk="-1">
-                                        <tr id="vehicles_new" style="display: none;">
-                                            <td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
-                                            <td><select data-container="body" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true"></select></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
-                                        </tr>
-                                        {% for i in object.vehicles.all %}
-                                        <tr id="vehicles_{{i.pk}}">
-                                            <td><input name="vehicle_{{i.pk}}" type="text" class="form-control" value="{{ i.vehicle }}"/></td>
-                                            <td>
-                                                <select data-container="body" name="driver_{{i.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                                    {% if i.driver != '' %}
-                                                        <option value="{{i.driver.pk}}" selected="selected">{{ i.driver.name }}</option>
-                                                    {% endif %}
-                                                </select>
-                                            </td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
-                                        </tr>
-                                        {% endfor %}
-                                    </tbody>
-                                </table>
-                            </div>
-                            <div class="text-right">
-                                <button type="button" class="btn btn-secondary" id="vehicle-add" data-action='add' data-target='#vehiclest' data-clone='#vehicles_new'><span class="fas fa-plus"></span> Add Vehicle</button>
-                            </div>
                         </div>
                     </div>
                 </div>
@@ -175,176 +89,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row my-3">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-header">Crew Record</div>
-                        <div class="card-body">
-                            <div class="table-responsive">
-                                <table class="table table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col">Person</th>
-                                            <th scope="col">Start Time</th>
-                                            <th scope="col">Role</th>
-                                            <th scope="col">End Time</th>
-                                            <th scope="col"></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody id="crewmemberst" data-pk="-1">
-                                        <tr id="crew_new" style="display: none;">
-                                            <td>
-                                                <select name="crewmember_new" class="form-control" data-container="body" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
-                                            </td>
-                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
-                                            <td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
-                                            <td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
-                                        </tr>
-                                        {% for crew in object.crew.all %}
-                                        <tr id="crew_{{crew.pk}}">
-                                            <td>
-                                                <select data-container="body" name="crewmember_{{crew.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                                    {% if crew.crewmember != '' %}
-                                                        <option value="{{crew.crewmember.pk}}" selected="selected">{{ crew.crewmember.name }}</option>
-                                                    {% endif %}
-                                                </select>
-                                            </td>
-                                            <td><input name="start_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.start|date:'Y-m-d' }}T{{ crew.start|date:'H:i:s' }}"/></td>
-                                            <td><input name="role_{{crew.pk}}" type="text" class="form-control" value="{{ crew.role }}"/></td>
-                                            <td><input name="end_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.end|date:'Y-m-d' }}T{{ crew.end|date:'H:i:s' }}"/></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
-                                        </tr>
-                                        {% endfor %}
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="card-footer">
-                            <div class="text-right">
-                                <button type="button" class="btn btn-secondary" data-action='add' data-target='#crewmemberst' data-clone='#crew_new'><span class="fas fa-plus"></span> Add Crewmember</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% if event.riskassessment.event_size == 0 %}
-            <div class="row my-3" id="size-0">
-                <div class="col-12">
-                    <div class="card border-success">
-                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
-                        <div class="card-body">
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% else %}
-            <div class="row my-3" id="size-1">
-                <div class="col-12">
-                    {% if event.riskassessment.event_size == 1 %}
-                    <div class="card border-warning">
-                        <div class="card-header">Electrical Checks <small>for ‘Medium’ TEC Events </small></div>
-                        <div class="card-body">
-                    {% else %}
-                    <div class="card border-danger">
-                                    <div class="card-header">Electrical Checks <small>for ‘Large’ TEC Events</small></div>
-                        <div class="card-body">
-                            <div class="alert alert-danger"><strong>Here be dragons. Ensure you have appeased the Power Gods before continuing... (If you didn't check with a Supervisor, <em>you cannot continue your event!</em>)</strong></div>
-                    {% endif %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.labelling %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
-                            <hr>
-                            <p>Tests at first distro</p>
-                            <div class="table-responsive">
-                                <table class="table table-bordered table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="text-center">Test</th>
-                                            <th scope="col" colspan="3" class="text-center">Value</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
-                                            <th class="text-center">{{ form.fd_voltage_l1.help_text }}</th>
-                                            <th class="text-center">{{ form.fd_voltage_l2.help_text }}</th>
-                                            <th class="text-center">{{ form.fd_voltage_l3.help_text }}</th>
-                                        </tr>
-                                        <tr>
-                                           <td>{% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}</td>
-                                           <td>{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}</td>
-                                           <td>{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_phase_rotation.help_text|safe}}</th>
-                                            <td colspan="3">{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_earth_fault.help_text|safe}}</th>
-                                            <td colspan="3">{% render_field form.fd_earth_fault class+="form-control" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_pssc.help_text|safe}}</th>
-                                            <td colspan="3">{% render_field form.fd_pssc class+="form-control" %}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <hr>
-                            <p>Tests at 'Worst Case' points (at least 1 point required)</p>
-                            <div class="table-responsive">
-                                <table class="table table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="text-center">Test</th>
-                                            <th scope="col" class="text-center">Point 1</th>
-                                            <th scope="col" class="text-center">Point 2</th>
-                                            <th scope="col" class="text-center">Point 3</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <th scope="row">{{form.w1_description.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                            <td>{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                            <td>{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_polarity.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_polarity %}</td>
-                                            <td>{% render_field form.w2_polarity %}</td>
-                                            <td>{% render_field form.w3_polarity %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_voltage.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_voltage class+="form-control" %}</td>
-                                            <td>{% render_field form.w2_voltage class+="form-control" %}</td>
-                                            <td>{% render_field form.w3_voltage class+="form-control" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_earth_fault.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_earth_fault class+="form-control" %}</td>
-                                            <td>{% render_field form.w2_earth_fault class+="form-control" %}</td>
-                                            <td>{% render_field form.w3_earth_fault class+="form-control" %}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <hr/>
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
-                            {% include 'partials/ec_power_info.html' %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% endif %}
             <div class="row mt-3">
                 <div class="col-sm-12 text-right">
                     {% button 'submit' %}

RIGS/templates/hs/eventcheckin_form.html

@@ -0,0 +1,105 @@
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% load widget_tweaks %}
+{% load static %}
+{% load button from filters %}
+
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
+{% endblock %}
+
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}"></script>
+    <script src="{% static 'js/easymde.min.js' %}"></script>
+{% endblock %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/interaction.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
+{% endblock %}
+
+{% block content %}
+    <div class="col-12">
+        {% include 'form_errors.html' %}
+        <form id="checkin" role="form" method="POST" action="{{ form.action|default:request.path }}">
+            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
+               value="{{event.pk}}"/>
+            {% if not request.is_ajax and self.request.user.pk is form.event.mic.pk %}
+            <div class="form-group">
+                <label for="{{ form.person.id_for_label }}"
+                       class="col-sm-4 col-form-label">{{ form.person.label }}</label>
+                <div class="col-sm-8">
+                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                        {% if person %}
+                            <option value="{{form.person.value}}" selected="selected" >{{ person.name }}</option>
+                        {% endif %}
+                    </select>
+                </div>
+            </div>
+            {% else %}
+            <input type="hidden" name="{{ form.person.name }}" id="{{ form.person.id_for_label }}"
+               value="{{request.user.pk}}"/>
+            {% endif %}
+            {% csrf_token %}
+            <div class="form-group">
+                <label for="{{ form.time.id_for_label }}"
+                       class="col-sm-4 col-form-label">Start Time</label>
+                <div class="col-sm-8">
+                    {% render_field form.time class+="form-control" %}
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="{{ form.role.id_for_label }}" class="col col-form-label">Role</label>
+                <div class="row pl-3">
+                    <div class="col-md-6 col-sm-12">
+                        <button type="button" class="btn btn-primary" onclick="document.getElementById('id_role').value='MIC'">MIC</button>
+                        <button type="button" class="btn btn-danger" onclick="document.getElementById('id_role').value='Power MIC'">Power MIC</button>
+                        <button type="button" class="btn btn-info" onclick="document.getElementById('id_role').value='Crew'">Crew</button>
+                    </div>
+                    <div class="col-md-6 mt-2">
+                        {% render_field form.role class+="form-control" placeholder="Other (enter text)" %}
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="{{ form.vehicle.id_for_label }}" class="col col-form-label">Vehicle (if applicable)</label>
+                <div class="row pl-3">
+                    <div class="col-md-6 col-sm-12">
+                        <button type="button" class="btn btn-primary" onclick="document.getElementById('id_vehicle').value='Virgil'"><span class="fas fa-truck-moving"></span> Virgil</button>
+                        <button type="button" class="btn btn-secondary" onclick="document.getElementById('id_vehicle').value='Virgil + Erms'"><span class="fas fa-trailer"></span><span class="fas fa-truck-moving"></span> Virgil + Erms</button>
+                    </div>
+                    <div class="col-md-6 mt-2">
+                        {% render_field form.vehicle class+="form-control" placeholder="Other (enter text)" %}
+                    </div>
+                </div>
+            </div>
+            {% if edit or manual %}
+            <div class="form-group">
+                <label for="{{ form.end_time.id_for_label }}"
+                       class="col-sm-4 col-form-label">End Time</label>
+                <div class="col-sm-8">
+                    {% render_field form.end_time class+="form-control" %}
+                </div>
+            </div>
+            {% endif %}
+            {% if not request.is_ajax %}
+            <div class="row mt-3">
+                <div class="col-sm-12 text-right">
+                    {% button 'submit' %}
+                </div>
+            </div>
+            {% endif %}
+        </form>
+    </div>
+{% endblock %}
+
+{% block footer %}
+<div class="col-sm-12 text-right pr-0">
+    <button type="submit" class="btn btn-primary" title="Save" form="checkin"
+><span class="fas fa-save align-middle"></span> <span class="d-none d-sm-inline align-middle">Save</span></button>
+</div>
+{% endblock %}

RIGS/templates/hs/hs_list.html

@@ -12,6 +12,7 @@
                 <th scope="col">Dates</th>
                 <th scope="col">RA</th>
                 <th scope="col">Checklists</th>
+                <th scope="col">Power Records</th>
             </tr>
         </thead>
         <tbody>
@@ -35,6 +36,14 @@
             <a href="{% url 'event_ec' event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
             class="d-none d-sm-inline">Create</span></a>
             </td>
+            <td>
+            {% for record in event.power_tests.all %}
+            {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %}
+            <br/>
+            {% endfor %}
+            <a href="{% url 'event_pt' event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
+            class="hidden-xs">Create</span></a>
+            </td>
         </tr>
         {% empty %}
         <tr class="bg-warning text-dark">

RIGS/templates/hs/hs_object_list.html

@@ -1,59 +0,0 @@
-{% extends 'base_rigs.html' %}
-{% load paginator from filters %}
-{% load help_text from filters %}
-{% load verbose_name from filters %}
-{% load get_field from filters %}
-
-{% block title %}{{ title }} List{% endblock %}
-
-{% block content %}
-    <div class="row">
-        <div class="col-12">
-            <h2>{{title}} List</h2>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-12">
-            <div class="table-responsive">
-                <table class="table mb-0 table-sm">
-                    <thead>
-                        <tr>
-                            <th scope="col">Event</th>
-                            {# mmm hax #}
-                            {% if object_list.0 != None %}
-                                {% for field in object_list.0.fieldz %}
-                                    <th scope="col">{{ object_list.0|verbose_name:field|title }}</th>
-                                {% endfor %}
-                            {% endif %}
-                            <th scope="col"></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    {% for object in object_list %}
-                    <tr class="{% if object.reviewed_by %}table-success{%endif%}">
-                        {# General #}
-                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a><br><small>{{ object.event.get_status_display }}</small></th>
-                        {% for field in object_list.0.fieldz %}
-                            <td>{{ object|get_field:field }}</td>
-                        {% endfor %}
-                        {# Buttons #}
-                        <td>
-                            {% include 'partials/hs_status.html' %}
-                        </td>
-                    </tr>
-                    {% empty %}
-                    <tr class="bg-warning">
-                        <td colspan="6">Nothing found</td>
-                    </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    {% if is_paginated %}
-        <div class="row justify-content-center">
-                {% paginator %}
-        </div>
-    {% endif %}
-{% endblock %}

RIGS/templates/hs/power_detail.html

@@ -0,0 +1,175 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% load help_text from filters %}
+{% load profile_by_index from filters %}
+{% load yesnoi from filters %}
+{% load button from filters %}
+
+{% block content %}
+<div class="row">
+    <div class="col-12 text-right my-3">
+        {% button 'edit' url='pt_edit' pk=object.pk %}
+        {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
+        {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
+    </div>
+</div>
+<div class="card mb-3">
+    <div class="card-header">{% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
+    <div class="card-body">
+        <dl class="row">
+                <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
+                <dd class="col-6">
+                    {% if object.power_mic %}
+                    <a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
+                    {% else %}
+                    None
+                    {% endif %}
+                </dd>
+                <dt class="col-6">Venue</dt>
+                <dd class="col-6">
+                    {% if object.venue %}
+                    <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
+                        {{ object.venue }}
+                    </a>
+                    {% endif %}
+                </dd>
+                <dt class="col-6">Notes</dt>
+                <dd class="col-6">
+                    {{ object.notes }}
+                </dd>
+        </dl>
+        {% if object.event.riskassessment.event_size == 0 %}
+        <dl class="row">
+            <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.rcds|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'supply_test'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.supply_test|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.earthing|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.pat|yesnoi }}
+            </dd>
+        </dl>
+        {% else %}
+        <dl class="row">
+            <dt class="col-10">{{ object|help_text:'source_rcd'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.source_rcd|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'labelling'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.labelling|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.earthing|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.pat|yesnoi }}
+            </dd>
+        </dl>
+        <hr>
+        <p>Tests at first distro</p>
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                    <th scope="col" class="text-center">Test</th>
+                    <th scope="col" colspan="3" class="text-center">Value</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small> / V</th>
+                    <th>{{ object|help_text:'fd_voltage_l1' }}</th>
+                    <th>{{ object|help_text:'fd_voltage_l2' }}</th>
+                    <th>{{ object|help_text:'fd_voltage_l3' }}</th>
+                </tr>
+                <tr>
+                   <td>{{ object.fd_voltage_l1 }}</td>
+                   <td>{{ object.fd_voltage_l2 }}</td>
+                   <td>{{ object.fd_voltage_l3 }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'fd_phase_rotation'|safe }}</th>
+                    <td colspan="3">{{ object.fd_phase_rotation|yesnoi }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'fd_earth_fault'|safe}}</th>
+                    <td colspan="3">{{ object.fd_earth_fault }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'fd_pssc'}}</th>
+                    <td colspan="3">{{ object.fd_pssc }}</td>
+                </tr>
+            </tbody>
+        </table>
+        <hr>
+        <p>Tests at 'Worst Case' points (at least 1 point required)</p>
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                    <th scope="col" class="text-center">Test</th>
+                    <th scope="col" class="text-center">Point 1</th>
+                    <th scope="col" class="text-center">Point 2</th>
+                    <th scope="col" class="text-center">Point 3</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th scope="row">{{ object|help_text:'w1_description'|safe}}</th>
+                    <td>{{ object.w1_description }}</td>
+                    <td>{{ object.w2_description|default:'' }}</td>
+                    <td>{{ object.w3_description|default:'' }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'w1_polarity'|safe}}</th>
+                    <td>{{ object.w1_polarity|yesnoi }}</td>
+                    <td>{{ object.w2_polarity|default:''|yesnoi }}</td>
+                    <td>{{ object.w3_polarity|default:''|yesnoi }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'w1_voltage'|safe}}</th>
+                    <td>{{ object.w1_voltage }}</td>
+                    <td>{{ object.w2_voltage|default:'' }}</td>
+                    <td>{{ object.w3_voltage|default:'' }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{{ object|help_text:'w1_earth_fault'|safe}}</th>
+                    <td>{{ object.w1_earth_fault }}</td>
+                    <td>{{ object.w2_earth_fault|default:'' }}</td>
+                    <td>{{ object.w3_earth_fault|default:'' }}</td>
+                </tr>
+            </tbody>
+        </table>
+        <hr>
+        <dl class="row">
+            <dt class="col-10">{{ object|help_text:'all_rcds_tested'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.all_rcds_tested|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'public_sockets_tested'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.public_sockets_tested|yesnoi }}
+            </dd>
+        </dl>
+        <hr>
+        {% include 'partials/ec_power_info.html' %}
+        {% endif %}
+    </div>
+</div>
+<div class="col-12 text-right">
+{% button 'edit' url='pt_edit' pk=object.pk %}
+{% button 'view' url='event_detail' pk=object.pk text="Event" %}
+{% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
+</div>
+<div class="col-12 text-right">
+{% include 'partials/last_edited.html' with target="powertestrecord_history" %}
+</div>
+{% endblock %}

RIGS/templates/hs/power_form.html

@@ -0,0 +1,199 @@
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% load widget_tweaks %}
+{% load static %}
+{% load help_text from filters %}
+{% load profile_by_index from filters %}
+{% load button from filters %}
+
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}"></script>
+{% endblock %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
+{% endblock %}
+
+{% block content %}
+    <div class="col-12">
+        {% include 'form_errors.html' %}
+        {% if edit %}
+        <form role="form" method="POST" action="{% url 'pt_edit' pk=object.pk %}">
+        {% else %}
+        <form role="form" method="POST" action="{% url 'event_pt' pk=event.pk %}">
+        {% endif %}
+            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
+               value="{{event.pk}}"/>
+            {% csrf_token %}
+            <div class="row">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header">Event Information</div>
+                        <div class="card-body">
+                            <dl class="row">
+                                <dt class="col-4">Event Date</dt>
+                                <dd class="col-8">{{ event.start_date}}{%if event.end_date %}-{{ event.end_date}}{%endif%}</dd>
+                                <dt class="col-4">Event Name</dt>
+                                <dd class="col-8">{{ event.name }}</dd>
+                                <dt class="col-4">Client</dt>
+                                <dd class="col-8">{{ event.person }}</dd>
+                                <dt class="col-4">Event Size</dt>
+                                <dd class="col-8">{% include 'partials/event_size.html' with object=event.riskassessment %}</dd>
+                            </dl>
+                            <hr>
+                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
+                            <label for="{{ form.power_mic.id_for_label }}"
+                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
+                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
+                                    {% if power_mic %}
+                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
+                                    {% endif %}
+                                </select>
+                            </div>
+                            <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
+                                <label for="{{ form.venue.id_for_label }}"
+                                class="col-4 col-form-label">{{ form.venue.label }}</label>
+                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                {% if venue %}
+                                    <option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
+                                {% endif %}
+                                </select>
+                            </div>
+                            <label for="{{ form.notes.id_for_label }}">Notes</label>
+                            {% render_field form.notes class+="form-control" %}
+                       </div>
+                    </div>
+                </div>
+            </div>
+            {% if event.riskassessment.event_size == 0 %}
+            <div class="row my-3" id="size-0">
+                <div class="col-12">
+                    <div class="card border-success">
+                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
+                        <div class="card-body">
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% else %}
+            <div class="row my-3" id="size-1">
+                <div class="col-12">
+                    {% if event.riskassessment.event_size == 1 %}
+                    <div class="card border-warning">
+                        <div class="card-header">Electrical Checks <small>for ‘Medium’ TEC Events </small></div>
+                        <div class="card-body">
+                    {% else %}
+                    <div class="card border-danger">
+                                    <div class="card-header">Electrical Checks <small>for ‘Large’ TEC Events</small></div>
+                        <div class="card-body">
+                            <div class="alert alert-danger"><strong>Here be dragons. Ensure you have appeased the Power Gods before continuing... (If you didn't check with a Supervisor, <em>you cannot continue your event!</em>)</strong></div>
+                    {% endif %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.labelling %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
+                            <hr>
+                            <p>Tests at first distro</p>
+                            <div class="table-responsive">
+                                <table class="table table-bordered table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col" class="text-center">Test</th>
+                                            <th scope="col" colspan="3" class="text-center">Value</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small> / V</th>
+                                            <th class="text-center">{{ form.fd_voltage_l1.help_text }}</th>
+                                            <th class="text-center">{{ form.fd_voltage_l2.help_text }}</th>
+                                            <th class="text-center">{{ form.fd_voltage_l3.help_text }}</th>
+                                        </tr>
+                                        <tr>
+                                           <td>{% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}</td>
+                                           <td>{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}</td>
+                                           <td>{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_phase_rotation.help_text|safe}}</th>
+                                            <td colspan="3">{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_earth_fault.help_text|safe}}</th>
+                                            <td colspan="3">{% render_field form.fd_earth_fault class+="form-control" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_pssc.help_text|safe}}</th>
+                                            <td colspan="3">{% render_field form.fd_pssc class+="form-control" %}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <hr>
+                            <p>Tests at 'Worst Case' points (at least 1 point required)</p>
+                            <div class="table-responsive">
+                                <table class="table table-bordered">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col" class="text-center">Test</th>
+                                            <th scope="col" class="text-center">Point 1</th>
+                                            <th scope="col" class="text-center">Point 2</th>
+                                            <th scope="col" class="text-center">Point 3</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <th scope="row">{{form.w1_description.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                            <td>{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                            <td>{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_polarity.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_polarity %}</td>
+                                            <td>{% render_field form.w2_polarity %}</td>
+                                            <td>{% render_field form.w3_polarity %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_voltage.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_voltage class+="form-control" %}</td>
+                                            <td>{% render_field form.w2_voltage class+="form-control" %}</td>
+                                            <td>{% render_field form.w3_voltage class+="form-control" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_earth_fault.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_earth_fault class+="form-control" %}</td>
+                                            <td>{% render_field form.w2_earth_fault class+="form-control" %}</td>
+                                            <td>{% render_field form.w3_earth_fault class+="form-control" %}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <hr/>
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
+                            {% include 'partials/ec_power_info.html' %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+            <div class="row mt-3">
+                <div class="col-sm-12 text-right">
+                    {% button 'submit' %}
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}

RIGS/templates/hs/risk_assessment_form.html

@@ -25,7 +25,7 @@
         });
         $('input[type=radio][name=outside], input[type=radio][name=generators], input[type=radio][name=other_companies_power], input[type=radio][name=nonstandard_equipment_power], input[type=radio][name=multiple_electrical_environments]').change(function() {
             $('#{{ form.power_notes.id_for_label }}').prop('required', parseBool(this.value));
-            $('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
+            //$('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
         });
         $('input[type=radio][name=special_structures]').change(function() {
             $('#{{ form.persons_responsible_structures.id_for_label }}').prop('hidden', !parseBool(this.value)).prop('required', parseBool(this.value));

RIGS/templates/partials/ec_power_info.html

@@ -47,6 +47,6 @@
                 </tr>
             </tbody>
         </table>
-        <p><strong>Voltage Drop on Circuit:</strong> 5% (approx. 12v)</p>
+        <p><strong>Voltage Drop on Circuit:</strong> &#8804;5% (approx. 12v)</p>
     </div>
 </div>

RIGS/templates/partials/event_detail_buttons.html

@@ -49,5 +49,13 @@
         {% endif %}
 
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSf-TBOuJZCTYc2L8DWdAaC3_Werq0ulsUs8-6G85I6pA9WVsg/viewform" class="btn btn-danger"><span class="fas fa-file-invoice-dollar"></span> <span class="d-none d-sm-inline">Subhire Insurance Form</span></a>
+
+        {% if event.can_check_in %}
+            {% if request.user.current_event %}
+            <a href="{% url 'event_checkout' %}" class="btn btn-warning">Check Out</a>
+            {% else %}
+            <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success modal-href"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a>
+            {% endif %}
+        {% endif %}
     {% endif %}
 </div>

RIGS/templates/partials/event_details.html

@@ -77,6 +77,15 @@
                 <dt class="col-sm-6">PO</dt>
                 <dd class="col-sm-6">{{ object.purchase_order }}</dd>
             {% endif %}
+
+            <dt class="col-6">Forum Thread</dt>
+            {% if object.forum_url %}
+            <dd class="col-6"><a href="{{object.forum_url}}">{{object.forum_url}}</a></dd>
+            {% else %}
+            <a href="{% url 'event_thread' object.pk %}" class="btn btn-primary" title="Create Forum Thread" target="_blank"><span
+            class="fas fa-plus"></span> <span
+            class="hidden-xs">Create Forum Thread</span></a>
+            {% endif %}
         </dl>
     </div>
 </div>

RIGS/templates/partials/event_status.html

@@ -20,14 +20,16 @@
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
         {% endif %}
-    {% endif %}
-    {% if not event.dry_hire %}
-        {% if event.hs_done %}
-            {# TODO Display status of all checklists #}
-            <span class="badge badge-success">Checklist: <span class="fas fa-check"></span></span>
+        {% if event.has_checklist %}
+            <span class="badge badge-success">Checklist: <span class="fas fa-check"></span> {% if event.checklists.count > 1 %}({{event.checklists.count}}){% endif %}</span>
         {% else %}
             <span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
         {% endif %}
+        {% if event.has_power %}
+            <span class="badge badge-success">Power Record: <span class="fas fa-check"></span> {% if event.power_tests.count > 1 %}({{event.power_tests.count}}){% endif %}</span>
+        {% else %}
+            <span class="badge badge-danger">Power Record: <span class="fas fa-times"></span></span>
+        {% endif %}
     {% endif %}
     {% if perms.RIGS.view_invoice %}
         {% if event.invoice %}

RIGS/templates/partials/hs_details.html

@@ -10,10 +10,18 @@
         <hr>
         <h5>Event Checklists:</h5>
         {% for checklist in event.checklists.all %}
-            {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
-            <br/>
-            {% endfor %}
-            <a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
-            class="hidden-xs">Create</span></a>
+        {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
+        <br/>
+        {% endfor %}
+        <a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
+        class="hidden-xs">Create</span></a>
+        <hr>
+        <h5>Power Test Records:</h5>
+        {% for record in event.power_tests.all %}
+        {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %}
+        <br/>
+        {% endfor %}
+        <a href="{% url 'event_pt' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
+        class="hidden-xs">Create</span></a>
     </div>
 </div>

RIGS/templatetags/filters.py

@@ -171,7 +171,7 @@ def title_spaced(string):
 @register.filter(needs_autoescape=True)
 def namewithnotes(obj, url, autoescape=True):
     if hasattr(obj, 'notes') and obj.notes is not None and len(obj.notes) > 0:
-        return mark_safe(obj.name + " <a href='{}'><span class='fas fa-sticky-note'></span></a>".format(reverse(url, kwargs={'pk': obj.pk})))
+        return mark_safe(obj.name + f" <a href='{reverse(url, kwargs={'pk': obj.pk})}'><span class='fas fa-sticky-note'></span></a>")
     else:
         return obj.name
 
@@ -183,7 +183,7 @@ def linkornone(target, namespace=None, autoescape=True):
             link = namespace + "://" + target
         else:
             link = target
-        return mark_safe("<a href='{}' target='_blank'><span class='overflow-ellipsis'>{}</span></a>".format(link, str(target)))
+        return mark_safe(f"<a href='{link}' target='_blank'><span class='overflow-ellipsis'>{target}</span></a>")
     else:
         return "None"
 

RIGS/tests/conftest.py

@@ -43,15 +43,22 @@ def venue(db):
 
 @pytest.fixture  # TODO parameterise with Event sizes
 def checklist(basic_event, venue, admin_user, ra):
-    checklist = models.EventChecklist.objects.create(event=basic_event, power_mic=admin_user, safe_parking=False,
+    checklist = models.EventChecklist.objects.create(event=basic_event, safe_parking=False,
                                                      safe_packing=False, exits=False, trip_hazard=False, warning_signs=False,
                                                      ear_plugs=False, hs_location="Locked away safely",
-                                                     extinguishers_location="Somewhere, I forgot", earthing=False, pat=False,
+                                                     extinguishers_location="Somewhere, I forgot",
                                                      date=timezone.now(), venue=venue)
     yield checklist
     checklist.delete()
 
 
+@pytest.fixture
+def power_test(basic_event, venue, admin_user, ra):
+    power_test = models.PowerTestRecord.objects.create(event=basic_event, venue=venue)
+    yield power_test
+    power_test.delete()
+
+
 @pytest.fixture
 def many_events(db, admin_user, scope="class"):
     many_events = {

RIGS/tests/pages.py

@@ -114,7 +114,7 @@ class CreateEvent(FormPage):
     }
 
     def select_event_type(self, type_name):
-        self.find_element(By.XPATH, '//button[.="{}"]'.format(type_name)).click()
+        self.find_element(By.XPATH, f'//button[.="{type_name}"]').click()
 
     def item_row(self, ID):
         return rigs_regions.ItemRow(self, self.find_element(By.ID, "item-" + ID))
@@ -230,11 +230,6 @@ class CreateEventChecklist(FormPage):
     URL_TEMPLATE = 'event/{event_id}/checklist'
 
     _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
-    _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]")
-    _add_vehicle_locator = (By.XPATH, "//button[contains(., 'Vehicle')]")
-    _add_crew_locator = (By.XPATH, "//button[contains(., 'Crew')]")
-    _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]")
-    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]")
 
     form_items = {
         'safe_parking': (regions.CheckBox, (By.ID, 'id_safe_parking')),
@@ -245,6 +240,20 @@ class CreateEventChecklist(FormPage):
         'ear_plugs': (regions.CheckBox, (By.ID, 'id_ear_plugs')),
         'hs_location': (regions.TextBox, (By.ID, 'id_hs_location')),
         'extinguishers_location': (regions.TextBox, (By.ID, 'id_extinguishers_location')),
+    }
+
+    @property
+    def success(self):
+        return '{event_id}' not in self.driver.current_url
+
+
+class CreatePowerTestRecord(FormPage):
+    URL_TEMPLATE = 'event/{event_id}/power'
+
+    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
+    _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]")
+
+    form_items = {
         'rcds': (regions.CheckBox, (By.ID, 'id_rcds')),
         'supply_test': (regions.CheckBox, (By.ID, 'id_supply_test')),
         'earthing': (regions.CheckBox, (By.ID, 'id_earthing')),
@@ -263,58 +272,10 @@ class CreateEventChecklist(FormPage):
         'w1_earth_fault': (regions.TextBox, (By.ID, 'id_w1_earth_fault')),
     }
 
-    def add_vehicle(self):
-        self.find_element(*self._add_vehicle_locator).click()
-
-    def add_crew(self):
-        self.find_element(*self._add_crew_locator).click()
-
     @property
     def power_mic(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._power_mic_selector))
 
-    @property
-    def vehicles(self):
-        return [self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)]
-
-    class VehicleRow(Region):
-        _name_locator = ('xpath', ".//input")
-        _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
-
-        @property
-        def name(self):
-            return regions.TextBox(self, self.root.find_element(*self._name_locator))
-
-        @property
-        def vehicle(self):
-            return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
-
-    @property
-    def crew(self):
-        return [self.CrewRow(self, el) for el in self.find_elements(*self._crew_row_locator)]
-
-    class CrewRow(Region):
-        _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
-        _start_time_locator = ('xpath', ".//input[@name[starts-with(., 'start') and not(contains(.,'new'))]]")
-        _end_time_locator = ('xpath', ".//input[@name[starts-with(., 'end') and not(contains(.,'new'))]]")
-        _role_locator = ('xpath', ".//input[@name[starts-with(., 'role') and not(contains(.,'new'))]]")
-
-        @property
-        def crewmember(self):
-            return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
-
-        @property
-        def start_time(self):
-            return regions.DateTimePicker(self, self.root.find_element(*self._start_time_locator))
-
-        @property
-        def end_time(self):
-            return regions.DateTimePicker(self, self.root.find_element(*self._end_time_locator))
-
-        @property
-        def role(self):
-            return regions.TextBox(self, self.root.find_element(*self._role_locator))
-
     @property
     def success(self):
         return '{event_id}' not in self.driver.current_url

RIGS/tests/regions.py

@@ -6,7 +6,7 @@ from PyRIGS.tests.regions import TextBox, Modal, SimpleMDETextArea
 
 class Header(Region):
     def find_link(self, link_text):
-        return self.driver.find_element_by_partial_link_text(link_text)
+        return self.driver.find_element(By.PARTIAL_LINK_TEXT, link_text)
 
 
 class ItemRow(Region):

RIGS/tests/test_interaction.py

@@ -318,7 +318,7 @@ class TestEventDuplicate(BaseRigboardTest):
 
         self.assertFalse(newEvent.authorised)
 
-        self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h2').text)
+        self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element(By.XPATH, '//h2').text)
         self.assertNotIn("Event data duplicated but not yet saved", self.page.warning)  # Check info message not visible
 
         # Check the new items are visible
@@ -327,26 +327,25 @@ class TestEventDuplicate(BaseRigboardTest):
         self.assertIn("Test Item 2", table.text)
         self.assertIn("Test Item 3", table.text)
 
-        infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
-        self.assertIn("N%05d" % self.testEvent.pk,
-                      infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+        infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
+        self.assertIn("N%05d" % self.testEvent.pk, infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
         # Check the PO hasn't carried through
-        self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
+        self.assertNotIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
 
         self.assertIn("N%05d" % self.testEvent.pk,
-                      infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                      infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
 
         self.driver.get(self.live_server_url + '/event/' + str(self.testEvent.pk))  # Go back to the old event
 
         # Check that based-on hasn't crept into the old event
-        infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
+        infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
         self.assertNotIn("N%05d" % self.testEvent.pk,
-                         infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                         infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
         # Check the PO remains on the old event
-        self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
+        self.assertIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
 
         self.assertNotIn("N%05d" % self.testEvent.pk,
-                         infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                         infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
 
         # Check the items are as they were
         table = self.page.item_table  # ID number is known, see above
@@ -677,14 +676,6 @@ def small_ec(page, admin_user):
     page.ear_plugs = True
     page.hs_location = "The Moon"
     page.extinguishers_location = "With the rest of the fire"
-    # If we do this first the search fails, for ... reasons
-    page.power_mic.search(admin_user.name)
-    page.power_mic.toggle()
-    assert not page.power_mic.is_open
-    page.earthing = True
-    page.rcds = True
-    page.supply_test = True
-    page.pat = True
 
 
 def test_ec_create_small(logged_in_browser, live_server, admin_user, ra):
@@ -705,14 +696,15 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
     page.ear_plugs = True
     page.hs_location = "Death Valley"
     page.extinguishers_location = "With the rest of the fire"
-    # If we do this first the search fails, for ... reasons
-    page.power_mic.search(admin_user.name)
-    page.power_mic.toggle()
-    assert not page.power_mic.is_open
 
     # Gotta scroll to make the button clickable
     logged_in_browser.driver.execute_script("window.scrollTo(0, document.body.scrollHeight);")
+    page.submit()
+    assert page.success
 
+
+def test_power_checklist(logged_in_browser, live_server, admin_user, power_test, medium_ra):
+    page = pages.CreatePowerTestRecord(logged_in_browser.driver, live_server.url, event_id=medium_ra.event.pk).open()
     page.earthing = True
     page.pat = True
     page.source_rcd = True
@@ -727,56 +719,15 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
     page.w1_polarity = True
     page.w1_voltage = 240
     page.w1_earth_fault = "0.42"
+    # If we do this first the search fails, for ... reasons
+    page.power_mic.search(admin_user.name)
+    page.power_mic.toggle()
+    assert not page.power_mic.is_open
 
     page.submit()
     assert page.success
 
 
-def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist):
-    page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
-    small_ec(page, admin_user)
-    page.add_vehicle()
-    assert len(page.vehicles) == 1
-    vehicle_name = 'Brian'
-    page.vehicles[0].name.set_value(vehicle_name)
-    # Appears we're moving too fast for javascript...
-    t.sleep(1)
-    page.vehicles[0].vehicle.search(admin_user.first_name)
-    t.sleep(1)
-    page.submit()
-    assert page.success
-    # Check data is correct
-    checklist.refresh_from_db()
-    vehicle = models.EventChecklistVehicle.objects.get(checklist=checklist.pk)
-    assert vehicle_name == vehicle.vehicle
-
-
-# TODO Test validation of end before start
-def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
-    page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
-    small_ec(page, admin_user)
-    page.add_crew()
-    assert len(page.crew) == 1
-    role = "MIC"
-    start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
-    end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
-    crew = page.crew[0]
-    t.sleep(2)
-    crew.crewmember.search(admin_user.first_name)
-    t.sleep(2)
-    crew.role.set_value(role)
-    crew.start_time.set_value(start_time)
-    crew.end_time.set_value(end_time)
-    page.submit()
-    assert page.success
-    # Check data is correct
-    crew_obj = models.EventChecklistCrew.objects.get(checklist=checklist.pk)
-    assert admin_user.pk == crew_obj.crewmember.pk
-    assert role == crew_obj.role
-    assert start_time == crew_obj.start
-    assert end_time == crew_obj.end
-
-
 # TODO Can I loop through all the boolean fields and test them at once?
 def test_ra_creation(logged_in_browser, live_server, admin_user, basic_event):
     page = pages.CreateRiskAssessment(logged_in_browser.driver, live_server.url, event_id=basic_event.pk).open()

RIGS/tests/test_unit.py

@@ -259,7 +259,7 @@ class TestPrintPaperwork(TestCase):
 
 def test_login_redirect(client, django_user_model):
     request_url = reverse('event_embed', kwargs={'pk': 1})
-    expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
+    expected_url = f"{reverse('login_embed')}?next={request_url}"
 
     # Request the page and check it redirects
     response = client.get(request_url, follow=True)
@@ -372,7 +372,8 @@ def test_ra_redirect(admin_client, admin_user, ra):
 
 
 class TestMarkdownTemplateTags(TestCase):
-    markdown = open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md")).read()
+    with open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md"), encoding="utf-8") as f:
+        markdown = f.read()
 
     def test_html_safe(self):
         html = markdown_filter(self.markdown)

RIGS/urls.py

@@ -79,10 +79,8 @@ urlpatterns = [
          name='ra_detail'),
     path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()),
          name='ra_edit'),
-    path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentList.as_view()),
-         name='ra_list'),
-    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.EventRiskAssessmentReview.as_view()),
-         name='ra_review'),
+    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.MarkReviewed.as_view()),
+         name='ra_review', kwargs={'model': 'RiskAssessment'}),
     path('event/ra/<int:pk>/print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'),
 
     path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
@@ -91,10 +89,29 @@ urlpatterns = [
          name='ec_detail'),
     path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
          name='ec_edit'),
-    path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistList.as_view()),
-         name='ec_list'),
-    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(views.EventChecklistReview.as_view()),
-         name='ec_review'),
+    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(views.MarkReviewed.as_view()),
+         name='ec_review', kwargs={'model': 'EventChecklist'}),
+
+    path('event/<int:pk>/power/', permission_required_with_403('RIGS.add_powertestrecord')(views.PowerTestCreate.as_view()),
+         name='event_pt'),
+    path('event/power/<int:pk>/', login_required(views.PowerTestDetail.as_view()),
+         name='pt_detail'),
+    path('event/power/<int:pk>/edit/', permission_required_with_403('RIGS.change_powertestrecord')(views.PowerTestEdit.as_view()),
+         name='pt_edit'),
+    path('event/power/<int:pk>/review/', permission_required_with_403('RIGS.review_power')(views.MarkReviewed.as_view()),
+         name='pt_review', kwargs={'model': 'PowerTestRecord'}),
+
+    path('event/<int:pk>/checkin/', login_required(views.EventCheckIn.as_view()),
+         name='event_checkin'),
+    path('event/checkout/', login_required(views.EventCheckOut.as_view()),
+         name='event_checkout'),
+    path('event/<int:pk>/checkin/edit/', login_required(views.EventCheckInEdit.as_view()),
+         name='edit_checkin'),
+    path('event/<int:pk>/checkin/add/', login_required(views.EventCheckInOverride.as_view()),
+         name='event_checkin_override'),
+
+    path('event/<int:pk>/thread/', permission_required_with_403('RIGS.change_event')(views.CreateForumThread.as_view()), name='event_thread'),
+    path('event/webhook/', views.RecieveForumWebhook.as_view(), name='webhook_recieve'),
 
     # Finance
     path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),

RIGS/views/hs.py

@@ -1,16 +1,39 @@
+from django.apps import apps
 from django.contrib import messages
 from django.http import HttpResponseRedirect
-from django.urls import reverse_lazy
+from django.urls import reverse
 from django.utils import timezone
 from django.views import generic
 from reversion import revisions as reversion
 
 from RIGS import models, forms
 from RIGS.views.rigboard import get_related
-from PyRIGS.views import PrintView
+from PyRIGS.views import PrintView, ModalURLMixin
+from django.shortcuts import redirect
 
 
-class EventRiskAssessmentCreate(generic.CreateView):
+class HSCreateView(generic.CreateView):
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        event = models.Event.objects.get(pk=self.kwargs.get('pk'))
+        context['event'] = event
+        context['page_title'] = f'Create {self.model.__name__} for Event {event.display_id}'
+        get_related(context['form'], context)
+        return context
+
+
+class MarkReviewed(generic.RedirectView):
+    def get_redirect_url(self, *args, **kwargs):
+        obj = apps.get_model('RIGS', kwargs.get('model')).objects.get(pk=kwargs.get('pk'))
+        with reversion.create_revision():
+            reversion.set_user(self.request.user)
+            obj.reviewed_by = self.request.user
+            obj.reviewed_at = timezone.now()
+            obj.save()
+        return self.request.META.get('HTTP_REFERER', reverse('hs_list'))
+
+
+class EventRiskAssessmentCreate(HSCreateView):
     model = models.RiskAssessment
     template_name = 'hs/risk_assessment_form.html'
     form_class = forms.EventRiskAssessmentForm
@@ -23,28 +46,12 @@ class EventRiskAssessmentCreate(generic.CreateView):
         ra = models.RiskAssessment.objects.filter(event=event).first()
 
         if ra is not None:
-            return HttpResponseRedirect(reverse_lazy('ra_edit', kwargs={'pk': ra.pk}))
+            return HttpResponseRedirect(reverse('ra_edit', kwargs={'pk': ra.pk}))
 
-        return super(EventRiskAssessmentCreate, self).get(self)
-
-    def get_form(self, **kwargs):
-        form = super(EventRiskAssessmentCreate, self).get_form(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        form.instance.event = event
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentCreate, self).get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = f'Create Risk Assessment for Event {event.display_id}'
-        get_related(context['form'], context)
-        return context
+        return super().get(self)
 
     def get_success_url(self):
-        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
+        return reverse('ra_detail', kwargs={'pk': self.object.pk})
 
 
 class EventRiskAssessmentEdit(generic.UpdateView):
@@ -57,10 +64,10 @@ class EventRiskAssessmentEdit(generic.UpdateView):
         ra.reviewed_by = None
         ra.reviewed_at = None
         ra.save()
-        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
+        return reverse('ra_detail', kwargs={'pk': self.object.pk})
 
     def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         rpk = self.kwargs.get('pk')
         ra = models.RiskAssessment.objects.get(pk=rpk)
         context['event'] = ra.event
@@ -75,47 +82,17 @@ class EventRiskAssessmentDetail(generic.DetailView):
     template_name = 'hs/risk_assessment_detail.html'
 
     def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['page_title'] = f"Risk Assessment for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
         return context
 
 
-class EventRiskAssessmentList(generic.ListView):
-    paginate_by = 20
-    model = models.RiskAssessment
-    template_name = 'hs/hs_object_list.html'
-
-    def get_queryset(self):
-        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
-        context['title'] = 'Risk Assessment'
-        context['view'] = 'ra_detail'
-        context['edit'] = 'ra_edit'
-        context['review'] = 'ra_review'
-        context['perm'] = 'perms.RIGS.review_riskassessment'
-        return context
-
-
-class EventRiskAssessmentReview(generic.View):
-    def get(self, *args, **kwargs):
-        rpk = kwargs.get('pk')
-        ra = models.RiskAssessment.objects.get(pk=rpk)
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            ra.reviewed_by = self.request.user
-            ra.reviewed_at = timezone.now()
-            ra.save()
-        return HttpResponseRedirect(reverse_lazy('ra_list'))
-
-
 class EventChecklistDetail(generic.DetailView):
     model = models.EventChecklist
     template_name = 'hs/event_checklist_detail.html'
 
     def get_context_data(self, **kwargs):
-        context = super(EventChecklistDetail, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['page_title'] = f"Event Checklist for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
         return context
 
@@ -130,10 +107,10 @@ class EventChecklistEdit(generic.UpdateView):
         ec.reviewed_by = None
         ec.reviewed_at = None
         ec.save()
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
+        return reverse('ec_detail', kwargs={'pk': self.object.pk})
 
     def get_context_data(self, **kwargs):
-        context = super(EventChecklistEdit, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         pk = self.kwargs.get('pk')
         ec = models.EventChecklist.objects.get(pk=pk)
         context['event'] = ec.event
@@ -143,7 +120,7 @@ class EventChecklistEdit(generic.UpdateView):
         return context
 
 
-class EventChecklistCreate(generic.CreateView):
+class EventChecklistCreate(HSCreateView):
     model = models.EventChecklist
     template_name = 'hs/event_checklist_form.html'
     form_class = forms.EventChecklistForm
@@ -152,75 +129,95 @@ class EventChecklistCreate(generic.CreateView):
     def get(self, *args, **kwargs):
         epk = kwargs.get('pk')
         event = models.Event.objects.get(pk=epk)
+        # Check if RA exists
+        ra = models.RiskAssessment.objects.filter(event=event).first()
+        if ra is None:
+            messages.error(self.request, f'A Risk Assessment must exist prior to creating any Event Checklists for {event}! Please create one now.')
+            return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk}))
+        return super().get(self)
 
+    def get_success_url(self):
+        return reverse('ec_detail', kwargs={'pk': self.object.pk})
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        if context['event'].venue:
+            context['venue'] = context['event'].venue
+        return context
+
+
+class PowerTestDetail(generic.DetailView):
+    model = models.PowerTestRecord
+    template_name = 'hs/power_detail.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = f"Power Test Record for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
+        return context
+
+
+class PowerTestEdit(generic.UpdateView):
+    model = models.PowerTestRecord
+    template_name = 'hs/power_form.html'
+    form_class = forms.PowerTestRecordForm
+
+    def get_success_url(self):
+        ec = self.get_object()
+        ec.reviewed_by = None
+        ec.reviewed_at = None
+        ec.save()
+        return reverse('pt_detail', kwargs={'pk': self.object.pk})
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        pk = self.kwargs.get('pk')
+        ec = models.PowerTestRecord.objects.get(pk=pk)
+        context['event'] = ec.event
+        context['edit'] = True
+        context['page_title'] = f'Edit Power Test Record for Event {ec.event.display_id}'
+        get_related(context['form'], context)
+        return context
+
+
+class PowerTestCreate(HSCreateView):
+    model = models.PowerTestRecord
+    template_name = 'hs/power_form.html'
+    form_class = forms.PowerTestRecordForm
+
+    def get(self, *args, **kwargs):
+        epk = kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
         # Check if RA exists
         ra = models.RiskAssessment.objects.filter(event=event).first()
 
         if ra is None:
-            messages.error(self.request, f'A Risk Assessment must exist prior to creating any Event Checklists for {event}! Please create one now.')
-            return HttpResponseRedirect(reverse_lazy('event_ra', kwargs={'pk': epk}))
+            messages.error(self.request, f'A Risk Assessment must exist prior to creating any Power Test Records for {event}! Please create one now.')
+            return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk}))
 
-        return super(EventChecklistCreate, self).get(self)
-
-    def get_form(self, **kwargs):
-        form = super(EventChecklistCreate, self).get_form(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        form.instance.event = event
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistCreate, self).get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = f'Create Event Checklist for Event {event.display_id}'
-        return context
+        return super().get(self)
 
     def get_success_url(self):
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
-
-
-class EventChecklistList(generic.ListView):
-    paginate_by = 20
-    model = models.EventChecklist
-    template_name = 'hs/hs_object_list.html'
-
-    def get_queryset(self):
-        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+        return reverse('pt_detail', kwargs={'pk': self.object.pk})
 
     def get_context_data(self, **kwargs):
-        context = super(EventChecklistList, self).get_context_data(**kwargs)
-        context['title'] = 'Event Checklist'
-        context['view'] = 'ec_detail'
-        context['edit'] = 'ec_edit'
-        context['review'] = 'ec_review'
-        context['perm'] = 'perms.RIGS.review_eventchecklist'
+        context = super().get_context_data(**kwargs)
+        if context['event'].venue:
+            context['venue'] = context['event'].venue
+        if context['event'].riskassessment.power_mic:
+            context['power_mic'] = context['event'].riskassessment.power_mic
         return context
 
 
-class EventChecklistReview(generic.View):
-    def get(self, *args, **kwargs):
-        rpk = kwargs.get('pk')
-        ec = models.EventChecklist.objects.get(pk=rpk)
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            ec.reviewed_by = self.request.user
-            ec.reviewed_at = timezone.now()
-            ec.save()
-        return HttpResponseRedirect(reverse_lazy('ec_list'))
-
-
 class HSList(generic.ListView):
     paginate_by = 20
     model = models.Event
     template_name = 'hs/hs_list.html'
 
     def get_queryset(self):
-        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).exclude(dry_hire=True).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
 
     def get_context_data(self, **kwargs):
-        context = super(HSList, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['page_title'] = 'H&S Overview'
         return context
 
@@ -233,3 +230,64 @@ class RAPrint(PrintView):
         context = super().get_context_data(**kwargs)
         context['filename'] = f"EventSpecificRiskAssessment_for_{context['object'].event.display_id}.pdf"
         return context
+
+
+class EventCheckIn(generic.CreateView, ModalURLMixin):
+    model = models.EventCheckIn
+    template_name = 'hs/eventcheckin_form.html'
+    form_class = forms.EventCheckInForm
+
+    def get_success_url(self):
+        return self.get_close_url('event_detail', 'event_detail')  # Well, that's one way of doing that...!
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk'))
+        context['page_title'] = f'Check In to Event {context["event"].display_id}'
+        # get_related(context['form'], context)
+        return context
+
+
+class EventCheckInOverride(generic.CreateView):
+    model = models.EventCheckIn
+    template_name = 'hs/eventcheckin_form.html'
+    form_class = forms.EditCheckInForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk'))
+        context['page_title'] = f'Manually add Check In to Event {context["event"].display_id}'
+        context['manual'] = True
+        return context
+
+
+class EventCheckInEdit(generic.UpdateView, ModalURLMixin):
+    model = models.EventCheckIn
+    template_name = 'hs/eventcheckin_form.html'
+    form_class = forms.EditCheckInForm
+
+    def dispatch(self, request, *args, **kwargs):
+        obj = self.get_object()
+        if not obj.person == self.request.user and not obj.event.mic == self.request.user:
+            return redirect(self.request.META.get('HTTP_REFERER', '/'))
+        return super().dispatch(request)
+
+    def get_success_url(self):
+        return self.get_close_url('event_detail', 'event_detail')  # Well, that's one way of doing that...!
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['event'] = self.object.event
+        context['page_title'] = f'Edit Check In for Event {context["event"].display_id}'
+        context['edit'] = True
+        # get_related(context['form'], context)
+        return context
+
+
+class EventCheckOut(generic.RedirectView):
+    def get_redirect_url(self, *args, **kwargs):
+        checkin = self.request.user.current_event()
+        if checkin:
+            checkin.end_time = timezone.now()
+            checkin.save()
+        return self.request.META.get('HTTP_REFERER', '/')

RIGS/views/rigboard.py

@@ -3,6 +3,12 @@ import datetime
 import re
 import premailer
 import simplejson
+import urllib
+import hmac
+import hashlib
+
+from envparse import env
+from bs4 import BeautifulSoup
 
 from django.conf import settings
 from django.contrib import messages
@@ -19,6 +25,7 @@ from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import generic
+from django.views.decorators.csrf import csrf_exempt
 
 from PyRIGS import decorators
 from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
@@ -377,3 +384,41 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
         context['to_name'] = self.request.GET.get('to_name', None)
         context['target'] = 'event_authorise_form_preview'
         return context
+
+
+class CreateForumThread(generic.base.RedirectView):
+    permanent = False
+
+    def get_redirect_url(self, *args, **kwargs):
+        event = get_object_or_404(models.Event, pk=kwargs['pk'])
+
+        if event.forum_url:
+            return event.forum_url
+
+        params = {
+            'title': str(event),
+            'body': f'https://rigs.nottinghamtec.co.uk/event/{event.pk}',
+            'category': 'rig-info'
+        }
+        return f'https://forum.nottinghamtec.co.uk/new-topic?{urllib.parse.urlencode(params)}'
+
+
+class RecieveForumWebhook(generic.View):
+    @method_decorator(csrf_exempt)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        computed = f"sha256={hmac.new(env('FORUM_WEBHOOK_SECRET').encode(), request.body, hashlib.sha256).hexdigest()}"
+        if not hmac.compare_digest(request.headers.get('X-Discourse-Event-Signature'), computed):
+            return HttpResponseForbidden('Invalid signature header')
+        # Check if this is the right kind of event. The webhook filters by category on the forum side
+        if request.headers.get('X-Discourse-Event') == "topic_created":
+            body = simplejson.loads(request.body.decode('utf-8'))
+            event_id = int(body['topic']['title'][1:6])  # find the ID, force convert it to an int to eliminate leading zeros
+            event = models.Event.objects.filter(pk=event_id).first()
+            if event:
+                event.forum_url = f"https://forum.nottinghamtec.co.uk/t/{body['topic']['slug']}"
+                event.save()
+                return HttpResponse(status=202)
+        return HttpResponse(status=204)

assets/migrations/0028_alter_asset_length.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-05-24 22:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0027_asset_nickname'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='length',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='m', max_digits=10, null=True),
+        ),
+    ]

assets/models.py

@@ -135,7 +135,7 @@ class Asset(models.Model, RevisionMixin):
     # Cable assets
     is_cable = models.BooleanField(default=False)
     cable_type = models.ForeignKey(to=CableType, blank=True, null=True, on_delete=models.SET_NULL)
-    length = models.DecimalField(decimal_places=1, max_digits=10,
+    length = models.DecimalField(decimal_places=2, max_digits=10,
                                  blank=True, null=True, help_text='m')
     csa = models.DecimalField(decimal_places=2, max_digits=10,
                               blank=True, null=True, help_text='mm²')
@@ -192,5 +192,5 @@ class Asset(models.Model, RevisionMixin):
         return str(self.asset_id)
 
     @property
-    def name(self):
+    def display_name(self):
         return f"{self.display_id} | {self.description}"

assets/templates/asset_audit_list.html

@@ -35,6 +35,11 @@
     function onAuditClick(assetID) {
          $('#' + assetID).remove();
     }
+    $('#modal').on('hidden.bs.modal', function (e) {
+      searchbar = document.getElementById('id_q');
+      searchbar.value = "";
+      setTimeout(searchbar.focus(), 2000);
+    })
     </script>
 {% endblock %}
 

assets/templates/asset_form.html

@@ -12,7 +12,6 @@
     {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
     <script src="{% static 'js/easymde.min.js' %}"></script>
-    <script src="{% static 'js/interaction.js' %}"></script>
 {% endblock %}
 
 {% block js %}
@@ -35,9 +34,10 @@
             $(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
         });
     </script>
+    <script src="{% static "js/tooltip.js" %}"></script>
     <script>
-        $(document).ready(function () {
-            setupMDE('#id_comments');
+        $(function () {
+          $('[data-toggle="tooltip"]').tooltip();
         });
     </script>
 {% endblock %}

assets/templates/partials/asset_list_table.html

@@ -12,7 +12,7 @@
       </thead>
       <tbody id="asset_table_body">
         {% for item in object_list %}
-            <tr class="table-{{ item.status.display_class|default:'' }} assetRow">
+            <tr class="table-{{ item.status.display_class|default:'' }} assetRow" id="{{ item.asset_id }}">
                 <th scope="row" class="align-middle"><a class="assetID" href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></th>
                 <td class="assetDesc"><span class="text-truncate d-inline-block align-middle">{{ item.description }}</span></td>
                 <td class="assetCategory align-middle">{{ item.category }}</td>

assets/templates/partials/purchasedetails_form.html

@@ -34,7 +34,7 @@
       <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+        {% render_field form.purchase_price|add_class:'form-control'|set_data:"toggle:tooltip" value=object.purchase_price title="Ex. VAT" %}
       </div>
     </div>
 
@@ -42,7 +42,7 @@
       <label for="{{ form.salvage_value.id_for_label }}">Replacement Cost</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.replacement_cost|add_class:'form-control' value=object.replacement_cost %}
+        {% render_field form.replacement_cost|add_class:'form-control'|set_data:"toggle:tooltip" value=object.replacement_cost title="Ex. VAT" %}
       </div>
     </div>
 

assets/tests/pages.py

@@ -77,7 +77,7 @@ class AssetForm(FormPage):
         'description': (regions.TextBox, (By.ID, 'id_description')),
         'is_cable': (regions.CheckBox, (By.ID, 'id_is_cable')),
         'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')),
-        'comments': (regions.SimpleMDETextArea, (By.ID, 'id_comments')),
+        'comments': (regions.TextBox, (By.ID, 'id_comments')),
         'purchase_price': (regions.TextBox, (By.ID, 'id_purchase_price')),
         'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
         'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')),

assets/tests/test_interaction.py

@@ -195,7 +195,7 @@ class TestAssetForm(AutoLoginTest):
         # self.assertTrue(self.page.parent_selector.options[0].selected)
         self.page.parent_selector.toggle()
 
-        self.assertFalse(self.driver.find_element_by_id('cable-table').is_displayed())
+        self.assertFalse(self.driver.find_element(By.ID, 'cable-table').is_displayed())
 
         self.page.submit()
         self.assertTrue(self.page.success)
@@ -350,7 +350,7 @@ class TestAssetAudit(AutoLoginTest):
         self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
         self.assertEqual(self.page.modal.asset_id, asset_row.id)
         self.page.modal.close()
-        self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
+        self.assertFalse(self.driver.find_element(By.ID, 'modal').is_displayed())
         # Make sure audit log was NOT filled out
         audited = models.Asset.objects.get(asset_id=asset_row.id)
         assert audited.last_audited_by is None

pipeline/source_assets/js/autocompleter.js

@@ -73,7 +73,7 @@ function initPicker(obj) {
             return array;
         }
     };
-    console.log(obj.data);
+    //console.log(obj.data);
     if (!obj.data('noclear')) {
         obj.prepend($("<option></option>")
 		    .attr("value",'')

pipeline/source_assets/js/interaction.js

@@ -6,11 +6,6 @@ function setupItemTable(items_json) {
     newitem = -1;
 }
 
-function nl2br(str, is_xhtml) {
-    var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';
-    return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ breakTag +'$2');
-}
-
 function escapeHtml(str) {
     return $('<div/>').text(str).html();
 }

templates/base.html

@@ -30,6 +30,9 @@
 <body>
 <a class="skip-link" href='#main'>Skip to content</a>
 {% block navbar %}
+{% if request.user.current_event %}
+<div class="bg-primary d-flex justify-content-between align-items-center"><span class="ml-2">You are currently checked in to <a href="{{request.user.current_event.event.get_absolute_url}}" class="text-white">{{request.user.current_event.event}}</a></span><a href="{% url 'event_checkout'%}" class="btn btn-warning">Check Out</a></div>
+{% endif %}
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
   <div class="container">
       <a class="navbar-brand" style="position: absolute; left:0.5em; top: 2px;" href="{% if request.user.is_authenticated %}https://rigs.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">

templates/base_ajax.html

@@ -17,7 +17,6 @@
                 e.preventDefault();
                 data = $(this).serialize();
                 action = $(this).attr('action');
-                console.log(action)
                 $.post(action, data, function(resp) {
                     $('#modal').html(resp);
                 });

templates/index.html

@@ -8,6 +8,13 @@
 <div class="row">
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
     <h2 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h2>
+    {% if now %}
+    <div class="col-sm-12 alert alert-primary rounded-0 mx-auto">
+    {% for event in now %}
+    Event {{ event }} is happening now! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
+    {% endfor %}
+    </div>
+    {% endif %}
     <div class="col-sm-4 mb-3">
         <div class="card">
             <img class="card-img-top d-none d-sm-block" src="{% static 'imgs/rigs.jpg' %}" alt="Some lights and haze, very purple" style="height: 150px; object-fit: cover;">
@@ -24,7 +31,6 @@
     </div>
     <div class="col-sm-4 mb-3">
         <div class="card">
-            {% now "m-d" as todays_date %}
             <img class="card-img-top d-none d-sm-block" src="{% if todays_date == '04-01' %}{% static 'imgs/tappytaptap.gif' %}{%else%}{% static 'imgs/assets.jpg' %}{%endif%}" alt="M32 sound desk close up of the faders" style="height: 150px; object-fit: cover;">
             <h4 class="card-header">Asset Database</h4>
             <div class="list-group list-group-flush">

templates/partials/form_field.html

@@ -1,15 +1,15 @@
 {% load widget_tweaks %}
 {% load title_spaced from filters %}
 {% spaceless %}
-<label for="{{ field.id_for_label }}" {% if col %}class="col-4 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
+{% if not nolabel %}<label for="{{ field.id_for_label }}" {% if col %}class="col-4 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>{%endif%}
 {% if append or prepend %}
-<div class="input-group {{col}}">
+<div class="input-group {{col}} flex-nowrap">
   {% if prepend %}
   <div class="input-group-prepend">
     <span class="input-group-text">{{ prepend }}</span>
   </div>
   {% endif %}
-  {% render_field field|add_class:'form-control' %}
+  {% render_field field|add_class:'form-control' style=style %}
   {% if append %}
   <div class="input-group-append">
     <span class="input-group-text">{{ append }}</span>
@@ -17,6 +17,6 @@
   {% endif %}
 </div>
 {% else %}
-{% render_field field|add_class:'form-control' class+=col %}
+{% render_field field|add_class:'form-control' class+=col style=style %}
 {% endif %}
 {% endspaceless %}

training/models.py

@@ -105,6 +105,10 @@ class TrainingItem(models.Model):
     def display_id(self):
         return f"{self.category.reference_number}.{self.reference_number}"
 
+    @property
+    def display_name(self):
+        return f"{self.display_id} | {self.name}"
+
     @display_id.filter
     @classmethod
     def display_id(cls, lookup, value):
@@ -369,7 +373,7 @@ class TrainingLevelQualification(models.Model, RevisionMixin):
         return str(self)
 
     def get_absolute_url(self):
-        return reverse('trainee_detail', kwargs={'pk': self.trainee.pk})
+        return reverse('trainee_detail', kwargs={'pk': self.trainee_id})
 
     class Meta:
         unique_together = ["trainee", "level"]

training/templates/level_list.html

@@ -8,10 +8,10 @@
 <p>Please Note:</p>
 <ul>
 <li>Technical Assistant status is automatically valid when the item requirements are met.</li>
-<li>Technician status is also automatic, but notification of status should be made at the next general meeting, at which point 'approval' should be granted on the system.</li>
+<li>Technician status is also automatic. Notification of completion should be made at the next general meeting.</li>
 <li>Supervisor status is <em>not automatically valid</em> and until signed off at a general meeting, does not count.</li>
 </ul>
-<sup>Correct as of 3rd September 2021, check the Training Policy.</sup>
+<sup>Correct as of 24th May 2023, check the Training Policy.</sup>
 </div>
 {% endif %}
 {% for level in object_list %}

training/templatetags/tags.py

@@ -43,7 +43,7 @@ def confirm_button(user, trainee, level):
     if level.user_has_requirements(trainee):
         string = "<span class='badge badge-warning p-2'>Awaiting Confirmation</span>"
         if models.Trainee.objects.get(pk=user.pk).is_supervisor or user.has_perm('training.add_traininglevelqualification'):
-            string += "<a class='btn btn-info' href='{}'>Confirm</a>".format(reverse('confirm_level', kwargs={'pk': trainee.pk, 'level_pk': level.pk}))
+            string += f"<a class='btn btn-info' href='{reverse('confirm_level', kwargs={'pk': trainee.pk, 'level_pk': level.pk})}'>Confirm</a>"
         return mark_safe(string)
     else:
         return ""

training/tests/test_interaction.py

@@ -44,7 +44,7 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
     page.submit()
     assert page.success
     qualification = models.TrainingItemQualification.objects.get(trainee=trainee, item=training_item)
-    assert qualification.supervisor.pk == supervisor.pk
+    assert qualification.supervisor_id == supervisor.pk
     assert qualification.date == date
     assert qualification.notes == "A note"
     assert qualification.depth == models.TrainingItemQualification.STARTED

training/tests/test_unit.py

@@ -29,7 +29,7 @@ def test_add_qualification_reversion(admin_client, trainee, training_item, super
     assert response.status_code == 302
     qual = models.TrainingItemQualification.objects.last()
     assert qual is not None
-    assert training_item.pk == qual.item.pk
+    assert training_item.pk == qual.item_id
     # Ensure only one revision has been created
     assert Revision.objects.count() == 1
     response = admin_client.post(url, {'date': date, 'supervisor': supervisor.pk, 'trainee': trainee.pk, 'item': training_item.pk, 'depth': 1})

training/views.py

@@ -265,5 +265,5 @@ class ItemQualifications(generic.ListView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["page_title"] = f"People Qualified In {self.object_list[0].item}"
+        context["page_title"] = f"People Qualified In {models.TrainingItem.objects.get(pk=self.kwargs['pk'])}"
         return context

users/management/commands/generateSampleUserData.py

@@ -50,10 +50,7 @@ class Command(BaseCommand):
                            "add_supplier", "view_cabletype", "change_cabletype",
                            "add_cabletype", "view_eventchecklist", "change_eventchecklist",
                            "add_eventchecklist", "view_riskassessment", "change_riskassessment",
-                           "add_riskassessment", "add_eventchecklistcrew", "change_eventchecklistcrew",
-                           "delete_eventchecklistcrew", "view_eventchecklistcrew", "add_eventchecklistvehicle",
-                           "change_eventchecklistvehicle",
-                           "delete_eventchecklistvehicle", "view_eventchecklistvehicle", ]
+                           "add_riskassessment"]
         finance_perms = keyholder_perms + ["add_invoice", "change_invoice", "view_invoice",
                                            "add_payment", "change_payment", "delete_payment"]
         hs_perms = keyholder_perms + ["review_riskassessment", "review_eventchecklist"]

users/tests/test_users.py

@@ -6,6 +6,7 @@ from django.core import mail
 from django.test import LiveServerTestCase
 from django.test.utils import override_settings
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.by import By
 
 from PyRIGS.tests.base import create_browser
 from RIGS import models
@@ -24,31 +25,31 @@ class UserRegistrationTest(LiveServerTestCase):
     def test_registration(self):
         # Navigate to the registration page
         self.browser.get(self.live_server_url + '/user/register/')
-        title_text = self.browser.find_element_by_tag_name('h3').text
+        title_text = self.browser.find_element(By.TAG_NAME, 'h3').text
         self.assertIn("User Registration", title_text)
 
         # Check the form invites correctly
-        username = self.browser.find_element_by_id('id_username')
+        username = self.browser.find_element(By.ID, 'id_username')
         self.assertEqual(username.get_attribute('placeholder'), 'Username')
-        email = self.browser.find_element_by_id('id_email')
+        email = self.browser.find_element(By.ID, 'id_email')
         self.assertEqual(email.get_attribute('placeholder'), 'E-mail')
         # If this is correct we don't need to test it later
         self.assertEqual(email.get_attribute('type'), 'email')
-        password1 = self.browser.find_element_by_id('id_password1')
+        password1 = self.browser.find_element(By.ID, 'id_password1')
         self.assertEqual(password1.get_attribute('placeholder'), 'Password')
         self.assertEqual(password1.get_attribute('type'), 'password')
-        password2 = self.browser.find_element_by_id('id_password2')
+        password2 = self.browser.find_element(By.ID, 'id_password2')
         self.assertEqual(
             password2.get_attribute('placeholder'), 'Password confirmation')
         self.assertEqual(password2.get_attribute('type'), 'password')
-        first_name = self.browser.find_element_by_id('id_first_name')
+        first_name = self.browser.find_element(By.ID, 'id_first_name')
         self.assertEqual(first_name.get_attribute('placeholder'), 'First name')
-        last_name = self.browser.find_element_by_id('id_last_name')
+        last_name = self.browser.find_element(By.ID, 'id_last_name')
         self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
-        initials = self.browser.find_element_by_id('id_initials')
+        initials = self.browser.find_element(By.ID, 'id_initials')
         self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
         # No longer required for new users
-        # phone = self.browser.find_element_by_id('id_phone')
+        # phone = self.browser.find_element(By.ID, 'id_phone')
         # self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
 
         # Fill the form out incorrectly
@@ -62,21 +63,20 @@ class UserRegistrationTest(LiveServerTestCase):
         initials.send_keys('JS')
         # phone.send_keys('0123456789')
         time.sleep(1)
-        self.browser.switch_to.frame(self.browser.find_element_by_tag_name("iframe"))
-        self.browser.find_element_by_id('anchor').click()
+        self.browser.switch_to.frame(self.browser.find_element(By.TAG_NAME, "iframe"))
+        self.browser.find_element(By.ID, 'anchor').click()
         self.browser.switch_to.default_content()
         time.sleep(3)
         # Submit incorrect form
-        submit = self.browser.find_element_by_xpath("//input[@type='submit']")
+        submit = self.browser.find_element(By.XPATH, "//input[@type='submit']")
         submit.click()
 
         # Restablish error fields
-        password1 = self.browser.find_element_by_id('id_password1')
-        password2 = self.browser.find_element_by_id('id_password2')
+        password1 = self.browser.find_element(By.ID, 'id_password1')
+        password2 = self.browser.find_element(By.ID, 'id_password2')
 
         # Read what the error is
-        alert = self.browser.find_element_by_css_selector(
-            'div.alert-danger').text
+        alert = self.browser.find_element(By.CSS_SELECTOR, '.alert-danger').text
         # TODO Use regex matching to handle smart/unsmart quotes...
         self.assertIn("password fields didn", alert)
 
@@ -92,8 +92,7 @@ class UserRegistrationTest(LiveServerTestCase):
         password2.send_keys(Keys.ENTER)
 
         # Check we have a success message
-        alert = self.browser.find_element_by_css_selector(
-            'div.alert-success').text
+        alert = self.browser.find_element(By.CSS_SELECTOR, '.alert-success').text
         self.assertIn('register', alert)
         self.assertIn('email', alert)
 
@@ -111,14 +110,14 @@ class UserRegistrationTest(LiveServerTestCase):
         self.browser.get(urls[0])  # go to the first link
 
         # Complete registration
-        title_text = self.browser.find_element_by_tag_name('h2').text
+        title_text = self.browser.find_element(By.TAG_NAME, 'h2').text
         self.assertIn('Complete', title_text)
 
         # Test login
         self.browser.get(self.live_server_url + '/user/login')
-        username = self.browser.find_element_by_id('id_username')
+        username = self.browser.find_element(By.ID, 'id_username')
         self.assertEqual(username.get_attribute('placeholder'), 'Username')
-        password = self.browser.find_element_by_id('id_password')
+        password = self.browser.find_element(By.ID, 'id_password')
         self.assertEqual(password.get_attribute('placeholder'), 'Password')
         self.assertEqual(password.get_attribute('type'), 'password')
 
@@ -132,8 +131,7 @@ class UserRegistrationTest(LiveServerTestCase):
         self.assertFalse(profileObject.is_approved)
 
         # Read what the error is
-        alert = self.browser.find_element_by_css_selector(
-            'div.alert-danger').text
+        alert = self.browser.find_element(By.CSS_SELECTOR, 'div.alert-danger').text
         self.assertIn("approved", alert)
 
         # Approve the user so we can proceed
@@ -142,14 +140,14 @@ class UserRegistrationTest(LiveServerTestCase):
 
         # Retry login
         self.browser.get(self.live_server_url + '/user/login')
-        username = self.browser.find_element_by_id('id_username')
+        username = self.browser.find_element(By.ID, 'id_username')
         username.send_keys('TestUsername')
-        password = self.browser.find_element_by_id('id_password')
+        password = self.browser.find_element(By.ID, 'id_password')
         password.send_keys('correcthorsebatterystaple')
         password.send_keys(Keys.ENTER)
 
         # Check we are logged in
-        udd = self.browser.find_element_by_class_name('navbar').text
+        udd = self.browser.find_element(By.CLASS_NAME, 'navbar').text
         self.assertIn('Hi John', udd)
 
         # Check all the data actually got saved

versioning/urls.py

@@ -30,15 +30,15 @@ for app in [apps.get_app_config(label) for label in ("RIGS", "assets", "training
         modelname = model.__name__.lower()
         if appname == 'rigboard':
             urlpatterns += [
-                path('{}/<str:pk>/history/'.format(modelname),
-                     permission_required_with_403('{}.change_{}'.format(app.label, modelname))(
+                path(f'{modelname}/<str:pk>/history/',
+                     permission_required_with_403(f'{app.label}.change_{modelname}')(
                          views.VersionHistory.as_view()),
-                     name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }),
+                     name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
             ]
         else:
             urlpatterns += [
-                path('{}/{}/<str:pk>/history/'.format(appname, modelname),
-                     permission_required_with_403('{}.change_{}'.format(app.label, modelname))(
+                path(f'{appname}/{modelname}/<str:pk>/history/',
+                     permission_required_with_403(f'{app.label}.change_{modelname}')(
                          views.VersionHistory.as_view()),
-                     name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }),
+                     name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
             ]

versioning/versioning.py

@@ -1,3 +1,4 @@
+import logging
 from diff_match_patch import diff_match_patch
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
@@ -147,9 +148,9 @@ class ModelComparison:
 
     @cached_property
     def item_changes(self):
-        from RIGS.models import EventAuthorisation
-        from training.models import TrainingLevelQualification, TrainingItemQualification
         if self.follow and self.version.object is not None:
+            from RIGS.models import EventAuthorisation
+            from training.models import TrainingLevelQualification, TrainingItemQualification
             item_type = ContentType.objects.get_for_model(self.version.object)
             old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type).exclude(content_type=ContentType.objects.get_for_model(TrainingItemQualification)) \
                 .exclude(content_type=ContentType.objects.get_for_model(TrainingLevelQualification))
@@ -160,10 +161,14 @@ class ModelComparison:
             # Build some dicts of what we have
             item_dict = {}  # build a list of items, key is the item_pk
             for version in old_item_versions:  # put all the old versions in a list
+                if version._model is None:
+                    continue
                 compare = ModelComparison(old=version._object_version.object, **comparisonParams)
                 item_dict[version.object_id] = compare
 
             for version in new_item_versions:  # go through the new versions
+                if version._model is None:
+                    continue
                 try:
                     compare = item_dict[version.object_id]  # see if there's a matching old version
                     compare.new = version._object_version.object  # then add the new version to the dictionary

versioning/views.py

@@ -27,10 +27,10 @@ class VersionHistory(generic.ListView):
             return get_object_or_404(self.kwargs['model'], pk=self.kwargs['pk'])
 
     def get_context_data(self, **kwargs):
-        context = super(VersionHistory, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['object'] = self.get_object()
         if self.kwargs['app'] != 'rigboard':
-            context['override'] = 'base_{}.html'.format(self.kwargs['app'])
+            context['override'] = f'base_{self.kwargs["app"]}.html'
 
         return context
 
@@ -59,10 +59,10 @@ class ActivityTable(generic.ListView):
         return RIGSVersion.objects.get_for_multiple_models(filter_models(self.kwargs.get('models'), self.request.user)).order_by("-revision__date_created")
 
     def get_context_data(self, **kwargs):
-        context = super(ActivityTable, self).get_context_data(**kwargs)
-        context['page_title'] = "{} Activity Stream".format(title(self.kwargs['app']))
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = f"{title(self.kwargs['app'])} Activity Stream"
         if self.kwargs['app'] != 'rigboard':
-            context['override'] = 'base_{}.html'.format(self.kwargs['app'])
+            context['override'] = f'base_{self.kwargs["app"]}.html'
 
         return context
 
@@ -77,7 +77,7 @@ class ActivityFeed(generic.ListView):  # Appears on homepage
 
     def get_context_data(self, **kwargs):
         # Call the base implementation first to get a context
-        context = super(ActivityFeed, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['page_title'] = "Activity Feed"
         maxTimeDelta = datetime.timedelta(hours=1)