Merge branch 'master' into subhire

# Conflicts: # Pipfile.lock
Draft "upcoming subhire" view
2026-02-15 02:59:41 +00:00 · 2022-12-11 00:53:27 +00:00 · 2022-12-11 00:49:56 +00:00 · 2022-12-11 00:44:14 +00:00 · 2022-12-06 15:31:35 +00:00 · 2022-12-06 15:03:57 +00:00
40 changed files with 994 additions and 949 deletions
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -13,20 +13,26 @@ jobs:
    env:
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
        with:
            python-version: 3.9
-            cache: 'pipenv'
+      - uses: actions/cache@v2
+        id: pcache
+        with:
+            path: ~/.local/share/virtualenvs
+            key: ${{ runner.os }}-pipenv-${{ hashFiles('Pipfile.lock') }}
+            restore-keys: |
+              ${{ runner.os }}-pipenv-
      - name: Install Dependencies
        run: |
-              python3 -m pip install --upgrade pip pipenv
+              python -m pip install --upgrade pip pipenv
              pipenv install -d
        # if: steps.pcache.outputs.cache-hit != 'true'
      - name: Cache Static Files
        id: static-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
            path: 'pipeline/built_assets'
            key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
@@ -37,9 +43,9 @@ jobs:
      - name: Basic Checks
        run: |
              pipenv run pycodestyle . --exclude=migrations,node_modules
-              pipenv run python3 manage.py check
-              pipenv run python3 manage.py makemigrations --check --dry-run
-              pipenv run python3 manage.py collectstatic --noinput
+              pipenv run python manage.py check
+              pipenv run python manage.py makemigrations --check --dry-run
+              pipenv run python manage.py collectstatic --noinput
      - name: Run Tests
        run: pipenv run pytest -n auto -vv --cov
      - uses: actions/upload-artifact@v2
--- a/15
+++ b/15
@@ -21,8 +21,7 @@ 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-widget-tweaks = "~=1.4.8"
@@ -76,7 +75,6 @@ django-hCaptcha = "*"
 importlib-metadata = "*"
 django-hcaptcha = "*"
 "z3c.rml" = "*"
-pikepdf = "*"
 django-queryable-properties = "*"
 django-mass-edit = "*"
 selenium = "~=3.141.0"
@@ -91,14 +89,11 @@ pluggy = "*"
 pytest-splinter = "*"
 pytest = "*"
 pytest-reverse = "*"
+pytest-xdist = {extras = [ "psutil",], version = "*"}
+PyPOM = {extras = [ "splinter",], version = "*"}

 [requires]
 python_version = "3.9"

-[dev-packages.pytest-xdist]
-extras = [ "psutil",]
-version = "*"
-
-[dev-packages.PyPOM]
-extras = [ "splinter",]
-version = "*"
+[pipenv]
+allow_prereleases = true
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "2e2fb4b609c10fc42db6bbd69ca73800629fbcaceec664e1fcc79d4b37bc0eb1"
+            "sha256": "fcd984e26845bc82b41f2651b61696f8f19be81ea6fb770751596b53f7b2bd2b"
        },
        "pipfile-spec": 6,
        "requires": {
@@ -155,11 +155,10 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
-                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+                "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3",
+                "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2023.5.7"
+            "version": "==2022.12.7"
        },
        "chardet": {
            "hashes": [
@@ -193,14 +192,6 @@
            "index": "pypi",
            "version": "==1.1.0"
        },
-        "cssselect2": {
-            "hashes": [
-                "sha256:1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a",
-                "sha256:fd23a65bfd444595913f02fc71f6b286c29261e354c41d722ca7a261a49b5969"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.7.0"
-        },
        "cssutils": {
            "hashes": [
                "sha256:a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf",
@@ -241,11 +232,11 @@
        },
        "django": {
            "hashes": [
-                "sha256:031365bae96814da19c10706218c44dff3b654cc4de20a98bd2d29b9bde469f0",
-                "sha256:21cc991466245d659ab79cb01204f9515690f8dae00e5eabde307f14d24d4d7d"
+                "sha256:18ba8efa36b69cfcd4b670d0fa187c6fe7506596f0ababe580e16909bcdec121",
+                "sha256:3adc285124244724a394fa9b9839cc8cd116faf7d159554c43ecdaa8cdf0b94d"
            ],
            "index": "pypi",
-            "version": "==3.2.19"
+            "version": "==3.2.16"
        },
        "django-debug-toolbar": {
            "hashes": [
@@ -280,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": [
@@ -304,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": [
@@ -354,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": {
@@ -379,90 +368,83 @@
                "sha256:d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313"
            ],
            "index": "pypi",
+            "markers": "python_version < '3.10'",
            "version": "==5.1.0"
        },
        "lxml": {
            "hashes": [
-                "sha256:01d36c05f4afb8f7c20fd9ed5badca32a2029b93b1750f571ccc0b142531caf7",
-                "sha256:04876580c050a8c5341d706dd464ff04fd597095cc8c023252566a8826505726",
-                "sha256:05ca3f6abf5cf78fe053da9b1166e062ade3fa5d4f92b4ed688127ea7d7b1d03",
-                "sha256:090c6543d3696cbe15b4ac6e175e576bcc3f1ccfbba970061b7300b0c15a2140",
-                "sha256:0dc313ef231edf866912e9d8f5a042ddab56c752619e92dfd3a2c277e6a7299a",
-                "sha256:0f2b1e0d79180f344ff9f321327b005ca043a50ece8713de61d1cb383fb8ac05",
-                "sha256:13598ecfbd2e86ea7ae45ec28a2a54fb87ee9b9fdb0f6d343297d8e548392c03",
-                "sha256:16efd54337136e8cd72fb9485c368d91d77a47ee2d42b057564aae201257d419",
-                "sha256:1ab8f1f932e8f82355e75dda5413a57612c6ea448069d4fb2e217e9a4bed13d4",
-                "sha256:223f4232855ade399bd409331e6ca70fb5578efef22cf4069a6090acc0f53c0e",
-                "sha256:2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67",
-                "sha256:2899456259589aa38bfb018c364d6ae7b53c5c22d8e27d0ec7609c2a1ff78b50",
-                "sha256:2a29ba94d065945944016b6b74e538bdb1751a1db6ffb80c9d3c2e40d6fa9894",
-                "sha256:2a87fa548561d2f4643c99cd13131acb607ddabb70682dcf1dff5f71f781a4bf",
-                "sha256:2e430cd2824f05f2d4f687701144556646bae8f249fd60aa1e4c768ba7018947",
-                "sha256:36c3c175d34652a35475a73762b545f4527aec044910a651d2bf50de9c3352b1",
-                "sha256:3818b8e2c4b5148567e1b09ce739006acfaa44ce3156f8cbbc11062994b8e8dd",
-                "sha256:3ab9fa9d6dc2a7f29d7affdf3edebf6ece6fb28a6d80b14c3b2fb9d39b9322c3",
-                "sha256:3efea981d956a6f7173b4659849f55081867cf897e719f57383698af6f618a92",
-                "sha256:4c8f293f14abc8fd3e8e01c5bd86e6ed0b6ef71936ded5bf10fe7a5efefbaca3",
-                "sha256:5344a43228767f53a9df6e5b253f8cdca7dfc7b7aeae52551958192f56d98457",
-                "sha256:58bfa3aa19ca4c0f28c5dde0ff56c520fbac6f0daf4fac66ed4c8d2fb7f22e74",
-                "sha256:5b4545b8a40478183ac06c073e81a5ce4cf01bf1734962577cf2bb569a5b3bbf",
-                "sha256:5f50a1c177e2fa3ee0667a5ab79fdc6b23086bc8b589d90b93b4bd17eb0e64d1",
-                "sha256:63da2ccc0857c311d764e7d3d90f429c252e83b52d1f8f1d1fe55be26827d1f4",
-                "sha256:6749649eecd6a9871cae297bffa4ee76f90b4504a2a2ab528d9ebe912b101975",
-                "sha256:6804daeb7ef69e7b36f76caddb85cccd63d0c56dedb47555d2fc969e2af6a1a5",
-                "sha256:689bb688a1db722485e4610a503e3e9210dcc20c520b45ac8f7533c837be76fe",
-                "sha256:699a9af7dffaf67deeae27b2112aa06b41c370d5e7633e0ee0aea2e0b6c211f7",
-                "sha256:6b418afe5df18233fc6b6093deb82a32895b6bb0b1155c2cdb05203f583053f1",
-                "sha256:76cf573e5a365e790396a5cc2b909812633409306c6531a6877c59061e42c4f2",
-                "sha256:7b515674acfdcadb0eb5d00d8a709868173acece5cb0be3dd165950cbfdf5409",
-                "sha256:7b770ed79542ed52c519119473898198761d78beb24b107acf3ad65deae61f1f",
-                "sha256:7d2278d59425777cfcb19735018d897ca8303abe67cc735f9f97177ceff8027f",
-                "sha256:7e91ee82f4199af8c43d8158024cbdff3d931df350252288f0d4ce656df7f3b5",
-                "sha256:821b7f59b99551c69c85a6039c65b75f5683bdc63270fec660f75da67469ca24",
-                "sha256:822068f85e12a6e292803e112ab876bc03ed1f03dddb80154c395f891ca6b31e",
-                "sha256:8340225bd5e7a701c0fa98284c849c9b9fc9238abf53a0ebd90900f25d39a4e4",
-                "sha256:85cabf64adec449132e55616e7ca3e1000ab449d1d0f9d7f83146ed5bdcb6d8a",
-                "sha256:880bbbcbe2fca64e2f4d8e04db47bcdf504936fa2b33933efd945e1b429bea8c",
-                "sha256:8d0b4612b66ff5d62d03bcaa043bb018f74dfea51184e53f067e6fdcba4bd8de",
-                "sha256:8e20cb5a47247e383cf4ff523205060991021233ebd6f924bca927fcf25cf86f",
-                "sha256:925073b2fe14ab9b87e73f9a5fde6ce6392da430f3004d8b72cc86f746f5163b",
-                "sha256:998c7c41910666d2976928c38ea96a70d1aa43be6fe502f21a651e17483a43c5",
-                "sha256:9b22c5c66f67ae00c0199f6055705bc3eb3fcb08d03d2ec4059a2b1b25ed48d7",
-                "sha256:9f102706d0ca011de571de32c3247c6476b55bb6bc65a20f682f000b07a4852a",
-                "sha256:a08cff61517ee26cb56f1e949cca38caabe9ea9fbb4b1e10a805dc39844b7d5c",
-                "sha256:a0a336d6d3e8b234a3aae3c674873d8f0e720b76bc1d9416866c41cd9500ffb9",
-                "sha256:a35f8b7fa99f90dd2f5dc5a9fa12332642f087a7641289ca6c40d6e1a2637d8e",
-                "sha256:a38486985ca49cfa574a507e7a2215c0c780fd1778bb6290c21193b7211702ab",
-                "sha256:a5da296eb617d18e497bcf0a5c528f5d3b18dadb3619fbdadf4ed2356ef8d941",
-                "sha256:a6e441a86553c310258aca15d1c05903aaf4965b23f3bc2d55f200804e005ee5",
-                "sha256:a82d05da00a58b8e4c0008edbc8a4b6ec5a4bc1e2ee0fb6ed157cf634ed7fa45",
-                "sha256:ab323679b8b3030000f2be63e22cdeea5b47ee0abd2d6a1dc0c8103ddaa56cd7",
-                "sha256:b1f42b6921d0e81b1bcb5e395bc091a70f41c4d4e55ba99c6da2b31626c44892",
-                "sha256:b23e19989c355ca854276178a0463951a653309fb8e57ce674497f2d9f208746",
-                "sha256:b264171e3143d842ded311b7dccd46ff9ef34247129ff5bf5066123c55c2431c",
-                "sha256:b26a29f0b7fc6f0897f043ca366142d2b609dc60756ee6e4e90b5f762c6adc53",
-                "sha256:b64d891da92e232c36976c80ed7ebb383e3f148489796d8d31a5b6a677825efe",
-                "sha256:b9cc34af337a97d470040f99ba4282f6e6bac88407d021688a5d585e44a23184",
-                "sha256:bc718cd47b765e790eecb74d044cc8d37d58562f6c314ee9484df26276d36a38",
-                "sha256:be7292c55101e22f2a3d4d8913944cbea71eea90792bf914add27454a13905df",
-                "sha256:c83203addf554215463b59f6399835201999b5e48019dc17f182ed5ad87205c9",
-                "sha256:c9ec3eaf616d67db0764b3bb983962b4f385a1f08304fd30c7283954e6a7869b",
-                "sha256:ca34efc80a29351897e18888c71c6aca4a359247c87e0b1c7ada14f0ab0c0fb2",
-                "sha256:ca989b91cf3a3ba28930a9fc1e9aeafc2a395448641df1f387a2d394638943b0",
-                "sha256:d02a5399126a53492415d4906ab0ad0375a5456cc05c3fc0fc4ca11771745cda",
-                "sha256:d17bc7c2ccf49c478c5bdd447594e82692c74222698cfc9b5daae7ae7e90743b",
-                "sha256:d5bf6545cd27aaa8a13033ce56354ed9e25ab0e4ac3b5392b763d8d04b08e0c5",
-                "sha256:d6b430a9938a5a5d85fc107d852262ddcd48602c120e3dbb02137c83d212b380",
-                "sha256:da248f93f0418a9e9d94b0080d7ebc407a9a5e6d0b57bb30db9b5cc28de1ad33",
-                "sha256:da4dd7c9c50c059aba52b3524f84d7de956f7fef88f0bafcf4ad7dde94a064e8",
-                "sha256:df0623dcf9668ad0445e0558a21211d4e9a149ea8f5666917c8eeec515f0a6d1",
-                "sha256:e5168986b90a8d1f2f9dc1b841467c74221bd752537b99761a93d2d981e04889",
-                "sha256:efa29c2fe6b4fdd32e8ef81c1528506895eca86e1d8c4657fda04c9b3786ddf9",
-                "sha256:f1496ea22ca2c830cbcbd473de8f114a320da308438ae65abad6bab7867fe38f",
-                "sha256:f49e52d174375a7def9915c9f06ec4e569d235ad428f70751765f48d5926678c"
+                "sha256:04da965dfebb5dac2619cb90fcf93efdb35b3c6994fea58a157a834f2f94b318",
+                "sha256:0538747a9d7827ce3e16a8fdd201a99e661c7dee3c96c885d8ecba3c35d1032c",
+                "sha256:0645e934e940107e2fdbe7c5b6fb8ec6232444260752598bc4d09511bd056c0b",
+                "sha256:079b68f197c796e42aa80b1f739f058dcee796dc725cc9a1be0cdb08fc45b000",
+                "sha256:0f3f0059891d3254c7b5fb935330d6db38d6519ecd238ca4fce93c234b4a0f73",
+                "sha256:10d2017f9150248563bb579cd0d07c61c58da85c922b780060dcc9a3aa9f432d",
+                "sha256:1355755b62c28950f9ce123c7a41460ed9743c699905cbe664a5bcc5c9c7c7fb",
+                "sha256:13c90064b224e10c14dcdf8086688d3f0e612db53766e7478d7754703295c7c8",
+                "sha256:1423631e3d51008871299525b541413c9b6c6423593e89f9c4cfbe8460afc0a2",
+                "sha256:1436cf0063bba7888e43f1ba8d58824f085410ea2025befe81150aceb123e345",
+                "sha256:1a7c59c6ffd6ef5db362b798f350e24ab2cfa5700d53ac6681918f314a4d3b94",
+                "sha256:1e1cf47774373777936c5aabad489fef7b1c087dcd1f426b621fda9dcc12994e",
+                "sha256:206a51077773c6c5d2ce1991327cda719063a47adc02bd703c56a662cdb6c58b",
+                "sha256:21fb3d24ab430fc538a96e9fbb9b150029914805d551deeac7d7822f64631dfc",
+                "sha256:27e590352c76156f50f538dbcebd1925317a0f70540f7dc8c97d2931c595783a",
+                "sha256:287605bede6bd36e930577c5925fcea17cb30453d96a7b4c63c14a257118dbb9",
+                "sha256:2aaf6a0a6465d39b5ca69688fce82d20088c1838534982996ec46633dc7ad6cc",
+                "sha256:32a73c53783becdb7eaf75a2a1525ea8e49379fb7248c3eeefb9412123536387",
+                "sha256:41fb58868b816c202e8881fd0f179a4644ce6e7cbbb248ef0283a34b73ec73bb",
+                "sha256:4780677767dd52b99f0af1f123bc2c22873d30b474aa0e2fc3fe5e02217687c7",
+                "sha256:4878e667ebabe9b65e785ac8da4d48886fe81193a84bbe49f12acff8f7a383a4",
+                "sha256:487c8e61d7acc50b8be82bda8c8d21d20e133c3cbf41bd8ad7eb1aaeb3f07c97",
+                "sha256:4beea0f31491bc086991b97517b9683e5cfb369205dac0148ef685ac12a20a67",
+                "sha256:4cfbe42c686f33944e12f45a27d25a492cc0e43e1dc1da5d6a87cbcaf2e95627",
+                "sha256:4d5bae0a37af799207140652a700f21a85946f107a199bcb06720b13a4f1f0b7",
+                "sha256:4e285b5f2bf321fc0857b491b5028c5f276ec0c873b985d58d7748ece1d770dd",
+                "sha256:57e4d637258703d14171b54203fd6822fda218c6c2658a7d30816b10995f29f3",
+                "sha256:5974895115737a74a00b321e339b9c3f45c20275d226398ae79ac008d908bff7",
+                "sha256:5ef87fca280fb15342726bd5f980f6faf8b84a5287fcc2d4962ea8af88b35130",
+                "sha256:603a464c2e67d8a546ddaa206d98e3246e5db05594b97db844c2f0a1af37cf5b",
+                "sha256:6653071f4f9bac46fbc30f3c7838b0e9063ee335908c5d61fb7a4a86c8fd2036",
+                "sha256:6ca2264f341dd81e41f3fffecec6e446aa2121e0b8d026fb5130e02de1402785",
+                "sha256:6d279033bf614953c3fc4a0aa9ac33a21e8044ca72d4fa8b9273fe75359d5cca",
+                "sha256:6d949f53ad4fc7cf02c44d6678e7ff05ec5f5552b235b9e136bd52e9bf730b91",
+                "sha256:6daa662aba22ef3258934105be2dd9afa5bb45748f4f702a3b39a5bf53a1f4dc",
+                "sha256:6eafc048ea3f1b3c136c71a86db393be36b5b3d9c87b1c25204e7d397cee9536",
+                "sha256:830c88747dce8a3e7525defa68afd742b4580df6aa2fdd6f0855481e3994d391",
+                "sha256:86e92728ef3fc842c50a5cb1d5ba2bc66db7da08a7af53fb3da79e202d1b2cd3",
+                "sha256:8caf4d16b31961e964c62194ea3e26a0e9561cdf72eecb1781458b67ec83423d",
+                "sha256:8d1a92d8e90b286d491e5626af53afef2ba04da33e82e30744795c71880eaa21",
+                "sha256:8f0a4d179c9a941eb80c3a63cdb495e539e064f8054230844dcf2fcb812b71d3",
+                "sha256:9232b09f5efee6a495a99ae6824881940d6447debe272ea400c02e3b68aad85d",
+                "sha256:927a9dd016d6033bc12e0bf5dee1dde140235fc8d0d51099353c76081c03dc29",
+                "sha256:93e414e3206779ef41e5ff2448067213febf260ba747fc65389a3ddaa3fb8715",
+                "sha256:98cafc618614d72b02185ac583c6f7796202062c41d2eeecdf07820bad3295ed",
+                "sha256:9c3a88d20e4fe4a2a4a84bf439a5ac9c9aba400b85244c63a1ab7088f85d9d25",
+                "sha256:9f36de4cd0c262dd9927886cc2305aa3f2210db437aa4fed3fb4940b8bf4592c",
+                "sha256:a60f90bba4c37962cbf210f0188ecca87daafdf60271f4c6948606e4dabf8785",
+                "sha256:a614e4afed58c14254e67862456d212c4dcceebab2eaa44d627c2ca04bf86837",
+                "sha256:ae06c1e4bc60ee076292e582a7512f304abdf6c70db59b56745cca1684f875a4",
+                "sha256:b122a188cd292c4d2fcd78d04f863b789ef43aa129b233d7c9004de08693728b",
+                "sha256:b570da8cd0012f4af9fa76a5635cd31f707473e65a5a335b186069d5c7121ff2",
+                "sha256:bcaa1c495ce623966d9fc8a187da80082334236a2a1c7e141763ffaf7a405067",
+                "sha256:bd34f6d1810d9354dc7e35158aa6cc33456be7706df4420819af6ed966e85448",
+                "sha256:be9eb06489bc975c38706902cbc6888f39e946b81383abc2838d186f0e8b6a9d",
+                "sha256:c4b2e0559b68455c085fb0f6178e9752c4be3bba104d6e881eb5573b399d1eb2",
+                "sha256:c62e8dd9754b7debda0c5ba59d34509c4688f853588d75b53c3791983faa96fc",
+                "sha256:c852b1530083a620cb0de5f3cd6826f19862bafeaf77586f1aef326e49d95f0c",
+                "sha256:d9fc0bf3ff86c17348dfc5d322f627d78273eba545db865c3cd14b3f19e57fa5",
+                "sha256:dad7b164905d3e534883281c050180afcf1e230c3d4a54e8038aa5cfcf312b84",
+                "sha256:e5f66bdf0976ec667fc4594d2812a00b07ed14d1b44259d19a41ae3fff99f2b8",
+                "sha256:e8f0c9d65da595cfe91713bc1222af9ecabd37971762cb830dea2fc3b3bb2acf",
+                "sha256:edffbe3c510d8f4bf8640e02ca019e48a9b72357318383ca60e3330c23aaffc7",
+                "sha256:eea5d6443b093e1545ad0210e6cf27f920482bfcf5c77cdc8596aec73523bb7e",
+                "sha256:ef72013e20dd5ba86a8ae1aed7f56f31d3374189aa8b433e7b12ad182c0d2dfb",
+                "sha256:f05251bbc2145349b8d0b77c0d4e5f3b228418807b1ee27cefb11f69ed3d233b",
+                "sha256:f1be258c4d3dc609e654a1dc59d37b17d7fef05df912c01fc2e15eb43a9735f3",
+                "sha256:f9ced82717c7ec65a67667bb05865ffe38af0e835cdd78728f1209c8fffe0cad",
+                "sha256:fe17d10b97fdf58155f858606bddb4e037b805a60ae023c009f760d8361a4eb8",
+                "sha256:fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"
            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==4.9.2"
+            "version": "==4.9.1"
        },
        "markdown": {
            "hashes": [
@@ -532,11 +514,10 @@
        },
        "packaging": {
            "hashes": [
-                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
-                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
+                "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3",
+                "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==23.1"
+            "version": "==22.0"
        },
        "pep517": {
            "hashes": [
@@ -585,7 +566,6 @@
                "sha256:e3ff858d504312ea07519121d3ecdf1b5bc40541f957d2b85d271a2ca6284b70",
                "sha256:f721cd86d8ddf0624306fcd1fed3e086387fcb2e32baeafbd1ba92a7c40c5563"
            ],
-            "index": "pypi",
            "version": "==6.2.5"
        },
        "pillow": {
@@ -660,7 +640,6 @@
                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
            ],
-            "markers": "python_version >= '3.6'",
            "version": "==1.0.0"
        },
        "premailer": {
@@ -880,14 +859,6 @@
            "index": "pypi",
            "version": "==1.11.1"
        },
-        "setuptools": {
-            "hashes": [
-                "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b",
-                "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==67.7.2"
-        },
        "simplejson": {
            "hashes": [
                "sha256:04e31fa6ac8e326480703fb6ded1488bfa6f1d3f760d32e29dbf66d0838982ce",
@@ -969,6 +940,7 @@
                "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"
            ],
            "index": "pypi",
+            "markers": "python_version >= '3.0'",
            "version": "==2.3.2.post1"
        },
        "sqlparse": {
@@ -993,13 +965,6 @@
            "index": "pypi",
            "version": "==0.3"
        },
-        "svglib": {
-            "hashes": [
-                "sha256:3ae765d3a9409ee60c0fb4d24c2deb6a80617aa927054f5bcd7fc98f0695e587"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.5.1"
-        },
        "tini": {
            "hashes": [
                "sha256:8062be51e6766c15ec402579fff422d8c2fb46bdb3f0b22bd009f32d8dd79c81",
@@ -1008,20 +973,11 @@
            "index": "pypi",
            "version": "==3.0.1"
        },
-        "tinycss2": {
-            "hashes": [
-                "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847",
-                "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.2.1"
-        },
        "toml": {
            "hashes": [
                "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": {
@@ -1073,11 +1029,11 @@
        },
        "z3c.rml": {
            "hashes": [
-                "sha256:100b62a3978a9acbd2d1a043d4c5b1e2e29601dc687a19b604a95570da6af94f",
-                "sha256:a8064fd06581e45fa208ff02707834744b3b776d4e399bc1fcd5f2217b8ecdd1"
+                "sha256:547370b5083a8d79b49e8dde03ac9a12818d9a1c4577a0a9e9bc4b0eccc925b7",
+                "sha256:d5d6fec99c3e909cd6305d04fb53b3923685db942abe56e85815629b6f841298"
            ],
            "index": "pypi",
-            "version": "==4.3.0"
+            "version": "==4.2.1"
        },
        "zipp": {
            "hashes": [
@@ -1284,105 +1240,28 @@
                "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
                "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"
            ],
-            "markers": "python_version >= '3.5'",
            "version": "==1.10"
        },
        "attrs": {
            "hashes": [
-                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
-                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
+                "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6",
+                "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==23.1.0"
+            "version": "==22.1.0"
        },
        "certifi": {
            "hashes": [
-                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
-                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+                "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3",
+                "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2023.5.7"
+            "version": "==2022.12.7"
        },
        "charset-normalizer": {
            "hashes": [
-                "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6",
-                "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1",
-                "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e",
-                "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373",
-                "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62",
-                "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230",
-                "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be",
-                "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c",
-                "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0",
-                "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448",
-                "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f",
-                "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649",
-                "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d",
-                "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0",
-                "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706",
-                "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a",
-                "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59",
-                "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23",
-                "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5",
-                "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb",
-                "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e",
-                "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e",
-                "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c",
-                "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28",
-                "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d",
-                "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41",
-                "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974",
-                "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce",
-                "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f",
-                "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1",
-                "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d",
-                "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8",
-                "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017",
-                "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31",
-                "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7",
-                "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8",
-                "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e",
-                "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14",
-                "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd",
-                "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d",
-                "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795",
-                "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b",
-                "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b",
-                "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b",
-                "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203",
-                "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f",
-                "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19",
-                "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1",
-                "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a",
-                "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac",
-                "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9",
-                "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0",
-                "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137",
-                "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f",
-                "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6",
-                "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5",
-                "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909",
-                "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f",
-                "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0",
-                "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324",
-                "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755",
-                "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb",
-                "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854",
-                "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c",
-                "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60",
-                "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84",
-                "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0",
-                "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b",
-                "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1",
-                "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531",
-                "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1",
-                "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11",
-                "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326",
-                "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df",
-                "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"
+                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
+                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.1.0"
+            "version": "==2.1.1"
        },
        "coverage": {
            "hashes": [
@@ -1437,7 +1316,6 @@
                "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84",
                "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==6.5.0"
        },
        "coveralls": {
@@ -1464,18 +1342,17 @@
        },
        "exceptiongroup": {
            "hashes": [
-                "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e",
-                "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"
+                "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828",
+                "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"
            ],
            "markers": "python_version < '3.11'",
-            "version": "==1.1.1"
+            "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": {
@@ -1483,7 +1360,6 @@
                "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
                "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==0.14.0"
        },
        "idna": {
@@ -1496,34 +1372,30 @@
        },
        "iniconfig": {
            "hashes": [
-                "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3",
-                "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"
+                "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3",
+                "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.0"
+            "version": "==1.1.1"
        },
        "outcome": {
            "hashes": [
                "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672",
                "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==1.2.0"
        },
        "packaging": {
            "hashes": [
-                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
-                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
+                "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3",
+                "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==23.1"
+            "version": "==22.0"
        },
        "pluggy": {
            "hashes": [
                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
            ],
-            "markers": "python_version >= '3.6'",
            "version": "==1.0.0"
        },
        "psutil": {
@@ -1625,9 +1497,6 @@
            "version": "==3.3.2"
        },
        "pytest-xdist": {
-            "extras": [
-                "psutil"
-            ],
            "hashes": [
                "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c",
                "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"
@@ -1651,20 +1520,11 @@
            "index": "pypi",
            "version": "==3.141.0"
        },
-        "setuptools": {
-            "hashes": [
-                "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b",
-                "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==67.7.2"
-        },
        "sniffio": {
            "hashes": [
                "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101",
                "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==1.3.0"
        },
        "sortedcontainers": {
@@ -1676,10 +1536,10 @@
        },
        "splinter": {
            "hashes": [
-                "sha256:1f072570c084f5f7e0c685b6b5d93b1a7959da06cb5da4c3b548dc1b3b0757a0",
-                "sha256:ba9603385deb91ffb92b2e0edeed3da58dce3bfa0e0db1a37143c5e64b83ceb2"
+                "sha256:4a14a9d1f9d1372c64b666627ef4e103d759379bc1a9bde0c487e00d70976b1e",
+                "sha256:616da85a0c99bef00b59e75eb29e2e48162027c68ccb81a12d1dfe6d26209692"
            ],
-            "version": "==0.19.0"
+            "version": "==0.18.1"
        },
        "tomli": {
            "hashes": [
@@ -1694,16 +1554,14 @@
                "sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf",
                "sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==0.22.0"
        },
        "trio-websocket": {
            "hashes": [
-                "sha256:0908435e4eecc49d830ae1c4d6c47b978a75f00594a2be2104d58b61a04cdb53",
-                "sha256:af13e9393f9051111300287947ec595d601758ce3d165328e7d36325135a8d62"
+                "sha256:5b558f6e83cc20a37c3b61202476c5295d1addf57bd65543364e0337e37ed2bc",
+                "sha256:a3d34de8fac26023eee701ed1e7bf4da9a8326b61a62934ec9e53b64970fd8fe"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.10.2"
+            "version": "==0.9.2"
        },
        "urllib3": {
            "hashes": [
@@ -1718,7 +1576,6 @@
                "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065",
                "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736"
            ],
-            "markers": "python_version >= '3.7'",
            "version": "==1.2.0"
        },
        "zope.component": {
--- a/PyRIGS/views.py
+++ b/PyRIGS/views.py
@@ -321,60 +321,45 @@ class OEmbedView(generic.View):
        return JsonResponse(data)


-def get_info_string(user):
-    user_str = f"by {user.name} " if user else ""
-    time = timezone.now().strftime('%d/%m/%Y %H:%I')
-    return f"[Paperwork generated {user_str}on {time}"
-
-
-def render_pdf_response(template, context, append_terms):
-    merger = PdfFileMerger()
-    rml = template.render(context)
-    buffer = rml2pdf.parseString(rml)
-    merger.append(PdfFileReader(buffer))
-    buffer.close()
-
-    if append_terms:
-        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-        merger.append(BytesIO(terms.read()))
-
-    merged = BytesIO()
-    merger.write(merged)
-
-    response = HttpResponse(content_type='application/pdf')
-    f = context['filename']
-    response['Content-Disposition'] = f'filename="{f}"'
-    response.write(merged.getvalue())
-    return response
-
-
 class PrintView(generic.View):
    append_terms = False

    def get_context_data(self, **kwargs):
        obj = get_object_or_404(self.model, pk=self.kwargs['pk'])
+        user_str = f"by {self.request.user.name} " if self.request.user is not None else ""
+        time = timezone.now().strftime('%d/%m/%Y %H:%I')
        object_name = re.sub(r'[^a-zA-Z0-9 \n\.]', '', obj.name)

        context = {
            'object': obj,
            'current_user': self.request.user,
            'object_name': object_name,
-            'info_string': get_info_string(self.request.user) + f"- {obj.current_version_id}]",
+            'info_string': f"[Paperwork generated {user_str}on {time} - {obj.current_version_id}]",
        }

        return context

    def get(self, request, pk):
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), self.append_terms)
+        template = get_template(self.template_name)

+        merger = PdfFileMerger()

-class PrintListView(generic.ListView):
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['current_user'] = self.request.user
-        context['info_string'] = get_info_string(self.request.user) + "]"
-        return context
+        context = self.get_context_data()

-    def get(self, request):
-        self.object_list = self.get_queryset()
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), False)
+        rml = template.render(context)
+        buffer = rml2pdf.parseString(rml)
+        merger.append(PdfFileReader(buffer))
+        buffer.close()
+
+        if self.append_terms:
+            terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
+            merger.append(BytesIO(terms.read()))
+
+        merged = BytesIO()
+        merger.write(merged)
+
+        response = HttpResponse(content_type='application/pdf')
+        f = context['filename']
+        response['Content-Disposition'] = f'filename="{f}"'
+        response.write(merged.getvalue())
+        return response
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -124,6 +124,22 @@ class EventForm(forms.ModelForm):
                  'purchase_order', 'collector']


+class SubhireForm(forms.ModelForm):
+    related_models = {
+        'person': models.Person,
+        'organisation': models.Organisation,
+    }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['start_date'].widget.format = '%Y-%m-%d'
+        self.fields['end_date'].widget.format = '%Y-%m-%d'
+
+    class Meta:
+        model = models.Subhire
+        fields = '__all__'
+
+
 class BaseClientEventAuthorisationForm(forms.ModelForm):
    tos = forms.BooleanField(required=True, label="Terms of hire")
    name = forms.CharField(label="Your Name")
--- a/RIGS/migrations/0045_subhire.py
+++ b/RIGS/migrations/0045_subhire.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.2.12 on 2022-10-15 19:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+import versioning.versioning
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0044_profile_is_supervisor'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Subhire',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, default='')),
+                ('status', models.IntegerField(choices=[(0, 'Provisional'), (1, 'Confirmed'), (2, 'Booked'), (3, 'Cancelled')], default=0)),
+                ('start_date', models.DateField()),
+                ('start_time', models.TimeField(blank=True, null=True)),
+                ('end_date', models.DateField(blank=True, null=True)),
+                ('end_time', models.TimeField(blank=True, null=True)),
+                ('purchase_order', models.CharField(blank=True, default='', max_length=255, verbose_name='PO')),
+                ('insurance_value', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('organisation', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='RIGS.organisation')),
+                ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='RIGS.person')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, versioning.versioning.RevisionMixin),
+        ),
+    ]
--- a/RIGS/migrations/0046_subhire_events.py
+++ b/RIGS/migrations/0046_subhire_events.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2022-10-20 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0045_subhire'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subhire',
+            name='events',
+            field=models.ManyToManyField(to='RIGS.Event'),
+        ),
+    ]
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -304,8 +304,29 @@ class EventManager(models.Manager):
        return qs


-@reversion.register(follow=['items'])
-class Event(models.Model, RevisionMixin):
+def find_earliest_event_time(event, datetime_list):
+    # If there is no start time defined, pretend it's midnight
+    startTimeFaked = False
+    if event.has_start_time:
+        startDateTime = datetime.datetime.combine(event.start_date, event.start_time)
+    else:
+        startDateTime = datetime.datetime.combine(event.start_date, datetime.time(00, 00))
+        startTimeFaked = True
+
+    # timezoneIssues - apply the default timezone to the naiive datetime
+    tz = pytz.timezone(settings.TIME_ZONE)
+    startDateTime = tz.localize(startDateTime)
+    datetime_list.append(startDateTime)  # then add it to the list
+
+    earliest = min(datetime_list).astimezone(tz)  # find the earliest datetime in the list
+
+    # if we faked it & it's the earliest, better own up
+    if startTimeFaked and earliest == startDateTime:
+        return event.start_date
+    return earliest
+
+
+class BaseEvent(models.Model, RevisionMixin):
    # Done to make it much nicer on the database
    PROVISIONAL = 0
    CONFIRMED = 1
@@ -321,31 +342,97 @@ class Event(models.Model, RevisionMixin):
    name = models.CharField(max_length=255)
    person = models.ForeignKey('Person', null=True, blank=True, on_delete=models.CASCADE)
    organisation = models.ForeignKey('Organisation', blank=True, null=True, on_delete=models.CASCADE)
-    venue = models.ForeignKey('Venue', blank=True, null=True, on_delete=models.CASCADE)
    description = models.TextField(blank=True, default='')
-    notes = models.TextField(blank=True, default='')
    status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL)
-    dry_hire = models.BooleanField(default=False)
-    is_rig = models.BooleanField(default=True)
-    based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True,
-                                 null=True)

    # Timing
    start_date = models.DateField()
    start_time = models.TimeField(blank=True, null=True)
    end_date = models.DateField(blank=True, null=True)
    end_time = models.TimeField(blank=True, null=True)
+
+    purchase_order = models.CharField(max_length=255, blank=True, default='', verbose_name='PO')
+
+    class Meta:
+        abstract = True
+
+    @property
+    def cancelled(self):
+        return (self.status == self.CANCELLED)
+
+    @property
+    def confirmed(self):
+        return (self.status == self.BOOKED or self.status == self.CONFIRMED)
+
+    @property
+    def has_start_time(self):
+        return self.start_time is not None
+
+    @property
+    def has_end_time(self):
+        return self.end_time is not None
+
+    @property
+    def latest_time(self):
+        """Returns the end of the event - this function could return either a tzaware datetime, or a naiive date object"""
+        tz = pytz.timezone(settings.TIME_ZONE)
+        endDate = self.end_date
+        if endDate is None:
+            endDate = self.start_date
+
+        if self.has_end_time:
+            endDateTime = datetime.datetime.combine(endDate, self.end_time)
+            tz = pytz.timezone(settings.TIME_ZONE)
+            endDateTime = tz.localize(endDateTime)
+
+            return endDateTime
+
+        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."]
+
+        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."]
+        return errdict
+
+    def __str__(self):
+        return f"{self.display_id}: {self.name}"
+
+@reversion.register(follow=['items'])
+class Event(BaseEvent):
+    mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True,
+                        verbose_name="MIC", on_delete=models.CASCADE)
+    venue = models.ForeignKey('Venue', blank=True, null=True, on_delete=models.CASCADE)
+    notes = models.TextField(blank=True, default='')
+    dry_hire = models.BooleanField(default=False)
+    is_rig = models.BooleanField(default=True)
+    based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True,
+                                 null=True)
+
    access_at = models.DateTimeField(blank=True, null=True)
    meet_at = models.DateTimeField(blank=True, null=True)

-    # Crew management
+    # Dry-hire only
    checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True,
                                      on_delete=models.CASCADE)
-    mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True,
-                            verbose_name="MIC", on_delete=models.CASCADE)

    # Monies
-    purchase_order = models.CharField(max_length=255, blank=True, default='', verbose_name='PO')
    collector = models.CharField(max_length=255, blank=True, default='', verbose_name='collected by')

    # Authorisation request details
@@ -395,26 +482,10 @@ class Event(models.Model, RevisionMixin):
    def total(self):
        return Decimal(self.sum_total + self.vat).quantize(Decimal('.01'))

-    @property
-    def cancelled(self):
-        return (self.status == self.CANCELLED)
-
-    @property
-    def confirmed(self):
-        return (self.status == self.BOOKED or self.status == self.CONFIRMED)
-
    @property
    def hs_done(self):
        return self.riskassessment is not None and len(self.checklists.all()) > 0

-    @property
-    def has_start_time(self):
-        return self.start_time is not None
-
-    @property
-    def has_end_time(self):
-        return self.end_time is not None
-
    @property
    def earliest_time(self):
        """Finds the earliest time defined in the event - this function could return either a tzaware datetime, or a naiive date object"""
@@ -428,73 +499,47 @@ class Event(models.Model, RevisionMixin):
        if self.meet_at:
            datetime_list.append(self.meet_at)

-        # If there is no start time defined, pretend it's midnight
-        startTimeFaked = False
-        if self.has_start_time:
-            startDateTime = datetime.datetime.combine(self.start_date, self.start_time)
-        else:
-            startDateTime = datetime.datetime.combine(self.start_date, datetime.time(00, 00))
-            startTimeFaked = True
-
-        # timezoneIssues - apply the default timezone to the naiive datetime
-        tz = pytz.timezone(settings.TIME_ZONE)
-        startDateTime = tz.localize(startDateTime)
-        datetime_list.append(startDateTime)  # then add it to the list
-
-        earliest = min(datetime_list).astimezone(tz)  # find the earliest datetime in the list
-
-        # if we faked it & it's the earliest, better own up
-        if startTimeFaked and earliest == startDateTime:
-            return self.start_date
+        earliest = find_earliest_event_time(self, datetime_list)

        return earliest

-    @property
-    def latest_time(self):
-        """Returns the end of the event - this function could return either a tzaware datetime, or a naiive date object"""
-        tz = pytz.timezone(settings.TIME_ZONE)
-        endDate = self.end_date
-        if endDate is None:
-            endDate = self.start_date
-
-        if self.has_end_time:
-            endDateTime = datetime.datetime.combine(endDate, self.end_time)
-            tz = pytz.timezone(settings.TIME_ZONE)
-            endDateTime = tz.localize(endDateTime)
-
-            return endDateTime
-
-        else:
-            return endDate
-
    @property
    def internal(self):
        return bool(self.organisation and self.organisation.union_account)

    @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 = {}
-        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.']
-
-        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 = super.clean()

        if self.access_at is not None:
            if self.access_at.date() > self.start_date:
@@ -555,6 +600,44 @@ 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):
        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
--- a/RIGS/static/imgs/paperwork/corner-tr-su.jpg
+++ b/RIGS/static/imgs/paperwork/corner-tr-su.jpg
--- a/RIGS/templates/base_print.xml
+++ b/RIGS/templates/base_print.xml
@@ -11,7 +11,6 @@
        <initialize>
            <color id="LightGray" RGB="#D3D3D3"/>
            <color id="DarkGray" RGB="#707070"/>
-            <color id="Brand" RGB="#3853a4"/>
        </initialize>

        <paraStyle name="style.para" fontName="OpenSans" />
@@ -28,8 +27,6 @@
        <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.emheader" fontName="OpenSans" textColor="White" fontSize="12" backColor="Brand" leading="20" borderPadding="4"/>
-        <paraStyle name="style.breakbefore" parent="emheader" pageBreakBefore="1"/>

        <blockTableStyle id="eventSpecifics">
            <blockValign value="top"/>
--- a/RIGS/templates/base_rigs.html
+++ b/RIGS/templates/base_rigs.html
@@ -30,6 +30,8 @@
        {% if perms.RIGS.add_event %}
        <a class="dropdown-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span>
                                New Event</a>
+        <a class="dropdown-item" href="{% url 'subhire_create' %}"><span class="fas fa-truck"></span>
+                                New Subhire</a>
        {% endif %}
       </div>
    </li>
--- 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/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -25,12 +25,10 @@
        {% include 'partials/hs_details.html' %}
    </div>
    {% endif %}
-    {% if event.is_rig %}
-        {% if event.is_rig and event.internal and perms.RIGS.view_event %}
-        <div class="col-md-8 py-3">
-            {% include 'partials/auth_details.html' %}
-        </div>
-    {% endif %}
+    {% if event.is_rig and event.internal and perms.RIGS.view_event %}
+    <div class="col-md-8 py-3">
+        {% include 'partials/auth_details.html' %}
+    </div>
    {% endif %}
    {% if not request.is_ajax and perms.RIGS.view_event %}
    <div class="col-sm-12 text-right">
--- 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/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_detail.html
+++ b/RIGS/templates/subhire_detail.html
@@ -0,0 +1,27 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+
+{% load markdown_tags %}
+
+{% block content %}
+<div class="row my-3 py-3">
+    <div class="col-md-6">
+        {% include 'partials/contact_details.html' %}
+    </div>
+    <div class="col-md-6">
+        {% include 'partials/event_details.html' %}
+    </div>
+    {% if not request.is_ajax and perms.RIGS.view_event %}
+        <div class="col-sm-12 text-right">
+            {% include 'partials/last_edited.html' with target="event_history" %}
+        </div>
+    {% endif %}
+</div>
+{% endblock %}
+
+{% if request.is_ajax %}
+    {% block footer %}
+            {% if perms.RIGS.view_event %}
+                {% include 'partials/last_edited.html' with target="event_history" %}
+            {% endif %}
+    {% endblock %}
+{% endif %}
--- a/RIGS/templates/subhire_form.html
+++ b/RIGS/templates/subhire_form.html
@@ -0,0 +1,192 @@
+{% extends 'base_rigs.html' %}
+
+{% load widget_tweaks %}
+{% load static %}
+{% load multiply from filters %}
+{% load button from filters %}
+
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
+{% endblock %}
+
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}"></script>
+    <script src="{% static 'js/easymde.min.js' %}"></script>
+{% endblock %}
+
+{% block js %}
+    {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/interaction.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
+
+    <script>
+        $(document).ready(function () {
+            setupMDE('#id_description');
+        });
+        $(function () {
+          $('[data-toggle="tooltip"]').tooltip();
+        });
+    </script>
+{% endblock %}
+
+{% block content %}
+<form class="row" role="form" method="POST">
+    {% csrf_token %}
+    <div class="col-12">
+        {% include 'form_errors.html' %}
+    </div>
+    {# Contact details #}
+    <div class="col-md-6 mb-2">
+        <div class="card">
+            <div class="card-header">Contact Details</div>
+            <div class="card-body">
+                <div class="form-group" data-toggle="tooltip">
+                    <label for="{{ form.person.id_for_label }}">Primary Contact</label>
+                    <div class="row">
+                        <div class="col-9">
+                            <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                {% if person %}
+                                    <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
+                                {% endif %}
+                            </select>
+                        </div>
+                        <div class="col-3 align-right">
+                            <div class="btn-group">
+                                <a href="{% url 'person_create' %}" class="btn btn-success modal-href"
+                                   data-target="#{{ form.person.id_for_label }}">
+                                    <span class="fas fa-plus"></span>
+                                </a>
+                                <a {% if form.person.value %}href="{% url 'person_update' form.person.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
+                                    <span class="fas fa-user-edit"></span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="{{ form.organisation.id_for_label }}">Hire Company</label>
+                    <div class="row">
+                        <div class="col-9">
+                            <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}">
+                                {% if organisation %}
+                                    <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
+                                {% endif %}
+                            </select>
+                        </div>
+                        <div class="col-3 align-right">
+                            <div class="btn-group">
+                                <a href="{% url 'organisation_create' %}" class="btn btn-success modal-href"
+                                   data-target="#{{ form.organisation.id_for_label }}">
+                                    <span class="fas fa-plus"></span>
+                                </a>
+                                <a {% if form.organisation.value %}href="{% url 'organisation_update' form.organisation.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
+                                    <span class="fas fa-edit"></span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </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">
+            <div class="card-header">Hire Details</div>
+            <div class="card-body">
+                <div class="form-group" data-toggle="tooltip" title="Name of the event, displays on rigboard and on paperwork">
+                    <label for="{{ form.name.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.name.label }}</label>
+                    <div class="col-sm-8">
+                        {% render_field form.name class+="form-control" %}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="{{ form.start_date.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.start_date.label }}</label>
+                    <div class="col-sm-8">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
+                                {% render_field form.start_date class+="form-control" %}
+                            </div>
+                            <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
+                                {% render_field form.start_time class+="form-control" step="60" %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="{{ form.end_date.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.end_date.label }}</label>
+                    <div class="col-sm-8">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
+                                {% render_field form.end_date class+="form-control" %}
+                            </div>
+                            <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
+                                {% render_field form.end_time class+="form-control" step="60" %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
+                    <label for="{{ form.status.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.status.label }}</label>
+                    <div class="col-sm-8">
+                        {% render_field form.status class+="form-control" %}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="{{ form.purchase_order.id_for_label }}"
+                           class="col-sm-4 col-form-label">{{ form.purchase_order.label }}</label>
+                    <div class="col-sm-8">
+                        {% render_field form.purchase_order class+="form-control" %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <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 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>
+    </div>
+    <div class="col-sm-12 text-right my-3">
+        {% button 'submit' %}
+    </div>
+</form>
+{% endblock %}
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -196,8 +196,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
        text = "Edit"
    elif type == 'print':
        clazz += " btn-primary "
-        icon = "fa-download"
-        text = "Export"
+        icon = "fa-print"
+        text = "Print"
    elif type == 'duplicate':
        clazz += " btn-info "
        icon = "fa-copy"
--- 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')),


@@ -70,6 +66,18 @@ urlpatterns = [
    path('event/<int:pk>/duplicate/', permission_required_with_403('RIGS.add_event')(views.EventDuplicate.as_view()),
         name='event_duplicate'),

+
+    # Subhire
+    path('subhire/<int:pk>/', views.SubhireDetail.as_view(),
+          name='subhire_detail'),
+    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_update'),
+    path('subhire/upcoming', views.SubhireList.as_view(),
+          name='subhire_list'),
+
+
    # Event H&S
    path('event/hs/', permission_required_with_403('RIGS.view_riskassessment')(views.HSList.as_view()), name='hs_list'),

--- 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/init.py
+++ b/RIGS/views/init.py
@@ -3,3 +3,4 @@ from .finance import *
 from .hs import *
 from .ical import *
 from .rigboard import *
+from .subhire import *
--- 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


@@ -61,10 +73,6 @@ class EventDetail(generic.DetailView, ModalURLMixin):
        if self.object.dry_hire:
            title += " <span class='badge badge-secondary'>Dry Hire</span>"
        context['page_title'] = title
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        else:
-            context['override'] = 'base_assets.html'
        return context


--- a/RIGS/views/subhire.py
+++ b/RIGS/views/subhire.py
@@ -0,0 +1,58 @@
+from django.urls import reverse_lazy
+from django.views import generic
+from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
+from RIGS import models, forms
+
+
+class SubhireDetail(generic.DetailView, ModalURLMixin):
+    template_name = 'subhire_detail.html'
+    model = models.Subhire
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = f"{self.object.display_id} | {self.object.name}"
+        return context
+
+
+class SubhireCreate(generic.CreateView):
+    model = models.Subhire
+    form_class = forms.SubhireForm
+    template_name = 'subhire_form.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = "New Subhire"
+        context['edit'] = True
+        form = context['form']
+        get_related(form, context)
+        return context
+
+    def get_success_url(self):
+        return reverse_lazy('subhire_detail', kwargs={'pk': self.object.pk})
+
+
+class SubhireEdit(generic.UpdateView):
+    model = models.Subhire
+    form_class = forms.SubhireForm
+    template_name = 'subhire_form.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = f"Edit Subhire: {self.object.display_id} | {self.object.name}"
+        context['edit'] = True
+        form = context['form']
+        get_related(form, context)
+        return context
+
+    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/management/commands/generateSampleAssetsData.py
+++ b/assets/management/commands/generateSampleAssetsData.py
@@ -105,7 +105,8 @@ class Command(BaseCommand):

        for i in range(100):
            prefix = random.choice(asset_prefixes)
-            asset_id = get_available_asset_id(wanted_prefix=prefix)
+            asset_id = str(get_available_asset_id(wanted_prefix=prefix))
+            asset_id = prefix + asset_id
            asset = models.Asset(
                asset_id=asset_id,
                description=random.choice(asset_description),
--- a/assets/models.py
+++ b/assets/models.py
@@ -102,8 +102,7 @@ class AssetManager(models.Manager):

 def get_available_asset_id(wanted_prefix=""):
    last_asset = Asset.objects.filter(asset_id_prefix=wanted_prefix).last()
-    last_asset_id = last_asset.asset_id_number if last_asset else 0
-    return wanted_prefix + str(last_asset_id + 1)
+    return 9000 if last_asset is None else wanted_prefix + str(last_asset.asset_id_number + 1)


 def validate_positive(value):
--- a/assets/views.py
+++ b/assets/views.py
@@ -168,7 +168,7 @@ class DuplicateMixin:
 class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
    def get_initial(self, *args, **kwargs):
        initial = super().get_initial(*args, **kwargs)
-        initial["asset_id"] = models.get_available_asset_id()
+        initial["asset_id"] = models.get_available_asset_id(wanted_prefix=self.get_object().asset_id_prefix)
        return initial

    def get_context_data(self, **kwargs):
--- 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
@@ -5,7 +5,6 @@
  "requires": true,
  "packages": {
    "": {
-      "name": "PyRIGS",
      "version": "1.0.0",
      "license": "Custom",
      "dependencies": {
@@ -19,7 +18,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",
@@ -38,7 +36,7 @@
        "uglify-js": "^3.14.5"
      },
      "devDependencies": {
-        "browser-sync": "^2.27.11"
+        "browser-sync": "^2.27.10"
      }
    },
    "node_modules/@babel/code-frame": {
@@ -280,13 +278,10 @@
      "dev": true
    },
    "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
    },
    "node_modules/@types/estree": {
      "version": "1.0.0",
@@ -304,9 +299,9 @@
      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
    },
    "node_modules/@types/node": {
-      "version": "18.16.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz",
-      "integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==",
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
      "dev": true
    },
    "node_modules/@types/normalize-package-data": {
@@ -1030,13 +1025,13 @@
      }
    },
    "node_modules/browser-sync": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.11.tgz",
-      "integrity": "sha512-U5f9u97OYJH66T0MGWWzG9rOQTW6ZmDMj97vsmtqwNS03JAwdLVES8eel2lD3rvAqQCNAFqaJ74NMacBI57vJg==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.10.tgz",
+      "integrity": "sha512-xKm+6KJmJu6RuMWWbFkKwOCSqQOxYe3nOrFkKI5Tr/ZzjPxyU3pFShKK3tWnazBo/3lYQzN7fzjixG8fwJh1Xw==",
      "dev": true,
      "dependencies": {
-        "browser-sync-client": "^2.27.11",
-        "browser-sync-ui": "^2.27.11",
+        "browser-sync-client": "^2.27.10",
+        "browser-sync-ui": "^2.27.10",
        "bs-recipes": "1.3.4",
        "bs-snippet-injector": "^2.0.1",
        "chokidar": "^3.5.1",
@@ -1054,7 +1049,7 @@
        "micromatch": "^4.0.2",
        "opn": "5.3.0",
        "portscanner": "2.2.0",
-        "qs": "^6.11.0",
+        "qs": "6.2.3",
        "raw-body": "^2.3.2",
        "resp-modifier": "6.0.2",
        "rx": "4.1.0",
@@ -1074,9 +1069,9 @@
      }
    },
    "node_modules/browser-sync-client": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.11.tgz",
-      "integrity": "sha512-okMNfD2NasL/XD1/BclP3onXjhahisk3e/kTQ5HPDT/lLqdBqNDd6QFcjI5I1ak7na2hxKQSLjryql+7fp5gKQ==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.10.tgz",
+      "integrity": "sha512-KCFKA1YDj6cNul0VsA28apohtBsdk5Wv8T82ClOZPZMZWxPj4Ny5AUbrj9UlAb/k6pdxE5HABrWDhP9+cjt4HQ==",
      "dev": true,
      "dependencies": {
        "etag": "1.8.1",
@@ -1090,9 +1085,9 @@
      }
    },
    "node_modules/browser-sync-ui": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.11.tgz",
-      "integrity": "sha512-1T/Y8Pp1R68aUL7zVSFq0nxtr258xWd/nTasCAHX2M6EsGaswVOFtXsw3bKqsr35z+J+LfVfOdz1HFLYKxdgrA==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.10.tgz",
+      "integrity": "sha512-elbJILq4Uo6OQv6gsvS3Y9vRAJlWu+h8j0JDkF0X/ua+3S6SVbbiWnZc8sNOFlG7yvVGIwBED3eaYQ0iBo1Dtw==",
      "dev": true,
      "dependencies": {
        "async-each-series": "0.1.1",
@@ -2237,9 +2232,9 @@
      }
    },
    "node_modules/engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
      "dev": true,
      "dependencies": {
        "@types/cookie": "^0.4.1",
@@ -2251,7 +2246,7 @@
        "cors": "~2.8.5",
        "debug": "~4.3.1",
        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
+        "ws": "~8.2.3"
      },
      "engines": {
        "node": ">=10.0.0"
@@ -2325,27 +2320,6 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
      "dev": true
    },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/entities": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@@ -3087,11 +3061,6 @@
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
-    "node_modules/fullcalendar": {
-      "version": "5.11.3",
-      "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-5.11.3.tgz",
-      "integrity": "sha512-SgqiMEA+lWLyEd2jEwtIxdfx41j2CZr4KK00D2Gepj1MnGOjaEi13athnU6xvqMQXXjgJNj+vmlUP69QiuGncQ=="
-    },
    "node_modules/function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -4234,9 +4203,9 @@
      "integrity": "sha512-rmglSaNttGo4LY33PFW51mgeD1ItvHyfS9cRCD+Cj9Msj/xFaG/sZjLGVtPbtxYJmhY/c8jtw6G07yWhC2ifEw=="
    },
    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
    },
    "node_modules/http-errors": {
      "version": "2.0.0",
@@ -5982,15 +5951,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -6944,18 +6904,12 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+      "integrity": "sha512-AY4g8t3LMboim0t6XWFdz6J5OuJ1ZNYu54SXihS/OMpgyCqYmcAJnWqkNSOjSjWmq3xxy+GF9uWQI2lI/7tKIA==",
      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
      "engines": {
        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/quick-lru": {
@@ -7671,20 +7625,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/signal-exit": {
      "version": "3.0.7",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -7872,62 +7812,38 @@
      }
    },
    "node_modules/socket.io": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
-      "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
      "dev": true,
      "dependencies": {
        "accepts": "~1.3.4",
        "base64id": "~2.0.0",
        "debug": "~4.3.2",
-        "engine.io": "~6.4.1",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
      },
      "engines": {
        "node": ">=10.0.0"
      }
    },
    "node_modules/socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "dependencies": {
-        "ws": "~8.11.0"
-      }
-    },
-    "node_modules/socket.io-adapter/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+      "dev": true
    },
    "node_modules/socket.io-client": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz",
-      "integrity": "sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
+      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
      "dev": true,
      "dependencies": {
        "@socket.io/component-emitter": "~3.1.0",
        "debug": "~4.3.2",
        "engine.io-client": "~6.2.3",
-        "socket.io-parser": "~4.2.1"
+        "socket.io-parser": "~4.2.0"
      },
      "engines": {
        "node": ">=10.0.0"
@@ -8745,9 +8661,9 @@
      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
    },
    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
+      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@@ -9510,13 +9426,10 @@
      "dev": true
    },
    "@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
    },
    "@types/estree": {
      "version": "1.0.0",
@@ -9534,9 +9447,9 @@
      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
    },
    "@types/node": {
-      "version": "18.16.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz",
-      "integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==",
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
      "dev": true
    },
    "@types/normalize-package-data": {
@@ -10072,13 +9985,13 @@
      }
    },
    "browser-sync": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.11.tgz",
-      "integrity": "sha512-U5f9u97OYJH66T0MGWWzG9rOQTW6ZmDMj97vsmtqwNS03JAwdLVES8eel2lD3rvAqQCNAFqaJ74NMacBI57vJg==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.10.tgz",
+      "integrity": "sha512-xKm+6KJmJu6RuMWWbFkKwOCSqQOxYe3nOrFkKI5Tr/ZzjPxyU3pFShKK3tWnazBo/3lYQzN7fzjixG8fwJh1Xw==",
      "dev": true,
      "requires": {
-        "browser-sync-client": "^2.27.11",
-        "browser-sync-ui": "^2.27.11",
+        "browser-sync-client": "^2.27.10",
+        "browser-sync-ui": "^2.27.10",
        "bs-recipes": "1.3.4",
        "bs-snippet-injector": "^2.0.1",
        "chokidar": "^3.5.1",
@@ -10096,7 +10009,7 @@
        "micromatch": "^4.0.2",
        "opn": "5.3.0",
        "portscanner": "2.2.0",
-        "qs": "^6.11.0",
+        "qs": "6.2.3",
        "raw-body": "^2.3.2",
        "resp-modifier": "6.0.2",
        "rx": "4.1.0",
@@ -10110,9 +10023,9 @@
      }
    },
    "browser-sync-client": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.11.tgz",
-      "integrity": "sha512-okMNfD2NasL/XD1/BclP3onXjhahisk3e/kTQ5HPDT/lLqdBqNDd6QFcjI5I1ak7na2hxKQSLjryql+7fp5gKQ==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.10.tgz",
+      "integrity": "sha512-KCFKA1YDj6cNul0VsA28apohtBsdk5Wv8T82ClOZPZMZWxPj4Ny5AUbrj9UlAb/k6pdxE5HABrWDhP9+cjt4HQ==",
      "dev": true,
      "requires": {
        "etag": "1.8.1",
@@ -10123,9 +10036,9 @@
      }
    },
    "browser-sync-ui": {
-      "version": "2.27.11",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.11.tgz",
-      "integrity": "sha512-1T/Y8Pp1R68aUL7zVSFq0nxtr258xWd/nTasCAHX2M6EsGaswVOFtXsw3bKqsr35z+J+LfVfOdz1HFLYKxdgrA==",
+      "version": "2.27.10",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.10.tgz",
+      "integrity": "sha512-elbJILq4Uo6OQv6gsvS3Y9vRAJlWu+h8j0JDkF0X/ua+3S6SVbbiWnZc8sNOFlG7yvVGIwBED3eaYQ0iBo1Dtw==",
      "dev": true,
      "requires": {
        "async-each-series": "0.1.1",
@@ -11005,9 +10918,9 @@
      }
    },
    "engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
      "dev": true,
      "requires": {
        "@types/cookie": "^0.4.1",
@@ -11019,7 +10932,7 @@
        "cors": "~2.8.5",
        "debug": "~4.3.1",
        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
+        "ws": "~8.2.3"
      },
      "dependencies": {
        "debug": {
@@ -11036,13 +10949,6 @@
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
          "dev": true
-        },
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
        }
      }
    },
@@ -11667,11 +11573,6 @@
      "dev": true,
      "optional": true
    },
-    "fullcalendar": {
-      "version": "5.11.3",
-      "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-5.11.3.tgz",
-      "integrity": "sha512-SgqiMEA+lWLyEd2jEwtIxdfx41j2CZr4KK00D2Gepj1MnGOjaEi13athnU6xvqMQXXjgJNj+vmlUP69QiuGncQ=="
-    },
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -12588,9 +12489,9 @@
      "integrity": "sha512-rmglSaNttGo4LY33PFW51mgeD1ItvHyfS9cRCD+Cj9Msj/xFaG/sZjLGVtPbtxYJmhY/c8jtw6G07yWhC2ifEw=="
    },
    "http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
    },
    "http-errors": {
      "version": "2.0.0",
@@ -13955,12 +13856,6 @@
        }
      }
    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true
-    },
    "object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -14594,13 +14489,10 @@
      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
    },
    "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+      "integrity": "sha512-AY4g8t3LMboim0t6XWFdz6J5OuJ1ZNYu54SXihS/OMpgyCqYmcAJnWqkNSOjSjWmq3xxy+GF9uWQI2lI/7tKIA==",
+      "dev": true
    },
    "quick-lru": {
      "version": "4.0.1",
@@ -15164,17 +15056,6 @@
      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
    "signal-exit": {
      "version": "3.0.7",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -15325,17 +15206,17 @@
      }
    },
    "socket.io": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
-      "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
      "dev": true,
      "requires": {
        "accepts": "~1.3.4",
        "base64id": "~2.0.0",
        "debug": "~4.3.2",
-        "engine.io": "~6.4.1",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.1"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
      },
      "dependencies": {
        "debug": {
@@ -15356,33 +15237,21 @@
      }
    },
    "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "requires": {
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+      "dev": true
    },
    "socket.io-client": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz",
-      "integrity": "sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
+      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
      "dev": true,
      "requires": {
        "@socket.io/component-emitter": "~3.1.0",
        "debug": "~4.3.2",
        "engine.io-client": "~6.2.3",
-        "socket.io-parser": "~4.2.1"
+        "socket.io-parser": "~4.2.0"
      },
      "dependencies": {
        "debug": {
@@ -16009,9 +15878,9 @@
      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
    },
    "typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
+      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
      "dev": true
    },
    "typo-js": {
--- 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",
@@ -34,7 +33,7 @@
    "uglify-js": "^3.14.5"
  },
  "devDependencies": {
-    "browser-sync": "^2.27.11"
+    "browser-sync": "^2.27.10"
  },
  "scripts": {
    "gulp": "gulp",
--- a/pipeline/source_assets/js/autocompleter.js
+++ b/pipeline/source_assets/js/autocompleter.js
@@ -73,7 +73,6 @@ function initPicker(obj) {
            return array;
        }
    };
