Checkin only requires login (no perms) and block users from editing other checkins at Django level

Add data migration for crew/vehicles
pep8
2026-02-10 00:39:40 +00:00 · 2023-05-18 13:34:32 +01:00 · 2023-05-18 13:10:09 +01:00 · 2023-05-17 12:23:17 +01:00 · 2023-05-17 09:45:46 +01:00 · 2023-05-16 17:22:42 +01:00
49 changed files with 176 additions and 581 deletions
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -12,7 +12,6 @@ jobs:
    runs-on: ubuntu-latest
    env:
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      PYTHONDONTWRITEBYTECODE: 1
    steps:
      - uses: actions/checkout@v3
      - name: Set up Python
@@ -42,8 +41,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 --cov
+        run: pipenv run pytest -n auto -vv --cov
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v2
        if: failure()
        with:
            name: failure-screenshots ${{ matrix.test-group }}
--- a/6
+++ b/6
@@ -47,7 +47,7 @@ python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
 reportlab = "*"
-requests = "~=2.31.0"
+requests = "~=2.25.1"
 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.3"
+tornado = "~=6.1"
 urllib3 = "~=1.26.5"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
@@ -93,7 +93,7 @@ pytest = "*"
 pytest-reverse = "*"
 [requires]
-python_version = "3.10"
+python_version = "3.9"
 [dev-packages.pytest-xdist]
 extras = [ "psutil",]
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,11 +1,11 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "71377846d2282aa2f5352819eb31260cbbb04f41c2c3462b5c3ca2c8bc602b34"
+            "sha256": "fd57c06cb6fe93ee6b4af9d978b7185d76bc32c962a847a209539534dcd2fb2a"
        },
        "pipfile-spec": 6,
        "requires": {
-            "python_version": "3.10"
+            "python_version": "3.9"
        },
        "sources": [
            {
@@ -37,7 +37,6 @@
                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
            ],
            "markers": "python_version >= '3.5'",
            "version": "==1.10"
        },
        "attrs": {
@@ -45,7 +44,6 @@
                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==23.1.0"
        },
        "backports.tempfile": {
@@ -174,7 +172,6 @@
                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
            ],
            "markers": "python_version >= '3.6'",
            "version": "==2023.5.7"
        },
        "chardet": {
@@ -185,87 +182,6 @@
            "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",
@@ -295,7 +211,6 @@
                "sha256:1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a",
                "sha256:fd23a65bfd444595913f02fc71f6b286c29261e354c41d722ca7a261a49b5969"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.7.0"
        },
        "cssutils": {
@@ -443,7 +358,6 @@
                "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e",
                "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"
            ],
            "markers": "python_version < '3.11'",
            "version": "==1.1.1"
        },
        "freetype-py": {
@@ -456,7 +370,6 @@
                "sha256:ccdb1616794a8ad48beaa9e29d3494e6643d24d8e925cc39263de21c062ea5a7",
                "sha256:f9b64ce3272a5c358dcee824800a32d70997fb872a0965a557adca20fce7a5d0"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==2.3.0"
        },
        "gunicorn": {
@@ -472,7 +385,6 @@
                "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
                "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.14.0"
        },
        "html5lib": {
@@ -480,7 +392,6 @@
                "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d",
                "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"
            ],
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
            "version": "==1.1"
        },
        "icalendar": {
@@ -505,6 +416,7 @@
                "sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705"
            ],
            "index": "pypi",
            "markers": "python_version < '3.10'",
            "version": "==6.6.0"
        },
        "lxml": {
@@ -587,7 +499,6 @@
                "sha256:f1496ea22ca2c830cbcbd473de8f114a320da308438ae65abad6bab7867fe38f",
                "sha256:f49e52d174375a7def9915c9f06ec4e569d235ad428f70751765f48d5926678c"
            ],
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
            "version": "==4.9.2"
        },
        "markdown": {
@@ -672,7 +583,6 @@
                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.2.0"
        },
        "packaging": {
@@ -680,7 +590,6 @@
                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==23.1"
        },
        "pep517": {
@@ -802,7 +711,6 @@
                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
            ],
            "markers": "python_version >= '3.6'",
            "version": "==1.0.0"
        },
        "premailer": {
@@ -889,7 +797,6 @@
                "sha256:e7cde633986435d87a86b6118b7b6109c384266fd719ef959883e2729f6eafae",
                "sha256:ec305fc7f2f0299df78aadec0eaf6eb9accb90eda242b5d3492544d3f2b28027"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.23.0"
        },
        "pygments": {
@@ -974,11 +881,11 @@
        },
        "requests": {
            "hashes": [
-                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
            ],
            "index": "pypi",
-            "version": "==2.31.0"
+            "version": "==2.25.1"
        },
        "retrying": {
            "hashes": [
@@ -993,7 +900,6 @@
                "sha256:7cd1eac30fe69d98f75d67a54892f9c10534a047b9a959ef17bb3926a196e50a",
                "sha256:a88bce206c45d2180f944b8754c6e2e9245f80506c90fdfb94c7fbdd27805c25"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.2.0"
        },
        "selenium": {
@@ -1006,19 +912,11 @@
        },
        "sentry-sdk": {
            "hashes": [
-                "sha256:0bbcecda9f51936904c1030e7fef0fe693e633888f02a14d1cb68646a50e83b3",
+                "sha256:5932c092c6e6035584eb74d77064e4bce3b7935dfc4a331349719a40db265840",
-                "sha256:56d6d9d194c898d853a7c1dd99bed92ce82334ee1282292c15bcc967ff1a49b5"
+                "sha256:cf89a5063ef84278d186aceaed6fb595bfe67d099298e537634a323664265669"
            ],
            "index": "pypi",
-            "version": "==1.24.0"
+            "version": "==1.22.2"
        },
        "setuptools": {
            "hashes": [
                "sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f",
                "sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==67.8.0"
        },
        "simplejson": {
            "hashes": [
@@ -1100,7 +998,6 @@
                "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101",
                "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.3.0"
        },
        "sortedcontainers": {
@@ -1116,6 +1013,7 @@
                "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.0'",
            "version": "==2.4.1"
        },
        "sqlparse": {
@@ -1144,7 +1042,6 @@
            "hashes": [
                "sha256:3ae765d3a9409ee60c0fb4d24c2deb6a80617aa927054f5bcd7fc98f0695e587"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.5.1"
        },
        "tini": {
@@ -1160,7 +1057,6 @@
                "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847",
                "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.2.1"
        },
        "toml": {
@@ -1168,32 +1064,30 @@
                "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
            ],
            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
            "version": "==0.10.2"
        },
        "tornado": {
            "hashes": [
-                "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4",
+                "sha256:1285f0691143f7ab97150831455d4db17a267b59649f7bd9700282cba3d5e771",
-                "sha256:0c325e66c8123c606eea33084976c832aa4e766b7dff8aedd7587ea44a604cdf",
+                "sha256:3455133b9ff262fd0a75630af0a8ee13564f25fb4fd3d9ce239b8a7d3d027bf8",
-                "sha256:29e71c847a35f6e10ca3b5c2990a52ce38b233019d8e858b755ea6ce4dcdd19d",
+                "sha256:5e2f49ad371595957c50e42dd7e5c14d64a6843a3cf27352b69c706d1b5918af",
-                "sha256:4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba",
+                "sha256:81c17e0cc396908a5e25dc8e9c5e4936e6dfd544c9290be48bd054c79bcad51e",
-                "sha256:5b17b1cf5f8354efa3d37c6e28fdfd9c1c1e5122f2cb56dac121ac61baa47cbe",
+                "sha256:90f569a35a8ec19bde53aa596952071f445da678ec8596af763b9b9ce07605e6",
-                "sha256:6a0848f1aea0d196a7c4f6772197cbe2abc4266f836b0aac76947872cd29b411",
+                "sha256:9661aa8bc0e9d83d757cd95b6f6d1ece8ca9fd1ccdd34db2de381e25bf818233",
-                "sha256:7efcbcc30b7c654eb6a8c9c9da787a851c18f8ccd4a5a3a95b05c7accfa068d2",
+                "sha256:a27a1cfa9997923f80bdd962b3aab048ac486ad8cfb2f237964f8ab7f7eb824b",
-                "sha256:834ae7540ad3a83199a8da8f9f2d383e3c3d5130a328889e4cc991acc81e87a0",
+                "sha256:b4e7b956f9b5e6f9feb643ea04f07e7c6b49301e03e0023eedb01fa8cf52f579",
-                "sha256:b46a6ab20f5c7c1cb949c72c1994a4585d2eaa0be4853f50a03b5031e964fc7c",
+                "sha256:d7117f3c7ba5d05813b17a1f04efc8e108a1b811ccfddd9134cc68553c414864",
-                "sha256:c2de14066c4a38b4ecbbcd55c5cc4b5340eb04f1c5e81da7451ef555859c833f",
+                "sha256:db181eb3df8738613ff0a26f49e1b394aade05034b01200a63e9662f347d4415",
-                "sha256:c367ab6c0393d71171123ca5515c61ff62fe09024fa6bf299cd1339dc9456829"
+                "sha256:ffdce65a281fd708da5a9def3bfb8f364766847fa7ed806821a69094c9629e8a"
            ],
            "index": "pypi",
-            "version": "==6.3.2"
+            "version": "==6.3.1"
        },
        "trio": {
            "hashes": [
                "sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf",
                "sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.22.0"
        },
        "trio-websocket": {
@@ -1201,16 +1095,15 @@
                "sha256:0908435e4eecc49d830ae1c4d6c47b978a75f00594a2be2104d58b61a04cdb53",
                "sha256:af13e9393f9051111300287947ec595d601758ce3d165328e7d36325135a8d62"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.10.2"
        },
        "urllib3": {
            "hashes": [
-                "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f",
+                "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305",
-                "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"
+                "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"
            ],
            "index": "pypi",
-            "version": "==1.26.16"
+            "version": "==1.26.15"
        },
        "webencodings": {
            "hashes": [
@@ -1232,7 +1125,6 @@
                "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
                "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
            ],
            "markers": "python_full_version >= '3.7.0'",
            "version": "==1.2.0"
        },
        "yolk": {
@@ -1284,11 +1176,11 @@
        },
        "zope.event": {
            "hashes": [
-                "sha256:2666401939cdaa5f4e0c08cf7f20c9b21423b95e88f4675b1443973bdb080c42",
+                "sha256:4ab47faac13163ca3c5d6d8a5595212e14770322e95c338d955e3688ba19082a",
-                "sha256:5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"
+                "sha256:8cca6074a2bbca140d32704694e74098d5621f2c75ea6e3a9458240a3b5382a9"
            ],
            "index": "pypi",
-            "version": "==4.5.0"
+            "version": "==4.5.1"
        },
        "zope.hookable": {
            "hashes": [
@@ -1455,7 +1347,6 @@
                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
            ],
            "markers": "python_version >= '3.5'",
            "version": "==1.10"
        },
        "attrs": {
@@ -1463,7 +1354,6 @@
                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==23.1.0"
        },
        "certifi": {
@@ -1471,7 +1361,6 @@
                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
            ],
            "markers": "python_version >= '3.6'",
            "version": "==2023.5.7"
        },
        "charset-normalizer": {
@@ -1552,7 +1441,6 @@
                "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df",
                "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"
            ],
            "markers": "python_full_version >= '3.7.0'",
            "version": "==3.1.0"
        },
        "coverage": {
@@ -1608,7 +1496,6 @@
                "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84",
                "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==6.5.0"
        },
        "coveralls": {
@@ -1638,7 +1525,6 @@
                "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e",
                "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"
            ],
            "markers": "python_version < '3.11'",
            "version": "==1.1.1"
        },
        "execnet": {
@@ -1646,7 +1532,6 @@
                "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5",
                "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"
            ],
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
            "version": "==1.9.0"
        },
        "h11": {
@@ -1654,7 +1539,6 @@
                "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
                "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.14.0"
        },
        "idna": {
@@ -1670,7 +1554,6 @@
                "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3",
                "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==2.0.0"
        },
        "outcome": {
@@ -1678,7 +1561,6 @@
                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.2.0"
        },
        "packaging": {
@@ -1686,7 +1568,6 @@
                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==23.1"
        },
        "pluggy": {
@@ -1694,7 +1575,6 @@
                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
            ],
            "markers": "python_version >= '3.6'",
            "version": "==1.0.0"
        },
        "psutil": {
@@ -1765,11 +1645,11 @@
        },
        "pytest-cov": {
            "hashes": [
-                "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6",
+                "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b",
-                "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"
+                "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"
            ],
            "index": "pypi",
-            "version": "==4.1.0"
+            "version": "==4.0.0"
        },
        "pytest-django": {
            "hashes": [
@@ -1796,23 +1676,20 @@
            "version": "==3.3.2"
        },
        "pytest-xdist": {
            "extras": [
                "psutil"
            ],
            "hashes": [
-                "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93",
+                "sha256:1849bd98d8b242b948e472db7478e090bf3361912a8fed87992ed94085f54727",
-                "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"
+                "sha256:37290d161638a20b672401deef1cba812d110ac27e35d213f091d15b8beb40c9"
            ],
            "index": "pypi",
-            "version": "==3.3.1"
+            "version": "==3.2.1"
        },
        "requests": {
            "hashes": [
-                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
+                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
            ],
            "index": "pypi",
-            "version": "==2.31.0"
+            "version": "==2.25.1"
        },
        "selenium": {
            "hashes": [
@@ -1822,20 +1699,11 @@
            "index": "pypi",
            "version": "==4.9.1"
        },
        "setuptools": {
            "hashes": [
                "sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f",
                "sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==67.8.0"
        },
        "sniffio": {
            "hashes": [
                "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101",
                "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==1.3.0"
        },
        "sortedcontainers": {
@@ -1857,7 +1725,6 @@
                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
            ],
            "markers": "python_version < '3.11'",
            "version": "==2.0.1"
        },
        "trio": {
@@ -1865,7 +1732,6 @@
                "sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf",
                "sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.22.0"
        },
        "trio-websocket": {
@@ -1873,23 +1739,21 @@
                "sha256:0908435e4eecc49d830ae1c4d6c47b978a75f00594a2be2104d58b61a04cdb53",
                "sha256:af13e9393f9051111300287947ec595d601758ce3d165328e7d36325135a8d62"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==0.10.2"
        },
        "urllib3": {
            "hashes": [
-                "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f",
+                "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305",
-                "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"
+                "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"
            ],
            "index": "pypi",
-            "version": "==1.26.16"
+            "version": "==1.26.15"
        },
        "wsproto": {
            "hashes": [
                "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
                "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
            ],
            "markers": "python_full_version >= '3.7.0'",
            "version": "==1.2.0"
        },
        "zope.component": {
@@ -1900,29 +1764,13 @@
            "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",
+                "sha256:4ab47faac13163ca3c5d6d8a5595212e14770322e95c338d955e3688ba19082a",
-                "sha256:5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"
+                "sha256:8cca6074a2bbca140d32704694e74098d5621f2c75ea6e3a9458240a3b5382a9"
            ],
            "index": "pypi",
-            "version": "==4.5.0"
+            "version": "==4.5.1"
        },
        "zope.hookable": {
            "hashes": [
@@ -2027,52 +1875,6 @@
            ],
            "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"
        }
    }
 }
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -218,6 +218,8 @@ TIME_ZONE = 'Europe/London'
 FORMAT_MODULE_PATH = 'PyRIGS.formats'
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True
@@ -262,10 +264,3 @@ 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
--- a/PyRIGS/tests/base.py
+++ b/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(f"Error in test {screenshot_name} is at path {screenshot_file}", file=sys.stderr)
+            print("Error in test {} is at path {}".format(screenshot_name, screenshot_file), file=sys.stderr)
            raise e
    return wrapper_func
--- a/PyRIGS/tests/test_unit.py
+++ b/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 not Asset.objects.all().exists()
+        assert Asset.objects.all().count() == 0
-        assert not Event.objects.all().exists()
+        assert Event.objects.all().count() == 0
@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 = f"{reverse('login_embed')}?next={request_url}"
+                    expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
                else:
-                    expected_url = f"{reverse('login')}?next={request_url}"
+                    expected_url = "{0}?next={1}".format(reverse('login'), request_url)
                assertRedirects(response, expected_url)
    call_command('deleteSampleData')
--- a/PyRIGS/views.py
+++ b/PyRIGS/views.py
@@ -48,7 +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)
+        context['now'] = models.Event.objects.events_in_bounds(timezone.now(), timezone.now())
        return context
@@ -134,15 +134,11 @@ 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': name,
+                    'text': o.name,
                }
                try:  # See if there is a valid update URL
                    data['update'] = reverse(f"{model}_update", kwargs={'pk': o.pk})
@@ -187,7 +183,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, f"modalobject[0]['update_url']='{update_url}'")
+            messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
        else:
            url = reverse_lazy(detail, kwargs={
                'pk': self.object.pk,
--- a/README.md
+++ b/README.md
@@ -11,9 +11,8 @@ 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)
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -154,9 +154,8 @@ class AssociateAdmin(VersionAdmin):
@admin.register(models.Profile)
 class ProfileAdmin(UserAdmin, AssociateAdmin):
-    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login')
+    list_display = ('username', 'name', 'is_approved', 'is_staff', 'is_superuser', 'is_supervisor', 'number_of_events')
    list_display_links = ['username']
    list_filter = UserAdmin.list_filter + ('is_approved',)
    fieldsets = (
        (None, {'fields': ('username', 'password')}),
        (_('Personal info'), {
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -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', 'forum_url']
+                  'purchase_order', 'collector']
 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().clean()
+        return super(BaseClientEventAuthorisationForm, self).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().clean()
+        return super(EventRiskAssessmentForm, self).clean()
    class Meta:
        model = models.RiskAssessment
@@ -195,6 +195,8 @@ 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,
@@ -214,11 +216,6 @@ class PowerTestRecordForm(forms.ModelForm):
                # 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,
    }
    class Meta:
        model = models.PowerTestRecord
        fields = '__all__'
--- a/RIGS/migrations/0046_create_powertests.py
+++ b/RIGS/migrations/0046_create_powertests.py
@@ -10,7 +10,7 @@ def migrate_old_data(apps, schema_editor):
    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")})
+        PowerTestRecord.objects.create(event=ec.event, **{i.name:getattr(ec, i.attname) for i in PowerTestRecord._meta.get_fields() if not (i.is_relation or i.auto_created)})
 def revert(apps, schema_editor):
--- a/RIGS/migrations/0047_auto_20230517_0944.py
+++ b/RIGS/migrations/0047_auto_20230517_0944.py
@@ -3,7 +3,6 @@
 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):
@@ -11,10 +10,8 @@ def migrate_old_data(apps, schema_editor):
    EventCheckIn = apps.get_model('RIGS', 'EventCheckIn')
    for ec in EventChecklist.objects.all():
        for crew in ec.crew.all():
-            try:
+            vehicle = ec.vehicles.get(driver=crew.crewmember) or None
-                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)
+            EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end, vehicle=vehicle.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):
--- a/RIGS/migrations/0049_auto_20230529_1123.py
+++ b/RIGS/migrations/0049_auto_20230529_1123.py
@@ -1,53 +0,0 @@
 # 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),
        ),
    ]
--- a/RIGS/migrations/0050_event_forum_url.py
+++ b/RIGS/migrations/0050_event_forum_url.py
@@ -1,19 +0,0 @@
 # 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]),
        ),
    ]
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -76,8 +76,7 @@ class Profile(AbstractUser):
    @classmethod
    def users_awaiting_approval_count(cls):
-        # last_login = None ensures we only pick up genuinely new users, not those that have been deactivated for inactivity
+        return Profile.objects.filter(models.Q(is_approved=False)).count()
        return Profile.objects.filter(is_approved=False, last_login=None).count()
    def __str__(self):
        return self.name
@@ -309,14 +308,6 @@ 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
@@ -366,8 +357,6 @@ 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:
@@ -508,7 +497,7 @@ class Event(models.Model, RevisionMixin):
            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()
+        return not self.dry_hire and earliest <= timezone.now()
    objects = EventManager()
@@ -516,7 +505,7 @@ class Event(models.Model, RevisionMixin):
        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 = {}
@@ -886,9 +875,6 @@ class EventChecklist(ReviewableModel, RevisionMixin):
@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?")
@@ -910,21 +896,21 @@ class PowerTestRecord(ReviewableModel, 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=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
+    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=pssc_text)
+    fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text="Prospective Short Circuit Current")
    # 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 / V")
