diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..9480a45c --- /dev/null +++ b/.flake8 @@ -0,0 +1,16 @@ +[flake8] +exclude = tests/* +max-line-length = 160 +inline-quotes = double +multiline-quotes = double +docstring-quotes = double +avoid-escape = True +ignore = + # Multiple statements of a function definition should be on their own separate lines + E704, + + # Line breaks should occur after the binary operator to keep all variable names aligned + W503, + + # Colons should not have any space before them + E203, diff --git a/.pylintrc b/.pylintrc index 16c3b4e3..a7ac3c3c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -77,14 +77,14 @@ limit-inference-results=100 # List of plugins (as comma separated values of python module names) to load, # usually to register additional checkers. -load-plugins=pylint.extensions.mccabe,pylint_quotes +load-plugins=pylint.extensions.mccabe # Pickle collected data for later comparisons. persistent=yes # Minimum Python version to use for version dependent checks. Will default to # the version used to run pylint. -py-version=3.11 +py-version=3.12 # Discover python modules and packages in the file system subtree. recursive=no @@ -344,11 +344,6 @@ single-line-class-stmt=no # else. single-line-if-stmt=no -string-quote=double-avoid-escape -triple-quote=double -docstring-quote=double - - [IMPORTS] # List of modules that can be imported at any level, not just the top level diff --git a/.python-version b/.python-version index 0c7d5f5f..35f236d6 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11.4 +3.12.6 diff --git a/poetry.lock b/poetry.lock index ae80e05c..57747c74 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,28 +2,24 @@ [[package]] name = "astroid" -version = "2.15.8" +version = "3.3.4" description = "An abstract syntax tree for Python with inference support." optional = false -python-versions = ">=3.7.2" +python-versions = ">=3.9.0" files = [ - {file = "astroid-2.15.8-py3-none-any.whl", hash = "sha256:1aa149fc5c6589e3d0ece885b4491acd80af4f087baafa3fb5203b113e68cd3c"}, - {file = "astroid-2.15.8.tar.gz", hash = "sha256:6c107453dffee9055899705de3c9ead36e74119cee151e5a9aaf7f0b0e020a6a"}, + {file = "astroid-3.3.4-py3-none-any.whl", hash = "sha256:5eba185467253501b62a9f113c263524b4f5d55e1b30456370eed4cdbd6438fd"}, + {file = "astroid-3.3.4.tar.gz", hash = "sha256:e73d0b62dd680a7c07cb2cd0ce3c22570b044dd01bd994bc3a2dd16c6cbba162"}, ] -[package.dependencies] -lazy-object-proxy = ">=1.4.0" -wrapt = {version = ">=1.14,<2", markers = "python_version >= \"3.11\""} - [[package]] name = "babel" -version = "2.15.0" +version = "2.14.0" description = "Internationalization utilities" optional = false -python-versions = ">=3.8" +python-versions = ">=3.7" files = [ - {file = "Babel-2.15.0-py3-none-any.whl", hash = "sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb"}, - {file = "babel-2.15.0.tar.gz", hash = "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413"}, + {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, + {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, ] [package.extras] @@ -31,33 +27,33 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "black" -version = "24.4.2" +version = "24.8.0" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-24.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dd1b5a14e417189db4c7b64a6540f31730713d173f0b63e55fabd52d61d8fdce"}, - {file = "black-24.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8e537d281831ad0e71007dcdcbe50a71470b978c453fa41ce77186bbe0ed6021"}, - {file = "black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063"}, - {file = "black-24.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:7768a0dbf16a39aa5e9a3ded568bb545c8c2727396d063bbaf847df05b08cd96"}, - {file = "black-24.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:257d724c2c9b1660f353b36c802ccece186a30accc7742c176d29c146df6e474"}, - {file = "black-24.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bdde6f877a18f24844e381d45e9947a49e97933573ac9d4345399be37621e26c"}, - {file = "black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb"}, - {file = "black-24.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:7e122b1c4fb252fd85df3ca93578732b4749d9be076593076ef4d07a0233c3e1"}, - {file = "black-24.4.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:accf49e151c8ed2c0cdc528691838afd217c50412534e876a19270fea1e28e2d"}, - {file = "black-24.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:88c57dc656038f1ab9f92b3eb5335ee9b021412feaa46330d5eba4e51fe49b04"}, - {file = "black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be8bef99eb46d5021bf053114442914baeb3649a89dc5f3a555c88737e5e98fc"}, - {file = "black-24.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:415e686e87dbbe6f4cd5ef0fbf764af7b89f9057b97c908742b6008cc554b9c0"}, - {file = "black-24.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bf10f7310db693bb62692609b397e8d67257c55f949abde4c67f9cc574492cc7"}, - {file = "black-24.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:98e123f1d5cfd42f886624d84464f7756f60ff6eab89ae845210631714f6db94"}, - {file = "black-24.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48a85f2cb5e6799a9ef05347b476cce6c182d6c71ee36925a6c194d074336ef8"}, - {file = "black-24.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:b1530ae42e9d6d5b670a34db49a94115a64596bc77710b1d05e9801e62ca0a7c"}, - {file = "black-24.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:37aae07b029fa0174d39daf02748b379399b909652a806e5708199bd93899da1"}, - {file = "black-24.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:da33a1a5e49c4122ccdfd56cd021ff1ebc4a1ec4e2d01594fef9b6f267a9e741"}, - {file = "black-24.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef703f83fc32e131e9bcc0a5094cfe85599e7109f896fe8bc96cc402f3eb4b6e"}, - {file = "black-24.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:b9176b9832e84308818a99a561e90aa479e73c523b3f77afd07913380ae2eab7"}, - {file = "black-24.4.2-py3-none-any.whl", hash = "sha256:d36ed1124bb81b32f8614555b34cc4259c3fbc7eec17870e8ff8ded335b58d8c"}, - {file = "black-24.4.2.tar.gz", hash = "sha256:c872b53057f000085da66a19c55d68f6f8ddcac2642392ad3a355878406fbd4d"}, + {file = "black-24.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6"}, + {file = "black-24.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb"}, + {file = "black-24.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42"}, + {file = "black-24.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a"}, + {file = "black-24.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"}, + {file = "black-24.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af"}, + {file = "black-24.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4"}, + {file = "black-24.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af"}, + {file = "black-24.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368"}, + {file = "black-24.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed"}, + {file = "black-24.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018"}, + {file = "black-24.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2"}, + {file = "black-24.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd"}, + {file = "black-24.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2"}, + {file = "black-24.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e"}, + {file = "black-24.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920"}, + {file = "black-24.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c"}, + {file = "black-24.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e"}, + {file = "black-24.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47"}, + {file = "black-24.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb"}, + {file = "black-24.8.0-py3-none-any.whl", hash = "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed"}, + {file = "black-24.8.0.tar.gz", hash = "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f"}, ] [package.dependencies] @@ -75,13 +71,13 @@ uvloop = ["uvloop (>=0.15.2)"] [[package]] name = "certifi" -version = "2024.7.4" +version = "2024.8.30" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"}, - {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"}, + {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"}, + {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"}, ] [[package]] @@ -238,13 +234,13 @@ files = [ [[package]] name = "dill" -version = "0.3.8" +version = "0.3.9" description = "serialize all of Python" optional = false python-versions = ">=3.8" files = [ - {file = "dill-0.3.8-py3-none-any.whl", hash = "sha256:c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7"}, - {file = "dill-0.3.8.tar.gz", hash = "sha256:3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca"}, + {file = "dill-0.3.9-py3-none-any.whl", hash = "sha256:468dff3b89520b474c0397703366b7b95eebe6303f108adf9b19da1f702be87a"}, + {file = "dill-0.3.9.tar.gz", hash = "sha256:81aa267dddf68cbfe8029c42ca9ec6a4ab3b22371d1c450abc54422577b4512c"}, ] [package.extras] @@ -252,16 +248,16 @@ graph = ["objgraph (>=1.7.2)"] profile = ["gprof2dot (>=2022.7.29)"] [[package]] -name = "eq_translations" -version = "4.9.2" -description = "Translations infrastructure for EQ Questionnaire Runner" +name = "eq-translations" +version = "1.0.0" +description = "ONS Digital eQ Translations App" optional = false -python-versions = "*" +python-versions = "^3.12" files = [] develop = false [package.dependencies] -babel = "*" +babel = "==2.14.0" jsonpath-rw = "*" jsonpointer = "*" requests = "*" @@ -271,8 +267,38 @@ tqdm = "*" [package.source] type = "git" url = "https://github.com/ONSDigital/eq-translations.git" -reference = "v4.9.2" -resolved_reference = "e8e433ce55afef4e87052f0a3018543148e949b7" +reference = "v4.10.0" +resolved_reference = "6da859996a85b675e32c673d3cc28ccca1dac41c" + +[[package]] +name = "flake8" +version = "7.1.1" +description = "the modular source code checker: pep8 pyflakes and co" +optional = false +python-versions = ">=3.8.1" +files = [ + {file = "flake8-7.1.1-py2.py3-none-any.whl", hash = "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"}, + {file = "flake8-7.1.1.tar.gz", hash = "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38"}, +] + +[package.dependencies] +mccabe = ">=0.7.0,<0.8.0" +pycodestyle = ">=2.12.0,<2.13.0" +pyflakes = ">=3.2.0,<3.3.0" + +[[package]] +name = "flake8-quotes" +version = "3.4.0" +description = "Flake8 lint for quotes." +optional = false +python-versions = "*" +files = [ + {file = "flake8-quotes-3.4.0.tar.gz", hash = "sha256:aad8492fb710a2d3eabe68c5f86a1428de650c8484127e14c43d0504ba30276c"}, +] + +[package.dependencies] +flake8 = "*" +setuptools = "*" [[package]] name = "humanfriendly" @@ -290,15 +316,18 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve [[package]] name = "idna" -version = "3.7" +version = "3.10" description = "Internationalized Domain Names in Applications (IDNA)" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" files = [ - {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, - {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, + {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"}, + {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"}, ] +[package.extras] +all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"] + [[package]] name = "isort" version = "5.13.2" @@ -339,52 +368,6 @@ files = [ {file = "jsonpointer-3.0.0.tar.gz", hash = "sha256:2b2d729f2091522d61c3b31f82e11870f60b68f43fbc705cb76bf4b832af59ef"}, ] -[[package]] -name = "lazy-object-proxy" -version = "1.10.0" -description = "A fast and thorough lazy object proxy." -optional = false -python-versions = ">=3.8" -files = [ - {file = "lazy-object-proxy-1.10.0.tar.gz", hash = "sha256:78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:855e068b0358ab916454464a884779c7ffa312b8925c6f7401e952dcf3b89977"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ab7004cf2e59f7c2e4345604a3e6ea0d92ac44e1c2375527d56492014e690c3"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc0d2fc424e54c70c4bc06787e4072c4f3b1aa2f897dfdc34ce1013cf3ceef05"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e2adb09778797da09d2b5ebdbceebf7dd32e2c96f79da9052b2e87b6ea495895"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b1f711e2c6dcd4edd372cf5dec5c5a30d23bba06ee012093267b3376c079ec83"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-win32.whl", hash = "sha256:76a095cfe6045c7d0ca77db9934e8f7b71b14645f0094ffcd842349ada5c5fb9"}, - {file = "lazy_object_proxy-1.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:b4f87d4ed9064b2628da63830986c3d2dca7501e6018347798313fcf028e2fd4"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fec03caabbc6b59ea4a638bee5fce7117be8e99a4103d9d5ad77f15d6f81020c"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:02c83f957782cbbe8136bee26416686a6ae998c7b6191711a04da776dc9e47d4"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:009e6bb1f1935a62889ddc8541514b6a9e1fcf302667dcb049a0be5c8f613e56"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:75fc59fc450050b1b3c203c35020bc41bd2695ed692a392924c6ce180c6f1dc9"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:782e2c9b2aab1708ffb07d4bf377d12901d7a1d99e5e410d648d892f8967ab1f"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-win32.whl", hash = "sha256:edb45bb8278574710e68a6b021599a10ce730d156e5b254941754a9cc0b17d03"}, - {file = "lazy_object_proxy-1.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:e271058822765ad5e3bca7f05f2ace0de58a3f4e62045a8c90a0dfd2f8ad8cc6"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e98c8af98d5707dcdecc9ab0863c0ea6e88545d42ca7c3feffb6b4d1e370c7ba"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:952c81d415b9b80ea261d2372d2a4a2332a3890c2b83e0535f263ddfe43f0d43"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80b39d3a151309efc8cc48675918891b865bdf742a8616a337cb0090791a0de9"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e221060b701e2aa2ea991542900dd13907a5c90fa80e199dbf5a03359019e7a3"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:92f09ff65ecff3108e56526f9e2481b8116c0b9e1425325e13245abfd79bdb1b"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-win32.whl", hash = "sha256:3ad54b9ddbe20ae9f7c1b29e52f123120772b06dbb18ec6be9101369d63a4074"}, - {file = "lazy_object_proxy-1.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:127a789c75151db6af398b8972178afe6bda7d6f68730c057fbbc2e96b08d282"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9e4ed0518a14dd26092614412936920ad081a424bdcb54cc13349a8e2c6d106a"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ad9e6ed739285919aa9661a5bbed0aaf410aa60231373c5579c6b4801bd883c"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fc0a92c02fa1ca1e84fc60fa258458e5bf89d90a1ddaeb8ed9cc3147f417255"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0aefc7591920bbd360d57ea03c995cebc204b424524a5bd78406f6e1b8b2a5d8"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5faf03a7d8942bb4476e3b62fd0f4cf94eaf4618e304a19865abf89a35c0bbee"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-win32.whl", hash = "sha256:e333e2324307a7b5d86adfa835bb500ee70bfcd1447384a822e96495796b0ca4"}, - {file = "lazy_object_proxy-1.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:cb73507defd385b7705c599a94474b1d5222a508e502553ef94114a143ec6696"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:366c32fe5355ef5fc8a232c5436f4cc66e9d3e8967c01fb2e6302fd6627e3d94"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2297f08f08a2bb0d32a4265e98a006643cd7233fb7983032bd61ac7a02956b3b"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18dd842b49456aaa9a7cf535b04ca4571a302ff72ed8740d06b5adcd41fe0757"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:217138197c170a2a74ca0e05bddcd5f1796c735c37d0eee33e43259b192aa424"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9a3a87cf1e133e5b1994144c12ca4aa3d9698517fe1e2ca82977781b16955658"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-win32.whl", hash = "sha256:30b339b2a743c5288405aa79a69e706a06e02958eab31859f7f3c04980853b70"}, - {file = "lazy_object_proxy-1.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:a899b10e17743683b293a729d3a11f2f399e8a90c73b089e29f5d0fe3509f0dd"}, - {file = "lazy_object_proxy-1.10.0-pp310.pp311.pp312.pp38.pp39-none-any.whl", hash = "sha256:80fa48bd89c8f2f456fc0765c11c23bf5af827febacd2f523ca5bc1893fcc09d"}, -] - [[package]] name = "mccabe" version = "0.7.0" @@ -431,19 +414,19 @@ files = [ [[package]] name = "platformdirs" -version = "4.2.2" +version = "4.3.6" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"}, - {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"}, + {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"}, + {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"}, ] [package.extras] -docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] -type = ["mypy (>=1.8)"] +docs = ["furo (>=2024.8.6)", "proselint (>=0.14)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.3.2)", "pytest-cov (>=5)", "pytest-mock (>=3.14)"] +type = ["mypy (>=1.11.2)"] [[package]] name = "ply" @@ -456,22 +439,44 @@ files = [ {file = "ply-3.11.tar.gz", hash = "sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3"}, ] +[[package]] +name = "pycodestyle" +version = "2.12.1" +description = "Python style guide checker" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pycodestyle-2.12.1-py2.py3-none-any.whl", hash = "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3"}, + {file = "pycodestyle-2.12.1.tar.gz", hash = "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"}, +] + +[[package]] +name = "pyflakes" +version = "3.2.0" +description = "passive checker of Python programs" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"}, + {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"}, +] + [[package]] name = "pylint" -version = "2.17.7" +version = "3.3.1" description = "python code static checker" optional = false -python-versions = ">=3.7.2" +python-versions = ">=3.9.0" files = [ - {file = "pylint-2.17.7-py3-none-any.whl", hash = "sha256:27a8d4c7ddc8c2f8c18aa0050148f89ffc09838142193fdbe98f172781a3ff87"}, - {file = "pylint-2.17.7.tar.gz", hash = "sha256:f4fcac7ae74cfe36bc8451e931d8438e4a476c20314b1101c458ad0f05191fad"}, + {file = "pylint-3.3.1-py3-none-any.whl", hash = "sha256:2f846a466dd023513240bc140ad2dd73bfc080a5d85a710afdb728c420a5a2b9"}, + {file = "pylint-3.3.1.tar.gz", hash = "sha256:9f3dcc87b1203e612b78d91a896407787e708b3f189b5fa0b307712d49ff0c6e"}, ] [package.dependencies] -astroid = ">=2.15.8,<=2.17.0-dev0" +astroid = ">=3.3.4,<=3.4.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -dill = {version = ">=0.3.6", markers = "python_version >= \"3.11\""} -isort = ">=4.2.5,<6" +dill = {version = ">=0.3.7", markers = "python_version >= \"3.12\""} +isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" tomlkit = ">=0.10.1" @@ -480,31 +485,20 @@ tomlkit = ">=0.10.1" spelling = ["pyenchant (>=3.2,<4.0)"] testutils = ["gitpython (>3)"] -[[package]] -name = "pylint-quotes" -version = "0.2.3" -description = "Quote consistency checker for PyLint.." -optional = false -python-versions = ">=3.6" -files = [ - {file = "pylint-quotes-0.2.3.tar.gz", hash = "sha256:2d6bb3fa8a1a85af3af8a0ca875a719ac5bcdb735c45756284699d809c109c95"}, - {file = "pylint_quotes-0.2.3-py2.py3-none-any.whl", hash = "sha256:89decd985d3c019314da630f5e3fe0e0df951c2310525fbd6e710bca329c810e"}, -] - -[package.dependencies] -pylint = ">=2.8.0" - [[package]] name = "pyreadline3" -version = "3.4.1" +version = "3.5.4" description = "A python implementation of GNU readline." optional = false -python-versions = "*" +python-versions = ">=3.8" files = [ - {file = "pyreadline3-3.4.1-py3-none-any.whl", hash = "sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb"}, - {file = "pyreadline3-3.4.1.tar.gz", hash = "sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae"}, + {file = "pyreadline3-3.5.4-py3-none-any.whl", hash = "sha256:eaf8e6cc3c49bcccf145fc6067ba8643d1df34d604a1ec0eccbf7a18e6d3fae6"}, + {file = "pyreadline3-3.5.4.tar.gz", hash = "sha256:8d57d53039a1c75adba8e50dd3d992b28143480816187ea5efbd5c78e6c885b7"}, ] +[package.extras] +dev = ["build", "flake8", "mypy", "pytest", "twine"] + [[package]] name = "requests" version = "2.32.3" @@ -526,6 +520,26 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] +[[package]] +name = "setuptools" +version = "75.1.0" +description = "Easily download, build, install, upgrade, and uninstall Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "setuptools-75.1.0-py3-none-any.whl", hash = "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2"}, + {file = "setuptools-75.1.0.tar.gz", hash = "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"}, +] + +[package.extras] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"] +core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] +cover = ["pytest-cov"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] +enabler = ["pytest-enabler (>=2.2)"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"] + [[package]] name = "six" version = "1.16.0" @@ -553,24 +567,24 @@ tests = ["pytest", "pytest-cov"] [[package]] name = "tomlkit" -version = "0.12.5" +version = "0.13.2" description = "Style preserving TOML library" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"}, - {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"}, + {file = "tomlkit-0.13.2-py3-none-any.whl", hash = "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde"}, + {file = "tomlkit-0.13.2.tar.gz", hash = "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79"}, ] [[package]] name = "tqdm" -version = "4.66.4" +version = "4.66.5" description = "Fast, Extensible Progress Meter" optional = false python-versions = ">=3.7" files = [ - {file = "tqdm-4.66.4-py3-none-any.whl", hash = "sha256:b75ca56b413b030bc3f00af51fd2c1a1a5eac6a0c1cca83cbb37a5c52abce644"}, - {file = "tqdm-4.66.4.tar.gz", hash = "sha256:e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb"}, + {file = "tqdm-4.66.5-py3-none-any.whl", hash = "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd"}, + {file = "tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad"}, ] [package.dependencies] @@ -584,13 +598,13 @@ telegram = ["requests"] [[package]] name = "urllib3" -version = "2.2.2" +version = "2.2.3" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.8" files = [ - {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"}, - {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"}, + {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"}, + {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"}, ] [package.extras] @@ -599,86 +613,7 @@ h2 = ["h2 (>=4,<5)"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] -[[package]] -name = "wrapt" -version = "1.16.0" -description = "Module for decorators, wrappers and monkey patching." -optional = false -python-versions = ">=3.6" -files = [ - {file = "wrapt-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4"}, - {file = "wrapt-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136"}, - {file = "wrapt-1.16.0-cp310-cp310-win32.whl", hash = "sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d"}, - {file = "wrapt-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2"}, - {file = "wrapt-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09"}, - {file = "wrapt-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d"}, - {file = "wrapt-1.16.0-cp311-cp311-win32.whl", hash = "sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362"}, - {file = "wrapt-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89"}, - {file = "wrapt-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b"}, - {file = "wrapt-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c"}, - {file = "wrapt-1.16.0-cp312-cp312-win32.whl", hash = "sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc"}, - {file = "wrapt-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8"}, - {file = "wrapt-1.16.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465"}, - {file = "wrapt-1.16.0-cp36-cp36m-win32.whl", hash = "sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e"}, - {file = "wrapt-1.16.0-cp36-cp36m-win_amd64.whl", hash = "sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966"}, - {file = "wrapt-1.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c"}, - {file = "wrapt-1.16.0-cp37-cp37m-win32.whl", hash = "sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c"}, - {file = "wrapt-1.16.0-cp37-cp37m-win_amd64.whl", hash = "sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00"}, - {file = "wrapt-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0"}, - {file = "wrapt-1.16.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6"}, - {file = "wrapt-1.16.0-cp38-cp38-win32.whl", hash = "sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b"}, - {file = "wrapt-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41"}, - {file = "wrapt-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2"}, - {file = "wrapt-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537"}, - {file = "wrapt-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3"}, - {file = "wrapt-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35"}, - {file = "wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1"}, - {file = "wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"}, -] - [metadata] lock-version = "2.0" -python-versions = "^3.11" -content-hash = "2c5ccbc950331798c223a8d40baf6648564a32d59849f0ecbcacc77f2f181e8f" +python-versions = "^3.12" +content-hash = "666e98acee0781cb89b990b966246eba5ca85c8391ccf63921692dc77a61fac3" diff --git a/pyproject.toml b/pyproject.toml index e954f076..273e1697 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,15 +5,15 @@ description = "Questionnaire Schemas Repository" authors = ["ONSDigital"] [tool.poetry.dependencies] -python = "^3.11" +python = "^3.12" coloredlogs = "*" -eq-translations = {git = "https://github.com/ONSDigital/eq-translations.git", rev = "v4.9.2"} +eq-translations = {git = "https://github.com/ONSDigital/eq-translations.git", rev = "v4.10.0"} [tool.poetry.dev-dependencies] black = "*" isort = "*" pylint = "*" -pylint_quotes = "*" +flake8-quotes = "*" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/schemas/business/en/covid_0002.json b/schemas/business/en/covid_0002.json index 5549d4f2..2b999cf3 100644 --- a/schemas/business/en/covid_0002.json +++ b/schemas/business/en/covid_0002.json @@ -167,6 +167,29 @@ } ] }, + { + "question": "Capital expenditure", + "contents": [ + { + "description": "This section asks for information about:" + }, + { + "list": [ + "expectations for capital expenditure", + "investment in plant and machinery", + "use of full expensing capital allowance on plant and machinery" + ] + } + ] + }, + { + "question": "Stock", + "contents": [ + { + "description": "This section asks for information about your business's stockpiling and stock levels." + } + ] + }, { "question": "Supply chains", "contents": [ @@ -219,8 +242,6 @@ }, { "list": [ - "expectations for cash reserves", - "insolvency", "the main concern for your business", "business's overall performance" ] @@ -375,7 +396,7 @@ "question": { "id": "questionturnover-comparison-to-last-month", "title": { - "text": "How did {ru_name}’s turnover in August 2024 compare with the previous calendar month?", + "text": "How did {ru_name}’s turnover in September 2024 compare with the previous calendar month?", "placeholders": [ { "placeholder": "ru_name", @@ -533,7 +554,7 @@ "type": "Question", "question": { "id": "questionturnover-expectations", - "title": "What are your business’s expectations for turnover in October 2024?", + "title": "What are your business’s expectations for turnover in November 2024?", "description": [ "

When considering expectations, compare to your business's current turnover.

" ], @@ -572,7 +593,7 @@ "type": "Question", "question": { "id": "questiondomestic-demand-for-goods-and-services", - "title": "How did your business’s domestic demand for goods and services in August 2024 compare with the previous calendar month?", + "title": "How did your business’s domestic demand for goods and services in September 2024 compare with the previous calendar month?", "description": ["

Informed estimates are acceptable.

"], "guidance": { "contents": [ @@ -631,7 +652,7 @@ "type": "Question", "question": { "id": "questioninternational-demand-for-goods-and-services", - "title": "How did your business’s international demand for goods and services in August 2024 compare with the previous calendar month?", + "title": "How did your business’s international demand for goods and services in September 2024 compare with the previous calendar month?", "description": ["

Informed estimates are acceptable.

"], "guidance": { "contents": [ @@ -701,45 +722,740 @@ } }, { - "id": "c4dcbbf3-8e5f-412e-9a63-aa80d41fd4fb", - "title": "Prices", + "id": "c4dcbbf3-8e5f-412e-9a63-aa80d41fd4fb", + "title": "Prices", + "summary": { + "show_on_completion": false, + "page_title": "Prices", + "collapsible": false + }, + "show_on_hub": true, + "groups": [ + { + "id": "groupc4dcbbf3-8e5f-412e-9a63-aa80d41fd4fb", + "blocks": [ + { + "type": "Interstitial", + "id": "prices-section", + "page_title": "Prices section", + "content": { + "title": "Prices", + "contents": [ + { + "description": "This section asks for information about:" + }, + { + "list": [ + "prices of goods or services bought or sold over the last month", + "expectations for goods or services sold for the next month", + "factors causing your business to consider raising prices" + ] + } + ] + } + }, + { + "id": "prices-of-goods-or-services-bought", + "type": "Question", + "question": { + "id": "questionprices-of-goods-or-services-bought", + "title": { + "text": "How did the prices of goods or services bought by {ru_name} in September 2024 compare with the previous calendar month?", + "placeholders": [ + { + "placeholder": "ru_name", + "value": { + "source": "metadata", + "identifier": "ru_name" + } + } + ] + }, + "guidance": { + "contents": [ + { + "description": "Exclude seasonal changes" + } + ] + }, + "type": "General", + "answers": [ + { + "id": "answerccf53a0c-e3cd-460e-84f9-040576e215ac", + "mandatory": true, + "type": "Radio", + "q_code": "153", + "options": [ + { + "label": "Prices increased", + "value": "Prices increased" + }, + { + "label": "Prices stayed the same", + "value": "Prices stayed the same" + }, + { + "label": "Prices decreased", + "value": "Prices decreased" + }, + { + "label": "Not sure", + "value": "Not sure" + }, + { + "label": "Not applicable", + "value": "Not applicable" + } + ] + } + ] + }, + "page_title": "Prices of goods or services bought" + }, + { + "id": "prices-of-goods-or-services-sold", + "type": "Question", + "question": { + "id": "questionprices-of-goods-or-services-sold", + "title": "How did the prices of goods or services sold by your business in September 2024 compare with the previous calendar month?", + "guidance": { + "contents": [ + { + "description": "Exclude seasonal changes" + } + ] + }, + "type": "General", + "answers": [ + { + "id": "answerb7e812f7-9a46-4179-b75a-bb361ed2d52d", + "mandatory": true, + "type": "Radio", + "q_code": "162", + "options": [ + { + "label": "Prices increased", + "value": "Prices increased" + }, + { + "label": "Prices stayed the same", + "value": "Prices stayed the same" + }, + { + "label": "Prices decreased", + "value": "Prices decreased" + }, + { + "label": "Not sure", + "value": "Not sure" + }, + { + "label": "Not applicable", + "value": "Not applicable" + } + ] + } + ] + }, + "page_title": "Prices of goods or services sold" + }, + { + "id": "expectations-for-prices-of-goods-or-services-sold", + "type": "Question", + "question": { + "id": "questionexpectations-for-prices-of-goods-or-services-sold", + "title": "What are your business's expectations for the prices of goods or services sold in November 2024?", + "description": [ + "

When considering expectations, compare to your business's current prices of goods or services.

" + ], + "guidance": { + "contents": [ + { + "description": "Exclude seasonal changes" + } + ] + }, + "type": "General", + "answers": [ + { + "id": "answer20d9b66d-b172-44a8-b99a-f1f11e0d2fda", + "mandatory": true, + "type": "Radio", + "q_code": "163", + "options": [ + { + "label": "Prices will increase", + "value": "Prices will increase" + }, + { + "label": "Prices will stay the same", + "value": "Prices will stay the same" + }, + { + "label": "Prices will decrease", + "value": "Prices will decrease" + }, + { + "label": "Not sure", + "value": "Not sure" + }, + { + "label": "Not applicable", + "value": "Not applicable" + } + ] + } + ] + }, + "page_title": "Expectations for prices of goods or services sold" + }, + { + "id": "factors-causing-business-to-consider-raising-prices", + "type": "Question", + "question": { + "id": "questionfactors-causing-business-to-consider-raising-prices", + "title": "Which of the following factors, if any, are causing your business to consider raising prices in November 2024?", + "type": "MutuallyExclusive", + "mandatory": true, + "answers": [ + { + "id": "answer67c39eaf-60f7-44fa-87a3-1686b60bf2b9", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "Energy prices", + "value": "Energy prices", + "q_code": "691" + }, + { + "label": "Finance costs", + "value": "Finance costs", + "q_code": "692", + "description": "For example, commissions, fees and interest rates" + }, + { + "label": "Labour costs", + "value": "Labour costs", + "q_code": "693" + }, + { + "label": "Raw material prices", + "value": "Raw material prices", + "q_code": "694" + }, + { + "label": "Transportation or haulage costs", + "value": "Transportation or haulage costs", + "q_code": "200074" + }, + { + "label": "Other", + "value": "Other", + "q_code": "695", + "detail_answer": { + "label": "Please describe", + "type": "TextField", + "id": "answerda33786d-bf85-4411-9631-01bcf6a7248a", + "mandatory": false + } + }, + { + "label": "Not sure", + "value": "Not sure", + "q_code": "699" + } + ] + }, + { + "id": "answer62f6576b-0493-4409-b07a-a4baaeb77547", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "Business is not considering raising prices", + "value": "Business is not considering raising prices", + "q_code": "690" + } + ] + } + ] + }, + "page_title": "Factors causing business to consider raising prices" + } + ] + } + ], + "enabled": { + "when": { + "in": [ + { + "identifier": "answer4ec8d01d-485e-4262-80a2-a42289f447d3", + "source": "answers" + }, + [ + "Currently fully trading", + "Currently partially trading", + "Paused trading but intends to restart in the next two weeks", + "Paused trading and does not intend to restart in the next two weeks" + ] + ] + } + } + }, + { + "id": "0a9662ac-73ec-4943-89c1-3dfa9fa707c0", + "title": "Capital expenditure", + "summary": { + "show_on_completion": false, + "page_title": "Stock levels", + "collapsible": false + }, + "show_on_hub": true, + "groups": [ + { + "id": "group0a9662ac-73ec-4943-89c1-3dfa9fa707c0", + "blocks": [ + { + "type": "Interstitial", + "id": "capital-expenditure", + "page_title": "Capital expenditure", + "content": { + "title": "Capital expenditure", + "contents": [ + { + "description": "This section asks for information about:" + }, + { + "list": [ + "expectations for capital expenditure", + "investment in plant and machinery", + "use of full expensing capital allowance on plant and machinery" + ] + } + ] + } + }, + { + "id": "expectations-for-capital-expenditure", + "type": "Question", + "question": { + "id": "questionexpectations-for-capital-expenditure", + "title": { + "text": "What are {ru_name}'s expectations for capital expenditure between October and December 2024?", + "placeholders": [ + { + "placeholder": "ru_name", + "value": { + "source": "metadata", + "identifier": "ru_name" + } + } + ] + }, + "guidance": { + "contents": [ + { + "description": "Include:" + }, + { + "list": [ + "new buildings and major improvements to existing buildings", + "purchased software", + "spending on plant and machinery", + "transport and energy infrastructures, such as roads and powerlines", + "transport equipment" + ] + } + ] + }, + "type": "General", + "answers": [ + { + "id": "answerebff70ad-7c58-4253-a944-8fbbee4af7cd", + "mandatory": true, + "type": "Radio", + "q_code": "188", + "options": [ + { + "label": "Capital expenditure will increase", + "value": "Capital expenditure will increase" + }, + { + "label": "Capital expenditure will stay the same", + "value": "Capital expenditure will stay the same" + }, + { + "label": "Capital expenditure will decrease", + "value": "Capital expenditure will decrease" + }, + { + "label": "Not sure", + "value": "Not sure" + }, + { + "label": "Not applicable", + "value": "Not applicable" + } + ] + } + ] + }, + "page_title": "Expectations for capital expenditure", + "routing_rules": [ + { + "block": "factors-limiting-businesss-capital-expenditure", + "when": { + "in": [ + { + "identifier": "answerebff70ad-7c58-4253-a944-8fbbee4af7cd", + "source": "answers" + }, + ["Not applicable"] + ] + } + }, + { + "block": "authorising-capital-expenditure" + } + ] + }, + { + "id": "authorising-capital-expenditure", + "type": "Question", + "question": { + "id": "questionauthorising-capital-expenditure", + "title": "Why is your business expecting to authorise capital expenditure between October and December 2024?", + "type": "MutuallyExclusive", + "mandatory": true, + "answers": [ + { + "id": "answer3fe192d3-b594-458b-8844-0cba52bf44fd", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "For replacements", + "value": "For replacements", + "q_code": "741", + "description": "For example, to replace worn out or out of date equipment" + }, + { + "label": "To expand capacity", + "value": "To expand capacity", + "q_code": "742", + "description": "For example, to increase future activity, outputs or production" + }, + { + "label": "To increase efficiency", + "value": "To increase efficiency", + "q_code": "743" + }, + { + "label": "To provide new services", + "value": "To provide new services", + "q_code": "744" + }, + { + "label": "To reach new customers", + "value": "To reach new customers", + "q_code": "745" + }, + { + "label": "To purchase new technology", + "value": "To purchase new technology", + "q_code": "746" + }, + { + "label": "Other", + "value": "Other", + "q_code": "747", + "detail_answer": { + "label": "Please describe", + "type": "TextField", + "id": "answerf3f012f5-3a9b-4ea5-ac34-dbd5b655dae0", + "mandatory": false + } + }, + { + "label": "Not sure", + "value": "Not sure", + "q_code": "749" + } + ] + }, + { + "id": "answerf25cbaa7-80ec-46b8-9a13-a44fdb3642bf", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "Not applicable", + "value": "Not applicable", + "q_code": "740" + } + ] + } + ] + }, + "page_title": "Authorising capital expenditure" + }, + { + "id": "factors-limiting-businesss-capital-expenditure", + "type": "Question", + "question": { + "id": "questionfactors-limiting-businesss-capital-expenditure", + "title": "Which of the following, if any, do you expect to limit your business's capital expenditure between October and December 2024?", + "type": "MutuallyExclusive", + "mandatory": true, + "answers": [ + { + "id": "answerceca3459-4b30-4ea6-bf13-081735fc1635", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "Inability to raise external finance", + "value": "Inability to raise external finance", + "q_code": "751" + }, + { + "label": "Inadequate return on proposed investment", + "value": "Inadequate return on proposed investment", + "q_code": "752" + }, + { + "label": "Shortage of internal finance", + "value": "Shortage of internal finance", + "q_code": "753" + }, + { + "label": "Shortage of labour", + "value": "Shortage of labour", + "q_code": "754" + }, + { + "label": "Uncertainty about demand or business prospects", + "value": "Uncertainty about demand or business prospects", + "q_code": "755" + }, + { + "label": "Other", + "value": "Other", + "q_code": "756", + "detail_answer": { + "label": "Please describe", + "type": "TextField", + "id": "answere5b1ed1e-8fef-40bf-a78e-5c1e5871603e", + "mandatory": false + } + }, + { + "label": "Not sure", + "value": "Not sure", + "q_code": "759" + } + ] + }, + { + "id": "answer94ef25e7-339a-424b-ba2a-ef49518ed60a", + "mandatory": false, + "type": "Checkbox", + "options": [ + { + "label": "Not expecting any limits to capital expenditure", + "value": "Not expecting any limits to capital expenditure", + "q_code": "750" + } + ] + } + ] + }, + "page_title": "Factors limiting business's capital expenditure" + }, + { + "id": "investing-in-plant-and-machinery", + "type": "Question", + "question": { + "id": "questioninvesting-in-plant-and-machinery", + "title": "Did your business invest in plant and machinery between July and September 2024?", + "guidance": { + "contents": [ + { + "description": "Examples of plant and machinery:" + }, + { + "list": [ + "machines such as computers, printers, lathes and planers", + "office equipment such as desks and chairs", + "vehicles such as, vans, lorries and tractors, excluding cars", + "warehousing equipment such as forklift trucks, pallet trucks, shelving and stackers", + "tools such as ladders and drills", + "construction equipment such as excavators, compactors, and bulldozers", + "some fixtures such as kitchen and bathroom fittings and fire alarm systems in non-residential property" + ] + }, + { + "description": "This list is not exhaustive. View further information on the gov.uk website (this link opens in a new tab)." + } + ] + }, + "type": "General", + "answers": [ + { + "id": "answer8583bbc9-cffb-433b-a388-79a634d76d98", + "mandatory": true, + "type": "Radio", + "q_code": "10023", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + }, + { + "label": "Not sure", + "value": "Not sure" + } + ] + } + ] + }, + "page_title": "Investing in plant and machinery", + "routing_rules": [ + { + "section": "End", + "when": { + "in": [ + { + "identifier": "answer8583bbc9-cffb-433b-a388-79a634d76d98", + "source": "answers" + }, + ["No", "Not sure"] + ] + } + }, + { + "block": "using-full-expensing-on-plant-and-machinery" + } + ] + }, + { + "id": "using-full-expensing-on-plant-and-machinery", + "type": "Question", + "question": { + "id": "questionusing-full-expensing-on-plant-and-machinery", + "title": "Did your business use the full expensing capital allowance on qualifying plant and machinery investments between July and September 2024?", + "definitions": [ + { + "title": "What we mean by 'full expensing capital allowance'", + "contents": [ + { + "description": "This refers to a measure announced in the March 2023 budget in which companies can claim 100% capital allowances on qualifying plant and machinery investments from 1 April 2023 until 31 March 2026." + }, + { + "description": "Examples of plant and machinery assets that qualify for the new capital allowance:" + }, + { + "list": [ + "solar panels", + "computer equipment and servers", + "tractors, lorries and vans", + "ladders, drills and cranes", + "office chairs and desks", + "electric vehicle charge points", + "refrigeration units", + "compressors", + "foundry equipment" + ] + }, + { + "description": "This list is not exhaustive. View further information on the gov.uk website (this link opens in a new tab)." + } + ] + } + ], + "type": "General", + "answers": [ + { + "id": "answer648c5ad2-3842-4f63-98fa-49b67a6f4d0e", + "mandatory": true, + "type": "Radio", + "q_code": "10024", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + }, + { + "label": "Not sure", + "value": "Not sure" + } + ] + } + ] + }, + "page_title": "Using full expensing on plant and machinery" + } + ] + } + ], + "enabled": { + "when": { + "in": [ + { + "identifier": "answer4ec8d01d-485e-4262-80a2-a42289f447d3", + "source": "answers" + }, + [ + "Currently partially trading", + "Paused trading but intends to restart in the next two weeks", + "Paused trading and does not intend to restart in the next two weeks", + "Currently fully trading" + ] + ] + } + } + }, + { + "id": "f3bc55d6-d18b-49e2-b19d-df448dc77182", + "title": "Stock", "summary": { "show_on_completion": false, - "page_title": "Prices", "collapsible": false }, "show_on_hub": true, "groups": [ { - "id": "groupc4dcbbf3-8e5f-412e-9a63-aa80d41fd4fb", + "id": "groupf3bc55d6-d18b-49e2-b19d-df448dc77182", "blocks": [ { "type": "Interstitial", - "id": "prices-section", - "page_title": "Prices section", + "id": "stock", + "page_title": "Stock", "content": { - "title": "Prices", + "title": "Stock", "contents": [ { - "description": "This section asks for information about:" - }, - { - "list": [ - "prices of goods or services bought or sold over the last month", - "expectations for goods or services sold for the next month", - "factors causing your business to consider raising prices" - ] + "description": "This section asks for information about your business's stockpiling and stock levels." } ] } }, { - "id": "prices-of-goods-or-services-bought", + "id": "stockpiling-of-goods-or-materials", "type": "Question", "question": { - "id": "questionprices-of-goods-or-services-bought", + "id": "questionstockpiling-of-goods-or-materials", "title": { - "text": "How did the prices of goods or services bought by {ru_name} in August 2024 compare with the previous calendar month?", + "text": "Is {ru_name} stockpiling any goods or materials?", "placeholders": [ { "placeholder": "ru_name", @@ -750,79 +1466,83 @@ } ] }, - "guidance": { - "contents": [ - { - "description": "Exclude seasonal changes" - } - ] - }, "type": "General", "answers": [ { - "id": "answerccf53a0c-e3cd-460e-84f9-040576e215ac", + "id": "answer5c058e75-e3bc-4248-9f26-48e9ce912980", "mandatory": true, "type": "Radio", - "q_code": "153", + "q_code": "34", "options": [ { - "label": "Prices increased", - "value": "Prices increased" - }, - { - "label": "Prices stayed the same", - "value": "Prices stayed the same" + "label": "Yes", + "value": "Yes" }, { - "label": "Prices decreased", - "value": "Prices decreased" + "label": "No", + "value": "No" }, { "label": "Not sure", "value": "Not sure" - }, - { - "label": "Not applicable", - "value": "Not applicable" } ] } ] }, - "page_title": "Prices of goods or services bought" + "page_title": "Stockpiling of goods or materials" }, { - "id": "prices-of-goods-or-services-sold", + "id": "stock-levels-of-raw-materials", "type": "Question", "question": { - "id": "questionprices-of-goods-or-services-sold", - "title": "How did the prices of goods or services sold by your business in August 2024 compare with the previous calendar month?", + "id": "questionstock-levels-of-raw-materials", + "title": "How did your business's stock levels of raw materials in September 2024 compare with the previous calendar month?", "guidance": { "contents": [ { - "description": "Exclude seasonal changes" + "description": "Include:" + }, + { + "list": ["work in progress"] + }, + { + "description": "Exclude:" + }, + { + "list": ["seasonal changes"] } ] }, + "definitions": [ + { + "title": "What we mean by 'raw materials'", + "contents": [ + { + "description": "This refers to the basic input goods that your business requires to manufacture its products." + } + ] + } + ], "type": "General", "answers": [ { - "id": "answerb7e812f7-9a46-4179-b75a-bb361ed2d52d", + "id": "answer5f334cf3-9460-4054-ab30-e9cf49d11227", "mandatory": true, "type": "Radio", - "q_code": "162", + "q_code": "175", "options": [ { - "label": "Prices increased", - "value": "Prices increased" + "label": "Stock levels were higher", + "value": "Stock levels were higher" }, { - "label": "Prices stayed the same", - "value": "Prices stayed the same" + "label": "Stock levels stayed the same", + "value": "Stock levels stayed the same" }, { - "label": "Prices decreased", - "value": "Prices decreased" + "label": "Stock levels were lower", + "value": "Stock levels were lower" }, { "label": "Not sure", @@ -836,43 +1556,59 @@ } ] }, - "page_title": "Prices of goods or services sold" + "page_title": "Stock levels of raw materials" }, { - "id": "expectations-for-prices-of-goods-or-services-sold", + "id": "stock-levels-of-finished-goods", "type": "Question", "question": { - "id": "questionexpectations-for-prices-of-goods-or-services-sold", - "title": "What are your business's expectations for the prices of goods or services sold in October 2024?", - "description": [ - "

When considering expectations, compare to your business's current prices of goods or services.

" - ], + "id": "questionstock-levels-of-finished-goods", + "title": "How did your business's stock levels of finished goods in September 2024 compare with the previous calendar month?", "guidance": { "contents": [ { - "description": "Exclude seasonal changes" + "description": "Include:" + }, + { + "list": ["goods for resale"] + }, + { + "description": "Exclude:" + }, + { + "list": ["seasonal changes", "work in progress"] } ] }, + "definitions": [ + { + "title": "What we mean by 'finished goods'", + "contents": [ + { + "description": "This refers to goods that have completed the manufacturing process and are ready for sale." + } + ] + } + ], "type": "General", "answers": [ { - "id": "answer20d9b66d-b172-44a8-b99a-f1f11e0d2fda", + "id": "answer559b55e3-ad95-48ff-a3d7-c9a14ea6b22c", "mandatory": true, "type": "Radio", - "q_code": "163", + "q_code": "179", "options": [ { - "label": "Prices will increase", - "value": "Prices will increase" + "label": "Stock levels were higher", + "value": "Stock levels were higher" }, { - "label": "Prices will stay the same", - "value": "Prices will stay the same" + "label": "Stock levels stayed the same", + "value": "Stock levels stayed the same" }, { - "label": "Prices will decrease", - "value": "Prices will decrease" + "label": "Stock levels were lower", + "value": "Stock levels were lower" }, { "label": "Not sure", @@ -886,81 +1622,7 @@ } ] }, - "page_title": "Expectations for prices of goods or services sold" - }, - { - "id": "factors-causing-business-to-consider-raising-prices", - "type": "Question", - "question": { - "id": "questionfactors-causing-business-to-consider-raising-prices", - "title": "Which of the following factors, if any, are causing your business to consider raising prices in October 2024?", - "type": "MutuallyExclusive", - "mandatory": true, - "answers": [ - { - "id": "answer67c39eaf-60f7-44fa-87a3-1686b60bf2b9", - "mandatory": false, - "type": "Checkbox", - "options": [ - { - "label": "Energy prices", - "value": "Energy prices", - "q_code": "691" - }, - { - "label": "Finance costs", - "value": "Finance costs", - "q_code": "692", - "description": "For example, commissions, fees and interest rates" - }, - { - "label": "Labour costs", - "value": "Labour costs", - "q_code": "693" - }, - { - "label": "Raw material prices", - "value": "Raw material prices", - "q_code": "694" - }, - { - "label": "Transportation or haulage costs", - "value": "Transportation or haulage costs", - "q_code": "200074" - }, - { - "label": "Other", - "value": "Other", - "q_code": "695", - "detail_answer": { - "label": "Please describe", - "type": "TextField", - "id": "answerda33786d-bf85-4411-9631-01bcf6a7248a", - "mandatory": false - } - }, - { - "label": "Not sure", - "value": "Not sure", - "q_code": "699" - } - ] - }, - { - "id": "answer62f6576b-0493-4409-b07a-a4baaeb77547", - "mandatory": false, - "type": "Checkbox", - "options": [ - { - "label": "Business is not considering raising prices", - "value": "Business is not considering raising prices", - "q_code": "690" - } - ] - } - ] - }, - "page_title": "Factors causing business to consider raising prices" + "page_title": "Stock levels of finished goods" } ] } @@ -974,9 +1636,9 @@ }, [ "Currently fully trading", - "Currently partially trading", "Paused trading but intends to restart in the next two weeks", - "Paused trading and does not intend to restart in the next two weeks" + "Paused trading and does not intend to restart in the next two weeks", + "Currently partially trading" ] ] } @@ -1019,7 +1681,7 @@ "question": { "id": "questionmaterials-goods-or-services-from-within-the-uk", "title": { - "text": "Was {ru_name} able to get the materials, goods or services it needed from within the UK in August 2024?", + "text": "Was {ru_name} able to get the materials, goods or services it needed from within the UK in September 2024?", "placeholders": [ { "placeholder": "ru_name", @@ -1065,7 +1727,7 @@ "type": "Question", "question": { "id": "questionglobal-supply-chain-disruption", - "title": "Did your business experience any global supply chain disruption in August 2024?", + "title": "Did your business experience any global supply chain disruption in September 2024?", "definitions": [ { "title": "Examples of global supply chain disruption", @@ -1261,7 +1923,7 @@ "question": { "id": "questionexporting-and-importing", "title": { - "text": "Did {ru_name} export or import any goods or services in August 2024?", + "text": "Did {ru_name} export or import any goods or services in September 2024?", "placeholders": [ { "placeholder": "ru_name", @@ -1353,7 +2015,7 @@ "type": "Question", "question": { "id": "questionincrease-in-exporting-challenges", - "title": "Did your business experience an increase in any of the following exporting challenges in August 2024, compared with the previous calendar month?", + "title": "Did your business experience an increase in any of the following exporting challenges in September 2024, compared with the previous calendar month?", "definitions": [ { "title": "What we mean by an 'increase'", @@ -1466,7 +2128,7 @@ "type": "Question", "question": { "id": "questionincrease-in-importing-challenges", - "title": "Did your business experience an increase in any of the following importing challenges in August 2024, compared with the previous calendar month?", + "title": "Did your business experience an increase in any of the following importing challenges in September 2024, compared with the previous calendar month?", "definitions": [ { "title": "What we mean by an 'increase'", @@ -1634,7 +2296,7 @@ "question": { "id": "questionexpectations-for-businesss-number-of-employees", "title": { - "text": "What are {ru_name}’s expectations for the number of employees in October 2024?", + "text": "What are {ru_name}’s expectations for the number of employees in November 2024?", "placeholders": [ { "placeholder": "ru_name", @@ -1726,7 +2388,7 @@ "type": "Question", "question": { "id": "questiondifficulties-in-recruiting-employees", - "title": "Did your business experience any difficulties recruiting employees in August 2024?", + "title": "Did your business experience any difficulties recruiting employees in September 2024?", "type": "General", "answers": [ { @@ -1802,8 +2464,6 @@ }, { "list": [ - "expectations for cash reserves", - "insolvency", "the main concern for your business", "business's overall performance" ] @@ -1811,121 +2471,12 @@ ] } }, - { - "id": "cash-reserves", - "type": "Question", - "question": { - "id": "questioncash-reserves", - "title": { - "text": "How long do you expect {ru_name}'s cash reserves will last?", - "placeholders": [ - { - "placeholder": "ru_name", - "value": { - "source": "metadata", - "identifier": "ru_name" - } - } - ] - }, - "type": "General", - "answers": [ - { - "id": "answer6363fbd6-f7f9-44d0-8b56-3c3acb7f3a97", - "mandatory": true, - "type": "Radio", - "q_code": "73", - "options": [ - { - "label": "Less than 1 month", - "value": "Less than 1 month" - }, - { - "label": "1 to 3 months", - "value": "1 to 3 months" - }, - { - "label": "4 to 6 months", - "value": "4 to 6 months" - }, - { - "label": "More than 6 months", - "value": "More than 6 months" - }, - { - "label": "Not sure", - "value": "Not sure" - }, - { - "label": "Business has no cash reserves", - "value": "Business has no cash reserves" - } - ] - } - ] - }, - "page_title": "Cash reserves" - }, - { - "id": "risk-of-insolvency", - "type": "Question", - "question": { - "id": "questionrisk-of-insolvency", - "title": "What is your business's risk of insolvency?", - "definitions": [ - { - "title": "What we mean by 'insolvency'", - "contents": [ - { - "description": "This refers to when a business cannot pay its debts when they are due or the business owes more than it owns." - } - ] - } - ], - "type": "General", - "answers": [ - { - "id": "answer37c9075a-922e-45ef-bb85-7006a93d056f", - "mandatory": true, - "type": "Radio", - "q_code": "218", - "options": [ - { - "label": "Severe risk", - "value": "Severe risk" - }, - { - "label": "Moderate risk", - "value": "Moderate risk" - }, - { - "label": "Low risk", - "value": "Low risk" - }, - { - "label": "No risk", - "value": "No risk" - }, - { - "label": "Not sure", - "value": "Not sure" - }, - { - "label": "The business is insolvent", - "value": "The business is insolvent" - } - ] - } - ] - }, - "page_title": "Risk of insolvency" - }, { "id": "main-concern-for-your-business", "type": "Question", "question": { "id": "questionmain-concern-for-your-business", - "title": "Which of the following, if any, will be the main concern for your business in October 2024?", + "title": "Which of the following, if any, will be the main concern for your business in November 2024?", "type": "General", "answers": [ { @@ -2005,7 +2556,7 @@ "type": "Question", "question": { "id": "questionbusinesss-overall-performance", - "title": "How would you describe your business’s overall performance in August 2024, compared with the same calendar month last year?", + "title": "How would you describe your business’s overall performance in September 2024, compared with the same calendar month last year?", "description": [ "

Consider all aspects of your business contributing to overall performance such as pricing, trading and workforce.

" ], diff --git a/schemas/health/en/hms_0001.json b/schemas/health/en/hms_0001.json index d55c1d9b..bcd1f056 100644 --- a/schemas/health/en/hms_0001.json +++ b/schemas/health/en/hms_0001.json @@ -17,7 +17,7 @@ }, { "answer_id": "answer0da5bb67-bd65-4a6a-bafc-8e3a3f913143", - "code": "HMS_INT_003" + "code": "HMS-INT-003" }, { "answer_id": "answerdbcb618e-6c8f-491d-91e5-820d15cb282c", @@ -99,14 +99,38 @@ "answer_id": "answercb86a649-4cd8-4165-96ec-d5ac0f7f5b95", "code": "HMS-GPP-009" }, + { + "answer_id": "answera5a720df-2868-4aec-b99f-10de345df1a2", + "code": "HMS-GPP-021" + }, { "answer_id": "answera826470f-5e13-4c38-9872-22582abc3ad0", "code": "HMS-GPP-010" }, + { + "answer_id": "answer342b188f-9b3f-43ba-8dac-2b7fa4cbaab7", + "code": "HMS-GPP-022" + }, { "answer_id": "answer65dfd89d-4f31-428e-95ff-246a9604167e", "code": "HMS-GPP-011" }, + { + "answer_id": "answer28ba1a13-b3a9-47c2-8cb9-5b1cb3ba6aee", + "code": "HMS-GPP-023" + }, + { + "answer_id": "answerbaa80034-71a8-428f-848b-b557fb6f0778", + "code": "HMS-GPP-024" + }, + { + "answer_id": "answer8475a907-2511-440c-a533-3ce2e5a41ffe", + "code": "HMS-GPP-025" + }, + { + "answer_id": "answer39ce3489-d860-4e96-b638-e98b5346b29a", + "code": "HMS-GPP-026" + }, { "answer_id": "answer5045cf44-3167-4967-bf4c-203ca0d0305c", "code": "HMS-GPP-012" @@ -151,10 +175,6 @@ "answer_id": "answer19cd1efc-6bf8-4246-b929-551302e37c6a", "code": "HMS-DEN-002" }, - { - "answer_id": "answer65bbc01e-ea14-43cb-a1c2-604641ebcbd3", - "code": "HMS-DEN-003" - }, { "answer_id": "answer8c8e5e2a-ed58-482e-907e-9666c3da974f", "code": "HMS-DEN-004" @@ -167,10 +187,6 @@ "answer_id": "answer61a69530-a01e-4c23-9d65-62b2e62fec24", "code": "HMS-DEN-006" }, - { - "answer_id": "answer6a8cf8b2-af9b-4c55-b19c-f5b676dfb87e", - "code": "HMS-DEN-007" - }, { "answer_id": "answer6d7012e0-b1fa-4705-9d0e-c73b5871f114", "code": "HMS-DEN-008" @@ -300,9 +316,7 @@ "identifier": "answer039428b9-a54d-4027-8270-1197ea1043de", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -371,9 +385,7 @@ "identifier": "answeracadafee-1958-4039-ab53-7eedc1db6b95", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -420,9 +432,9 @@ "answers": [ { "id": "answer0da5bb67-bd65-4a6a-bafc-8e3a3f913143", - "mandatory": false, + "mandatory": true, "type": "Checkbox", - "label": "Select to continue to submit", + "label": "Select continue to submit", "options": [ { "label": "Continue", @@ -537,9 +549,7 @@ "block": "about-you-your-home-postcode", "when": { "all-in": [ - [ - "Yes, I have moved house" - ], + ["Yes, I have moved house"], { "identifier": "answerdbcb618e-6c8f-491d-91e5-820d15cb282c", "source": "answers" @@ -551,9 +561,7 @@ "block": "work-and-education-current-status", "when": { "all-in": [ - [ - "Yes, my work or education status has changed" - ], + ["Yes, my work or education status has changed"], { "identifier": "answerdbcb618e-6c8f-491d-91e5-820d15cb282c", "source": "answers" @@ -674,10 +682,7 @@ "identifier": "answerb7e6d0c6-fb29-4c61-9742-771e46147541", "source": "answers" }, - [ - "Employed", - "Self-employed" - ] + ["Employed", "Self-employed"] ] } }, @@ -796,9 +801,7 @@ "identifier": "answer73ccf278-cb53-4c1b-b05f-42292d2633b4", "source": "answers" }, - [ - "Retired" - ] + ["Retired"] ] } }, @@ -846,9 +849,7 @@ "identifier": "answer14561f81-1af8-4f1a-a4be-e4f1d3ac5efb", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -933,9 +934,7 @@ "identifier": "answer57101fe3-33fe-4e01-a88c-610dc5b2066a", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -1100,10 +1099,7 @@ "identifier": "answer92f402d4-7fb4-4769-a8e9-e599761705bb", "source": "answers" }, - [ - "No", - "Do not know" - ] + ["No", "Do not know"] ] } }, @@ -1439,21 +1435,7 @@ "page_title": "GP practice - next step", "routing_rules": [ { - "block": "gp-practice-face-to-face-appointment", - "when": { - "in": [ - { - "identifier": "answer45632ec7-df36-4d30-94f9-7364870bab93", - "source": "answers" - }, - [ - "I was given a face-to-face appointment" - ] - ] - } - }, - { - "block": "gp-practice-call-back", + "block": "gp-practice-face-to-face-appointment-asked", "when": { "in": [ { @@ -1461,6 +1443,7 @@ "source": "answers" }, [ + "I was given a face-to-face appointment", "The GP or other healthcare professional called me back" ] ] @@ -1474,9 +1457,7 @@ "identifier": "answer45632ec7-df36-4d30-94f9-7364870bab93", "source": "answers" }, - [ - "The GP practice asked me to do something else" - ] + ["The GP practice asked me to do something else"] ] } }, @@ -1546,6 +1527,50 @@ } ] }, + { + "id": "gp-practice-face-to-face-appointment-asked", + "type": "Question", + "question": { + "id": "questiongp-practice-face-to-face-appointment-asked", + "title": "Were you asked if you wanted a face-to-face appointment?", + "type": "General", + "answers": [ + { + "id": "answera5a720df-2868-4aec-b99f-10de345df1a2", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + } + ] + } + ] + }, + "page_title": "GP practice - face to face appointment asked", + "routing_rules": [ + { + "block": "gp-practice-call-back", + "when": { + "in": [ + { + "identifier": "answer45632ec7-df36-4d30-94f9-7364870bab93", + "source": "answers" + }, + ["The GP or other healthcare professional called me back"] + ] + } + }, + { + "block": "gp-practice-face-to-face-appointment" + } + ] + }, { "id": "gp-practice-face-to-face-appointment", "type": "Question", @@ -1577,12 +1602,45 @@ }, "page_title": "GP practice - face to face appointment" }, + { + "id": "gp-practice-have-preferred-health-care-professional", + "type": "Question", + "question": { + "id": "questiongp-practice-have-preferred-health-care-professional", + "title": "Do you have any healthcare professionals at your GP practice who you prefer to see?", + "description": [ + "

A preferred healthcare professional could be a nurse or doctor who understands your health issues better than others.

" + ], + "type": "General", + "answers": [ + { + "id": "answer342b188f-9b3f-43ba-8dac-2b7fa4cbaab7", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + } + ] + } + ] + }, + "page_title": "GP practice - have preferred health care professional" + }, { "id": "gp-practice-choice-of-healthcare-professional", "type": "Question", "question": { "id": "questiongp-practice-choice-of-healthcare-professional", "title": "Were you asked if you wanted to see a preferred healthcare professional?", + "description": [ + "

A preferred healthcare professional could be a nurse or doctor who understands your health issues better than others.

" + ], "type": "General", "answers": [ { @@ -1603,19 +1661,165 @@ ] }, "page_title": "GP practice - choice of healthcare professional", + "routing_rules": [ + { + "block": "gp-practice-see-preferred-healthcare-professional", + "when": { + "in": [ + { + "identifier": "answer342b188f-9b3f-43ba-8dac-2b7fa4cbaab7", + "source": "answers" + }, + ["Yes"] + ] + } + }, + { + "block": "gp-practice-appointment-waiting-time" + } + ] + }, + { + "id": "gp-practice-see-preferred-healthcare-professional", + "type": "Question", + "question": { + "id": "questiongp-practice-see-preferred-healthcare-professional", + "title": "Were you able to see your preferred healthcare professional?", + "description": [ + "

A preferred healthcare professional could be a nurse or doctor who understands your health issues better than others.

" + ], + "type": "General", + "answers": [ + { + "id": "answer28ba1a13-b3a9-47c2-8cb9-5b1cb3ba6aee", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + } + ] + } + ] + }, + "page_title": "GP practice - see preferred healthcare professional", "routing_rules": [ { "block": "gp-practice-appointment-waiting-time", "when": { "in": [ { - "identifier": "answer65dfd89d-4f31-428e-95ff-246a9604167e", + "identifier": "answer28ba1a13-b3a9-47c2-8cb9-5b1cb3ba6aee", "source": "answers" }, - [ - "Yes", - "No" - ] + ["Yes"] + ] + } + }, + { + "block": "gp-practice-preferred-healthcare-professional-not-seen" + } + ] + }, + { + "id": "gp-practice-preferred-healthcare-professional-not-seen", + "type": "Question", + "question": { + "id": "questiongp-practice-preferred-healthcare-professional-not-seen", + "title": "What was the reason for not seeing your preferred healthcare professional?", + "type": "General", + "answers": [ + { + "id": "answerbaa80034-71a8-428f-848b-b557fb6f0778", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "No appointments available within 48 hours", + "value": "No appointments available within 48 hours" + }, + { + "label": "No appointments available within 14 days", + "value": "No appointments available within 14 days" + }, + { + "label": "Another reason", + "value": "Another reason" + } + ] + } + ] + }, + "page_title": "GP practice - preferred healthcare professional not seen" + }, + { + "id": "gp-practice-preferred-healthcare-professional-appointment-offered", + "type": "Question", + "question": { + "id": "questiongp-practice-preferred-healthcare-professional-appointment-offered", + "title": "Were you offered any appointments with your preferred healthcare professional that were not convenient for you?", + "type": "General", + "answers": [ + { + "id": "answer8475a907-2511-440c-a533-3ce2e5a41ffe", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + } + ] + } + ] + }, + "page_title": "GP practice - preferred healthcare professional appointment offered" + }, + { + "id": "gp-practice-saw-another-healthcare-professional", + "type": "Question", + "question": { + "id": "questiongp-practice-saw-another-healthcare-professional", + "title": "Did you see another healthcare professional at your GP practice, rather than wait to see your preferred healthcare professional?", + "type": "General", + "answers": [ + { + "id": "answer39ce3489-d860-4e96-b638-e98b5346b29a", + "mandatory": true, + "type": "Radio", + "options": [ + { + "label": "Yes", + "value": "Yes" + }, + { + "label": "No", + "value": "No" + } + ] + } + ] + }, + "page_title": "GP practice - saw another healthcare professional", + "routing_rules": [ + { + "block": "gp-practice-appointment-waiting-time", + "when": { + "in": [ + { + "identifier": "answer39ce3489-d860-4e96-b638-e98b5346b29a", + "source": "answers" + }, + ["Yes", "No"] ] } }, @@ -1832,9 +2036,7 @@ "identifier": "answerd9788aad-c1d4-4d21-bb6e-28a79957fb87", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -1944,9 +2146,7 @@ "identifier": "answerfeb9f663-f6bf-487e-aacd-1215c94f7f3a", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -2069,110 +2269,24 @@ { "block": "dental-care-last-nhs-appointment", "when": { - "and": [ - { - "in": [ - { - "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", - "source": "answers" - }, - [ - "Yes, an NHS dentist", - "I go to a dental hospital" - ] - ] - }, - { - "==": [ - { - "source": "metadata", - "identifier": "PREVIOUS_COMPLETION" - }, - "NO" - ] - } - ] - } - }, - { - "block": "dental-care-nhs-appointment-last-28-days", - "when": { - "and": [ + "in": [ { - "in": [ - { - "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", - "source": "answers" - }, - [ - "Yes, an NHS dentist", - "I go to a dental hospital" - ] - ] + "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", + "source": "answers" }, - { - "==": [ - { - "source": "metadata", - "identifier": "PREVIOUS_COMPLETION" - }, - "YES" - ] - } + ["Yes, an NHS dentist", "I go to a dental hospital"] ] } }, { "block": "dental-care-last-nhs-attempt", "when": { - "and": [ - { - "in": [ - { - "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", - "source": "answers" - }, - [ - "No, I do not have a dentist" - ] - ] - }, - { - "==": [ - { - "source": "metadata", - "identifier": "PREVIOUS_COMPLETION" - }, - "NO" - ] - } - ] - } - }, - { - "block": "dental-care-nhs-attempt-last-28-days", - "when": { - "and": [ + "in": [ { - "in": [ - { - "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", - "source": "answers" - }, - [ - "No, I do not have a dentist" - ] - ] + "identifier": "answer775f1bda-b70b-4b04-a57e-aeef045abf0a", + "source": "answers" }, - { - "==": [ - { - "source": "metadata", - "identifier": "PREVIOUS_COMPLETION" - }, - "YES" - ] - } + ["No, I do not have a dentist"] ] } }, @@ -2228,59 +2342,7 @@ "identifier": "answer19cd1efc-6bf8-4246-b929-551302e37c6a", "source": "answers" }, - [ - "Less than 1 month ago", - "1 month but less than 6 months ago", - "6 months but less than 12 months ago", - "12 months but less than 24 months ago", - "24 months ago or over" - ] - ] - } - }, - { - "block": "dental-care-last-nhs-appointment-reason" - } - ] - }, - { - "id": "dental-care-nhs-appointment-last-28-days", - "type": "Question", - "question": { - "id": "questiondental-care-nhs-appointment-last-28-days", - "title": "Have you had an NHS dental appointment in the last 28 days?", - "type": "General", - "answers": [ - { - "id": "answer65bbc01e-ea14-43cb-a1c2-604641ebcbd3", - "mandatory": true, - "type": "Radio", - "options": [ - { - "label": "Yes", - "value": "Yes" - }, - { - "label": "No", - "value": "No" - } - ] - } - ] - }, - "page_title": "Dental care - NHS appointment last 28 days", - "routing_rules": [ - { - "block": "dental-care-last-nhs-appointment-reason", - "when": { - "in": [ - { - "identifier": "answer65bbc01e-ea14-43cb-a1c2-604641ebcbd3", - "source": "answers" - }, - [ - "Yes" - ] + ["Less than 1 month ago"] ] } }, @@ -2431,64 +2493,16 @@ ] }, "page_title": "Dental care - last NHS attempt", - "routing_rules": [ - { - "section": "End", - "when": { - "in": [ - { - "identifier": "answer61a69530-a01e-4c23-9d65-62b2e62fec24", - "source": "answers" - }, - [ - "Never" - ] - ] - } - }, - { - "block": "dental-care-trying-to-access-nhs-care-reason" - } - ] - }, - { - "id": "dental-care-nhs-attempt-last-28-days", - "type": "Question", - "question": { - "id": "questiondental-care-nhs-attempt-last-28-days", - "title": "Have you tried to access NHS dental care in the last 28 days?", - "type": "General", - "answers": [ - { - "id": "answer6a8cf8b2-af9b-4c55-b19c-f5b676dfb87e", - "mandatory": true, - "type": "Radio", - "options": [ - { - "label": "Yes", - "value": "Yes" - }, - { - "label": "No", - "value": "No" - } - ] - } - ] - }, - "page_title": "Dental care - NHS attempt last 28 days", "routing_rules": [ { "block": "dental-care-trying-to-access-nhs-care-reason", "when": { "in": [ { - "identifier": "answer6a8cf8b2-af9b-4c55-b19c-f5b676dfb87e", + "identifier": "answer61a69530-a01e-4c23-9d65-62b2e62fec24", "source": "answers" }, - [ - "Yes" - ] + ["Less than 1 month ago"] ] } }, @@ -2615,9 +2629,7 @@ "identifier": "answer55b304a7-0228-4eb5-bb82-f4144ce2dad4", "source": "answers" }, - [ - "Yes" - ] + ["Yes"] ] } }, @@ -3031,9 +3043,7 @@ "block": "pharmacies-problems-receiving-nhs-prescription", "when": { "all-in": [ - [ - "Dispensing of prescriptions" - ], + ["Dispensing of prescriptions"], { "identifier": "answerac757159-12c6-4846-8d18-cb64d93984a6", "source": "answers" @@ -3223,7 +3233,7 @@ "description": "You will need to click the "leave this page" link below." }, { - "description": "They will then need to log in using their unique 16 character access code in the email or letter they were sent." + "description": "They will then need to log in using their unique 16 character access code in the email they were sent." } ] } @@ -3233,4 +3243,4 @@ "title": "Submit your questionnaire", "warning": "You cannot view your answers after submission" } -} \ No newline at end of file +}