-    console.log(obj.data);
    if (!obj.data('noclear')) {
        obj.prepend($("<option></option>")
 		    .attr("value",'')
--- 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/training/management/commands/generateSampleTrainingData.py
+++ b/training/management/commands/generateSampleTrainingData.py
@@ -143,15 +143,6 @@ class Command(BaseCommand):
            "Bin Diving",
            "Wiki Editing"]

-        descriptions = [
-            "Physical training concentrates on mechanistic goals: training programs in this area develop specific motor skills, agility, strength or physical fitness, often with an intention of peaking at a particular time.",
-            "In military use, training means gaining the physical ability to perform and survive in combat, and learn the many skills needed in a time of war.",
-            "These include how to use a variety of weapons, outdoor survival skills, and how to survive being captured by the enemy, among many others.  See military education and training.",
-            "While some studies have indicated relaxation training is useful for some medical conditions, autogenic training has limited results or has been the result of few studies.",
-            "Some occupations are inherently hazardous, and require a minimum level of competence before the practitioners can perform the work at an acceptable level of safety to themselves or others in the vicinity.",
-            "Occupational diving, rescue, firefighting and operation of certain types of machinery and vehicles may require assessment and certification of a minimum acceptable competence before the person is allowed to practice as a licensed instructor."
-        ]
-
        for i, name in enumerate(names):
            category = random.choice(self.categories)
            previous_item = models.TrainingItem.objects.filter(category=category).last()
@@ -159,7 +150,7 @@ class Command(BaseCommand):
                number = previous_item.reference_number + 1
            else:
                number = 0
-            item = models.TrainingItem.objects.create(category=category, reference_number=number, name=name, description=random.choice(descriptions) + random.choice(descriptions) + random.choice(descriptions))
+            item = models.TrainingItem.objects.create(category=category, reference_number=number, description=name)
            self.items.append(item)

    def setup_levels(self):
--- a/training/migrations/0006_rename_description_trainingitem_name.py
+++ b/training/migrations/0006_rename_description_trainingitem_name.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.18 on 2023-02-19 14:02
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('training', '0005_auto_20220223_1535'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='trainingitem',
-            old_name='description',
-            new_name='name',
-        ),
-    ]
--- a/training/migrations/0007_trainingitem_description.py
+++ b/training/migrations/0007_trainingitem_description.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.18 on 2023-02-19 14:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('training', '0006_rename_description_trainingitem_name'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trainingitem',
-            name='description',
-            field=models.TextField(blank=True),
-        ),
-    ]
--- a/training/models.py
+++ b/training/models.py
@@ -85,7 +85,7 @@ class TrainingItemManager(QueryablePropertiesManager):
    def search(self, query=None):
        qs = self.get_queryset()
        if query is not None:
-            or_lookup = (Q(name__icontains=query) | Q(description__icontains=query) | Q(display_id=query))
+            or_lookup = (Q(description__icontains=query) | Q(display_id=query))
            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
        return qs

@@ -94,13 +94,16 @@ class TrainingItemManager(QueryablePropertiesManager):
 class TrainingItem(models.Model):
    reference_number = models.IntegerField()
    category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.CASCADE)
-    name = models.CharField(max_length=50)
-    description = models.TextField(blank=True)
+    description = models.CharField(max_length=50)
    active = models.BooleanField(default=True)
    prerequisites = models.ManyToManyField('self', symmetrical=False, blank=True)

    objects = TrainingItemManager()

+    @property
+    def name(self):
+        return str(self)
+
    @queryable_property
    def display_id(self):
        return f"{self.category.reference_number}.{self.reference_number}"
@@ -118,7 +121,7 @@ class TrainingItem(models.Model):
        return models.Q()

    def __str__(self):
-        name = f"{self.display_id} {self.name}"
+        name = f"{self.display_id} {self.description}"
        if not self.active:
            name += " (inactive)"
        return name
@@ -146,7 +149,7 @@ class TrainingItemQualificationManager(QueryablePropertiesManager):
    def search(self, query=None):
        qs = self.get_queryset().select_related('item', 'supervisor', 'item__category')
        if query is not None:
-            or_lookup = (Q(item__name__icontains=query) | Q(supervisor__first_name__icontains=query) | Q(supervisor__last_name__icontains=query) | Q(item__category__name__icontains=query) | Q(item__display_id=query))
+            or_lookup = (Q(item__description__icontains=query) | Q(supervisor__first_name__icontains=query) | Q(supervisor__last_name__icontains=query) | Q(item__category__name__icontains=query) | Q(item__display_id=query))

            try:
                or_lookup = Q(item__category__reference_number=int(query)) | or_lookup
--- a/training/templates/item_list.html
+++ b/training/templates/item_list.html
@@ -1,11 +1,6 @@
 {% extends 'base_training.html' %}

-{% load button from filters %}
-
 {% block content %}
-<div class="col-12 text-right py-2 pr-0">
-{% button 'print' 'item_list_export' %}
-</div>
 <div id="accordion">
  {% for category in categories %}
  <div class="card">
@@ -18,11 +13,10 @@
      <div class="card-body">
        <div class="list-group list-group-flush">
            {% for item in category.items.all %}
-                <li class="list-group-item {% if not item.active%}text-warning{%endif%}">{{ item }} <a href="{% url 'item_qualification' item.pk %}" class="btn btn-info float-right"><span class="fas fa-user"></span> Qualified Users</a>
-                <br><small>{{ item.description }}</small>
+                <li class="list-group-item {% if not item.active%}text-warning{%endif%}">{{ item }}
                {% if item.prerequisites.exists %}
                    <div class="ml-3 font-italic">
-                    <p class="text-info mb-0">Competency Assessment Prerequisites:</p>
+                    <p class="text-info mb-0">Passed Out Prerequisites:</p>
                    <ul>
                    {% for p in item.prerequisites.all %}
                    <li>{{p}}</li>
@@ -30,6 +24,7 @@
                    </ul>
                    </div>
                {% endif %}
+                <a href="{% url 'item_qualification' item.pk %}" class="btn btn-info"><span class="fas fa-user"></span> Qualified Users</a>
                </li>
            {% endfor %}
        </div>
--- a/training/templates/item_list.xml
+++ b/training/templates/item_list.xml
@@ -1,25 +0,0 @@
-{% extends 'base_print.xml' %}
-
-{% block content %}
-<h1 style="page-head">TEC Training Item List</h1>
-<spacer length="15" />
-{% for category in categories %}
-<h2 {% if not forloop.first %}style="breakbefore"{%else%}style="emheader"{%endif%}>{{category}}</h2>
-<spacer length="10" />
-    {% for item in category.items.all %}
-        <h3>{{ item }}</h3>
-        <spacer length="4" />
-        <para>{{ item.description }}</para>
-        {% if item.prerequisites.exists %}
-            <h4>Competency Assessment Prerequisites:</h4>
-            <ul bulletFontSize="5">
-            {% for p in item.prerequisites.all %}
-            <li><para>{{p}}</para></li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-        <spacer length="8" />
-    {% endfor %}
-{% endfor %}
-<namedString id="lastPage"><pageNumber/></namedString>
-{% endblock %}
--- a/training/urls.py
+++ b/training/urls.py
@@ -8,7 +8,6 @@ from versioning.views import VersionHistory

 urlpatterns = [
    path('items/', login_required(views.ItemList.as_view()), name='item_list'),
-    path('items/export/', login_required(views.ItemListExport.as_view()), name='item_list_export'),
    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'),
--- a/training/views.py
+++ b/training/views.py
@@ -7,7 +7,7 @@ from django.db import transaction
 from django.db.models import Q, Count
 from django.db.utils import IntegrityError

-from PyRIGS.views import is_ajax, ModalURLMixin, get_related, PrintListView
+from PyRIGS.views import is_ajax, ModalURLMixin, get_related
 from training import models, forms
 from users import views
 from reversion.views import RevisionMixin
@@ -24,20 +24,6 @@ class ItemList(generic.ListView):
        return context


-class ItemListExport(PrintListView):
-    model = models.TrainingItem
-    template_name = 'item_list.xml'
-
-    def get_queryset(self):
-        return self.model.objects.filter(active=True)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['filename'] = "TrainingItemList.pdf"
-        context["categories"] = models.TrainingCategory.objects.all()
-        return context
-
-
 class TraineeDetail(views.ProfileDetail):
    template_name = "trainee_detail.html"
    model = models.Trainee
Author	SHA1	Message	Date
FreneticScribbler	1660f51e55	Merge branch 'master' into subhire # Conflicts: # Pipfile.lock	2022-12-11 00:53:27 +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	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	04ec728972	Reimplemented calendar mostly working Multi day alignment puzzle is pretty hard...	2022-11-22 23:59:21 +00:00
FreneticScribbler	bede8b4176	Merge branch 'master' into subhire # Conflicts: # Pipfile # Pipfile.lock # package-lock.json	2022-11-21 19:49:33 +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
Arona Jones	948a41f43a	Initial work on associating events with subhires	2022-10-20 12:56:42 +01:00
FreneticScribbler	4449efcced	Add subhire detail view	2022-10-20 00:00:57 +01:00
FreneticScribbler	8b0cd13159	Initially create subhire model and form	2022-10-15 19:09:51 +01:00