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

Add view for consuming new batch ID; misc. tweaks for grids etc.

Browse source
This commit is contained in:
Lance Edgar 2017-08-02 19:16:45 -05:00
parent 6ae129ea24
commit 8186366b69
5 changed files with 76 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tailbone/grids/core.py
View file

@ -26,6 +26,7 @@ Core Grid Classes
from __future__ import unicode_literals, absolute_import
import datetime
import urllib
import six
@ -34,7 +35,7 @@ from sqlalchemy import orm
from rattail.db import api
from rattail.db.types import GPCType
from rattail.util import pretty_boolean, pretty_quantity, prettify
from rattail.util import prettify, pretty_boolean, pretty_quantity, pretty_hours
import webhelpers2_grid
from pyramid.renderers import render
@ -149,6 +150,8 @@ class Grid(object):
self.set_renderer(key, self.render_percent)
elif type_ == 'quantity':
self.set_renderer(key, self.render_quantity)
elif type_ == 'duration':
self.set_renderer(key, self.render_duration)
else:
raise ValueError("Unsupported type for column '{}': {}".format(key, type_))
@ -211,6 +214,12 @@ class Grid(object):
value = self.obtain_value(obj, column_name)
return pretty_quantity(value)
def render_duration(self, obj, column_name):
value = self.obtain_value(obj, column_name)
if value is None:
return ""
return pretty_hours(datetime.timedelta(seconds=value))
def set_url(self, url):
self.url = url

1
tailbone/static/css/grids.css
View file

@ -24,6 +24,7 @@
.grid-wrapper .grid-header td.tools {
margin: 0;
padding: 0;
text-align: right;
vertical-align: bottom;
white-space: nowrap;
}

11
tailbone/static/js/tailbone.js
View file

@ -27,13 +27,16 @@ function disable_filter_options() {
/*
* Convenience function to disable a form button.
* Convenience function to disable a UI button.
*/
function disable_button(button, label) {
if (label) {
$(button).html(label + ", please wait...");
$(button).button('disable');
if (label === undefined) {
label = "Working, please wait...";
}
if (label) {
$(button).button('option', 'label', label);
}
$(button).attr('disabled', 'disabled');
}

68
tailbone/templates/master/index.mako
View file

@ -90,37 +90,39 @@
## ${grid.render_complete(tools=capture(self.grid_tools).strip(), context_menu=capture(self.context_menu_items).strip())|n}
<div class="grid-wrapper">
${grid.render_complete(tools=capture(self.grid_tools).strip(), context_menu=capture(self.context_menu_items).strip())|n}
<table class="grid-header">
<tbody>
<tr>
<td class="filters" rowspan="2">
% if grid.filterable:
## TODO: should this be variable sometimes?
${grid.render_filters(allow_save_defaults=True)|n}
% endif
</td>
<td class="menu">
<ul id="context-menu">
${self.context_menu_items()}
</ul>
</td>
</tr>
<tr>
<td class="tools">
<div class="grid-tools">
${self.grid_tools()}
</div><!-- grid-tools -->
</td>
</tr>
</tbody>
</table><!-- grid-header -->
${grid.render_grid()|n}
</div><!-- grid-wrapper -->
## <div class="grid-wrapper">
##
## <table class="grid-header">
## <tbody>
## <tr>
##
## <td class="filters" rowspan="2">
## % if grid.filterable:
## ## TODO: should this be variable sometimes?
## ${grid.render_filters(allow_save_defaults=True)|n}
## % endif
## </td>
##
## <td class="menu">
## <ul id="context-menu">
## ${self.context_menu_items()}
## </ul>
## </td>
## </tr>
##
## <tr>
## <td class="tools">
## <div class="grid-tools">
## ${self.grid_tools()}
## </div><!-- grid-tools -->
## </td>
## </tr>
##
## </tbody>
## </table><!-- grid-header -->
##
## ${grid.render_grid()|n}
##
## </div><!-- grid-wrapper -->

23
tailbone/views/common.py
View file

@ -29,6 +29,7 @@ from __future__ import unicode_literals, absolute_import
import six
import rattail
from rattail.batch import consume_batch_id
from rattail.mail import send_email
from rattail.util import OrderedDict
from rattail.files import resource_path
@ -40,6 +41,7 @@ from pyramid_simpleform import Form
import tailbone
from tailbone import forms
from tailbone.db import Session
from tailbone.views import View
@ -124,6 +126,14 @@ class CommonView(View):
return httpexceptions.HTTPFound(location=form.data['referrer'])
return {'form': forms.FormRenderer(form)}
def consume_batch_id(self):
"""
Consume next batch ID from the PG sequence, and display via flash message.
"""
batch_id = consume_batch_id(Session())
self.request.session.flash("Batch ID has been consumed: {:08d}".format(batch_id))
return self.redirect(self.request.get_referrer())
def bogus_error(self):
"""
A special view which simply raises an error, for the sake of testing
@ -133,6 +143,10 @@ class CommonView(View):
@classmethod
def defaults(cls, config):
cls._defaults(config)
@classmethod
def _defaults(cls, config):
rattail_config = config.registry.settings.get('rattail_config')
# auto-correct URLs which require trailing slash
@ -142,6 +156,9 @@ class CommonView(View):
if rattail_config and rattail_config.production():
config.add_exception_view(cls, attr='exception', renderer='/exception.mako')
# permissions
config.add_tailbone_permission_group('common', "(common)", overwrite=False)
# home
config.add_route('home', '/')
config.add_view(cls, attr='home', route_name='home', renderer='/home.mako')
@ -162,6 +179,12 @@ class CommonView(View):
config.add_route('feedback', '/feedback')
config.add_view(cls, attr='feedback', route_name='feedback', renderer='/feedback.mako')
# consume batch ID
config.add_tailbone_permission('common', 'common.consume_batch_id',
"Consume new Batch ID")
config.add_route('consume_batch_id', '/consume-batch-id')
config.add_view(cls, attr='consume_batch_id', route_name='consume_batch_id')
# bogus error
config.add_route('bogus_error', '/bogus-error')
config.add_view(cls, attr='bogus_error', route_name='bogus_error', permission='errors.bogus')