diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py index d96d84a7..fccd2cea 100644 --- a/tailbone/views/batch/core.py +++ b/tailbone/views/batch/core.py @@ -149,6 +149,7 @@ class BatchMasterView(MasterView): g.id.set(label="ID", renderer=forms.renderers.BatchIDFieldRenderer) g.created_by.set(label="Created by", renderer=forms.renderers.UserFieldRenderer) g.cognized_by.set(renderer=forms.renderers.UserFieldRenderer) + g.rowcount.set(label="Rows") g.executed_by.set(label="Executed by", renderer=forms.renderers.UserFieldRenderer) def configure_grid(self, g): @@ -177,6 +178,7 @@ class BatchMasterView(MasterView): fs.created_by.set(label="Created by", renderer=forms.renderers.UserFieldRenderer, readonly=True) fs.cognized_by.set(label="Cognized by", renderer=forms.renderers.UserFieldRenderer) + fs.rowcount.set(label="Row Count") fs.executed_by.set(label="Executed by", renderer=forms.renderers.UserFieldRenderer) fs.notes.set(renderer=fa.TextAreaFieldRenderer, size=(80, 10)) diff --git a/tailbone/views/handheld.py b/tailbone/views/handheld.py index 2b02284f..1ed66342 100644 --- a/tailbone/views/handheld.py +++ b/tailbone/views/handheld.py @@ -93,6 +93,7 @@ class HandheldBatchView(FileBatchMasterView): g.device_name, g.created, g.created_by, + g.rowcount, g.executed, ], readonly=True) @@ -117,6 +118,7 @@ class HandheldBatchView(FileBatchMasterView): fs.filename, fs.created, fs.created_by, + fs.rowcount, fs.executed, fs.executed_by, ]) @@ -130,17 +132,24 @@ class HandheldBatchView(FileBatchMasterView): kwargs['device_name'] = batch.device_name return kwargs + def _preconfigure_row_grid(self, g): + super(HandheldBatchView, self)._preconfigure_row_grid(g) + g.upc.set(label="UPC") + g.brand_name.set(label="Brand") + g.cases.set(renderer=forms.renderers.QuantityFieldRenderer) + g.units.set(renderer=forms.renderers.QuantityFieldRenderer) + def configure_row_grid(self, g): g.configure( include=[ g.sequence, - g.upc.label("UPC"), - g.brand_name.label("Brand"), + g.upc, + g.brand_name, g.description, g.size, g.cases, g.units, - g.status_code.label("Status"), + g.status_code, ], readonly=True)