Remove some more references to 'newgrids' / old MasterView
This commit is contained in:
Lance Edgar
parent
172efe2ab9
commit
52c7f485ab
9 changed files with 134 additions and 145 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# -*- coding: utf-8; -*-
|
||||
################################################################################
|
||||
#
|
||||
# Rattail -- Retail Software Framework
|
||||
|
|
@ -36,7 +36,8 @@ from rattail.time import localtime
|
|||
import formalchemy as fa
|
||||
|
||||
from tailbone import forms
|
||||
from tailbone.views import MasterView
|
||||
from tailbone.views import MasterView2 as MasterView
|
||||
from tailbone.util import raw_datetime
|
||||
|
||||
|
||||
class CustomerOrderItemsView(MasterView):
|
||||
|
|
@ -50,6 +51,18 @@ class CustomerOrderItemsView(MasterView):
|
|||
editable = False
|
||||
deletable = False
|
||||
|
||||
grid_columns = [
|
||||
'person',
|
||||
'product_brand',
|
||||
'product_description',
|
||||
'product_size',
|
||||
'case_quantity',
|
||||
'cases_ordered',
|
||||
'units_ordered',
|
||||
'order_created',
|
||||
'status_code',
|
||||
]
|
||||
|
||||
has_rows = True
|
||||
model_row_class = model.CustomerOrderItemEvent
|
||||
rows_title = "Event History"
|
||||
|
|
@ -58,61 +71,53 @@ class CustomerOrderItemsView(MasterView):
|
|||
rows_pageable = False
|
||||
rows_viewable = False
|
||||
|
||||
row_grid_columns = [
|
||||
'occurred',
|
||||
'type_code',
|
||||
'user',
|
||||
'note',
|
||||
]
|
||||
|
||||
def query(self, session):
|
||||
return session.query(model.CustomerOrderItem)\
|
||||
.join(model.CustomerOrder)\
|
||||
.options(orm.joinedload(model.CustomerOrderItem.order)\
|
||||
.joinedload(model.CustomerOrder.person))
|
||||
|
||||
def _preconfigure_grid(self, g):
|
||||
def configure_grid(self, g):
|
||||
super(CustomerOrderItemsView, self).configure_grid(g)
|
||||
|
||||
g.joiners['person'] = lambda q: q.outerjoin(model.Person)
|
||||
g.filters['person'] = g.make_filter('person', model.Person.display_name, label="Person Name",
|
||||
g.set_joiner('person', lambda q: q.outerjoin(model.Person))
|
||||
|
||||
g.filters['person'] = g.make_filter('person', model.Person.display_name,
|
||||
default_active=True, default_verb='contains')
|
||||
g.sorters['person'] = g.make_sorter(model.Person.display_name)
|
||||
|
||||
g.filters['product_brand'].label = "Brand"
|
||||
g.product_brand.set(label="Brand")
|
||||
|
||||
g.filters['product_description'].label = "Description"
|
||||
g.product_description.set(label="Description")
|
||||
|
||||
g.filters['product_size'].label = "Size"
|
||||
g.product_size.set(label="Size")
|
||||
|
||||
g.case_quantity.set(renderer=forms.renderers.QuantityFieldRenderer)
|
||||
g.cases_ordered.set(renderer=forms.renderers.QuantityFieldRenderer)
|
||||
g.units_ordered.set(renderer=forms.renderers.QuantityFieldRenderer)
|
||||
|
||||
g.total_price.set(renderer=forms.renderers.CurrencyFieldRenderer)
|
||||
|
||||
g.filters['status_code'].label = "Status"
|
||||
g.status_code.set(label="Status")
|
||||
|
||||
g.append(fa.Field('person', value=lambda i: i.order.person))
|
||||
|
||||
g.sorters['order_created'] = g.make_sorter(model.CustomerOrder.created)
|
||||
g.append(fa.Field('order_created',
|
||||
value=lambda i: localtime(self.rattail_config, i.order.created, from_utc=True),
|
||||
renderer=forms.renderers.DateTimeFieldRenderer))
|
||||
g.set_sorter('person', model.Person.display_name)
|
||||
g.set_sorter('order_created', model.CustomerOrder.created)
|
||||
|
||||
g.default_sortkey = 'order_created'
|
||||
g.default_sortdir = 'desc'
|
||||
|
||||
def configure_grid(self, g):
|
||||
g.configure(
|
||||
include=[
|
||||
g.person,
|
||||
g.product_brand,
|
||||
g.product_description,
|
||||
g.product_size,
|
||||
g.case_quantity,
|
||||
g.cases_ordered,
|
||||
g.units_ordered,
|
||||
g.order_created,
|
||||
g.status_code,
|
||||
],
|
||||
readonly=True)
|
||||
g.set_type('case_quantity', 'quantity')
|
||||
g.set_type('cases_ordered', 'quantity')
|
||||
g.set_type('units_ordered', 'quantity')
|
||||
g.set_type('total_price', 'currency')
|
||||
|
||||
g.set_renderer('person', self.render_person)
|
||||
g.set_renderer('order_created', self.render_order_created)
|
||||
|
||||
g.set_label('person', "Person Name")
|
||||
g.set_label('product_brand', "Brand")
|
||||
g.set_label('product_description', "Description")
|
||||
g.set_label('product_size', "Size")
|
||||
g.set_label('status_code', "Status")
|
||||
|
||||
def render_person(self, item, column):
|
||||
return item.order.person
|
||||
|
||||
def render_order_created(self, item, column):
|
||||
value = localtime(self.rattail_config, item.order.created, from_utc=True)
|
||||
return raw_datetime(self.rattail_config, value)
|
||||
|
||||
def _preconfigure_fieldset(self, fs):
|
||||
fs.order.set(renderer=forms.renderers.CustomerOrderFieldRenderer)
|
||||
|
|
@ -151,21 +156,12 @@ class CustomerOrderItemsView(MasterView):
|
|||
.order_by(model.CustomerOrderItemEvent.occurred,
|
||||
model.CustomerOrderItemEvent.type_code)
|
||||
|
||||
def _preconfigure_row_grid(self, g):
|
||||
g.occurred.set(label="When")
|
||||
g.type_code.set(label="What") # TODO: enum renderer
|
||||
g.user.set(label="Who")
|
||||
g.note.set(label="Notes")
|
||||
|
||||
def configure_row_grid(self, g):
|
||||
g.configure(
|
||||
include=[
|
||||
g.occurred,
|
||||
g.type_code,
|
||||
g.user,
|
||||
g.note,
|
||||
],
|
||||
readonly=True)
|
||||
super(CustomerOrderItemsView, self).configure_row_grid(g)
|
||||
g.set_label('occurred', "When")
|
||||
g.set_label('type_code', "What") # TODO: enum renderer
|
||||
g.set_label('user', "Who")
|
||||
g.set_label('note', "Notes")
|
||||
|
||||
|
||||
def includeme(config):
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ from rattail.db import model
|
|||
|
||||
from tailbone import forms
|
||||
from tailbone.db import Session
|
||||
from tailbone.views import MasterView
|
||||
from tailbone.views import MasterView2 as MasterView
|
||||
|
||||
|
||||
class CustomerOrdersView(MasterView):
|
||||
|
|
@ -45,43 +45,42 @@ class CustomerOrdersView(MasterView):
|
|||
editable = False
|
||||
deletable = False
|
||||
|
||||
grid_columns = [
|
||||
'id',
|
||||
'customer',
|
||||
'person',
|
||||
'created',
|
||||
'status_code',
|
||||
]
|
||||
|
||||
def query(self, session):
|
||||
return session.query(model.CustomerOrder)\
|
||||
.options(orm.joinedload(model.CustomerOrder.customer))
|
||||
|
||||
def _preconfigure_grid(self, g):
|
||||
g.joiners['customer'] = lambda q: q.outerjoin(model.Customer)
|
||||
g.sorters['customer'] = g.make_sorter(model.Customer.name)
|
||||
def configure_grid(self, g):
|
||||
super(CustomerOrdersView, self).configure_grid(g)
|
||||
|
||||
g.set_joiner('customer', lambda q: q.outerjoin(model.Customer))
|
||||
g.set_joiner('person', lambda q: q.outerjoin(model.Person))
|
||||
|
||||
g.filters['customer'] = g.make_filter('customer', model.Customer.name,
|
||||
label="Customer Name",
|
||||
default_active=True,
|
||||
default_verb='contains')
|
||||
|
||||
g.joiners['person'] = lambda q: q.outerjoin(model.Person)
|
||||
g.sorters['person'] = g.make_sorter(model.Person.display_name)
|
||||
g.filters['person'] = g.make_filter('person', model.Person.display_name,
|
||||
label="Person Name",
|
||||
default_active=True,
|
||||
default_verb='contains')
|
||||
|
||||
# TODO: enum choices renderer
|
||||
g.filters['status_code'].label = "Status"
|
||||
g.status_code.set(label="Status")
|
||||
g.set_sorter('customer', model.Customer.name)
|
||||
g.set_sorter('person', model.Person.display_name)
|
||||
|
||||
g.id.set(label="ID")
|
||||
g.default_sortkey = 'created'
|
||||
g.default_sortdir = 'desc'
|
||||
|
||||
def configure_grid(self, g):
|
||||
g.configure(
|
||||
include=[
|
||||
g.id,
|
||||
g.customer,
|
||||
g.person,
|
||||
g.created,
|
||||
g.status_code,
|
||||
],
|
||||
readonly=True)
|
||||
# TODO: enum choices renderer
|
||||
g.set_label('status_code', "Status")
|
||||
g.set_label('id', "ID")
|
||||
|
||||
def _preconfigure_fieldset(self, fs):
|
||||
fs.customer.set(options=[])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue