diff --git a/contracts/migrations/0070_alter_contract_paper_form_state.py b/contracts/migrations/0070_alter_contract_paper_form_state.py new file mode 100644 index 0000000000000000000000000000000000000000..8ab9e995957d5289d8840c512da5d7c9304fec3b --- /dev/null +++ b/contracts/migrations/0070_alter_contract_paper_form_state.py @@ -0,0 +1,30 @@ +# Generated by Django 4.1.4 on 2023-10-10 18:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("contracts", "0069_contract_work_in_progress_nastenka_notice_id_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="contract", + name="paper_form_state", + field=models.CharField( + choices=[ + ("never_made", "Nikdy nevznikl (digitálně podepsáno)"), + ("on_the_way", "Na cestě"), + ("sent", "Odeslaný"), + ("mailbox", "Ve schránce"), + ("to_shred", "Ke skartaci"), + ("shredded", "Skartovaný"), + ("stored", "Uložený"), + ("lost", "Ztracený"), + ], + max_length=10, + verbose_name="Stav fyzického dokumentu", + ), + ), + ] diff --git a/contracts/models.py b/contracts/models.py index 185427b4933124926dc57318ad4651ea4293c6c2..fea9d9e556f2fd998d77bfa44eaa90e22da3692b 100644 --- a/contracts/models.py +++ b/contracts/models.py @@ -573,6 +573,8 @@ class Contract(NameStrMixin, models.Model): NO = "no", "Neveřejná" class PaperFormStates(models.TextChoices): + NEVER_MADE = "never_made", "Nikdy nevznikl (digitálně podepsáno)" + ON_THE_WAY = "on_the_way", "Na cestě" SENT = "sent", "Odeslaný" MAILBOX = "mailbox", "Ve schránce" @@ -794,6 +796,7 @@ class Contract(NameStrMixin, models.Model): self.PaperFormStates.STORED, self.PaperFormStates.SHREDDED, self.PaperFormStates.LOST, + self.PaperFormStates.NEVER_MADE, ) and not self.paper_form_person_responsible ): diff --git a/package-lock.json b/package-lock.json index 183b077861cd802e4c5b5fcbbe52b574521b29f4..7dc4b76836df74c306fe86241b1a6a5f64b25a4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1184,9 +1184,15 @@ } }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -1310,9 +1316,9 @@ } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -1321,10 +1327,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -3063,9 +3073,9 @@ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" }, "neo-async": { "version": "2.6.2", @@ -3147,11 +3157,11 @@ } }, "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } diff --git a/static_src/admin/contract_form.js b/static_src/admin/contract_form.js index b4e91ab19566e00bb18f471fa2441bb2d47f7721..d479adf58daf2188adf438a0d87e7ec579fa939c 100644 --- a/static_src/admin/contract_form.js +++ b/static_src/admin/contract_form.js @@ -43,7 +43,7 @@ $(window).ready( "display", ( ( - !["stored", "shredded"].includes( + !["never_made", "stored", "shredded", "lost"].includes( $("#id_paper_form_state").find(":selected").val() ) ) ? @@ -51,6 +51,16 @@ $(window).ready( ) ); + $(".field-filing_area"). + css( + "display", + ( + ( + $("#id_paper_form_state").find(":selected").val() !== "never_made" + ) ? + "block" : "none" + ) + ); $("#id_cost_unit").on( "change", @@ -74,11 +84,15 @@ $(window).ready( "change", event => { const notStoredOrShredded = ( - !["stored", "shredded", "lost"].includes( + !["never_made", "stored", "shredded", "lost"].includes( $(event.target).find(":selected").val() ) ); + const notNeverMade = ( + $(event.target).find(":selected").val() !== "never_made" + ) + $(".field-paper_form_person_responsible"). css( "display", @@ -88,6 +102,15 @@ $(window).ready( ) ); + $(".field-filing_area"). + css( + "display", + ( + (notNeverMade) ? + "block" : "none" + ) + ); + if (!notStoredOrShredded) { $("#id_paper_form_person_responsible").val(""); }