rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Various tweaks to support mobile inventory batches

Browse source 
still not fully there I think, but pretty close..
This commit is contained in:
Lance Edgar 2017-07-11 20:57:31 -05:00
parent 452cb99349
commit 32d256932e
10 changed files with 341 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tailbone/views/batch/core.py
View file

@ -204,7 +204,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.rowcount.set(label="Row Count", readonly=True)
fs.status_code.set(label="Status", renderer=StatusRenderer(self.model_class.STATUS))
fs.executed_by.set(label="Executed by", renderer=forms.renderers.UserFieldRenderer)
fs.notes.set(renderer=fa.TextAreaFieldRenderer, size=(80, 10))
@ -322,6 +322,7 @@ class BatchMasterView(MasterView):
kwargs['notes'] = batch.notes
if hasattr(batch, 'filename'):
kwargs['filename'] = batch.filename
kwargs['complete'] = batch.complete
return kwargs
# TODO: deprecate / remove this (is it used at all now?)
@ -338,13 +339,13 @@ class BatchMasterView(MasterView):
"""
return True
def redirect_after_create(self, batch):
def redirect_after_create(self, batch, mobile=False):
if self.handler.should_populate(batch):
return self.redirect(self.get_action_url('prefill', batch))
return self.redirect(self.get_action_url('prefill', batch, mobile=mobile))
elif self.refresh_after_create:
return self.redirect(self.get_action_url('refresh', batch))
return self.redirect(self.get_action_url('refresh', batch, mobile=mobile))
else:
return self.redirect(self.get_action_url('view', batch))
return self.redirect(self.get_action_url('view', batch, mobile=mobile))
# TODO: some of this at least can go to master now right?
def edit(self):
@ -429,6 +430,7 @@ class BatchMasterView(MasterView):
def get_mobile_row_data(self, batch):
return super(BatchMasterView, self).get_mobile_row_data(batch)\
.order_by(self.model_row_class.sequence)
def redirect_after_edit(self, batch):
"""
If refresh flag is set, do that; otherwise go (back) to view/edit page.