From 7ac4af5f343e6451dba908c81e6e6a19dc25c860 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 14 Feb 2016 17:50:03 -0600 Subject: [PATCH] Refactor vendor invoice batch views to use BatchMasterView. --- .../templates/vendors/invoices/create.mako | 3 - tailbone/templates/vendors/invoices/edit.mako | 3 - .../templates/vendors/invoices/index.mako | 3 - .../templates/vendors/invoices/row.view.mako | 3 - tailbone/templates/vendors/invoices/view.mako | 3 - tailbone/views/batch.py | 2 +- tailbone/views/vendors/catalogs.py | 2 - tailbone/views/vendors/invoices.py | 181 +++++++----------- 8 files changed, 65 insertions(+), 135 deletions(-) delete mode 100644 tailbone/templates/vendors/invoices/create.mako delete mode 100644 tailbone/templates/vendors/invoices/edit.mako delete mode 100644 tailbone/templates/vendors/invoices/index.mako delete mode 100644 tailbone/templates/vendors/invoices/row.view.mako delete mode 100644 tailbone/templates/vendors/invoices/view.mako diff --git a/tailbone/templates/vendors/invoices/create.mako b/tailbone/templates/vendors/invoices/create.mako deleted file mode 100644 index 2e46901c..00000000 --- a/tailbone/templates/vendors/invoices/create.mako +++ /dev/null @@ -1,3 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/batch/create.mako" /> -${parent.body()} diff --git a/tailbone/templates/vendors/invoices/edit.mako b/tailbone/templates/vendors/invoices/edit.mako deleted file mode 100644 index d0eea0a6..00000000 --- a/tailbone/templates/vendors/invoices/edit.mako +++ /dev/null @@ -1,3 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/batch/edit.mako" /> -${parent.body()} diff --git a/tailbone/templates/vendors/invoices/index.mako b/tailbone/templates/vendors/invoices/index.mako deleted file mode 100644 index acddd2fb..00000000 --- a/tailbone/templates/vendors/invoices/index.mako +++ /dev/null @@ -1,3 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/batch/index.mako" /> -${parent.body()} diff --git a/tailbone/templates/vendors/invoices/row.view.mako b/tailbone/templates/vendors/invoices/row.view.mako deleted file mode 100644 index 4fb9847f..00000000 --- a/tailbone/templates/vendors/invoices/row.view.mako +++ /dev/null @@ -1,3 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/batch/row.view.mako" /> -${parent.body()} diff --git a/tailbone/templates/vendors/invoices/view.mako b/tailbone/templates/vendors/invoices/view.mako deleted file mode 100644 index 9b89af91..00000000 --- a/tailbone/templates/vendors/invoices/view.mako +++ /dev/null @@ -1,3 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/batch/view.mako" /> -${parent.body()} diff --git a/tailbone/views/batch.py b/tailbone/views/batch.py index 51821748..5555708d 100644 --- a/tailbone/views/batch.py +++ b/tailbone/views/batch.py @@ -66,7 +66,7 @@ class BatchMasterView(MasterView): rows_viewable = True rows_creatable = False rows_editable = False - rows_deletable = False + rows_deletable = True def __init__(self, request): super(BatchMasterView, self).__init__(request) diff --git a/tailbone/views/vendors/catalogs.py b/tailbone/views/vendors/catalogs.py index 15b1d28c..24b14dc7 100644 --- a/tailbone/views/vendors/catalogs.py +++ b/tailbone/views/vendors/catalogs.py @@ -49,7 +49,6 @@ class VendorCatalogsView(FileBatchMasterView): model_class = model.VendorCatalog batch_row_class = model.VendorCatalogRow batch_handler_class = VendorCatalogHandler - # route_prefix = 'vendorcatalogs' url_prefix = '/vendors/catalogs' def get_parsers(self): @@ -155,5 +154,4 @@ class VendorCatalogsView(FileBatchMasterView): def includeme(config): - VendorCatalogsView.defaults(config) diff --git a/tailbone/views/vendors/invoices.py b/tailbone/views/vendors/invoices.py index 2bd9e624..eb9a4bac 100644 --- a/tailbone/views/vendors/invoices.py +++ b/tailbone/views/vendors/invoices.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2015 Lance Edgar +# Copyright © 2010-2016 Lance Edgar # # This file is part of Rattail. # @@ -24,43 +24,35 @@ Views for maintaining vendor invoices """ -from __future__ import unicode_literals +from __future__ import unicode_literals, absolute_import -from rattail.db import model -from rattail.db.api import get_setting, get_vendor -from rattail.db.batch.vendorinvoice import VendorInvoice, VendorInvoiceRow +from rattail.db import model, api from rattail.db.batch.vendorinvoice.handler import VendorInvoiceHandler from rattail.vendors.invoices import iter_invoice_parsers, require_invoice_parser -from rattail.util import load_object import formalchemy from tailbone.db import Session -from tailbone.views.batch import FileBatchGrid, FileBatchCrud, BatchRowGrid, BatchRowCrud, defaults +from tailbone.views.batch import FileBatchMasterView -class VendorInvoiceGrid(FileBatchGrid): +class VendorInvoicesView(FileBatchMasterView): """ - Grid view for vendor invoices. + Master view for vendor invoice batches. """ - batch_class = VendorInvoice - batch_display = "Vendor Invoice" - route_prefix = 'vendors.invoices' + model_class = model.VendorInvoice + batch_row_class = model.VendorInvoiceRow + batch_handler_class = VendorInvoiceHandler + url_prefix = '/vendors/invoices' - def join_map_extras(self): - return {'vendor': lambda q: q.join(model.Vendor)} - - def filter_map_extras(self): - return {'vendor': self.filter_ilike(model.Vendor.name)} - - def filter_config_extras(self): - return {'filter_type_vendor': 'lk', - 'include_filter_vendor': True} - - def sort_map_extras(self): - return {'vendor': self.sorter(model.Vendor.name)} + def get_instance_title(self, batch): + return unicode(batch.vendor) def configure_grid(self, g): + g.joiners['vendor'] = lambda q: q.join(model.Vendor) + g.filters['vendor'] = g.make_filter('vendor', model.Vendor.name, + default_active=True, default_verb='contains') + g.sorters['vendor'] = g.make_sorter(model.Vendor.name) g.configure( include=[ g.created, @@ -71,39 +63,42 @@ class VendorInvoiceGrid(FileBatchGrid): ], readonly=True) + def configure_fieldset(self, fs): + fs.purchase_order_number.set(label=self.handler.po_number_title) + fs.purchase_order_number.set(validate=self.validate_po_number) + fs.filename.set(label="Invoice File") -class VendorInvoiceCrud(FileBatchCrud): - """ - CRUD view for vendor invoices. - """ - batch_class = VendorInvoice - batch_handler_class = VendorInvoiceHandler - route_prefix = 'vendors.invoices' + if self.creating: + parsers = sorted(iter_invoice_parsers(), key=lambda p: p.display) + parser_options = [(p.display, p.key) for p in parsers] + parser_options.insert(0, ("(please choose)", '')) + fs.parser_key.set(label="File Type", + renderer=formalchemy.fields.SelectFieldRenderer, + options=parser_options) - batch_display = "Vendor Invoice" - flash = {'create': "New vendor invoice has been uploaded.", - 'update': "Vendor invoice has been updated.", - 'delete': "Vendor invoice has been deleted."} + fs.configure( + include=[ + fs.filename, + fs.parser_key, + fs.purchase_order_number, + ]) - def get_handler(self): - """ - Returns a `BatchHandler` instance for the view. - - Derived classes may override this, but if you only need to replace the - handler (i.e. and not the view logic) then you can instead subclass - :class:`rattail.db.batch.vendorinvoice.handler.VendorInvoiceHandler` - and create a setting named "rattail.batch.vendorinvoice.handler" in the - database, the value of which should be a spec string pointed at your - custom handler. - """ - handler = get_setting(Session, 'rattail.batch.vendorinvoice.handler') - if not handler: - handler = self.request.rattail_config.get('rattail.batch', 'vendorinvoice.handler') - if handler: - handler = load_object(handler)(self.request.rattail_config) - if not handler: - handler = super(VendorInvoiceCrud, self).get_handler() - return handler + else: + fs.configure( + include=[ + fs.vendor.readonly(), + fs.filename, + fs.purchase_order_number, + fs.invoice_date.readonly(), + fs.created, + fs.created_by, + fs.executed, + fs.executed_by, + ]) + batch = fs.model + if not batch.executed: + del fs.executed + del fs.executed_by def validate_po_number(self, value, field): """ @@ -114,65 +109,24 @@ class VendorInvoiceCrud(FileBatchCrud): if not parser_key: raise formalchemy.ValidationError("Cannot validate PO number until File Type is chosen") parser = require_invoice_parser(parser_key) - vendor = get_vendor(Session(), parser.vendor_key) + vendor = api.get_vendor(Session(), parser.vendor_key) try: self.handler.validate_po_number(value, vendor) except ValueError as error: raise formalchemy.ValidationError(unicode(error)) - def configure_fieldset(self, fs): - parsers = sorted(iter_invoice_parsers(), key=lambda p: p.display) - parser_options = [(p.display, p.key) for p in parsers] - parser_options.insert(0, ("(please choose)", '')) - fs.parser_key.set(renderer=formalchemy.fields.SelectFieldRenderer, - options=parser_options) - - fs.purchase_order_number.set(label=self.handler.po_number_title) - fs.purchase_order_number.set(validate=self.validate_po_number) - - fs.configure( - include=[ - fs.vendor.readonly(), - fs.filename.label("Invoice File"), - fs.parser_key.label("File Type"), - fs.purchase_order_number, - fs.invoice_date.readonly(), - fs.created, - fs.created_by, - fs.executed, - fs.executed_by, - ]) - if self.creating: - del fs.vendor - del fs.invoice_date - else: - del fs.parser_key - def init_batch(self, batch): parser = require_invoice_parser(batch.parser_key) - vendor = get_vendor(Session, parser.vendor_key) + vendor = api.get_vendor(Session(), parser.vendor_key) if not vendor: - self.request.session.flash("No vendor setting found in database for key: {0}".format(parser.vendor_key)) + self.request.session.flash("No vendor setting found in database for key: {}".format(parser.vendor_key)) return False batch.vendor = vendor return True - -class VendorInvoiceRowGrid(BatchRowGrid): - """ - Grid view for vendor invoice rows. - """ - row_class = VendorInvoiceRow - route_prefix = 'vendors.invoices' - - def filter_map_extras(self): - return {'ilike': ['upc', 'brand_name', 'description', 'size', 'vendor_code']} - - def filter_config_extras(self): - return {'filter_label_upc': "UPC", - 'filter_label_brand_name': "Brand"} - - def configure_grid(self, g): + def configure_row_grid(self, g): + g.filters['upc'].label = "UPC" + g.filters['brand_name'].label = "Brand" g.configure( include=[ g.sequence, @@ -188,24 +142,17 @@ class VendorInvoiceRowGrid(BatchRowGrid): ], readonly=True) - def tr_class(self, row, i): - if row.status_code in ((row.STATUS_NOT_IN_PURCHASE, - row.STATUS_NOT_IN_INVOICE, - row.STATUS_DIFFERS_FROM_PURCHASE)): - return 'notice' + def row_grid_row_attrs(self, row, i): + attrs = {} + if row.status_code in (row.STATUS_NOT_IN_PURCHASE, + row.STATUS_NOT_IN_INVOICE, + row.STATUS_DIFFERS_FROM_PURCHASE): + attrs['class_'] = 'notice' if row.status_code in (row.STATUS_NOT_IN_DB, row.STATUS_COST_NOT_IN_DB): - return 'warning' - - -class VendorInvoiceRowCrud(BatchRowCrud): - row_class = VendorInvoiceRow - route_prefix = 'vendors.invoices' - batch_display = "Vendor Invoice" + attrs['class_'] = 'warning' + return attrs def includeme(config): - """ - Add configuration for the vendor invoice views. - """ - defaults(config, VendorInvoiceGrid, VendorInvoiceCrud, VendorInvoiceRowGrid, VendorInvoiceRowCrud, '/vendors/invoices/') + VendorInvoicesView.defaults(config)