+    w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    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)
+    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>)")
    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 / V")
+    w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    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)
+    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>)")
    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 / V")
+    w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    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)
+    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>)")
    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>")
@@ -938,9 +924,6 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
    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)
--- a/RIGS/templates/event_form.html
+++ b/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="{{venue.id}}" selected="selected" data-update_url="{% url 'venue_update' venue.id %}">{{ venue }}</option>
+                                            <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ 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-10">
+                            <div class="col-sm-8">
                                <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-10">
+                            <div class="col-sm-8">
                                <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,26 +334,12 @@
                            <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-form-label">{{ form.purchase_order.label }}</label>
+                                       class="col-sm-4 col-fitem_tableorm-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>
--- a/RIGS/templates/hs/event_checklist_detail.html
+++ b/RIGS/templates/hs/event_checklist_detail.html
@@ -9,8 +9,6 @@
    <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>
@@ -73,8 +71,6 @@
 <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">
--- a/RIGS/templates/hs/event_checklist_form.html
+++ b/RIGS/templates/hs/event_checklist_form.html
@@ -24,7 +24,7 @@
 {% block content %}
    <div class="col-12">
        {% include 'form_errors.html' %}
-
+        
        <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}}"/>
@@ -59,6 +59,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="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
                                {% elif event.venue %}
                                    <option value="{{event.venue.pk}}" selected="selected">{{ event.venue.name }}</option>
                                {% endif %}
                                </select>
                            </div>
--- a/RIGS/templates/hs/power_detail.html
+++ b/RIGS/templates/hs/power_detail.html
@@ -86,7 +86,7 @@
            </thead>
            <tbody>
                <tr>
-                    <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small> / V</th>
+                    <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>
@@ -165,11 +165,11 @@
    </div>
 </div>
 <div class="col-12 text-right">
-{% button 'edit' url='pt_edit' pk=object.pk %}
+{% button 'edit' url='ec_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' %}
+{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
 </div>
 <div class="col-12 text-right">
-{% include 'partials/last_edited.html' with target="powertestrecord_history" %}
+{% include 'partials/last_edited.html' with target="eventchecklist_history" %}
 </div>
 {% endblock %}
--- a/RIGS/templates/hs/power_form.html
+++ b/RIGS/templates/hs/power_form.html
@@ -51,18 +51,22 @@
                            <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">
+                                <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>
                            <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' %}">
+                                <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' %}">
                                {% 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>
@@ -115,7 +119,7 @@
                                    </thead>
                                    <tbody>
                                        <tr>
-                                            <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small> / V</th>
+                                            <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>
--- a/RIGS/templates/hs/risk_assessment_form.html
+++ b/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));
--- a/RIGS/templates/partials/event_details.html
+++ b/RIGS/templates/partials/event_details.html
@@ -77,15 +77,6 @@
                <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>
--- a/RIGS/templates/partials/event_status.html
+++ b/RIGS/templates/partials/event_status.html
@@ -15,7 +15,7 @@
        {% endif %}
    {% endif %}
    {% if not event.dry_hire %}
-        {% if event.riskassessment %}
+        {% if event.has_checklist %}
            <a href="{{ event.riskassessment.get_absolute_url }}"><span class="badge badge-success">RA: <span class="fas fa-check{% if event.riskassessment.reviewed_by %}-double{%endif%}"></span></a>
        {% else %}
            <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
--- a/RIGS/templatetags/filters.py
+++ b/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 + f" <a href='{reverse(url, kwargs={'pk': obj.pk})}'><span class='fas fa-sticky-note'></span></a>")
+        return mark_safe(obj.name + " <a href='{}'><span class='fas fa-sticky-note'></span></a>".format(reverse(url, kwargs={'pk': obj.pk})))
    else:
        return obj.name
@@ -183,7 +183,7 @@ def linkornone(target, namespace=None, autoescape=True):
            link = namespace + "://" + target
        else:
            link = target
-        return mark_safe(f"<a href='{link}' target='_blank'><span class='overflow-ellipsis'>{target}</span></a>")
+        return mark_safe("<a href='{}' target='_blank'><span class='overflow-ellipsis'>{}</span></a>".format(link, str(target)))
    else:
        return "None"
--- a/RIGS/tests/pages.py
+++ b/RIGS/tests/pages.py
@@ -114,7 +114,7 @@ class CreateEvent(FormPage):
    }
    def select_event_type(self, type_name):
-        self.find_element(By.XPATH, f'//button[.="{type_name}"]').click()
+        self.find_element(By.XPATH, '//button[.="{}"]'.format(type_name)).click()
    def item_row(self, ID):
        return rigs_regions.ItemRow(self, self.find_element(By.ID, "item-" + ID))
--- a/RIGS/tests/test_unit.py
+++ b/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 = f"{reverse('login_embed')}?next={request_url}"
+    expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
    # Request the page and check it redirects
    response = client.get(request_url, follow=True)
@@ -372,8 +372,7 @@ def test_ra_redirect(admin_client, admin_user, ra):
 class TestMarkdownTemplateTags(TestCase):
-    with open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md"), encoding="utf-8") as f:
+    markdown = open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md")).read()
        markdown = f.read()
    def test_html_safe(self):
        html = markdown_filter(self.markdown)
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -110,9 +110,6 @@ urlpatterns = [
    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()),
         name='invoice_list'),
--- a/RIGS/views/hs.py
+++ b/RIGS/views/hs.py
@@ -13,24 +13,31 @@ from django.shortcuts import redirect
 class HSCreateView(generic.CreateView):
    def get_form(self, **kwargs):
        form = super().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().get_context_data(**kwargs)
-        event = models.Event.objects.get(pk=self.kwargs.get('pk'))
+        epk = self.kwargs.get('pk')
        event = models.Event.objects.get(pk=epk)
        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):
+class MarkReviewed(generic.View):
-    def get_redirect_url(self, *args, **kwargs):
+    def get(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'))
+        return HttpResponseRedirect(reverse('hs_list'))
 class EventRiskAssessmentCreate(HSCreateView):
@@ -48,7 +55,7 @@ class EventRiskAssessmentCreate(HSCreateView):
        if ra is not None:
            return HttpResponseRedirect(reverse('ra_edit', kwargs={'pk': ra.pk}))
-        return super().get(self)
+        return super(EventRiskAssessmentCreate, self).get(self)
    def get_success_url(self):
        return reverse('ra_detail', kwargs={'pk': self.object.pk})
@@ -67,7 +74,7 @@ class EventRiskAssessmentEdit(generic.UpdateView):
        return reverse('ra_detail', kwargs={'pk': self.object.pk})
    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs)
        rpk = self.kwargs.get('pk')
        ra = models.RiskAssessment.objects.get(pk=rpk)
        context['event'] = ra.event
@@ -82,7 +89,7 @@ class EventRiskAssessmentDetail(generic.DetailView):
    template_name = 'hs/risk_assessment_detail.html'
    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventRiskAssessmentDetail, self).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
@@ -92,7 +99,7 @@ class EventChecklistDetail(generic.DetailView):
    template_name = 'hs/event_checklist_detail.html'
    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventChecklistDetail, self).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
@@ -110,7 +117,7 @@ class EventChecklistEdit(generic.UpdateView):
        return reverse('ec_detail', kwargs={'pk': self.object.pk})
    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventChecklistEdit, self).get_context_data(**kwargs)
        pk = self.kwargs.get('pk')
        ec = models.EventChecklist.objects.get(pk=pk)
        context['event'] = ec.event
@@ -129,22 +136,19 @@ class EventChecklistCreate(HSCreateView):
    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)
+
        return super(EventChecklistCreate, self).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
@@ -166,7 +170,7 @@ class PowerTestEdit(generic.UpdateView):
        ec.reviewed_by = None
        ec.reviewed_at = None
        ec.save()
-        return reverse('pt_detail', kwargs={'pk': self.object.pk})
+        return reverse('ec_detail', kwargs={'pk': self.object.pk})
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
@@ -175,7 +179,7 @@ class PowerTestEdit(generic.UpdateView):
        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)
+        # get_related(context['form'], context)
        return context
@@ -187,6 +191,7 @@ class PowerTestCreate(HSCreateView):
    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()
@@ -199,14 +204,6 @@ class PowerTestCreate(HSCreateView):
    def get_success_url(self):
        return reverse('pt_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
        if context['event'].riskassessment.power_mic:
            context['power_mic'] = context['event'].riskassessment.power_mic
        return context
 class HSList(generic.ListView):
    paginate_by = 20
@@ -214,10 +211,10 @@ class HSList(generic.ListView):
    template_name = 'hs/hs_list.html'
    def get_queryset(self):
-        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).exclude(dry_hire=True).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(HSList, self).get_context_data(**kwargs)
        context['page_title'] = 'H&S Overview'
        return context
--- a/RIGS/views/rigboard.py
+++ b/RIGS/views/rigboard.py
@@ -3,12 +3,6 @@ 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
@@ -25,7 +19,6 @@ 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
@@ -384,41 +377,3 @@ 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)
--- a/assets/migrations/0028_alter_asset_length.py
+++ b/assets/migrations/0028_alter_asset_length.py
@@ -1,18 +0,0 @@
 # 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),
        ),
    ]
--- a/assets/models.py
+++ b/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=2, max_digits=10,
+    length = models.DecimalField(decimal_places=1, 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 display_name(self):
+    def name(self):
        return f"{self.display_id} | {self.description}"
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -35,11 +35,6 @@
    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 %}
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -12,6 +12,7 @@
    {{ 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 %}
@@ -34,10 +35,9 @@
            $(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
        });
    </script>
    <script src="{% static "js/tooltip.js" %}"></script>
    <script>
-        $(function () {
+        $(document).ready(function () {
-          $('[data-toggle="tooltip"]').tooltip();
+            setupMDE('#id_comments');
        });
    </script>
 {% endblock %}
--- a/assets/templates/partials/asset_list_table.html
+++ b/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" id="{{ item.asset_id }}">
+            <tr class="table-{{ item.status.display_class|default:'' }} assetRow">
                <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>
--- a/assets/templates/partials/form_field.html
+++ b/assets/templates/partials/form_field.html
@@ -1,15 +1,15 @@
 {% load widget_tweaks %}
 {% load title_spaced from filters %}
 {% spaceless %}
-{% 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%}
+<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 append or prepend %}
-<div class="input-group {{col}} flex-nowrap">
+<div class="input-group {{col}}">
  {% if prepend %}
  <div class="input-group-prepend">
    <span class="input-group-text">{{ prepend }}</span>
  </div>
  {% endif %}
-  {% render_field field|add_class:'form-control' style=style %}
+  {% render_field field|add_class:'form-control' %}
  {% 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 style=style %}
+{% render_field field|add_class:'form-control' class+=col %}
 {% endif %}
 {% endspaceless %}
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/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'|set_data:"toggle:tooltip" value=object.purchase_price title="Ex. VAT" %}
+        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
      </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'|set_data:"toggle:tooltip" value=object.replacement_cost title="Ex. VAT" %}
+        {% render_field form.replacement_cost|add_class:'form-control' value=object.replacement_cost %}
      </div>
    </div>
--- a/assets/tests/pages.py
+++ b/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.TextBox, (By.ID, 'id_comments')),
+        'comments': (regions.SimpleMDETextArea, (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')),
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
  "requires": true,
  "packages": {
    "": {
      "name": "PyRIGS",
      "version": "1.0.0",
      "license": "Custom",
      "dependencies": {
@@ -7905,9 +7904,9 @@
      "dev": true
    },
    "node_modules/socket.io-parser": {
-      "version": "4.2.3",
+      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-      "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
      "dev": true,
      "dependencies": {
        "@socket.io/component-emitter": "~3.1.0",
@@ -15234,9 +15233,9 @@
      }
    },
    "socket.io-parser": {
-      "version": "4.2.3",
+      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-      "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
      "dev": true,
      "requires": {
        "@socket.io/component-emitter": "~3.1.0",
--- a/pipeline/source_assets/js/interaction.js
+++ b/pipeline/source_assets/js/interaction.js
@@ -6,6 +6,11 @@ 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();
 }
--- a/templates/base_ajax.html
+++ b/templates/base_ajax.html
@@ -17,6 +17,7 @@
                e.preventDefault();
                data = $(this).serialize();
                action = $(this).attr('action');
                console.log(action)
                $.post(action, data, function(resp) {
                    $('#modal').html(resp);
                });
--- a/training/models.py
+++ b/training/models.py
@@ -105,10 +105,6 @@ 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):
@@ -373,7 +369,7 @@ class TrainingLevelQualification(models.Model, RevisionMixin):
        return str(self)
    def get_absolute_url(self):
-        return reverse('trainee_detail', kwargs={'pk': self.trainee_id})
+        return reverse('trainee_detail', kwargs={'pk': self.trainee.pk})
    class Meta:
        unique_together = ["trainee", "level"]
--- a/training/templates/level_list.html
+++ b/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. Notification of completion should be made at the next general meeting.</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>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 24th May 2023, check the Training Policy.</sup>
+<sup>Correct as of 3rd September 2021, check the Training Policy.</sup>
 </div>
 {% endif %}
 {% for level in object_list %}
--- a/training/templatetags/tags.py
+++ b/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 += f"<a class='btn btn-info' href='{reverse('confirm_level', kwargs={'pk': trainee.pk, 'level_pk': level.pk})}'>Confirm</a>"
+            string += "<a class='btn btn-info' href='{}'>Confirm</a>".format(reverse('confirm_level', kwargs={'pk': trainee.pk, 'level_pk': level.pk}))
        return mark_safe(string)
    else:
        return ""
--- a/training/tests/test_interaction.py
+++ b/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_id == supervisor.pk
+    assert qualification.supervisor.pk == supervisor.pk
    assert qualification.date == date
    assert qualification.notes == "A note"
    assert qualification.depth == models.TrainingItemQualification.STARTED
--- a/training/tests/test_unit.py
+++ b/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_id
+    assert training_item.pk == qual.item.pk
    # 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})
--- a/training/views.py
+++ b/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 {models.TrainingItem.objects.get(pk=self.kwargs['pk'])}"
+        context["page_title"] = f"People Qualified In {self.object_list[0].item}"
        return context
--- a/versioning/urls.py
+++ b/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(f'{modelname}/<str:pk>/history/',
+                path('{}/<str:pk>/history/'.format(modelname),
-                     permission_required_with_403(f'{app.label}.change_{modelname}')(
+                     permission_required_with_403('{}.change_{}'.format(app.label, modelname))(
                         views.VersionHistory.as_view()),
-                     name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
+                     name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }),
            ]
        else:
            urlpatterns += [
-                path(f'{appname}/{modelname}/<str:pk>/history/',
+                path('{}/{}/<str:pk>/history/'.format(appname, modelname),
-                     permission_required_with_403(f'{app.label}.change_{modelname}')(
+                     permission_required_with_403('{}.change_{}'.format(app.label, modelname))(
                         views.VersionHistory.as_view()),
-                     name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
+                     name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }),
            ]
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -1,4 +1,3 @@
 import logging
 from diff_match_patch import diff_match_patch
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
@@ -148,9 +147,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))
@@ -161,14 +160,10 @@ 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
--- a/versioning/views.py
+++ b/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().get_context_data(**kwargs)
+        context = super(VersionHistory, self).get_context_data(**kwargs)
        context['object'] = self.get_object()
        if self.kwargs['app'] != 'rigboard':
-            context['override'] = f'base_{self.kwargs["app"]}.html'
+            context['override'] = 'base_{}.html'.format(self.kwargs['app'])
        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().get_context_data(**kwargs)
+        context = super(ActivityTable, self).get_context_data(**kwargs)
-        context['page_title'] = f"{title(self.kwargs['app'])} Activity Stream"
+        context['page_title'] = "{} Activity Stream".format(title(self.kwargs['app']))
        if self.kwargs['app'] != 'rigboard':
-            context['override'] = f'base_{self.kwargs["app"]}.html'
+            context['override'] = 'base_{}.html'.format(self.kwargs['app'])
        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().get_context_data(**kwargs)
+        context = super(ActivityFeed, self).get_context_data(**kwargs)
        context['page_title'] = "Activity Feed"
        maxTimeDelta = datetime.timedelta(hours=1)
Author	SHA1	Message	Date
FreneticScribbler	b151e1fcf3	Checkin only requires login (no perms) and block users from editing other checkins at Django level	2023-05-18 13:34:32 +01:00
FreneticScribbler	013922bd90	Add data migration for crew/vehicles	2023-05-18 13:10:09 +01:00
FreneticScribbler	f72b611e77	pep8	2023-05-17 12:23:17 +01:00
FreneticScribbler	8da90ba670	Implement codedoctor suggestions	2023-05-17 09:45:46 +01:00
arona	0d1beeaead	Minor fixes	2023-05-16 17:22:42 +01:00
arona	51ff06fadd	Add power record status chip, checklist status chip displays number of checklists	2023-05-16 16:01:27 +01:00
arona	06137ab180	Register check in model with the admin site	2023-05-16 14:45:54 +01:00
arona	e7dd8f4cf9	Clicking check out does not redirect the user	2023-05-16 14:42:56 +01:00
arona	2fb8b8c81b	UI work	2023-05-15 13:40:15 +01:00
FreneticScribbler	dd02df4a17	Checkin button turns into checkout button where applicable	2023-05-15 01:31:56 +01:00
FreneticScribbler	8cc40fe9fa	Minor improvement to homepage UI	2023-05-15 01:28:50 +01:00
FreneticScribbler	904ef1f180	Add homepage checkin for events happening now	2023-05-15 01:26:54 +01:00
FreneticScribbler	417ec8ff3d	Basic checkin/out logic complete	2023-05-15 01:12:04 +01:00
FreneticScribbler	97dac51a52	Add ability to edit checkins, more validation	2023-05-15 00:36:57 +01:00
FreneticScribbler	fc8bb2dc4b	Fix tests after form split	2023-05-14 22:26:58 +01:00
FreneticScribbler	67d2f80815	Merge branch 'master' into checkin	2023-05-14 22:14:04 +01:00
FreneticScribbler	15a9a03200	Further work on checkin, add role field etc	2023-05-10 18:24:56 +01:00
arona	676cee164b	Very initial version of checkin form	2023-05-09 21:37:25 +01:00
arona	cccb84e4dc	Remove old 'vehicle/crew' stuff	2023-05-09 20:47:41 +01:00
FreneticScribbler	742836486e	Revamp H&S overview, remove individual lists. They were not a good thing.	2023-05-08 19:59:58 +01:00
FreneticScribbler	e774b06ac4	Split power related parts of event checklist into a seperate form	2023-05-08 19:46:35 +01:00