diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index c62cf906..c418899b 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -1,6 +1,13 @@ -from wtforms.fields import BooleanField, DecimalField, FieldList, FileField, FormField, StringField +from wtforms.fields import ( + BooleanField, + DecimalField, + FieldList, + FileField, + FormField, + StringField, +) from wtforms.fields.html5 import DateField -from wtforms.validators import Required, Optional +from wtforms.validators import Required from flask_wtf.file import FileAllowed from flask_wtf import FlaskForm diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 5a3e7b6e..0e2d5ba2 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -130,9 +130,7 @@ class TaskOrder(Base, mixins.TimestampsMixin): return { "portfolio_name": self.portfolio_name, "pdf": self.pdf, - "clins": [ - clin.to_dictionary() for clin in self.clins - ], + "clins": [clin.to_dictionary() for clin in self.clins], **{ c.name: getattr(self, c.name) for c in self.__table__.columns diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 03f1f328..1f6a271b 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -13,9 +13,7 @@ def render_task_orders_edit(portfolio_id, task_order_id=None, form=None): if task_order_id: task_order = TaskOrders.get(task_order_id) - render_args["form"] = form or TaskOrderForm( - **task_order.to_dictionary() - ) + render_args["form"] = form or TaskOrderForm(**task_order.to_dictionary()) render_args["task_order_id"] = task_order_id else: render_args["form"] = form or TaskOrderForm() diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 5d396c61..df52dd9d 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -14,6 +14,6 @@ export default { }, data: function() { - return {clinIndex: this.initialClinIndex} + return { clinIndex: this.initialClinIndex } }, } diff --git a/js/components/date_selector.js b/js/components/date_selector.js index 18bd2c6e..05809b0b 100644 --- a/js/components/date_selector.js +++ b/js/components/date_selector.js @@ -19,7 +19,7 @@ export default { initialyear: { type: String }, mindate: { type: String }, maxdate: { type: String }, - nameTag: { type: String } + nameTag: { type: String }, }, data: function() { diff --git a/js/components/forms/to_form.js b/js/components/forms/to_form.js index e807229a..0f4f6f45 100644 --- a/js/components/forms/to_form.js +++ b/js/components/forms/to_form.js @@ -30,8 +30,6 @@ export default { clins, clinIndex, } - // pass initialCLINIndex in props and add one each time a clin is added... - // this way we can keep track of the clin id for the html name/id/etc }, methods: { diff --git a/tests/domain/test_task_orders.py b/tests/domain/test_task_orders.py index b34bbd24..6a337505 100644 --- a/tests/domain/test_task_orders.py +++ b/tests/domain/test_task_orders.py @@ -55,7 +55,7 @@ def test_all_sections_complete(): assert TaskOrders.all_sections_complete(task_order) -def test_create_adds_clins(): +def test_create_adds_clins(pdf_upload): portfolio = PortfolioFactory.create() clins = [ { @@ -80,11 +80,12 @@ def test_create_adds_clins(): portfolio_id=portfolio.id, number="0123456789", clins=clins, + pdf=pdf_upload, ) assert len(task_order.clins) == 2 -def test_update_adds_clins(): +def test_update_adds_clins(pdf_upload): task_order = TaskOrderFactory.create(number="1231231234") to_number = task_order.number clins = [ @@ -110,12 +111,13 @@ def test_update_adds_clins(): portfolio_id=task_order.portfolio_id, number="0000000000", clins=clins, + pdf=pdf_upload, ) assert task_order.number != to_number assert len(task_order.clins) == 2 -def test_update_does_not_duplicate_clins(): +def test_update_does_not_duplicate_clins(pdf_upload): task_order = TaskOrderFactory.create(number="3453453456", clins=["123", "456"]) clins = [ { @@ -136,7 +138,7 @@ def test_update_does_not_duplicate_clins(): }, ] task_order = TaskOrders.update( - task_order_id=task_order.id, number="0000000000", clins=clins + task_order_id=task_order.id, number="0000000000", clins=clins, pdf=pdf_upload ) assert len(task_order.clins) == 2 for clin in task_order.clins: