Add "total amount" to CLINS

- includes migration for change to model
This commit is contained in:
graham-dds
2019-09-05 15:09:20 -04:00
parent e565913f48
commit f3eea39536
5 changed files with 37 additions and 0 deletions

View File

@@ -58,6 +58,7 @@ class TaskOrders(BaseDomainClass):
number=clin_data["number"],
start_date=clin_data["start_date"],
end_date=clin_data["end_date"],
total_amount=clin_data["total_amount"],
obligated_amount=clin_data["obligated_amount"],
jedi_clin_type=clin_data["jedi_clin_type"],
)

View File

@@ -47,6 +47,10 @@ class CLINForm(FlaskForm):
format="%m/%d/%Y",
validators=[Optional()],
)
total_amount = DecimalField(
label=translate("task_orders.form.total_funds_label"),
validators=[Optional()],
)
obligated_amount = DecimalField(
label=translate("task_orders.form.obligated_funds_label"),
validators=[Optional()],

View File

@@ -23,6 +23,7 @@ class CLIN(Base, mixins.TimestampsMixin):
number = Column(String, nullable=True)
start_date = Column(Date, nullable=True)
end_date = Column(Date, nullable=True)
total_amount = Column(Numeric(scale=2), nullable=True)
obligated_amount = Column(Numeric(scale=2), nullable=True)
jedi_clin_type = Column(SQLAEnum(JEDICLINType, native_enum=False), nullable=True)
@@ -46,6 +47,7 @@ class CLIN(Base, mixins.TimestampsMixin):
self.number,
self.start_date,
self.end_date,
self.total_amount,
self.obligated_amount,
self.jedi_clin_type,
]