Merge branch 'master' into subhire

# Conflicts: # Pipfile.lock
FIX: Do not specify minor version of python in CI
2026-02-16 19:49:41 +00:00 · 2022-12-11 00:53:27 +00:00 · 2022-12-11 00:51:19 +00:00 · 2022-12-11 00:49:56 +00:00 · 2022-12-11 00:44:14 +00:00 · 2022-12-11 00:29:30 +00:00
59 changed files with 4640 additions and 4019 deletions
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -0,0 +1,151 @@
+name: 'Combine PRs'
+
+# Controls when the action will run - in this case triggered manually
+on:
+  workflow_dispatch:
+    inputs:
+      branchPrefix:
+        description: 'Branch prefix to find combinable PRs based on'
+        required: true
+        default: 'dependabot'
+      mustBeGreen:
+        description: 'Only combine PRs that are green (status is success)'
+        required: true
+        default: true
+      combineBranchName:
+        description: 'Name of the branch to combine PRs into'
+        required: true
+        default: 'combine-prs-branch'
+      ignoreLabel:
+        description: 'Exclude PRs with this label'
+        required: true
+        default: 'nocombine'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "combine-prs"
+  combine-prs:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/github-script@v6
+        id: create-combined-pr
+        name: Create Combined PR
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+            let branchesAndPRStrings = [];
+            let baseBranch = null;
+            let baseBranchSHA = null;
+            for (const pull of pulls) {
+              const branch = pull['head']['ref'];
+              console.log('Pull for branch: ' + branch);
+              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
+                console.log('Branch matched prefix: ' + branch);
+                let statusOK = true;
+                if(${{ github.event.inputs.mustBeGreen }}) {
+                  console.log('Checking green status: ' + branch);
+                  const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) {
+                    repository(owner: $owner, name: $repo) {
+                      pullRequest(number:$pull_number) {
+                        commits(last: 1) {
+                          nodes {
+                            commit {
+                              statusCheckRollup {
+                                state
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }`
+                  const vars = {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pull['number']
+                  };
+                  const result = await github.graphql(stateQuery, vars);
+                  const [{ commit }] = result.repository.pullRequest.commits.nodes;
+                  const state = commit.statusCheckRollup.state
+                  console.log('Validating status: ' + state);
+                  if(state != 'SUCCESS') {
+                    console.log('Discarding ' + branch + ' with status ' + state);
+                    statusOK = false;
+                  }
+                }
+                console.log('Checking labels: ' + branch);
+                const labels = pull['labels'];
+                for(const label of labels) {
+                  const labelName = label['name'];
+                  console.log('Checking label: ' + labelName);
+                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
+                    console.log('Discarding ' + branch + ' with label ' + labelName);
+                    statusOK = false;
+                  }
+                }
+                if (statusOK) {
+                  console.log('Adding branch to array: ' + branch);
+                  const prString = '#' + pull['number'] + ' ' + pull['title'];
+                  branchesAndPRStrings.push({ branch, prString });
+                  baseBranch = pull['base']['ref'];
+                  baseBranchSHA = pull['base']['sha'];
+                }
+              }
+            }
+            if (branchesAndPRStrings.length == 0) {
+              core.setFailed('No PRs/branches matched criteria');
+              return;
+            }
+            try {
+              await github.rest.git.createRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: 'refs/heads/' + '${{ github.event.inputs.combineBranchName }}',
+                sha: baseBranchSHA
+              });
+            } catch (error) {
+              console.log(error);
+              core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?');
+              return;
+            }
+            
+            let combinedPRs = [];
+            let mergeFailedPRs = [];
+            for(const { branch, prString } of branchesAndPRStrings) {
+              try {
+                await github.rest.repos.merge({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  base: '${{ github.event.inputs.combineBranchName }}',
+                  head: branch,
+                });
+                console.log('Merged branch ' + branch);
+                combinedPRs.push(prString);
+              } catch (error) {
+                console.log('Failed to merge branch ' + branch);
+                mergeFailedPRs.push(prString);
+              }
+            }
+            
+            console.log('Creating combined PR');
+            const combinedPRsString = combinedPRs.join('\n');
+            let body = '✅ This PR was created by the Combine PRs action by combining the following PRs:\n' + combinedPRsString;
+            if(mergeFailedPRs.length > 0) {
+              const mergeFailedPRsString = mergeFailedPRs.join('\n');
+              body += '\n\n⚠️ The following PRs were left out due to merge conflicts:\n' + mergeFailedPRsString
+            }
+            await github.rest.pulls.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: 'Combined PR',
+              head: '${{ github.event.inputs.combineBranchName }}',
+              base: baseBranch,
+              body: body
+            });
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -17,7 +17,7 @@ jobs:
      - name: Set up Python
        uses: actions/setup-python@v2
        with:
-            python-version: 3.9.1
+            python-version: 3.9
      - uses: actions/cache@v2
        id: pcache
        with:
--- a/16
+++ b/16
@@ -11,7 +11,6 @@ asgiref = "~=3.3.1"
 beautifulsoup4 = "~=4.9.3"
 Brotli = "~=1.0.9"
 cachetools = "~=4.2.1"
-certifi = "*"
 chardet = "~=4.0.0"
 configparser = "~=5.0.1"
 contextlib2 = "~=0.6.0.post1"
@@ -22,22 +21,19 @@ dj-static = "~=0.0.6"
 Django = "~=3.2"
 django-debug-toolbar = "~=3.2"
 django-filter = "~=2.4.0"
-django-ical = "~=1.7.1"
-django-recurrence = "~=1.10.3"
+django-ical = "~=1.8.3"
 django-registration-redux = "~=2.9"
 django-reversion = "~=3.0.9"
-django-toolbelt = "~=0.0.1"
 django-widget-tweaks = "~=1.4.8"
 django-htmlmin = "~=0.11.0"
-envparse = "~=0.2.0"
+envparse = "*"
 gunicorn = "~=20.0.4"
 icalendar = "~=4.0.7"
 idna = "~=2.10"
-lxml = "*"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
-Pillow = "~=9.0.0"
+Pillow = "~=9.3.0"
 premailer = "~=3.7.0"
 progress = "~=1.5"
 psutil = "~=5.8.0"
@@ -45,6 +41,7 @@ psycopg2 = "~=2.8.6"
 Pygments = "~=2.7.4"
 pyparsing = "~=2.4.7"
 PyPDF2 = "~=1.27.5"
+PyPOM = "~=2.2.4"
 python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
@@ -78,13 +75,12 @@ django-hCaptcha = "*"
 importlib-metadata = "*"
 django-hcaptcha = "*"
 "z3c.rml" = "*"
-pikepdf = "*"
 django-queryable-properties = "*"
 django-mass-edit = "*"
+selenium = "~=3.141.0"

 [dev-packages]
-selenium = "~=3.141.0"
-pycodestyle = "*"
+pycodestyle = "~=2.9.1"
 coveralls = "*"
 django-coverage-plugin = "*"
 pytest-cov = "*"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "d3f3987adec5a5b668690511e14e87cfb100964246132f1dc5f86eda18ca2e0d"
+            "sha256": "fcd984e26845bc82b41f2651b61696f8f19be81ea6fb770751596b53f7b2bd2b"
        },
        "pipfile-spec": 6,
        "requires": {
@@ -59,6 +59,8 @@
        },
        "brotli": {
            "hashes": [
+                "sha256:02177603aaca36e1fd21b091cb742bb3b305a569e2402f1ca38af471777fb019",
+                "sha256:11d3283d89af7033236fa4e73ec2cbe743d4f6a81d41bd234f24bf63dde979df",
                "sha256:12effe280b8ebfd389022aa65114e30407540ccb89b177d3fbc9a4f177c4bd5d",
                "sha256:160c78292e98d21e73a4cc7f76a234390e516afcd982fa17e1422f7c6a9ce9c8",
                "sha256:16d528a45c2e1909c2798f27f7bf0a3feec1dc9e50948e738b961618e38b6a7b",
@@ -69,9 +71,15 @@
                "sha256:26d168aac4aaec9a4394221240e8a5436b5634adc3cd1cdf637f6645cecbf181",
                "sha256:29d1d350178e5225397e28ea1b7aca3648fcbab546d20e7475805437bfb0a130",
                "sha256:2aad0e0baa04517741c9bb5b07586c642302e5fb3e75319cb62087bd0995ab19",
+                "sha256:3148362937217b7072cf80a2dcc007f09bb5ecb96dae4617316638194113d5be",
+                "sha256:330e3f10cd01da535c70d09c4283ba2df5fb78e915bea0a28becad6e2ac010be",
+                "sha256:336b40348269f9b91268378de5ff44dc6fbaa2268194f85177b53463d313842a",
                "sha256:3496fc835370da351d37cada4cf744039616a6db7d13c430035e901443a34daa",
                "sha256:35a3edbe18e876e596553c4007a087f8bcfd538f19bc116917b3c7522fca0429",
                "sha256:3b78a24b5fd13c03ee2b7b86290ed20efdc95da75a3557cc06811764d5ad1126",
+                "sha256:3b8b09a16a1950b9ef495a0f8b9d0a87599a9d1f179e2d4ac014b2ec831f87e7",
+                "sha256:3c1306004d49b84bd0c4f90457c6f57ad109f5cc6067a9664e12b7b79a9948ad",
+                "sha256:3ffaadcaeafe9d30a7e4e1e97ad727e4f5610b9fa2f7551998471e3736738679",
                "sha256:40d15c79f42e0a2c72892bf407979febd9cf91f36f495ffb333d1d04cebb34e4",
                "sha256:44bb8ff420c1d19d91d79d8c3574b8954288bdff0273bf788954064d260d7ab0",
                "sha256:4688c1e42968ba52e57d8670ad2306fe92e0169c6f3af0089be75bbac0c64a3b",
@@ -81,6 +89,7 @@
                "sha256:56d027eace784738457437df7331965473f2c0da2c70e1a1f6fdbae5402e0389",
                "sha256:5913a1177fc36e30fcf6dc868ce23b0453952c78c04c266d3149b3d39e1410d6",
                "sha256:5b6ef7d9f9c38292df3690fe3e302b5b530999fa90014853dcd0d6902fb59f26",
+                "sha256:5bf37a08493232fbb0f8229f1824b366c2fc1d02d64e7e918af40acd15f3e337",
                "sha256:5cb1e18167792d7d21e21365d7650b72d5081ed476123ff7b8cac7f45189c0c7",
                "sha256:61a7ee1f13ab913897dac7da44a73c6d44d48a4adff42a5701e3239791c96e14",
                "sha256:622a231b08899c864eb87e85f81c75e7b9ce05b001e59bbfbf43d4a71f5f32b2",
@@ -88,6 +97,7 @@
                "sha256:6b2ae9f5f67f89aade1fab0f7fd8f2832501311c363a21579d02defa844d9296",
                "sha256:6c772d6c0a79ac0f414a9f8947cc407e119b8598de7621f39cacadae3cf57d12",
                "sha256:6d847b14f7ea89f6ad3c9e3901d1bc4835f6b390a9c71df999b0162d9bb1e20f",
+                "sha256:73fd30d4ce0ea48010564ccee1a26bfe39323fde05cb34b5863455629db61dc7",
                "sha256:76ffebb907bec09ff511bb3acc077695e2c32bc2142819491579a695f77ffd4d",
                "sha256:7bbff90b63328013e1e8cb50650ae0b9bac54ffb4be6104378490193cd60f85a",
                "sha256:7cb81373984cc0e4682f31bc3d6be9026006d96eecd07ea49aafb06897746452",
@@ -97,6 +107,7 @@
                "sha256:87fdccbb6bb589095f413b1e05734ba492c962b4a45a13ff3408fa44ffe6479b",
                "sha256:88c63a1b55f352b02c6ffd24b15ead9fc0e8bf781dbe070213039324922a2eea",
                "sha256:8a674ac10e0a87b683f4fa2b6fa41090edfd686a6524bd8dedbd6138b309175c",
+                "sha256:8ed6a5b3d23ecc00ea02e1ed8e0ff9a08f4fc87a1f58a2530e71c0f48adf882f",
                "sha256:93130612b837103e15ac3f9cbacb4613f9e348b58b3aad53721d92e57f96d46a",
                "sha256:9744a863b489c79a73aba014df554b0e7a0fc44ef3f8a0ef2a52919c7d155031",
                "sha256:9749a124280a0ada4187a6cfd1ffd35c350fb3af79c706589d98e088c5044267",
@@ -106,15 +117,24 @@
                "sha256:9ed4c92a0665002ff8ea852353aeb60d9141eb04109e88928026d3c8a9e5433c",
                "sha256:a72661af47119a80d82fa583b554095308d6a4c356b2a554fdc2799bc19f2a43",
                "sha256:afde17ae04d90fbe53afb628f7f2d4ca022797aa093e809de5c3cf276f61bbfa",
+                "sha256:b1375b5d17d6145c798661b67e4ae9d5496920d9265e2f00f1c2c0b5ae91fbde",
                "sha256:b336c5e9cf03c7be40c47b5fd694c43c9f1358a80ba384a21969e0b4e66a9b17",
+                "sha256:b3523f51818e8f16599613edddb1ff924eeb4b53ab7e7197f85cbc321cdca32f",
+                "sha256:b43775532a5904bc938f9c15b77c613cb6ad6fb30990f3b0afaea82797a402d8",
                "sha256:b663f1e02de5d0573610756398e44c130add0eb9a3fc912a09665332942a2efb",
                "sha256:b83bb06a0192cccf1eb8d0a28672a1b79c74c3a8a5f2619625aeb6f28b3a82bb",
+                "sha256:ba72d37e2a924717990f4d7482e8ac88e2ef43fb95491eb6e0d124d77d2a150d",
                "sha256:c2415d9d082152460f2bd4e382a1e85aed233abc92db5a3880da2257dc7daf7b",
                "sha256:c83aa123d56f2e060644427a882a36b3c12db93727ad7a7b9efd7d7f3e9cc2c4",
+                "sha256:c8e521a0ce7cf690ca84b8cc2272ddaf9d8a50294fd086da67e517439614c755",
+                "sha256:cab1b5964b39607a66adbba01f1c12df2e55ac36c81ec6ed44f2fca44178bf1a",
+                "sha256:cb02ed34557afde2d2da68194d12f5719ee96cfb2eacc886352cb73e3808fc5d",
+                "sha256:cc0283a406774f465fb45ec7efb66857c09ffefbe49ec20b7882eff6d3c86d3a",
                "sha256:cfc391f4429ee0a9370aa93d812a52e1fee0f37a81861f4fdd1f4fb28e8547c3",
                "sha256:db844eb158a87ccab83e868a762ea8024ae27337fc7ddcbfcddd157f841fdfe7",
                "sha256:defed7ea5f218a9f2336301e6fd379f55c655bea65ba2476346340a0ce6f74a1",
                "sha256:e16eb9541f3dd1a3e92b89005e37b1257b157b7256df0e36bd7b33b50be73bcb",
+                "sha256:e1abbeef02962596548382e393f56e4c94acd286bd0c5afba756cffc33670e8a",
                "sha256:e23281b9a08ec338469268f98f194658abfb13658ee98e2b7f85ee9dd06caa91",
                "sha256:e2d9e1cbc1b25e22000328702b014227737756f4b5bf5c485ac1d8091ada078b",
                "sha256:e48f4234f2469ed012a98f4b7874e7f7e173c167bed4934912a29e03167cf6b1",
@@ -135,11 +155,10 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
-                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
+                "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3",
+                "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
            ],
-            "index": "pypi",
-            "version": "==2022.9.24"
+            "version": "==2022.12.7"
        },
        "chardet": {
            "hashes": [
@@ -221,11 +240,11 @@
        },
        "django-debug-toolbar": {
            "hashes": [
-                "sha256:1e3acad24e3d351ba45c6fa2072e4164820307332a776b16c9f06d1f89503465",
-                "sha256:80de23066b624d3970fd296cf02d61988e5d56c31aa0dc4a428970b46e2883a8"
+                "sha256:24ef1a7d44d25e60d7951e378454c6509bf536dce7e7d9d36e7c387db499bc27",
+                "sha256:879f8a4672d41621c06a4d322dcffa630fc4df056cada6e417ed01db0e5e0478"
            ],
            "index": "pypi",
-            "version": "==3.7.0"
+            "version": "==3.8.1"
        },
        "django-filter": {
            "hashes": [
@@ -252,11 +271,11 @@
        },
        "django-ical": {
            "hashes": [
-                "sha256:6df4dc61eb4abc55816bd16a949e497bea99828c7de648438ace7f1f85eeb405",
-                "sha256:bd5c874d2eb81329f220174cc0dde7be385f4574ce6c8a2d1579d7fd564a94f3"
+                "sha256:0d5595c5bc954e401b59b27a9a86962557f0d3b965e9f5860244cd6bc450e8ab",
+                "sha256:d3f97d163c03ea795e0722d5031e7f3806037ac913c814b0cfee54464f06978e"
            ],
            "index": "pypi",
-            "version": "==1.7.3"
+            "version": "==1.8.3"
        },
        "django-mass-edit": {
            "hashes": [
@@ -276,11 +295,10 @@
        },
        "django-recurrence": {
            "hashes": [
-                "sha256:715f681f6af029ff3a8d73c7b1460abd8cbc5d5a5001efcb127032e84d9cb963",
-                "sha256:9053b44b78b7fbfe3530673edfdd6d2f562105f8a192bc6a4b906a3df4f95f59"
+                "sha256:0c65f30872599b5813a9bab6952dada23c55894f28674490a753ada559f14bc5",
+                "sha256:9c89444e651a78c587f352c5f63eda48ab2f53996347b9fcdff2d248f4fcff70"
            ],
-            "index": "pypi",
-            "version": "==1.10.3"
+            "version": "==1.11.1"
        },
        "django-registration-redux": {
            "hashes": [
@@ -298,13 +316,6 @@
            "index": "pypi",
            "version": "==3.0.9"
        },
-        "django-toolbelt": {
-            "hashes": [
-                "sha256:2711b7f9c46908a3f867f4ebb5c0c3f06dcc4f2cabe48a7a53292f6f1cbb83e5"
-            ],
-            "index": "pypi",
-            "version": "==0.0.1"
-        },
        "django-widget-tweaks": {
            "hashes": [
                "sha256:9bfc5c705684754a83cc81da328b39ad1b80f32bd0f4340e2a810cbab4b0c00e",
@@ -333,7 +344,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": {
@@ -354,11 +364,12 @@
        },
        "importlib-metadata": {
            "hashes": [
-                "sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab",
-                "sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43"
+                "sha256:d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b",
+                "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313"
            ],
            "index": "pypi",
-            "version": "==5.0.0"
+            "markers": "python_version < '3.10'",
+            "version": "==5.1.0"
        },
        "lxml": {
            "hashes": [
@@ -433,7 +444,6 @@
                "sha256:fe17d10b97fdf58155f858606bddb4e037b805a60ae023c009f760d8361a4eb8",
                "sha256:fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"
            ],
-            "index": "pypi",
            "version": "==4.9.1"
        },
        "markdown": {
@@ -504,11 +514,10 @@
        },
        "packaging": {
            "hashes": [
-                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
-                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
+                "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3",
+                "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==21.3"
+            "version": "==22.0"
        },
        "pep517": {
            "hashes": [
@@ -520,84 +529,118 @@
        },
        "pikepdf": {
            "hashes": [
-                "sha256:0fb4e028abc84fba49513c1759b78e2948eebabb23ec33e68f5beec9edc3b1e4",
-                "sha256:169fd0a1d1d15186f0e2ac4d31eba8b7b45a1a0e7c88be5e10358d6edd3387b3",
-                "sha256:178be221e8bee2282a1a36e32007365a959df7efd58cfd1f7139888aceb0afb8",
-                "sha256:18fc6bf7c189138c77f976fbef3f8679dd7a26254e869429879a0943dcfd0775",
-                "sha256:19e25bfa0b7cbb87620dcfaf5e22d235eba675aa0f2bb74acb08ff039cc8a771",
-                "sha256:215e6850c04ccf89aee37288aa34dfea151c5b8bd1e6fc75cd429e5ace2c8bec",
-                "sha256:28309830b84e1392949afe5dc8e02d635531b63ab41f0ed6ec05ca8a8cc384ee",
-                "sha256:28b808dd9cb588c2792b8c3f18e44549e8cf3df637d0a126fc16d7cb9651b704",
-                "sha256:4b14b7e47cb306719a3ade4a2caedf576912a78e569571a9bdae134679e1ad07",
-                "sha256:50dbeca36dc3ba04df3754845faad05c4c6fe35e8515a7ebb9ccdcf6d14672d3",
-                "sha256:55f35903308efc6148e11e7950950da6a188ef73f0c4912f60deb5665c13c3de",
-                "sha256:5b47df6d084a9f35d66f1166afc01588c51c55afcae1e3792f4a1b900fce95ae",
-                "sha256:5c656f518fd1eaf9613d39ad1eb437808494038a4c88fae44f40e1a5f57b32ed",
-                "sha256:6bb2041045aa9f40a47bae436cc24355918e88693db075d7526d194d56c53797",
-                "sha256:7704956b8a36aeb67b11191b7fc17c6918c9aa73a5d2ae5b102fc7f29eee043a",
-                "sha256:7a4240a128c26e44cade7a50c12380f38648db254752876fc8c2fd8921532e57",
-                "sha256:7faf78b668e86cafded3f269bfd602e7af33c1f22c2cad440f3c4a92b76a7254",
-                "sha256:905e5166954161b760c545bbae2bc4438292f1e487cf7c52991fdaef7d75aac6",
-                "sha256:93c258b15a0bbd9f061907bda558b289fbe66821fb2ddce19c8f456ed7c61df3",
-                "sha256:9f0685745f08c1d7d6769e367d14b74817a7fced75c1afca17034f4d6c04c00b",
-                "sha256:a1fd1968de6c2439008673edbc3e47c6a63858bea5d15baddd0c7e77d35eae0f",
-                "sha256:ab52590158b073643a8482105e4927356eef63345ae4e9ba59ba8f951193dd54",
-                "sha256:aeb9a442d384fa37f5e9c6364176b6c661fac9cfd427f7b537ead1a6a660aef1",
-                "sha256:b8b948febcca7b376c2474c83b80b98ea3bdc76d5dd74872c9fa6fb3b66e315c",
-                "sha256:c3acd73ca490cd81ca467eb4d24aa6ba63a7e1b6514e86fe1072388607d7f1ba",
-                "sha256:ddca7062db6fbcf5b7a7d07a031030a219d9eb4a90225c25c53318e2b2dd354d",
-                "sha256:dfa17513abeb5e9a4de4af5fb098fd0bac4708e961424be9750b16cd00af42c5",
-                "sha256:e4d7adb67d3c14f05ce3452d8e212c60ded743bb2977f28a28759dfc499ed3a5",
-                "sha256:e6e548a3a3ec18e790101f984da04f7c968525e1077a072ec8dc4769bbd1fc45",
-                "sha256:f4e0e86b104354eb1b5195bca51a13fb0c390e218f18544cd39d3ba2d07fc26a",
-                "sha256:f75ce310d36fe83aa075c78002c1cdcd1e08be594730d4a6f33b0c86670c637e",
-                "sha256:f80cc66c20b897fc4a4f1f15b8b34a2d20a9a83b421910f0bfacb405af95912a",
-                "sha256:f85231bcbe8a63feb29e42b2437b8e59d92ad9f9bfea294c345bab23e097a401",
-                "sha256:ff2adf043a85bca67ffcd3d235e48ce482f00875e3c54931dd9e98b49615868f"
+                "sha256:08ca2566c3ddcb633bbfb90c9e2b7134f222ab48f642f056c266fd69a4c0844e",
+                "sha256:15eff12d7b5dc4eeeb9fbe5148d5e93cdc9f632a352d7df5191409837cdada6f",
+                "sha256:24717a49cab8cf0ccb360ae38fefe4b09e23d394086ef6da740071165a2542d8",
+                "sha256:2c1a3a1ae0d787a6819ffb9d456b0ccbf2b8d48ad8b0748f765a6a306b92184b",
+                "sha256:2c653bc771cc6065642f5a734ecb771ff16b5412cf05a5c3435072ac01f84fbe",
+                "sha256:2e9c9cc68bc123b88007b321a494ab054c3ce378ee2f77bba1b90c8bdaaad59e",
+                "sha256:32a7775f8b2117e72fa101427edf4526f0886e785146a7bfdf2a877d27f94dbf",
+                "sha256:4675c743ac873d8a1ff9d06c1d5fab15e9ca66aa1abf73fcbca4b86c976b214e",
+                "sha256:4800fd878876d9a780e2d1125e971d680a0de466440bd6bcbc54ac7cfb925fd6",
+                "sha256:5b1271b200ece3e16ffa97c76ff93c057d3676f2ecee89ae52efd5e4804874ab",
+                "sha256:5b1c975d02e75aa8a0e09679ed23f85b6eddf91ac7c85189dc18f1ef8599ce70",
+                "sha256:5b295d9579081ab46ce7bb463eccbc62e0c60cbe546f29c0a9135abd5cf76a24",
+                "sha256:5f040aa7d9327b6d9087848dc8e35d2b8515bf17a04e2bdb20f8c51931810213",
+                "sha256:62d724e37a2f004f63615513d3f877334e679dd43b6c55cdfe9b8af56ff52400",
+                "sha256:6452fa9d10b15bb60b2343b7ac08123e0c5b87f852250538d32bf556f09b8c3a",
+                "sha256:66679ee6b364b3b9659a72697e053554e2f4c231371173745b59114f00a821e5",
+                "sha256:6b21fde29bd006cb0889e05a0407f0825b5650ae22272ba70720fc68a2e44a0e",
+                "sha256:788df6789df19a381976f6644b78a65da92c5d4fd45714682a1cffb0cd3ff410",
+                "sha256:7a6de8d04df3dc4f37ddbdfdbecdb4c3d20d479699260902ec06fa531cbfbae6",
+                "sha256:80a4546f59bb38121c20fc37305a388b8f9d561c6bbcc77a3415afdd8a7ab16d",
+                "sha256:856e527970fa2516858662906173004568a38f95b46ef95c8231c529f3e71581",
+                "sha256:8874d4d38b2da71837352576c5ec10c03b2a7976124b95721564d8c456c9824b",
+                "sha256:913437609c3e5b9109a2fe1100f52bdcead4e56e8c83ca8a9c3b520cd7720016",
+                "sha256:91fd023805733163927ae04b16d48374f04f03f204f2cfa45d442b052314de83",
+                "sha256:9d9fe5e3fbd54a45fe7678c08d24c1e8347a1e48adcb4f32c6c25ef380f056ca",
+                "sha256:a98fcebb4303b8b2f5cde0d56f2406a53e74a9ad4bc1e1bc12bdc2b3dd4def1f",
+                "sha256:aa7d3831fa016634f2ead255717644ba2dddf462117b8558b783ac2ba94583bb",
+                "sha256:ae0ba99841d80107becaec6ed067b63c455f51a9bb83b0e88efd3a098753735b",
+                "sha256:b77e2e134315d25dd004b4ffbd2d5032352da164b21bc3bd92768379610fa2b5",
+                "sha256:c5a2710aacb1fa25edd77feba51dcadf85a9b735f2190e8b45edf0e1e79b5d1d",
+                "sha256:c768e55caf96024218866a5b5f95fdded2ef001b2d5463d1c89e57d07bdab928",
+                "sha256:d55b1d8eb3b17e55682b91c042c48e2d0c67be4c1e30b7e539a82e03977eed29",
+                "sha256:d57a35b3ed3f8ef98aa528d4981d1376ccc1ba64ab937f2ac2ed0aadee1d5911",
+                "sha256:e35110f69406e5b9cf6330d16106877372f6aa955fdc1a920d53babcd6a5ae3d",
+                "sha256:e3ff858d504312ea07519121d3ecdf1b5bc40541f957d2b85d271a2ca6284b70",
+                "sha256:f721cd86d8ddf0624306fcd1fed3e086387fcb2e32baeafbd1ba92a7c40c5563"
            ],
-            "index": "pypi",
-            "version": "==6.2.1"
+            "version": "==6.2.5"
        },
        "pillow": {
            "hashes": [
-                "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97",
-                "sha256:0f29d831e2151e0b7b39981756d201f7108d3d215896212ffe2e992d06bfe049",
-                "sha256:12875d118f21cf35604176872447cdb57b07126750a33748bac15e77f90f1f9c",
-                "sha256:14d4b1341ac07ae07eb2cc682f459bec932a380c3b122f5540432d8977e64eae",
-                "sha256:1c3c33ac69cf059bbb9d1a71eeaba76781b450bc307e2291f8a4764d779a6b28",
-                "sha256:1d19397351f73a88904ad1aee421e800fe4bbcd1aeee6435fb62d0a05ccd1030",
-                "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56",
-                "sha256:2632d0f846b7c7600edf53c48f8f9f1e13e62f66a6dbc15191029d950bfed976",
-                "sha256:335ace1a22325395c4ea88e00ba3dc89ca029bd66bd5a3c382d53e44f0ccd77e",
-                "sha256:413ce0bbf9fc6278b2d63309dfeefe452835e1c78398efb431bab0672fe9274e",
-                "sha256:5100b45a4638e3c00e4d2320d3193bdabb2d75e79793af7c3eb139e4f569f16f",
-                "sha256:514ceac913076feefbeaf89771fd6febde78b0c4c1b23aaeab082c41c694e81b",
-                "sha256:528a2a692c65dd5cafc130de286030af251d2ee0483a5bf50c9348aefe834e8a",
-                "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e",
-                "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa",
-                "sha256:718856856ba31f14f13ba885ff13874be7fefc53984d2832458f12c38205f7f7",
-                "sha256:7f7609a718b177bf171ac93cea9fd2ddc0e03e84d8fa4e887bdfc39671d46b00",
-                "sha256:80ca33961ced9c63358056bd08403ff866512038883e74f3a4bf88ad3eb66838",
-                "sha256:80fe64a6deb6fcfdf7b8386f2cf216d329be6f2781f7d90304351811fb591360",
-                "sha256:81c4b81611e3a3cb30e59b0cf05b888c675f97e3adb2c8672c3154047980726b",
-                "sha256:855c583f268edde09474b081e3ddcd5cf3b20c12f26e0d434e1386cc5d318e7a",
-                "sha256:9bfdb82cdfeccec50aad441afc332faf8606dfa5e8efd18a6692b5d6e79f00fd",
-                "sha256:a5d24e1d674dd9d72c66ad3ea9131322819ff86250b30dc5821cbafcfa0b96b4",
-                "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70",
-                "sha256:b5b3f092fe345c03bca1e0b687dfbb39364b21ebb8ba90e3fa707374b7915204",
-                "sha256:b9618823bd237c0d2575283f2939655f54d51b4527ec3972907a927acbcc5bfc",
-                "sha256:cef9c85ccbe9bee00909758936ea841ef12035296c748aaceee535969e27d31b",
-                "sha256:d21237d0cd37acded35154e29aec853e945950321dd2ffd1a7d86fe686814669",
-                "sha256:d3c5c79ab7dfce6d88f1ba639b77e77a17ea33a01b07b99840d6ed08031cb2a7",
-                "sha256:d9d7942b624b04b895cb95af03a23407f17646815495ce4547f0e60e0b06f58e",
-                "sha256:db6d9fac65bd08cea7f3540b899977c6dee9edad959fa4eaf305940d9cbd861c",
-                "sha256:ede5af4a2702444a832a800b8eb7f0a7a1c0eed55b644642e049c98d589e5092",
-                "sha256:effb7749713d5317478bb3acb3f81d9d7c7f86726d41c1facca068a04cf5bb4c",
-                "sha256:f154d173286a5d1863637a7dcd8c3437bb557520b01bddb0be0258dcb72696b5",
-                "sha256:f25ed6e28ddf50de7e7ea99d7a976d6a9c415f03adcaac9c41ff6ff41b6d86ac"
+                "sha256:03150abd92771742d4a8cd6f2fa6246d847dcd2e332a18d0c15cc75bf6703040",
+                "sha256:073adb2ae23431d3b9bcbcff3fe698b62ed47211d0716b067385538a1b0f28b8",
+                "sha256:0b07fffc13f474264c336298d1b4ce01d9c5a011415b79d4ee5527bb69ae6f65",
+                "sha256:0b7257127d646ff8676ec8a15520013a698d1fdc48bc2a79ba4e53df792526f2",
+                "sha256:12ce4932caf2ddf3e41d17fc9c02d67126935a44b86df6a206cf0d7161548627",
+                "sha256:15c42fb9dea42465dfd902fb0ecf584b8848ceb28b41ee2b58f866411be33f07",
+                "sha256:18498994b29e1cf86d505edcb7edbe814d133d2232d256db8c7a8ceb34d18cef",
+                "sha256:1c7c8ae3864846fc95f4611c78129301e203aaa2af813b703c55d10cc1628535",
+                "sha256:22b012ea2d065fd163ca096f4e37e47cd8b59cf4b0fd47bfca6abb93df70b34c",
+                "sha256:276a5ca930c913f714e372b2591a22c4bd3b81a418c0f6635ba832daec1cbcfc",
+                "sha256:2e0918e03aa0c72ea56edbb00d4d664294815aa11291a11504a377ea018330d3",
+                "sha256:3033fbe1feb1b59394615a1cafaee85e49d01b51d54de0cbf6aa8e64182518a1",
+                "sha256:3168434d303babf495d4ba58fc22d6604f6e2afb97adc6a423e917dab828939c",
+                "sha256:32a44128c4bdca7f31de5be641187367fe2a450ad83b833ef78910397db491aa",
+                "sha256:3dd6caf940756101205dffc5367babf288a30043d35f80936f9bfb37f8355b32",
+                "sha256:40e1ce476a7804b0fb74bcfa80b0a2206ea6a882938eaba917f7a0f004b42502",
+                "sha256:41e0051336807468be450d52b8edd12ac60bebaa97fe10c8b660f116e50b30e4",
+                "sha256:4390e9ce199fc1951fcfa65795f239a8a4944117b5935a9317fb320e7767b40f",
+                "sha256:502526a2cbfa431d9fc2a079bdd9061a2397b842bb6bc4239bb176da00993812",
+                "sha256:51e0e543a33ed92db9f5ef69a0356e0b1a7a6b6a71b80df99f1d181ae5875636",
+                "sha256:57751894f6618fd4308ed8e0c36c333e2f5469744c34729a27532b3db106ee20",
+                "sha256:5d77adcd56a42d00cc1be30843d3426aa4e660cab4a61021dc84467123f7a00c",
+                "sha256:655a83b0058ba47c7c52e4e2df5ecf484c1b0b0349805896dd350cbc416bdd91",
+                "sha256:68943d632f1f9e3dce98908e873b3a090f6cba1cbb1b892a9e8d97c938871fbe",
+                "sha256:6c738585d7a9961d8c2821a1eb3dcb978d14e238be3d70f0a706f7fa9316946b",
+                "sha256:73bd195e43f3fadecfc50c682f5055ec32ee2c933243cafbfdec69ab1aa87cad",
+                "sha256:772a91fc0e03eaf922c63badeca75e91baa80fe2f5f87bdaed4280662aad25c9",
+                "sha256:77ec3e7be99629898c9a6d24a09de089fa5356ee408cdffffe62d67bb75fdd72",
+                "sha256:7db8b751ad307d7cf238f02101e8e36a128a6cb199326e867d1398067381bff4",
+                "sha256:801ec82e4188e935c7f5e22e006d01611d6b41661bba9fe45b60e7ac1a8f84de",
+                "sha256:82409ffe29d70fd733ff3c1025a602abb3e67405d41b9403b00b01debc4c9a29",
+                "sha256:828989c45c245518065a110434246c44a56a8b2b2f6347d1409c787e6e4651ee",
+                "sha256:829f97c8e258593b9daa80638aee3789b7df9da5cf1336035016d76f03b8860c",
+                "sha256:871b72c3643e516db4ecf20efe735deb27fe30ca17800e661d769faab45a18d7",
+                "sha256:89dca0ce00a2b49024df6325925555d406b14aa3efc2f752dbb5940c52c56b11",
+                "sha256:90fb88843d3902fe7c9586d439d1e8c05258f41da473952aa8b328d8b907498c",
+                "sha256:97aabc5c50312afa5e0a2b07c17d4ac5e865b250986f8afe2b02d772567a380c",
+                "sha256:9aaa107275d8527e9d6e7670b64aabaaa36e5b6bd71a1015ddd21da0d4e06448",
+                "sha256:9f47eabcd2ded7698106b05c2c338672d16a6f2a485e74481f524e2a23c2794b",
+                "sha256:a0a06a052c5f37b4ed81c613a455a81f9a3a69429b4fd7bb913c3fa98abefc20",
+                "sha256:ab388aaa3f6ce52ac1cb8e122c4bd46657c15905904b3120a6248b5b8b0bc228",
+                "sha256:ad58d27a5b0262c0c19b47d54c5802db9b34d38bbf886665b626aff83c74bacd",
+                "sha256:ae5331c23ce118c53b172fa64a4c037eb83c9165aba3a7ba9ddd3ec9fa64a699",
+                "sha256:af0372acb5d3598f36ec0914deed2a63f6bcdb7b606da04dc19a88d31bf0c05b",
+                "sha256:afa4107d1b306cdf8953edde0534562607fe8811b6c4d9a486298ad31de733b2",
+                "sha256:b03ae6f1a1878233ac620c98f3459f79fd77c7e3c2b20d460284e1fb370557d4",
+                "sha256:b0915e734b33a474d76c28e07292f196cdf2a590a0d25bcc06e64e545f2d146c",
+                "sha256:b4012d06c846dc2b80651b120e2cdd787b013deb39c09f407727ba90015c684f",
+                "sha256:b472b5ea442148d1c3e2209f20f1e0bb0eb556538690fa70b5e1f79fa0ba8dc2",
+                "sha256:b59430236b8e58840a0dfb4099a0e8717ffb779c952426a69ae435ca1f57210c",
+                "sha256:b90f7616ea170e92820775ed47e136208e04c967271c9ef615b6fbd08d9af0e3",
+                "sha256:b9a65733d103311331875c1dca05cb4606997fd33d6acfed695b1232ba1df193",
+                "sha256:bac18ab8d2d1e6b4ce25e3424f709aceef668347db8637c2296bcf41acb7cf48",
+                "sha256:bca31dd6014cb8b0b2db1e46081b0ca7d936f856da3b39744aef499db5d84d02",
+                "sha256:be55f8457cd1eac957af0c3f5ece7bc3f033f89b114ef30f710882717670b2a8",
+                "sha256:c7025dce65566eb6e89f56c9509d4f628fddcedb131d9465cacd3d8bac337e7e",
+                "sha256:c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f",
+                "sha256:dbb8e7f2abee51cef77673be97760abff1674ed32847ce04b4af90f610144c7b",
+                "sha256:e6ea6b856a74d560d9326c0f5895ef8050126acfdc7ca08ad703eb0081e82b74",
+                "sha256:ebf2029c1f464c59b8bdbe5143c79fa2045a581ac53679733d3a91d400ff9efb",
+                "sha256:f1ff2ee69f10f13a9596480335f406dd1f70c3650349e2be67ca3139280cade0"
            ],
            "index": "pypi",
-            "version": "==9.0.1"
+            "version": "==9.3.0"
+        },
+        "pluggy": {
+            "hashes": [
+                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
+                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
+            ],
+            "version": "==1.0.0"
        },
        "premailer": {
            "hashes": [
@@ -693,6 +736,14 @@
            "index": "pypi",
            "version": "==1.27.12"
        },
+        "pypom": {
+            "hashes": [
+                "sha256:5da52cf447e62f43a0cfa47dfe52eb822eff07b2fdad759f930d1d227c15220b",
+                "sha256:8b4dc6d1a24580298bf5ad8ad6c586f33b73c326c10a4419f83aee1abb20077d"
+            ],
+            "index": "pypi",
+            "version": "==2.2.4"
+        },
        "python-barcode": {
            "hashes": [
                "sha256:241b34aa5c5cb6a9889882f9409b0182903a2c5d19b4218be3609cdbbd5ffdf9",
@@ -727,45 +778,54 @@
        },
        "reportlab": {
            "hashes": [
-                "sha256:03501aa3cffb93ec35ca01d66a70d38090e88080b16eb4efb015a0fdc94a48c9",
-                "sha256:04fc4420f0548815d0623e031c86a1f7f3f3003e699d9af7148742e2d72b024a",
-                "sha256:06a9a9b04083529e4204e0c0f4574b7795cc8364a49e66dac25d94588fdaf24a",
-                "sha256:32b3e10acdbbd2b91a8bb94134ed011af8e5c32ef5fe69f5481f83bbc89fd40e",
-                "sha256:384e51906d710cec7721ee4f074bc59131dbed9ef3b8e45408432caa752c1d5d",
-                "sha256:3e53e8222afc535cfdad3d73786c570ec6567b48e3e09bfadca606b170f3f46d",
-                "sha256:456b9e245dacfa0f676f2864b8981a61bb50aa3fe690fe54885dc41b2b2b402c",
-                "sha256:4c183a28a44bc03c0ab825fceab4a07a8b36d7f67a208dcf9e561dc4e343aec9",
-                "sha256:4e97028ea070199955cb50dd1e321177f7fd2fefe89fb328d016e510d60bfc9e",
-                "sha256:5104000c1f84066c452022316faecb7382eae23a878547cacfa6511f9fddfe02",
-                "sha256:55df316e227f876e88ba5979c2456e3be47988056e0053d1139f9fbaff968d24",
-                "sha256:60bcdefa9246e9dd26708d53fe4a51dcef74f9a387b8daa557804adf856a4fd5",
-                "sha256:689ecf2eea098afb4bba39c97994c6e9ab65a1cf8e5ca7f897942f8692af9932",
-                "sha256:68d118d8f4dabfde284237901a24b22e7827695cc74c8184b57828eb10e28090",
-                "sha256:74ca4e4221bb68403753a595a9d24899b2a559d42fd573d00d8884e6a54d0ba1",
-                "sha256:89c9ba175f72a2fd91836c414a09f91459f2e53b648f69300de6f8e0709a2de2",
-                "sha256:89f486c48a06655a7aec92b593be60f70d4cfed0b205038acc0c3263df3d8b4a",
-                "sha256:8e4d4133a2be465aae0826ae8e11319e6411e3119d16b4d6f40079fa89835c43",
-                "sha256:93864be3ae1dabfa66607734113cc08ac9f839e2b49632df60ede1f0893864ee",
-                "sha256:a62a856d5c6168f07d2c18e725f577bda5d4bbd4bf535d5c7c99d03b335effe1",
-                "sha256:a71f6f231e94f2e543a255aa98bf8db2936f7b132be456c70ccf3c98cd60c160",
-                "sha256:abb5d98541fc89c0d94627d82c83bdd464120c3422333e0f9f37a236ca1c44c8",
-                "sha256:ad2d649197971c52a8c074739b3aae3cf3db99971561a371a54d429c19a49050",
-                "sha256:b36e27adeb36fcf2854f8d9951e5e99fa655b4f03d2d15ba321bae42d65e2535",
-                "sha256:b5f30124b0f5dab69fa56d12b94a50656f030e547bb09ab03936fd8708f04afc",
-                "sha256:b6450ebf6fbbe826dd4e4837e7cc906a256e1383883ef21a143a5d39c7ce35cc",
-                "sha256:b6d8979e7769cb860dfffd8d1c303501fea4820f592b5e6836cba1b64aa82f10",
-                "sha256:c3988595e57c114c2cc93dd21b08f917c3d868bf57fd52bbb20008e3c26f023e",
-                "sha256:c3a4bdb586e6649bd2b7d452b79c09a819bcb848ac408f1f4b00155c91469ffd",
-                "sha256:c3d774f1d522579398ebfb5ad9129cc4a409c35a14f412e1ae20c0a7d42561f0",
-                "sha256:c894990d87b0c8eae1f60a747c5180f9abcc525f1c71435cbdcb1f5ee420d675",
-                "sha256:ca40c72a6c07ebd35a1b85d8cb3069b43587a589fe2ff2d16e33ea53b1ffe40f",
-                "sha256:cf0e362917ca2c00627828fce077fe364b7e0f70e795fb98e97c8befe8f96289",
-                "sha256:ea3dc427b6be0eb0966732e9e30bccec1c8b395aba0484430bc72d811a9e84ea",
-                "sha256:f73970f8c4ccb2c32cf350f1b86171af27ed7df79dc0cc529875bc40610b6bbd",
-                "sha256:fe5c2fcbe8f130c8913dad56d2513afb809491ad8a17b5c49b3951cfa070d4a3"
+                "sha256:07fdd968df7941c2bfb67b9bb4532f424992dfafc71b72a4e4b291ff707e6b0e",
+                "sha256:090ea99ff829d918f7b6140594373b1340a34e1e6876eddae5aa06662ec10d64",
+                "sha256:109009b02fc225882ea766a5ed8be0ef473fa1356e252a3f651a6aa89b4a195f",
+                "sha256:1dd0307b2b13b0482ac8314fd793fbbce263a428b189371addf0466784e1d597",
+                "sha256:236a6483210049205f6180d7a7595d0ca2e4ce343d83cc94ca719a4145809c6f",
+                "sha256:26c25ea4afa8b92a2c14f4edc41c8fc30505745ce84cae86538e80cacadd7ae2",
+                "sha256:2a0bc7a1d64fe754b62e175ba0cf47a630b529c0488ec9ac4e4c7655e295ea4d",
+                "sha256:2c9b0861d8f40d7a24b094b8834f6a489b9e8c70bceaa7fa98237eed229671ce",
+                "sha256:39e92fa4ab2a8f0f2cc051d9c1e3acb881340c07ef59c0c8b627861343d653c0",
+                "sha256:3a62e51a4a47616896bd0f1e9cc3fbfb174b713794a5031a34b84f69dbe01775",
+                "sha256:3fd1ffdd5204301eb4c290a5752ac62f44d2d0b262e02e35a1e5234c13e14662",
+                "sha256:498b4ec7e73426de64c6bf6ec03c5b3f10dedf5db8a9e13fdf195f95a3d065aa",
+                "sha256:4c599645af9b5b2241a23e977a82c965a59c24cd94b2600b8d34373c66cad763",
+                "sha256:4fa3cdf490f3828b055381e8c7dc7819b3e5f7a442d7af7a8f90e9806a7fff51",
+                "sha256:55a070206580e161b6bbe1a96abf816c18d4c2c225d49916654714c93d842835",
+                "sha256:666bdba4958b348460a765c48b8c0640e7085540846ed9494f47d8651604b33c",
+                "sha256:69f41295d696c822224334f0994f1f107df7efed72211d45a1118696f1427c84",
+                "sha256:6dfcf7bd6db5d80711cbbd0996b6e7a79cc414ca81457960367df11d2860f92a",
+                "sha256:71cf73f9907c444ef663ea653dbac24af07c307079572c3ff8f20ad1463af3b7",
+                "sha256:72ec333f089b4fce5a6d740ed0a1963a3994146be195722da0d8e14d4a7e1600",
+                "sha256:759495c2b8c15cb0d6b539c246896029e4cde42a896c3956f77e311c5f6b0807",
+                "sha256:7a7c3369fa618eca79f9554ce06c618a5e738e592d61d96aa09b2457ca3ea410",
+                "sha256:8b1215facead57cc5325aef4229ef886e85d270b2ba02080fb5809ce9d2b81b4",
+                "sha256:907f7cd4832bb295d0c1573de15cc5aab5988282caf2ee7a2b1276fb6cdf502b",
+                "sha256:93e229519d046491b798f2c12dbbf2f3e237e89589aa5cbb5e1d8c1a978816db",
+                "sha256:a12049314497d872f6788f811e2b331654db207937f8a2fb34ff3e3cd9897faa",
+                "sha256:a8dddc52e0e486291be0ad39184da0607fae9cc665fdba1881211de9cfc0b332",
+                "sha256:adf78ccb2defad5b6ecb2e2e9f2a672719b0a8e2278592a7d77f6c220a042388",
+                "sha256:b13cebf4e397bba14542bcd023338b6ff2c151a3a12aabca89eecbf972cb361a",
+                "sha256:b3648f3c340b6b6aabf9352341478c708cee6f00c5cd5c902311fcf4ce870f3c",
+                "sha256:b6a1b685da0b9a8000bb980e02d9d5be202d0cc539af113b661c76c051fca6f1",
+                "sha256:b777ddc57b2d3366cbc540616034cdc1089ca0a31fefc907028e1dd62a6bf16c",
+                "sha256:bb83df8f7840321d34cb5b24c972c617a8c1716c8a36e5050fff56adf5891b8c",
+                "sha256:c07ec796a2a5d44bf787f2b623b6e668a389b0cafb78af34cf74554ff3bc532b",
+                "sha256:c40e108072379ff83dd7442159ebc249d12eb8eec15b70614953fecd2c403792",
+                "sha256:c4863c49602722237e35cbce5aa91af4539cc63a671f59504d2b3f3767d898cf",
+                "sha256:c56d701f7dc662e1d3d7fe364e66fa1339eafce54a488c2d16ec0ea49dc213c2",
+                "sha256:c84afd5bef6e407c80ba9f99b6abbe3ea78e8243b0f19897a871a7bcad1f749d",
+                "sha256:cdd206883e999278d2af656f988dfcc89eb0c175ce6d75e87b713cf1e792c0c4",
+                "sha256:ce85a204f46c871c8af6fa64b9bbed165456935c1d0bfb2f570a3194f6723ddb",
+                "sha256:cee3b6ebef5e4a8654ec5f0effeb1a2bb157ad87b0ac856871d25a805c0f2f90",
+                "sha256:d4cecfb48a6cfbfe2caf0fc280cecea999699e63bc98cb02254bd87b39eff677",
+                "sha256:db62bed0774778fdf82c609cb9efd0062f2fdcd285be527d01f6be9fd9755888",
+                "sha256:f51dcb39e910a853749250c0f82aced80bca3f7315e9c4ee14349eb7cab6a3f8",
+                "sha256:f5808e1dac6b66c109d6205ce2aebf84bb89e1a1493b7e6df38932df5ebfb9cf"
            ],
            "index": "pypi",
-            "version": "==3.6.11"
+            "version": "==3.6.12"
        },
        "requests": {
            "hashes": [
@@ -777,18 +837,27 @@
        },
        "retrying": {
            "hashes": [
-                "sha256:08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b"
+                "sha256:345da8c5765bd982b1d1915deb9102fd3d1f7ad16bd84a9700b85f64d24e8f3e",
+                "sha256:8cc4d43cb8e1125e0ff3344e9de678fefd85db3b750b81b2240dc0183af37b35"
            ],
            "index": "pypi",
-            "version": "==1.3.3"
+            "version": "==1.3.4"
+        },
+        "selenium": {
+            "hashes": [
+                "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c",
+                "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d"
+            ],
+            "index": "pypi",
+            "version": "==3.141.0"
        },
        "sentry-sdk": {
            "hashes": [
-                "sha256:2469240f6190aaebcb453033519eae69cfe8cc602065b4667e18ee14fc1e35dc",
-                "sha256:4fbace9a763285b608c06f01a807b51acb35f6059da6a01236654e08b0ee81ff"
+                "sha256:675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9",
+                "sha256:8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c"
            ],
            "index": "pypi",
-            "version": "==1.9.10"
+            "version": "==1.11.1"
        },
        "simplejson": {
            "hashes": [
@@ -871,6 +940,7 @@
                "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"
            ],
            "index": "pypi",
+            "markers": "python_version >= '3.0'",
            "version": "==2.3.2.post1"
        },
        "sqlparse": {
@@ -908,7 +978,6 @@
                "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": {
@@ -930,11 +999,11 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e",
-                "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"
+                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
+                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
            ],
            "index": "pypi",
-            "version": "==1.26.12"
+            "version": "==1.26.13"
        },
        "webencodings": {
            "hashes": [
@@ -1166,34 +1235,35 @@
        }
    },
    "develop": {
+        "async-generator": {
+            "hashes": [
+                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
+                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
+            ],
+            "version": "==1.10"
+        },
        "attrs": {
            "hashes": [
                "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6",
                "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"
            ],
-            "markers": "python_version >= '3.5'",
            "version": "==22.1.0"
        },
        "certifi": {
            "hashes": [
-                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
-                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
+                "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3",
+                "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
            ],
-            "index": "pypi",
-            "version": "==2022.9.24"
+            "version": "==2022.12.7"
        },
        "charset-normalizer": {
            "hashes": [
                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
            ],
-            "markers": "python_version >= '3.6'",
            "version": "==2.1.1"
        },
        "coverage": {
-            "extras": [
-                "toml"
-            ],
            "hashes": [
                "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79",
                "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a",
@@ -1246,7 +1316,6 @@
                "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84",
                "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==6.5.0"
        },
        "coveralls": {
@@ -1259,11 +1328,11 @@
        },
        "django-coverage-plugin": {
            "hashes": [
-                "sha256:e73231e3bfddb2ac836fd43cb0e6ec2ab3a97457b1d9ca2468085e506beb7935",
-                "sha256:fd888f2ff41e3410a004d799b198cf8b19694d692a2d2264e8c944b9321bedc3"
+                "sha256:245ecd6e91e5be7a66e0f811fd57091c46b55c0eb85c7fe1a1e4aebca9842a5f",
+                "sha256:c063d8d49ba2da30fe95d91cf3f0f9f659b55c3f80d4a029d619b2b3144b1206"
            ],
            "index": "pypi",
-            "version": "==2.0.3"
+            "version": "==3.0.0"
        },
        "docopt": {
            "hashes": [
@@ -1271,14 +1340,28 @@
            ],
            "version": "==0.6.2"
        },
+        "exceptiongroup": {
+            "hashes": [
+                "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828",
+                "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"
+            ],
+            "markers": "python_version < '3.11'",
+            "version": "==1.0.4"
+        },
        "execnet": {
            "hashes": [
                "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": {
+            "hashes": [
+                "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
+                "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
+            ],
+            "version": "==0.14.0"
+        },
        "idna": {
            "hashes": [
                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
@@ -1294,20 +1377,25 @@
            ],
            "version": "==1.1.1"
        },
+        "outcome": {
+            "hashes": [
+                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
+                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
+            ],
+            "version": "==1.2.0"
+        },
        "packaging": {
            "hashes": [
-                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
-                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
+                "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3",
+                "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==21.3"
+            "version": "==22.0"
        },
        "pluggy": {
            "hashes": [
                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
            ],
-            "index": "pypi",
            "version": "==1.0.0"
        },
        "psutil": {
@@ -1344,14 +1432,6 @@
            "index": "pypi",
            "version": "==5.8.0"
        },
-        "py": {
-            "hashes": [
-                "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719",
-                "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==1.11.0"
-        },
        "pycodestyle": {
            "hashes": [
                "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785",
@@ -1360,18 +1440,7 @@
            "index": "pypi",
            "version": "==2.9.1"
        },
-        "pyparsing": {
-            "hashes": [
-                "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
-                "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
-            ],
-            "index": "pypi",
-            "version": "==2.4.7"
-        },
        "pypom": {
-            "extras": [
-                "splinter"
-            ],
            "hashes": [
                "sha256:5da52cf447e62f43a0cfa47dfe52eb822eff07b2fdad759f930d1d227c15220b",
                "sha256:8b4dc6d1a24580298bf5ad8ad6c586f33b73c326c10a4419f83aee1abb20077d"
@@ -1379,13 +1448,21 @@
            "index": "pypi",
            "version": "==2.2.4"
        },
+        "pysocks": {
+            "hashes": [
+                "sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299",
+                "sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5",
+                "sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
+            ],
+            "version": "==1.7.1"
+        },
        "pytest": {
            "hashes": [
-                "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7",
-                "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"
+                "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71",
+                "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"
            ],
            "index": "pypi",
-            "version": "==7.1.3"
+            "version": "==7.2.0"
        },
        "pytest-cov": {
            "hashes": [
@@ -1403,14 +1480,6 @@
            "index": "pypi",
            "version": "==4.5.2"
        },
-        "pytest-forked": {
-            "hashes": [
-                "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e",
-                "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.4.0"
-        },
        "pytest-reverse": {
            "hashes": [
                "sha256:71952dbcc09d0bbed88af33dab2d540298325cc6193a00b4bb037f380041d680",
@@ -1428,15 +1497,12 @@
            "version": "==3.3.2"
        },
        "pytest-xdist": {
-            "extras": [
-                "psutil"
-            ],
            "hashes": [
-                "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf",
-                "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"
+                "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c",
+                "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"
            ],
            "index": "pypi",
-            "version": "==2.5.0"
+            "version": "==3.1.0"
        },
        "requests": {
            "hashes": [
@@ -1454,13 +1520,19 @@
            "index": "pypi",
            "version": "==3.141.0"
        },
-        "six": {
+        "sniffio": {
            "hashes": [
-                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+                "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101",
+                "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"
            ],
-            "index": "pypi",
-            "version": "==1.15.0"
+            "version": "==1.3.0"
+        },
+        "sortedcontainers": {
+            "hashes": [
+                "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88",
+                "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"
+            ],
+            "version": "==2.4.0"
        },
        "splinter": {
            "hashes": [
@@ -1474,16 +1546,37 @@
                "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
                "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
            ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_version < '3.11'",
            "version": "==2.0.1"
        },
+        "trio": {
+            "hashes": [
+                "sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf",
+                "sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0"
+            ],
+            "version": "==0.22.0"
+        },
+        "trio-websocket": {
+            "hashes": [
+                "sha256:5b558f6e83cc20a37c3b61202476c5295d1addf57bd65543364e0337e37ed2bc",
+                "sha256:a3d34de8fac26023eee701ed1e7bf4da9a8326b61a62934ec9e53b64970fd8fe"
+            ],
+            "version": "==0.9.2"
+        },
        "urllib3": {
            "hashes": [
-                "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e",
-                "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"
+                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
+                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
            ],
            "index": "pypi",
-            "version": "==1.26.12"
+            "version": "==1.26.13"
+        },
+        "wsproto": {
+            "hashes": [
+                "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
+                "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
+            ],
+            "version": "==1.2.0"
        },
        "zope.component": {
            "hashes": [
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -42,8 +42,9 @@ if not DEBUG:

 INTERNAL_IPS = ['127.0.0.1']

-ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'),
-          ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
+DOMAIN = env('DOMAIN', default='example.com')
+
+ADMINS = [('IT Manager', f'it@{DOMAIN}'), ('Arona Jones', f'arona.jones@{DOMAIN}')]
 if DEBUG:
    ADMINS.append(('Testing Superuser', 'superuser@example.com'))

--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -233,7 +233,7 @@ class EventChecklistForm(forms.ModelForm):
        for key in vehicles:
            pk = int(key.split('_')[1])
            driver_key = 'driver_' + str(pk)
-            if(self.data[driver_key] == ''):
+            if (self.data[driver_key] == ''):
                raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
            else:
                try:
--- a/RIGS/management/commands/send_reminders.py
+++ b/RIGS/management/commands/send_reminders.py
@@ -0,0 +1,38 @@
+import premailer
+import datetime
+
+from django.template.loader import get_template
+from django.contrib.staticfiles import finders
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+from django.core.mail import EmailMultiAlternatives
+from django.utils import timezone
+from django.urls import reverse
+
+from RIGS import models
+
+
+class Command(BaseCommand):
+    help = 'Sends email reminders as required. Triggered daily through heroku-scheduler in production.'
+
+    def handle(self, *args, **options):
+        events = models.Event.objects.current_events().select_related('riskassessment')
+        for event in events:
+            earliest_time = event.earliest_time if isinstance(event.earliest_time, datetime.datetime) else timezone.make_aware(datetime.datetime.combine(event.earliest_time, datetime.time(00, 00)))
+            # 48 hours = 172800 seconds
+            if event.is_rig and not event.cancelled and not event.dry_hire and (earliest_time - timezone.now()).total_seconds() <= 172800 and not hasattr(event, 'riskassessment'):
+                context = {
+                    "event": event,
+                    "url": "https://" + settings.DOMAIN + reverse('event_ra', kwargs={'pk': event.pk})
+                }
+                target = event.mic.email if event.mic else f"productions@{settings.DOMAIN}"
+                msg = EmailMultiAlternatives(
+                    f"{event} - Risk Assessment Incomplete",
+                    get_template("email/ra_reminder.txt").render(context),
+                    to=[target],
+                    reply_to=[f"h.s.manager@{settings.DOMAIN}"],
+                )
+                css = finders.find('css/email.css')
+                html = premailer.Premailer(get_template("email/ra_reminder.html").render(context), external_styles=css).transform()
+                msg.attach_alternative(html, 'text/html')
+                msg.send()
--- a/RIGS/migrations/0045_alter_profile_is_approved.py
+++ b/RIGS/migrations/0045_alter_profile_is_approved.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-10-20 23:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0044_profile_is_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='is_approved',
+            field=models.BooleanField(default=False, help_text='Designates whether a staff member has approved this user.', verbose_name='Approval Status'),
+        ),
+    ]
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -36,7 +36,7 @@ class Profile(AbstractUser):
    initials = models.CharField(max_length=5, null=True, blank=False)
    phone = models.CharField(max_length=13, blank=True, default='')
    api_key = models.CharField(max_length=40, blank=True, editable=False, default='')
-    is_approved = models.BooleanField(default=False)
+    is_approved = models.BooleanField(default=False, verbose_name="Approval Status", help_text="Designates whether a staff member has approved this user.")
    # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
    last_emailed = models.DateTimeField(blank=True, null=True)
    dark_theme = models.BooleanField(default=False)
@@ -390,17 +390,29 @@ class BaseEvent(models.Model, RevisionMixin):
        else:
            return endDate

+    @property
+    def length(self):
+        start = self.earliest_time
+        if isinstance(self.earliest_time, datetime.datetime):
+            start = self.earliest_time.date()
+        end = self.latest_time
+        if isinstance(self.latest_time, datetime.datetime):
+            end = self.latest_time.date()
+        return (end - start).days
+
    def clean(self):
        errdict = {}
        if self.end_date and self.start_date > self.end_date:
-            errdict['end_date'] = ['Unless you\'ve invented time travel, the event can\'t finish before it has started.']
+            errdict['end_date'] = ["Unless you've invented time travel, the event can't finish before it has started."]

        startEndSameDay = not self.end_date or self.end_date == self.start_date
        hasStartAndEnd = self.has_start_time and self.has_end_time
        if startEndSameDay and hasStartAndEnd and self.start_time > self.end_time:
-            errdict['end_time'] = ['Unless you\'ve invented time travel, the event can\'t finish before it has started.']
+            errdict['end_time'] = ["Unless you've invented time travel, the event can't finish before it has started."]
        return errdict

+    def __str__(self):
+        return f"{self.display_id}: {self.name}"

@reversion.register(follow=['items'])
 class Event(BaseEvent):
@@ -497,18 +509,34 @@ class Event(BaseEvent):

    @property
    def authorised(self):
-        if self.internal:
+        if self.internal and hasattr(self, 'authorisation'):
            return self.authorisation.amount == self.total
        else:
            return bool(self.purchase_order)

+    @property
+    def color(self):
+        if self.cancelled:
+            return "secondary"
+        elif not self.is_rig:
+            return "info"
+        elif not self.mic:
+            return "danger"
+        elif self.confirmed and self.authorised:
+            if self.dry_hire or self.riskassessment:
+               return "success"
+            else:
+                return "warning"
+        else:
+            return "warning"
+
    objects = EventManager()

    def get_absolute_url(self):
        return reverse('event_detail', kwargs={'pk': self.pk})

-    def __str__(self):
-        return f"{self.display_id}: {self.name}"
+    def get_edit_url(self):
+        return reverse('event_update', kwargs={'pk': self.pk})

    def clean(self):
        errdict = super.clean()
@@ -572,15 +600,43 @@ class EventAuthorisation(models.Model, RevisionMixin):
        return f"{self.event.display_id} (requested by {self.sent_by.initials})"


+class SubhireManager(models.Manager):
+    def current_events(self):
+        events = self.filter(
+            (models.Q(start_date__gte=timezone.now(), end_date__isnull=True) & ~models.Q(
+                status=Event.CANCELLED)) |  # Starts after with no end
+            (models.Q(end_date__gte=timezone.now().date()) & ~models.Q(
+                status=Event.CANCELLED))  # Ends after
+        ).order_by('start_date', 'end_date', 'start_time', 'end_time').select_related('person', 'organisation')
+
+        return events
+
+
@reversion.register
 class Subhire(BaseEvent):
    insurance_value = models.DecimalField(max_digits=10, decimal_places=2) # TODO Validate if this is over notifiable threshold
    events = models.ManyToManyField(Event)

+    objects = SubhireManager()
+
    @property
    def display_id(self):
        return f"S{self.pk:05d}"

+    @property
+    def color(self):
+        return "purple"
+
+    def get_edit_url(self):
+        return reverse('subhire_update', kwargs={'pk': self.pk})
+
+    def get_absolute_url(self):
+        return reverse('subhire_detail', kwargs={'pk': self.pk})
+
+    @property
+    def earliest_time(self):
+        return find_earliest_event_time(self, [])
+

 class InvoiceManager(models.Manager):
    def outstanding_invoices(self):
--- a/RIGS/signals.py
+++ b/RIGS/signals.py
@@ -58,13 +58,13 @@ def send_eventauthorisation_success_email(instance):

    client_email = EmailMultiAlternatives(
        subject,
-        get_template("eventauthorisation_client_success.txt").render(context),
+        get_template("email/eventauthorisation_client_success.txt").render(context),
        to=[instance.email],
        reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
    )

    css = finders.find('css/email.css')
-    html = Premailer(get_template("eventauthorisation_client_success.html").render(context),
+    html = Premailer(get_template("email/eventauthorisation_client_success.html").render(context),
                     external_styles=css).transform()
    client_email.attach_alternative(html, 'text/html')

@@ -82,7 +82,7 @@ def send_eventauthorisation_success_email(instance):

    mic_email = EmailMessage(
        subject,
-        get_template("eventauthorisation_mic_success.txt").render(context),
+        get_template("email/eventauthorisation_mic_success.txt").render(context),
        to=[mic_email_address]
    )

@@ -117,12 +117,12 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):

            email = EmailMultiAlternatives(
                f"{context['number_of_users']} new users awaiting approval on RIGS",
-                get_template("admin_awaiting_approval.txt").render(context),
+                get_template("email/admin_awaiting_approval.txt").render(context),
                to=[admin.email],
                reply_to=[user.email],
            )
            css = finders.find('css/email.css')
-            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
+            html = Premailer(get_template("email/admin_awaiting_approval.html").render(context),
                             external_styles=css).transform()
            email.attach_alternative(html, 'text/html')
            email.send()
--- a/RIGS/templates/base_print.xml
+++ b/RIGS/templates/base_print.xml
@@ -84,7 +84,7 @@
                   bulletFontSize="10"/>
    </stylesheet>

-    <template > {# Note: page is 595x842 points (1 point=1/72in) #}
+    <template title="{{filename}}"> {# Note: page is 595x842 points (1 point=1/72in) #}
            <pageTemplate id="Headed" >
                <pageGraphics>
                    <image file="static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>
--- a/RIGS/templates/calendar.html
+++ b/RIGS/templates/calendar.html
@@ -1,197 +1,131 @@
 {% extends 'base_rigs.html' %}
 {% load static %}

-{% block title %}Calendar{% endblock %}
-
-{% block css %}
-<link href="{% static 'css/main.css' %}" rel='stylesheet' />
-{% endblock %}
-
 {% block js %}
-    <script src="{% static 'js/moment.js' %}"></script>
-    <script src="{% static 'js/main.js' %}"></script>
-    <script>
-        viewToUrl = {
-            'timeGridWeek':'week',
-            'timeGridDay':'day',
-            'dayGridMonth':'month'
-        }
-        viewFromUrl = {
-            'week':'timeGridWeek',
-            'day':'timeGridDay',
-            'month':'dayGridMonth'
-        }
-        var calendar; //Need to access it from jquery ready
-        document.addEventListener('DOMContentLoaded', function() {
-            var calendarEl = document.getElementById('calendar');
-
-            calendar = new FullCalendar.Calendar(calendarEl, {
-              themeSystem: 'bootstrap',
-              aspectRatio: 1.5,
-              eventTimeFormat: {
-                'hour': '2-digit',
-                'minute': '2-digit',
-                'hour12': false
-              },
-              headerToolbar: false,
-              editable: false,
-              dayMaxEventRows: true, // allow "more" link when too many events
-              events: function(fetchInfo, successCallback, failureCallback) {
-                    $.ajax({
-                        url: '/api/event',
-                        dataType: 'json',
-                        data: {
-                            start: moment(fetchInfo.startStr).format("YYYY-MM-DD[T]HH:mm:ss"),
-                            end: moment(fetchInfo.endStr).format("YYYY-MM-DD[T]HH:mm:ss")
-                        },
-                        success: function(doc) {
-                            var events = [];
-                            colours = {
-                                'Provisional': '#FFE89B',
-                                'Confirmed': '#3AB54A' ,
-                                'Booked': '#3AB54A' ,
-                                'Cancelled': 'grey' ,
-                                'non-rig': '#25AAE2'
-                            };
-                            $(doc).each(function() {
-                                end = $(this).attr('latest')
-                                allDay = false
-                                if(end.indexOf("T") < 0){ //If latest does not contain a time
-                                   end = moment(end + " 23:59").format("YYYY-MM-DD[T]HH:mm:ss")
-                                   allDay = true
-                                }
-
-                                thisEvent = {
-                                    'start': $(this).attr('earliest'),
-                                    'end': end,
-                                    'className': 'modal-href',
-                                    'title': $(this).attr('title'),
-                                    'url': $(this).attr('url'),
-                                    'allDay': allDay
-                                }
-
-                                if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){
-                                    thisEvent['color'] = colours[$(this).attr('status')];
-                                }else{
-                                    thisEvent['color'] = colours['non-rig'];
-                                }
-                                events.push(thisEvent);
-                            });
-                            successCallback(events);
-                        }
-                    });
-                },
-                datesSet: function(info) {
-                    var view = info.view;
-                    // Set the title of the view
-                    $('#calendar-header').text(view.title);
-
-                    // Enable/Disable "Today" button as required
-                    let $today = $('#today-button');
-                    if(moment().isBetween(view.currentStart, view.currentEnd)){
-                        //Today is within the current view
-                        $today.prop('disabled', true);
-                    }else{
-                        $today.prop('disabled', false);
-                    }
-
-                    // Set active view select button
-                    let $month = $('#month-button');
-                    let $week = $('#week-button');
-                    let $day = $('#day-button');
-                    switch(view.type){
-                        case 'dayGridMonth':
-                            $month.addClass('active');
-                            $week.removeClass('active');
-                            $day.removeClass('active');
-                            break;
-
-                        case 'timeGridWeek':
-                            $month.removeClass('active');
-                            $week.addClass('active');
-                            $day.removeClass('active');
-                            break;
-
-                        case 'timeGridDay':
-                            $month.removeClass('active');
-                            $week.removeClass('active');
-                            $day.addClass('active');
-                            break;
-                    }
-                    history.replaceState(null,null,"{% url 'web_calendar' %}"+viewToUrl[view.type]+'/'+moment(view.currentStart).format('YYYY-MM-DD')+'/');
-                }
-            });
-            calendar.render();
-        });
-        $(document).ready(function() {
+<script src="{% static 'js/moment.js' %}"></script>
+<script>
+    $(document).ready(function() {
            // set some button listeners
-            $('#next-button').click(function(){ calendar.next(); });
-            $('#prev-button').click(function(){ calendar.prev(); });
            $('#today-button').click(function(){ calendar.today(); });
-            $('#month-button').click(function(){ calendar.changeView('dayGridMonth'); });
-            $('#week-button').click(function(){ calendar.changeView('timeGridWeek'); });
-            $('#day-button').click(function(){ calendar.changeView('timeGridDay'); });
            $('#go-to-date-input').change(function(){
                if(moment($('#go-to-date-input').val()).isValid()){
-                    $('#go-to-date-button').prop('disabled', false);
+                    document.getElementById('go-to-date-button').classList.remove('disabled');
+                    document.getElementById('go-to-date-button').href = "?month=" + moment($('#go-to-date-input').val()).format("YYYY-MM");
                } else{
-                    $('#go-to-date-button').prop('disabled', true);
+                    document.getElementById('go-to-date-button').classList.add('disabled');
                }
            });
-            $('#go-to-date-button').click(function(){
-                day = moment($('#go-to-date-input').val());
-                if(day.isValid()){
-                    calendar.gotoDate(day.format("YYYY-MM-DD"));
-                } else{
-                    alert('Invalid Date');
-                }
-            });
-            {% if view and date %}
-            // Go to the initial settings, if they're valid
-            view = viewFromUrl['{{view}}'];
-            calendar.changeView(view);
-            day = moment('{{date}}');
-            if(day.isValid()){
-                calendar.gotoDate(day.format("YYYY-MM-DD"));
-            } else{
-                console.log('Supplied date is invalid - using default')
-            }
-            {% endif %}
        });
-    </script>
+</script>
+{% endblock %}
+
+{% block css %}
+<style>
+.week {
+  display:grid;
+  grid-template-columns: repeat(7, minmax(0, 1fr));
+  grid-auto-flow: dense;
+  grid-gap: 2px 10px;
+  border: 1px solid black;
+  height: 8em;
+  align-content: start;
+  max-width: 100%;
+}
+
+.day {
+  display:contents;
+}
+.day-label {
+  grid-row-start: 1;
+  text-align: right;
+  margin:0;
+  font-size: 1em !important;
+  height: 1em;
+}
+
+.week-day, .day-label, .event {
+  padding: 4px 10px;
+}
+
+.event {
+  background-color: #CCC;
+  font-size: 0.8em !important;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.event-end {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.event-start {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.week-day {
+    font-size: 0.8em;
+}
+
+@media (max-width: 767.98px) {
+    .event {
+        padding: 2px;
+    }
+}
+
+[data-span="1"] { grid-column-end: span 1; }
+[data-span="2"] { grid-column-end: span 2; }
+[data-span="3"] { grid-column-end: span 3; }
+[data-span="4"] { grid-column-end: span 4; }
+[data-span="5"] { grid-column-end: span 5; }
+[data-span="6"] { grid-column-end: span 6; }
+[data-span="7"] { grid-column-end: span 7; }
+
+.day > a {
+  color: inherit !important;
+  text-decoration: inherit !important;
+}
+
+</style>
 {% endblock %}

 {% block content %}
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="pull-left">
-                <span id="calendar-header" class="h2"></span>
-            </div>
-            <div class="form-inline float-right btn-page my-3">
-                <div class="input-group mx-2">
-                  <input type="date" class="form-control" id="go-to-date-input" placeholder="Go to date...">
-                  <span class="input-group-append">
-                    <button class="btn btn-success" id="go-to-date-button" type="button" disabled>Go!</button>
-                  </span>
-                </div>
-                <div class="btn-group mx-2">
-                  <button type="button" class="btn btn-primary" id="today-button">Today</button>
-                </div>
-                <div class="btn-group mx-2">
-                  <button type="button" class="btn btn-secondary" id="prev-button"><span class="fas fa-chevron-left"></span></button>
-                  <button type="button" class="btn btn-secondary" id="next-button"><span class="fas fa-chevron-right"></span></button>
-                </div>
-                <div class="btn-group ml-2">
-                  <button type="button" class="btn btn-light" id="month-button">Month</button>
-                  <button type="button" class="btn btn-light" id="week-button">Week</button>
-                  <button type="button" class="btn btn-light" id="day-button">Day</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12">
-            <div id='calendar'></div>
+<div class="row justify-content-center mb-1">
+    <a class="btn btn-info col-2" href="{% url 'web_calendar' %}?{{ prev_month }}"><span class="fas fa-chevron-left"></span> Previous Month</a>
+    <div class="form-inline col-4">
+        <div class="input-group">
+            <input type="date" id="go-to-date-input" placeholder="Go to date..." class="form-control">
+            <span class="input-group-append">
+            <a class="btn btn-success" id="go-to-date-button">Go!</a>
+            </span>
        </div>
    </div>
+    <button type="button" class="btn btn-primary col-2" id="today-button">Today</button>
+    <a class="btn btn-info mx-2 col-2" href="{% url 'web_calendar' %}?{{ next_month }}"><span class="fas fa-chevron-right"></span> Next Month</a>
+</div>
+
+<div class="week" style="height: 2em;">
+  <div class="week-day">Monday</div>
+  <div class="week-day">Tuesday</div>
+  <div class="week-day">Wednesday</div>
+  <div class="week-day">Thursday</div>
+  <div class="week-day">Friday</div>
+  <div class="week-day">Saturday</div>
+  <div class="week-day">Sunday</div>
+</div>
+{% for week in weeks %}
+<div class="week">
+    {% for day in week %}
+        {% if day.0 != 0 %}
+            <div class="day" id="{{day.0}}">
+                <h3 class="day-label text-muted">{{day.0}}</h3>
+                {{ day.2|safe }}
+            </div>
+        {% else %}
+        <div class="day"><span style="grid-row-start: 1;">&nbsp;<span></div>
+        {% endif %}
+    {% endfor %}
+</div>
+{% endfor %}
 {% endblock %}
--- a/RIGS/templates/email/admin_awaiting_approval.html
+++ b/RIGS/templates/email/admin_awaiting_approval.html
--- a/RIGS/templates/email/admin_awaiting_approval.txt
+++ b/RIGS/templates/email/admin_awaiting_approval.txt
--- a/RIGS/templates/email/eventauthorisation_client_request.html
+++ b/RIGS/templates/email/eventauthorisation_client_request.html
--- a/RIGS/templates/email/eventauthorisation_client_request.txt
+++ b/RIGS/templates/email/eventauthorisation_client_request.txt
--- a/RIGS/templates/email/eventauthorisation_client_success.html
+++ b/RIGS/templates/email/eventauthorisation_client_success.html
--- a/RIGS/templates/email/eventauthorisation_client_success.txt
+++ b/RIGS/templates/email/eventauthorisation_client_success.txt
--- a/RIGS/templates/email/eventauthorisation_mic_success.txt
+++ b/RIGS/templates/email/eventauthorisation_mic_success.txt
@@ -0,0 +1,5 @@
+Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
+
+Just to let you know your event N{{object.eventdisplay_id}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
+
+The TEC Rig Information Gathering System
--- a/RIGS/templates/email/ra_reminder.html
+++ b/RIGS/templates/email/ra_reminder.html
@@ -0,0 +1,16 @@
+{% extends 'base_client_email.html' %}
+
+{% block content %}
+    <p>Hi {{event.mic.get_full_name|default_if_none:"Productions Manager"}},</p>
+
+    {% if event.mic %}
+    <p>Just to let you know your event {{event.display_id}} <em>requires<em> a pre-event risk assessment completing prior to the event. Please do so as soon as possible.</p>
+    {% else %}
+    <p>This is a reminder that event {{event.display_id}} requires a MIC assigning and a risk assessment completing.</p>
+    {% endif %}
+
+    <p>Fill it out here:</p>
+    <a href="{{url}}" class="btn btn-info"><span class="fas fa-paperclip"></span> Create Risk Assessment</a>
+
+    <p>TEC PA &amp; Lighting</p>
+{% endblock %}
--- a/RIGS/templates/email/ra_reminder.txt
+++ b/RIGS/templates/email/ra_reminder.txt
@@ -0,0 +1,9 @@
+Hi {{event.mic.get_full_name|default_if_none:"Productions Manager"}},
+
+{% if event.mic %}
+Just to let you know your event {{event.display_id}} requires a risk assessment completing prior to the event. Please do so as soon as possible.
+{% else %}
+This is a reminder that event {{event.display_id}} requires a MIC assigning and a risk assessment completing.
+{% endif %}
+
+The TEC Rig Information Gathering System
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -106,6 +106,10 @@
                          title="Things that aren't service-based, like training, meetings and site visits.">
 			            <button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button>
 		            </span>
+                    <span data-toggle="tooltip"
+                          title="Record equipment hired in from other companies">
+			            <a href="{% url 'subhire_create' %}" class="btn bg-warning w-25">Subhire</a>
+		            </span>
                </div>
            </div>
        </div>
--- a/RIGS/templates/eventauthorisation_mic_success.txt
+++ b/RIGS/templates/eventauthorisation_mic_success.txt
@@ -1,5 +0,0 @@
-Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
-
-Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
-
-The TEC Rig Information Gathering System
--- a/RIGS/templates/partials/event_table.html
+++ b/RIGS/templates/partials/event_table.html
@@ -12,21 +12,7 @@
        </thead>
        <tbody>
        {% for event in events %}
-        <tr class="{% if event.cancelled %}
-                    table-secondary
-                    {% elif not event.is_rig %}
-                    table-info
-                    {% elif not event.mic %}
-                    table-danger
-                    {% elif event.confirmed and event.authorised %}
-                        {% if event.dry_hire or event.riskassessment %}
-                            table-success
-                        {% else %}
-                            table-warning
-                        {% endif %}
-                    {% else %}
-                    table-warning
-                    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
+        <tr class="table-{{event.color}}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
            <!---Number-->
            <th scope="row" id="event_number">{{ event.display_id }}</th>
            <!--Dates & Times-->
--- a/RIGS/templates/subhire_form.html
+++ b/RIGS/templates/subhire_form.html
@@ -40,7 +40,7 @@
        {% include 'form_errors.html' %}
    </div>
    {# Contact details #}
-    <div class="col-md-6">
+    <div class="col-md-6 mb-2">
        <div class="card">
            <div class="card-header">Contact Details</div>
            <div class="card-body">
@@ -93,6 +93,16 @@
            </div>
        </div>
    </div>
+    <div class="col-md-6 mb-2">
+        <div class="card">
+            <div class="card-header">Associated Event(s)</div>
+            <div class="card-body">
+                <div class="form-group">
+                  <select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}"></select>
+                </div>
+            </div>
+        </div>
+    </div>
    {# Event details #}
    <div class="col-md-6 mb-2">
        <div class="card card-default">
@@ -150,33 +160,27 @@
            </div>
        </div>
    </div>
-    <div class="card">
-        <div class="card-header">Associated Event(s)</div>
-        <div class="card-body">
-            <div class="form-group">
-              <select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}"></select>
-            </div>
-        </div>
-    </div>
-    <div class="card">
-        <div class="card-header">Equipment Information</div>
-        <div class="card-body">
-            <div class="form-group">
-                <label for="{{ form.description.id_for_label }}"
-                       class="col-sm-4 col-form-label">{{ form.description.label }}</label>
-                <div class="col-sm-12">
-                    {% render_field form.description class+="form-control" %}
+    <div class="col-md-6 mb-2">
+        <div class="card">
+            <div class="card-header">Equipment Information</div>
+            <div class="card-body">
+                <div class="form-group">
+                    <label for="{{ form.description.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.description.label }}</label>
+                    <div class="col-sm-12">
+                        {% render_field form.description class+="form-control" %}
+                    </div>
                </div>
-            </div>
-            <div class="form-group">
-                <label for="{{ form.insurance_value.id_for_label }}"
-                       class="col-sm-6 col-form-label">{{ form.insurance_value.label }}</label>
-                <div class="col-sm-8 input-group">
-                    <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-                    {% render_field form.insurance_value class+="form-control" %}
-                </div>
-                <div class="border border-info p-2 rounded mt-1" style="border-width: thin thin thin thick !important;">
-                    If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements
+                <div class="form-group">
+                    <label for="{{ form.insurance_value.id_for_label }}"
+                           class="col-sm-6 col-form-label">{{ form.insurance_value.label }}</label>
+                    <div class="col-sm-8 input-group">
+                        <div class="input-group-prepend"><span class="input-group-text">£</span></div>
+                        {% render_field form.insurance_value class+="form-control" %}
+                    </div>
+                    <div class="border border-info p-2 rounded mt-1 font-weight-bold" style="border-width: thin thin thin thick !important;">
+                        If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements
+                    </div>
                </div>
            </div>
        </div>
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -118,9 +118,9 @@ def orderby(request, field, attr):
@register.filter(needs_autoescape=True)  # Used for accessing outside of a form, i.e. in detail views of RiskAssessment and EventChecklist
 def get_field(obj, field, autoescape=True):
    value = getattr(obj, field)
-    if(isinstance(value, bool)):
+    if (isinstance(value, bool)):
        value = yesnoi(value, field in obj.inverted_fields)
-    elif(isinstance(value, str)):
+    elif (isinstance(value, str)):
        value = truncatewords(value, 20)
    return mark_safe(value)

@@ -144,7 +144,7 @@ def get_list(dictionary, key):

@register.filter
 def profile_by_index(value):
-    if(value):
+    if (value):
        return models.Profile.objects.get(pk=int(value))
    else:
        return ""
@@ -216,6 +216,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
        return {'submit': True, 'class': 'btn-info', 'icon': 'fa-search', 'text': 'Search', 'id': id, 'style': style}
    elif type == 'submit':
        return {'submit': True, 'class': 'btn-primary', 'icon': 'fa-save', 'text': 'Save', 'id': id, 'style': style}
+    elif type == 'today':
+        return {'today': True, 'id': id}
    return {'target': url, 'pk': pk, 'class': clazz, 'icon': icon, 'text': text, 'id': id, 'style': style}


--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -43,12 +43,8 @@ urlpatterns = [

    # Rigboard
    path('rigboard/', login_required(views.RigboardIndex.as_view()), name='rigboard'),
-    path('rigboard/calendar/', login_required()(views.WebCalendar.as_view()),
+    re_path(r'^rigboard/calendar/$', login_required()(views.WebCalendar.as_view()),
         name='web_calendar'),
-    re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
-            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
-    re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
-            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
    path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),


@@ -77,7 +73,9 @@ urlpatterns = [
    path('subhire/create/', permission_required_with_403('RIGS.add_event')(views.SubhireCreate.as_view()),
          name='subhire_create'),
    path('subhire/<int:pk>/edit', views.SubhireEdit.as_view(),
-          name='subhire_edit'),
+          name='subhire_update'),
+    path('subhire/upcoming', views.SubhireList.as_view(),
+          name='subhire_list'),


    # Event H&S
@@ -85,7 +83,7 @@ urlpatterns = [

    path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(views.EventRiskAssessmentCreate.as_view()),
         name='event_ra'),
-    path('event/ra/<int:pk>/', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentDetail.as_view()),
+    path('event/ra/<int:pk>/', login_required(views.EventRiskAssessmentDetail.as_view()),
         name='ra_detail'),
    path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()),
         name='ra_edit'),
@@ -97,7 +95,7 @@ urlpatterns = [

    path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
         name='event_ec'),
-    path('event/checklist/<int:pk>/', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistDetail.as_view()),
+    path('event/checklist/<int:pk>/', login_required(views.EventChecklistDetail.as_view()),
         name='ec_detail'),
    path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
         name='ec_edit'),
--- a/RIGS/utils.py
+++ b/RIGS/utils.py
@@ -0,0 +1,53 @@
+from datetime import datetime, timedelta, date
+import calendar
+from calendar import HTMLCalendar
+from RIGS.models import BaseEvent, Event, Subhire
+
+class Calendar(HTMLCalendar):
+    def __init__(self, year=None, month=None):
+        self.year = year
+        self.month = month
+        super(Calendar, self).__init__()
+
+    def get_html(self, day, event):
+        return f"<a href='{event.get_absolute_url()}' class='modal-href' style='display: contents;'><div class='event event-start event-end bg-{event.color}' data-span='{event.length}' style='grid-column-start: calc({day[1]} + 1)'>{event}</div></a>"
+
+    def formatmonth(self, withyear=True):
+        events = Event.objects.filter(start_date__year=self.year, start_date__month=self.month)
+        subhires = Subhire.objects.filter(start_date__year=self.year, start_date__month=self.month)
+        weeks = self.monthdays2calendar(self.year, self.month)
+        data = []
+
+        for week in weeks:
+            weeks_events = []
+            for day in week:
+                events_per_day = events.order_by("start_date").filter(start_date__day=day[0])
+                subhires_per_day = subhires.order_by("start_date").filter(start_date__day=day[0])
+                event_html = ""
+                for event in events_per_day:
+                    event_html += self.get_html(day, event)
+                for sh in subhires_per_day:
+                    event_html += self.get_html(day, sh)
+                weeks_events.append((day[0], day[1], event_html))
+            data.append(weeks_events)
+        return data
+
+
+def get_date(req_day):
+    if req_day:
+        year, month = (int(x) for x in req_day.split('-'))
+        return date(year, month, day=1)
+    return datetime.today()
+
+def prev_month(d):
+    first = d.replace(day=1)
+    prev_month = first - timedelta(days=1)
+    month = f'month={str(prev_month.year)}-{str(prev_month.month)}'
+    return month
+
+def next_month(d):
+    days_in_month = calendar.monthrange(d.year, d.month)[1]
+    last = d.replace(day=days_in_month)
+    next_month = last + timedelta(days=1)
+    month = f'month={str(next_month.year)}-{str(next_month.month)}'
+    return month
--- a/RIGS/views/rigboard.py
+++ b/RIGS/views/rigboard.py
@@ -17,12 +17,13 @@ from django.template.loader import get_template
 from django.urls import reverse
 from django.urls import reverse_lazy
 from django.utils import timezone
+from django.utils.html import mark_safe
 from django.utils.decorators import method_decorator
 from django.views import generic

 from PyRIGS import decorators
 from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
-from RIGS import models, forms
+from RIGS import models, forms, utils

 __author__ = 'ghost'

@@ -40,14 +41,25 @@ class RigboardIndex(generic.TemplateView):
        return context


-class WebCalendar(generic.TemplateView):
+class WebCalendar(generic.ListView):
+    model = models.Event
    template_name = 'calendar.html'

    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
-        context['view'] = kwargs.get('view', '')
-        context['date'] = kwargs.get('date', '')
-        # context['page_title'] = "Calendar"
+        # use today's date for the calendar
+        d = utils.get_date(self.request.GET.get('month', None))
+        context['prev_month'] = utils.prev_month(d)
+        context['next_month'] = utils.next_month(d)
+
+        # Instantiate our calendar class with today's year and date
+        cal = utils.Calendar(d.year, d.month)
+
+        # Call the formatmonth method, which returns our calendar as a table
+        html_cal = cal.formatmonth(withyear=True)
+        # context['calendar'] = mark_safe(html_cal)
+        context['weeks'] = html_cal
+        context['page_title'] = d.strftime("%B %Y")
        return context


@@ -338,12 +350,12 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix

        msg = EmailMultiAlternatives(
            f"{self.object.display_id} | {self.object.name} - Event Authorisation Request",
-            get_template("eventauthorisation_client_request.txt").render(context),
+            get_template("email/eventauthorisation_client_request.txt").render(context),
            to=[email],
            reply_to=[self.request.user.email],
        )
        css = finders.find('css/email.css')
-        html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
+        html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
                                   external_styles=css).transform()
        msg.attach_alternative(html, 'text/html')

@@ -353,7 +365,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix


 class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "eventauthorisation_client_request.html"
+    template_name = "email/eventauthorisation_client_request.html"
    model = models.Event

    def render_to_response(self, context, **response_kwargs):
--- a/RIGS/views/subhire.py
+++ b/RIGS/views/subhire.py
@@ -46,3 +46,13 @@ class SubhireEdit(generic.UpdateView):

    def get_success_url(self):
        return reverse_lazy('subhire_detail', kwargs={'pk': self.object.pk})
+
+
+class SubhireList(generic.TemplateView):
+    template_name = 'rigboard.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['events'] = models.Subhire.objects.current_events()
+        context['page_title'] = "Upcoming Subhire"
+        return context
--- a/assets/migrations/0027_asset_nickname.py
+++ b/assets/migrations/0027_asset_nickname.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2022-12-11 00:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0026_auto_20220526_1623'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='asset',
+            name='nickname',
+            field=models.CharField(blank=True, max_length=120),
+        ),
+    ]
--- a/assets/models.py
+++ b/assets/models.py
@@ -95,7 +95,7 @@ class AssetManager(models.Manager):
    def search(self, query=None):
        qs = self.get_queryset()
        if query is not None:
-            or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query))
+            or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query) | Q(nickname__icontains=query))
            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
        return qs

@@ -125,6 +125,7 @@ class Asset(models.Model, RevisionMixin):
    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
    replacement_cost = models.DecimalField(null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
    comments = models.TextField(blank=True)
+    nickname = models.CharField(max_length=120, blank=True)

    # Audit
    last_audited_at = models.DateTimeField(blank=True, null=True)
--- a/assets/templates/partials/asset_detail_form.html
+++ b/assets/templates/partials/asset_detail_form.html
@@ -21,6 +21,10 @@
      <label for="{{ form.description.id_for_label }}">Description</label>
      {% render_field form.description|add_class:'form-control' value=object.description %}
    </div>
+    <div class="form-group">
+      <label for="{{ form.nickname.id_for_label }}">Nickname</label>
+      {% render_field form.nickname|add_class:'form-control' value=object.nickname %}
+    </div>
    <div class="form-group">
      <label for="{{ form.category.id_for_label }}" >Category</label>
      {% render_field form.category|add_class:'form-control'%}
@@ -45,7 +49,10 @@
    {% else %}
    <dt>Asset ID</dt>
    <dd>{{ object.asset_id }}</dd>
-
+    {% if object.nickname %}
+    <dt>Nickname</dt>
+    <dd>"{{ object.nickname }}"</dd>
+    {% endif %}
    <dt>Description</dt>
    <dd>{{ object.description }}</dd>

--- a/conftest.py
+++ b/conftest.py
@@ -28,6 +28,7 @@ def admin_user(admin_user):
    admin_user.last_name = "Test"
    admin_user.initials = "ETU"
    admin_user.is_approved = True
+    admin_user.is_supervisor = True
    admin_user.save()
    return admin_user

--- a/gulpfile.js
+++ b/gulpfile.js
@@ -24,7 +24,6 @@ function fonts(done) {
 function styles(done) {
    const bs_select = ["bootstrap-select.css", "ajax-bootstrap-select.css"]
    return gulp.src(['pipeline/source_assets/scss/**/*.scss',
-                    'node_modules/fullcalendar/main.css',
                    'node_modules/bootstrap-select/dist/css/bootstrap-select.css',
                    'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.css',
                    'node_modules/easymde/dist/easymde.min.css'
@@ -59,7 +58,6 @@ function scripts() {
                    'node_modules/html5sortable/dist/html5sortable.min.js',
                    'node_modules/clipboard/dist/clipboard.min.js',
                    'node_modules/moment/moment.js',
-                    'node_modules/fullcalendar/main.js',
                    'node_modules/bootstrap-select/dist/js/bootstrap-select.js',
                    'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.js',
                    'node_modules/easymde/dist/easymde.min.js',
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
    "clipboard": "^2.0.8",
    "cssnano": "^5.0.13",
    "easymde": "^2.16.1",
-    "fullcalendar": "^5.10.1",
    "gulp": "^4.0.2",
    "gulp-concat": "^2.6.1",
    "gulp-flatten": "^0.4.0",
@@ -27,14 +26,14 @@
    "html5sortable": "^0.13.3",
    "jquery": "^3.6.0",
    "konami": "^1.6.3",
-    "moment": "^2.29.2",
-    "node-sass": "^7.0.0",
+    "moment": "^2.29.4",
+    "node-sass": "^7.0.3",
    "popper.js": "^1.16.1",
    "postcss": "^8.4.5",
    "uglify-js": "^3.14.5"
  },
  "devDependencies": {
-    "browser-sync": "^2.27.7"
+    "browser-sync": "^2.27.10"
  },
  "scripts": {
    "gulp": "gulp",
--- a/pipeline/source_assets/js/autocompleter.js
+++ b/pipeline/source_assets/js/autocompleter.js
@@ -47,14 +47,16 @@ function initPicker(obj) {
        //log: 3,
        preprocessData: function (data) {
            var i, l = data.length, array = [];
-            array.push({
-                        text: clearSelectionLabel,
-                        value: '',
-                        data:{
-                        	update_url: '',
-                        	subtext:''
-                        }
-                    });
+            if (!obj.data('noclear')) {
+                array.push({
+                            text: clearSelectionLabel,
+                            value: '',
+                            data:{
+                            	update_url: '',
+                            	subtext:''
+                            }
+                        });
+            }

            if (l) {
                for(i = 0; i < l; i++){
@@ -71,11 +73,12 @@ function initPicker(obj) {
            return array;
        }
    };
-
-    obj.prepend($("<option></option>")
-		.attr("value",'')
-		.text(clearSelectionLabel)
-		.data('update_url',''));  //Add "clear selection" option
+    if (!obj.data('noclear')) {
+        obj.prepend($("<option></option>")
+		    .attr("value",'')
+		    .text(clearSelectionLabel)
+		    .data('update_url',''));  //Add "clear selection" option
+    }


 	obj.selectpicker().ajaxSelectPicker(options); //Initiaise selectPicker
--- a/pipeline/source_assets/js/src.js
+++ b/pipeline/source_assets/js/src.js
@@ -4,16 +4,16 @@ Date.prototype.getISOString = function () {
        var dd = this.getDate().toString();
        return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding
 };
-jQuery(document).ready(function () {
-    jQuery(document).on('click', '.modal-href', function (e) {
-        $link = jQuery(this);
+$(document).ready(function () {
+    $(document).on('click', '.modal-href', function (e) {
+        $link = $(this);
        // Anti modal inception
        if ($link.parents('#modal').length == 0) {
            e.preventDefault();
            modaltarget = $link.data('target');
            modalobject = "";
-            jQuery('#modal').load($link.attr('href'), function (e) {
-                jQuery('#modal').modal();
+            $('#modal').load($link.attr('href'), function (e) {
+                $('#modal').modal();
            });
        }
    });
@@ -23,7 +23,6 @@ jQuery(document).ready(function () {
        s.type = 'text/javascript';
        document.body.appendChild(s);
        s.src = '{% static "js/asteroids.min.js"%}';
-        ga('send', 'event', 'easter_egg', 'activated');
    }
    easter_egg.load();
 });
--- a/pipeline/source_assets/scss/screen.scss
+++ b/pipeline/source_assets/scss/screen.scss
@@ -281,3 +281,7 @@ html.embedded {
 .bootstrap-select, button.btn.dropdown-toggle.bs-placeholder.btn-light {
    padding-right: 1rem !important;
 }
+
+.badge-purple, .bg-purple {
+    background-color: #800080 !important;
+}
--- a/templates/form_errors.html
+++ b/templates/form_errors.html
@@ -1,13 +1,12 @@
 {% load nice_errors from filters %}
 {% if form.errors %}
-	<div class="alert alert-danger alert-dismissable">
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+	<div class="alert alert-danger mb-0">
 		<dl>
 			{% with form|nice_errors as qq %}
 				{% for error_name,desc in qq.items %}
                <span class="row">
-				    <dt class="col-4">{{error_name}}</dt>
-				    <dd class="col-8">{{desc}}</dd>
+				    <dt class="col-3">{{error_name}}</dt>
+				    <dd class="col-9">{{desc}}</dd>
                </span>
 				{% endfor %}
 			{% endwith %}
--- a/templates/partials/button.html
+++ b/templates/partials/button.html
@@ -4,6 +4,8 @@
 <a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%} {% if text == 'Print' %}target="_blank"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% elif copy %}
 <button class="btn btn-secondary btn-sm mr-1" data-clipboard-target="{{id}}" data-content="Copied to clipboard!"><span class="fas fa-copy"></span></button>
+{% elif today %}
+<button class="btn btn-info col-sm-2" onclick="var date = new Date(); $('#{{id}}').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'))" tabindex="-1" type="button">Today</button>
 {% else %}
 <a href="{% url target %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% endif %}
--- a/templates/registration/loginform.html
+++ b/templates/registration/loginform.html
@@ -1,5 +1,10 @@
 {% load widget_tweaks %}
 {% include 'form_errors.html' %}
+{% if form.errors %}
+	<div class="alert alert-info">
+		<p><strong>Please note:</strong> If it has been more than a year since you last logged in, your account will have been automatically deactivated. Contact <a href="mailto:it@nottinghamtec.co.uk">it@nottinghamtec.co.uk</a> for assistance.</p>
+	</div>
+{% endif %}
 <div class="col-sm-6 offset-sm-3 col-lg-4 offset-lg-4">
    <form action="{% url 'login' %}" method="post" role="form" target="_self">{% csrf_token %}
        <div class="form-group">
--- a/training/decorators.py
+++ b/training/decorators.py
@@ -1,5 +1,5 @@
 from PyRIGS.decorators import user_passes_test_with_403


-def has_perm_or_supervisor(perm, login_url=None, oembed_view=None):
-    return user_passes_test_with_403(lambda u: (hasattr(u, 'is_supervisor') and u.is_supervisor) or u.has_perm(perm), login_url=login_url, oembed_view=oembed_view)
+def is_supervisor(login_url=None, oembed_view=None):
+    return user_passes_test_with_403(lambda u: (hasattr(u, 'is_supervisor') and u.is_supervisor))
--- a/training/models.py
+++ b/training/models.py
@@ -201,7 +201,7 @@ class TrainingItemQualification(models.Model, RevisionMixin):

    @property
    def activity_feed_string(self):
-        return f"{self.trainee} {self.get_depth_display().lower()} {self.get_depth_display()} in {self.item}"
+        return f"{self.trainee} {self.get_depth_display().lower()} in {self.item}"

    @classmethod
    def get_colour_from_depth(cls, depth):
--- a/training/templates/base_training.html
+++ b/training/templates/base_training.html
@@ -30,7 +30,7 @@
        <a class="dropdown-item" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> Item List</a>
      </div>
    </li>
-    {% if perms.training.add_trainingitemqualification or request.user.is_supervisor %}
+    {% if request.user.is_supervisor %}
    <li class="nav-item"><a class="nav-link" href="{% url 'session_log' %}"><span class="fas fa-users"></span> Log Session</a></li>
    {% endif %}
    <li class="nav-item"><a class="nav-link" href="{% url 'training_activity_table' %}"><span class="fas fa-random"></span> Recent Changes</a></li>
--- a/training/templates/edit_training_record.html
+++ b/training/templates/edit_training_record.html
@@ -43,7 +43,7 @@
            {% render_field form.date|add_class:'form-control'|attr:'type="date"' value=training_date %}
            {% endwith %}
        </div>
-        <button class="btn btn-info col-sm-2" onclick="var date = new Date(); $('#id_date').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'))" tabindex="-1" type="button">Today</button>
+        {% button 'today' id='id_date' %}
    </div>
    <div class="form-group form-row">
        <label for="id_notes" class="col-sm-2 col-form-label">Notes</label>
--- a/training/templates/level_detail.html
+++ b/training/templates/level_detail.html
@@ -44,7 +44,7 @@
 {% endblock %}

 {% block content %}
-{% if request.user.is_supervisor or perms.training.add_traininglevelrequirement %}
+{% if request.user.is_supervisor %}
 <div class="col-sm-12 text-right pr-0">
 <a type="button" class="btn btn-success mb-3" href="{% url 'add_requirement' pk=object.pk %}" id="requirement_button">
 	<span class="fas fa-plus"></span> Add New Requirement
@@ -79,9 +79,9 @@
            {% endfor %}
            <tr><th colspan="3" class="text-center">{{object}}</th></tr>
            <tr>
-              <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-              <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-              <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
            </tr>
          </tbody>
        </table>
--- a/training/templates/partials/add_qualification.html
+++ b/training/templates/partials/add_qualification.html
@@ -1,4 +1,4 @@
-{% if request.user.is_supervisor or perms.training.add_trainingitemqualification %}
+{% if request.user.is_supervisor %}
 <a type="button" class="btn btn-success" href="{% url 'add_qualification' object.pk %}" id="add_record">
    <span class="fas fa-plus"></span> Add New Training Record
 </a>
--- a/training/templates/partials/supervisor_field.html
+++ b/training/templates/partials/supervisor_field.html
@@ -1,5 +1,5 @@
 <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>
-<select name="supervisor" id="supervisor_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required>
+<select name="supervisor" id="supervisor_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required data-noclear="true">
 {% if supervisor %}
    <option value="{{form.supervisor.value}}" selected>{{ supervisor }}</option>
 {% endif %}
--- a/training/templates/session_log_form.html
+++ b/training/templates/session_log_form.html
@@ -28,25 +28,26 @@
            {% include 'form_errors.html' %}
            {% csrf_token %}
            <h3>People</h3>
-            <div class="form-group row">
+            <div class="form-group row" id="supervisor_group">
              {% include 'partials/supervisor_field.html' %}
            </div>
-            <div class="form-group row">
+            <div class="form-group row" id="trainees_group">
              <label for="trainees_id" class="col-sm-2">Select Attendees</label>
-              <select multiple name="trainees" id="trainees_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+              <select multiple name="trainees" id="trainees_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" data-noclear="true">
              </select>
            </div>
            <h3>Training Items</h3>
            {% for depth in depths %}
-            <div class="form-group row">
+            <div class="form-group row" id="{{depth.0}}">
              <label for="selectpicker" class="col-sm-2 text-{% colour_from_depth depth.0 %} py-1">{{ depth.1 }} Items</label>
-              <select multiple name="items_{{depth.0}}" id="items_{{depth.0}}_id" class="selectpicker col-sm-10 px-0" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active">
+              <select multiple name="items_{{depth.0}}" id="items_{{depth.0}}_id" class="selectpicker col-sm-10 px-0" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active" data-noclear="true">
              </select>
            </div>
            {% endfor %}
            <h3>Session Information</h3>
-            <div class="form-group">
-                {% include 'partials/form_field.html' with field=form.date %}
+            <div class="form-group row">
+                {% include 'partials/form_field.html' with field=form.date col='col-sm-6' %}
+                {% button 'today' id='id_date' %}
            </div>
            <div class="form-group">
              {% include 'partials/form_field.html' with field=form.notes %}
--- a/training/templates/trainee_item_list.html
+++ b/training/templates/trainee_item_list.html
@@ -54,7 +54,7 @@
                        <th>Date</th>
                        <th>Supervisor</th>
                        <th>Notes</th>
-                        {% if request.user.is_supervisor or perms.training.change_trainingitemqualification %}
+                        {% if request.user.is_supervisor %}
                        <th></th>
                        {% endif %}
                    </tr>
@@ -67,7 +67,7 @@
                        <td>{{ object.date }}</td>
                        <td><a href="{{ object.supervisor.get_absolute_url}}">{{ object.supervisor }}</a></td>
                        <td>{{ object.notes }}</td>
-                        {% if request.user.is_supervisor or perms.training.change_trainingitemqualification %}
+                        {% if request.user.is_supervisor %}
                        <td>{% button 'edit' 'edit_qualification' object.pk id="edit" %}</td>
                        {% endif %}
                    </tr>
--- a/training/tests/conftest.py
+++ b/training/tests/conftest.py
@@ -30,6 +30,15 @@ def training_item(db):
    training_item.delete()


+@pytest.fixture
+def training_item_2(db):
+    training_category = models.TrainingCategory.objects.create(reference_number=2, name="Sound")
+    training_item = models.TrainingItem.objects.create(category=training_category, reference_number=1, description="Fundamentals of Audio")
+    yield training_item
+    training_category.delete()
+    training_item.delete()
+
+
@pytest.fixture
 def level(db):
    level = models.TrainingLevel.objects.create(description="There is no description.", level=models.TrainingLevel.TECHNICIAN)
--- a/training/tests/pages.py
+++ b/training/tests/pages.py
@@ -40,3 +40,42 @@ class AddQualification(FormPage):
    @property
    def success(self):
        return 'add' not in self.driver.current_url
+
+
+class SessionLog(FormPage):
+    URL_TEMPLATE = 'training/session_log'
+
+    _supervisor_selector = (By.CSS_SELECTOR, 'div#supervisor_group>div.bootstrap-select')
+    _trainees_selector = (By.CSS_SELECTOR, 'div#trainees_group>div.bootstrap-select')
+    _training_started_selector = (By.XPATH, '//div[1]/div/div/form/div[4]/div')
+    _training_complete_selector = (By.XPATH, '//div[1]/div/div/form/div[4]/div')
+    _competency_assessed_selector = (By.XPATH, '//div[1]/div/div/form/div[5]/div')
+
+    form_items = {
+        'date': (regions.DatePicker, (By.ID, 'id_date')),
+        'notes': (regions.TextBox, (By.ID, 'id_notes')),
+    }
+
+    @property
+    def supervisor_selector(self):
+        return regions.BootstrapSelectElement(self, self.find_element(*self._supervisor_selector))
+
+    @property
+    def trainees_selector(self):
+        return regions.BootstrapSelectElement(self, self.find_element(*self._trainees_selector))
+
+    @property
+    def training_started_selector(self):
+        return regions.BootstrapSelectElement(self, self.find_element(*self._training_started_selector))
+
+    @property
+    def training_complete_selector(self):
+        return regions.BootstrapSelectElement(self, self.find_element(*self._training_complete_selector))
+
+    @property
+    def competency_assessed_selector(self):
+        return regions.BootstrapSelectElement(self, self.find_element(*self._competency_assessed_selector))
+
+    @property
+    def success(self):
+        return 'log' not in self.driver.current_url
--- a/training/tests/test_interaction.py
+++ b/training/tests/test_interaction.py
@@ -12,6 +12,15 @@ from training import models
 from training.tests import pages


+def select_super(page, supervisor):
+    page.supervisor_selector.toggle()
+    assert page.supervisor_selector.is_open
+    page.supervisor_selector.search(supervisor.name[:-6])
+    time.sleep(2)  # Slow down for javascript
+    assert page.supervisor_selector.options[0].selected
+    page.supervisor_selector.toggle()
+
+
 def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, training_item):
    page = pages.AddQualification(logged_in_browser.driver, live_server.url, pk=trainee.pk).open()
    # assert page.name in str(trainee)
@@ -30,12 +39,7 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
    assert page.item_selector.options[0].selected
    page.item_selector.toggle()

-    page.supervisor_selector.toggle()
-    assert page.supervisor_selector.is_open
-    page.supervisor_selector.search(supervisor.name[:-6])
-    time.sleep(2)  # Slow down for javascript
-    assert page.supervisor_selector.options[0].selected
-    page.supervisor_selector.toggle()
+    select_super(page, supervisor)

    page.submit()
    assert page.success
@@ -44,3 +48,32 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
    assert qualification.date == date
    assert qualification.notes == "A note"
    assert qualification.depth == models.TrainingItemQualification.STARTED
+
+
+def test_session_log(logged_in_browser, live_server, trainee, supervisor, training_item, training_item_2):
+    page = pages.SessionLog(logged_in_browser.driver, live_server.url).open()
+
+    page.date = date = datetime.date(2001, 1, 10)
+    page.notes = note = "A general note"
+
+    time.sleep(2)  # Slow down for javascript
+
+    select_super(page, supervisor)
+
+    page.trainees_selector.toggle()
+    assert page.trainees_selector.is_open
+    page.trainees_selector.search(trainee.first_name)
+    time.sleep(2)  # Slow down for javascript
+    page.trainees_selector.set_option(trainee.name, True)
+    # assert page.trainees_selector.options[0].selected
+    page.trainees_selector.toggle()
+
+    page.training_started_selector.toggle()
+    assert page.training_started_selector.is_open
+    page.training_started_selector.search(training_item.description[:-2])
+    time.sleep(2)  # Slow down for javascript
+    # assert page.training_started_selector.options[0].selected
+    page.training_started_selector.toggle()
+
+    page.submit()
+    assert page.success
--- a/training/tests/test_unit.py
+++ b/training/tests/test_unit.py
@@ -16,7 +16,7 @@ def test_add_qualification(admin_client, trainee, admin_user, training_item):
    response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': trainee.pk, 'item': training_item.pk})
    assertFormError(response, 'form', 'date', 'Qualification date may not be in the future')
    assertFormError(response, 'form', 'supervisor', 'One may not supervise oneself...')
-    response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': admin_user.pk, 'item': training_item.pk})
+    response = admin_client.post(url, {'date': date, 'trainee': admin_user.pk, 'supervisor': trainee.pk, 'item': training_item.pk})
    print(response.content)
    assertFormError(response, 'form', 'supervisor', 'Selected supervisor must actually *be* a supervisor...')

--- a/training/urls.py
+++ b/training/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path

 from django.contrib.auth.decorators import login_required
-from training.decorators import has_perm_or_supervisor
+from training.decorators import is_supervisor

 from training import views, models
 from versioning.views import VersionHistory
@@ -11,23 +11,22 @@ urlpatterns = [
    path('item/<int:pk>/qualified_users/', login_required(views.ItemQualifications.as_view()), name='item_qualification'),

    path('trainee/list/', login_required(views.TraineeList.as_view()), name='trainee_list'),
-    path('trainee/<int:pk>/',
-         has_perm_or_supervisor('RIGS.view_profile')(views.TraineeDetail.as_view()),
+    path('trainee/<int:pk>/', login_required(views.TraineeDetail.as_view()),
         name='trainee_detail'),
-    path('trainee/<int:pk>/history', has_perm_or_supervisor('RIGS.view_profile')(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}),  # Not picked up automatically because proxy model (I think)
-    path('trainee/<int:pk>/add_qualification/', has_perm_or_supervisor('training.add_trainingitemqualification')(views.AddQualification.as_view()),
+    path('trainee/<int:pk>/history', login_required(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}),  # Not picked up automatically because proxy model (I think)
+    path('trainee/<int:pk>/add_qualification/', is_supervisor()(views.AddQualification.as_view()),
         name='add_qualification'),
-    path('trainee/edit_qualification/<int:pk>/', has_perm_or_supervisor('training.change_trainingitemqualification')(views.EditQualification.as_view()),
+    path('trainee/edit_qualification/<int:pk>/', is_supervisor()(views.EditQualification.as_view()),
         name='edit_qualification'),

    path('levels/', login_required(views.LevelList.as_view()), name='level_list'),
    path('level/<int:pk>/', login_required(views.LevelDetail.as_view()), name='level_detail'),
    path('level/<int:pk>/user/<int:u>/', login_required(views.LevelDetail.as_view()), name='level_detail'),
-    path('level/<int:pk>/add_requirement/', login_required(views.AddLevelRequirement.as_view()), name='add_requirement'),
-    path('level/remove_requirement/<int:pk>/', login_required(views.RemoveRequirement.as_view()), name='remove_requirement'),
+    path('level/<int:pk>/add_requirement/', is_supervisor()(views.AddLevelRequirement.as_view()), name='add_requirement'),
+    path('level/remove_requirement/<int:pk>/', is_supervisor()(views.RemoveRequirement.as_view()), name='remove_requirement'),

-    path('trainee/<int:pk>/level/<int:level_pk>/confirm', login_required(views.ConfirmLevel.as_view()), name='confirm_level'),
+    path('trainee/<int:pk>/level/<int:level_pk>/confirm', is_supervisor()(views.ConfirmLevel.as_view()), name='confirm_level'),
    path('trainee/<int:pk>/item_record', login_required(views.TraineeItemDetail.as_view()), name='trainee_item_detail'),

-    path('session_log', has_perm_or_supervisor('training.add_trainingitemqualification')(views.SessionLog.as_view()), name='session_log'),
+    path('session_log', is_supervisor()(views.SessionLog.as_view()), name='session_log'),
 ]
--- a/users/management/commands/usercleanup.py
+++ b/users/management/commands/usercleanup.py
@@ -0,0 +1,26 @@
+from datetime import datetime, timedelta
+from django.core.management.base import BaseCommand, CommandError
+from django.utils import timezone
+
+from RIGS.models import Profile
+from training.models import TrainingLevel
+
+
+# This is triggered nightly by Heroku Scheduler
+class Command(BaseCommand):
+    help = 'Performs perodic user maintenance tasks'
+
+    def handle(self, *args, **options):
+        for person in Profile.objects.all():
+            # Inactivate users that have not logged in for a year (or have never logged in)
+            if person.last_login is None or (timezone.now() - person.last_login).days > 365:
+                person.is_active = False
+                person.is_approved = False
+                person.save()
+            # Ensure everyone with a supervisor level has the flag correctly set in the database
+            if person.level_qualifications.exclude(confirmed_on=None).select_related('level') \
+                    .filter(level__level__gte=TrainingLevel.SUPERVISOR) \
+                    .exclude(level__department=TrainingLevel.HAULAGE) \
+                    .exclude(level__department__isnull=True).exists():
+                person.is_supervisor = True
+                person.save()
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -183,7 +183,7 @@ class ModelComparison:
    def name(self):
        obj = self.new if self.new else self.old

-        if(hasattr(obj, 'activity_feed_string')):
+        if (hasattr(obj, 'activity_feed_string')):
            return obj.activity_feed_string
        else:
            return str(obj)
Author	SHA1	Message	Date
FreneticScribbler	1660f51e55	Merge branch 'master' into subhire # Conflicts: # Pipfile.lock	2022-12-11 00:53:27 +00:00
Arona Jones	a7bf990666	FIX: Do not specify minor version of python in CI	2022-12-11 00:51:19 +00:00
FreneticScribbler	9feea56211	Draft "upcoming subhire" view	2022-12-11 00:49:56 +00:00
FreneticScribbler	951227e68b	Make calendar work reasonably on mobile	2022-12-11 00:44:14 +00:00
FreneticScribbler	a4a28a6130	Add nickname field to assets Seems necessary given all the lights and some of the amps and distros have names :-)	2022-12-11 00:29:30 +00:00
FreneticScribbler	e3d8cf8978	Dependency update	2022-12-11 00:26:24 +00:00
FreneticScribbler	6e8779c81b	Revamped calendar basically there To fix: - Does not yet display events that span weeks correctly! - Breaks (overflows) on mobile	2022-12-06 15:31:35 +00:00
FreneticScribbler	e0da6a3120	Remove rogue print statement from JS	2022-12-06 15:03:57 +00:00
FreneticScribbler	0c80ef1b72	More calendar work	2022-12-06 15:03:27 +00:00
FreneticScribbler	0f127d8ca4	Entirely new concept	2022-12-06 13:20:07 +00:00
FreneticScribbler	626779ef25	Turn off RA reminders for non-rigs	2022-12-05 21:30:24 +00:00
Arona Jones	fa1dc31639	FIX: Only require login for viewing RAs/ECs	2022-11-26 12:58:15 +00:00
Arona Jones	d69543e309	FIX: Only require login to view training profiles Previously required a specific permission only granted to keyholders	2022-11-26 12:54:42 +00:00
FreneticScribbler	04ec728972	Reimplemented calendar mostly working Multi day alignment puzzle is pretty hard...	2022-11-22 23:59:21 +00:00
dependabot[bot]	a24e6d4495	Build(deps): Bump pillow from 9.0.1 to 9.3.0 (#516 ) Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.1 to 9.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/9.0.1...9.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-22 17:33:42 +00:00
dependabot[bot]	fa5792914a	Build(deps): Bump engine.io from 6.2.0 to 6.2.1 (#515 ) Bumps [engine.io](https://github.com/socketio/engine.io) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/6.2.0...6.2.1) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-22 17:33:14 +00:00
FreneticScribbler	bede8b4176	Merge branch 'master' into subhire # Conflicts: # Pipfile # Pipfile.lock # package-lock.json	2022-11-21 19:49:33 +00:00
Arona Jones	0117091f3e	FEAT #513 : Implement email reminders to complete risk assessments (#514 ) * FEAT #513: Implement email reminders to complete risk assessments * Add missing f-string tag	2022-11-19 15:34:15 +00:00
FreneticScribbler	8cade512d1	Initial work at reimplementing the calendar in python Buhby fullcalendar	2022-11-18 16:16:06 +00:00
FreneticScribbler	418219940b	Add subhire link to new event page	2022-11-18 14:58:59 +00:00
FreneticScribbler	37101d3340	Update lockfile	2022-11-18 14:29:44 +00:00
Arona Jones	de4bed92a4	Build(deps): Generally update JS & Python deps (#512 )	2022-11-17 12:06:21 +00:00
dependabot[bot]	3767923175	Build(deps): Bump yargs-parser and yargs (#507 ) Bumps [yargs-parser](https://github.com/yargs/yargs-parser) and [yargs](https://github.com/yargs/yargs). These dependencies needed to be updated together. Updates `yargs-parser` from 5.0.0-security.0 to 20.2.9 - [Release notes](https://github.com/yargs/yargs-parser/releases) - [Changelog](https://github.com/yargs/yargs-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs-parser/commits/yargs-parser-v20.2.9) Updates `yargs` from 7.1.1 to 15.4.1 - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs/commits/v15.4.1) --- updated-dependencies: - dependency-name: yargs-parser dependency-type: indirect - dependency-name: yargs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-15 15:52:49 +00:00
dependabot[bot]	1d77cf95d3	Build(deps): Bump scss-tokenizer and node-sass (#506 ) Bumps [scss-tokenizer](https://github.com/sasstools/scss-tokenizer) to 0.4.3 and updates ancestor dependency [node-sass](https://github.com/sass/node-sass). These dependencies need to be updated together. Updates `scss-tokenizer` from 0.3.0 to 0.4.3 - [Release notes](https://github.com/sasstools/scss-tokenizer/releases) - [Commits](https://github.com/sasstools/scss-tokenizer/compare/v0.3.0...v0.4.3) Updates `node-sass` from 7.0.1 to 7.0.3 - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v7.0.1...v7.0.3) --- updated-dependencies: - dependency-name: scss-tokenizer dependency-type: indirect - dependency-name: node-sass dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-15 15:44:25 +00:00
dependabot[bot]	1f21d0b265	Build(deps): Bump engine.io and browser-sync (#508 ) Bumps [engine.io](https://github.com/socketio/engine.io) to 6.2.0 and updates ancestor dependency [browser-sync](https://github.com/BrowserSync/browser-sync). These dependencies need to be updated together. Updates `engine.io` from 3.5.0 to 6.2.0 - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/3.5.0...6.2.0) Updates `browser-sync` from 2.27.7 to 2.27.10 - [Release notes](https://github.com/BrowserSync/browser-sync/releases) - [Changelog](https://github.com/BrowserSync/browser-sync/blob/master/CHANGELOG.md) - [Commits](https://github.com/BrowserSync/browser-sync/compare/v2.27.7...v2.27.10) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect - dependency-name: browser-sync dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-15 15:33:50 +00:00
Arona Jones	7846a6d31e	Rename combine-prs to combine-prs.yml	2022-11-14 18:20:57 +00:00
Arona Jones	d28b73a0b8	Create combine-prs Copied from here: https://github.com/hrvey/combine-prs-workflow	2022-11-14 16:30:55 +00:00
dependabot[bot]	5c2e8b391c	Build(deps): Bump moment from 2.29.2 to 2.29.4 (#505 ) Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-14 15:08:05 +00:00
dependabot[bot]	548bc1df81	Build(deps): Bump socket.io-parser from 3.3.2 to 3.3.3 (#503 ) Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.2...3.3.3) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-13 16:17:08 +00:00
dependabot[bot]	c1d2bce8fb	Build(deps): Bump minimatch from 3.0.4 to 3.0.8 (#504 ) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-13 16:16:51 +00:00
FreneticScribbler	c71beab278	Change: Only supervisors have edit access to the training database	2022-10-24 16:23:46 +01:00
FreneticScribbler	259932a548	FIX #502 : Possibility to choose 'no selection' in session log form Ref #501...may help/fix this...uncertain yet. Need to finish writing the relevant test!	2022-10-23 10:56:54 +01:00
FreneticScribbler	7526485837	FEAT: Add periodic cleanup command Currently performs two functions: 1. Inactivates users that have not logged in for at least one year. Closes #478 (Need to circle back round to full deletion SoonTM) 2. Ensures the supervisor database flag is set correctly for each user This is run automatically by the Heroku Scheduler addon at midnight daily.	2022-10-21 00:05:20 +01:00
Arona Jones	39ed5aefb4	Set printed PDF title == filename Should fix #497	2022-10-18 12:48:25 +01:00