Projects/dibbler
Projects
/
dibbler
9
2
Fork 0
Code Issues 8 Pull Requests 1 Activity

Endret makslengde for produktnavn fra 30 til 45 tegn. 

Gjorde følgende endring i databasen:

 ALTER TABLE products
 ALTER COLUMN name
 TYPE CHARACTER VARYING(45);

Lagret samtidig lengden på produktnavnfeltet i Product.name_length
istedenfor å hardkode det rundt omkring i formatstrenger og
input-sjekker.

(\ /)
(O.o)
(> <) Bunny approves these changes.
This commit is contained in:
Øystein Ingmar Skartsæterhagen 2010-09-04 14:57:32 +00:00
parent b4bfaf5e96
commit 100cc8eda4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db.py
View File

@ -34,11 +34,12 @@ class Product(Base):
__tablename__ = 'products' __tablename__ = 'products'
bar_code = Column(String(13), primary_key=True) bar_code = Column(String(13), primary_key=True)
name = Column(String(30)) name = Column(String(45))
price = Column(Integer) price = Column(Integer)
bar_code_re = r"[0-9]+" bar_code_re = r"[0-9]+"
name_re = r".+" name_re = r".+"
name_length = 45
def __init__(self, bar_code, name, price): def __init__(self, bar_code, name, price):
self.name = name self.name = name

14
text_based.py
View File

@ -589,7 +589,7 @@ class AddProductMenu(Menu):
def _execute(self): def _execute(self):
self.print_header() self.print_header()
bar_code = self.input_str('Bar code> ', Product.bar_code_re, (8,13)) bar_code = self.input_str('Bar code> ', Product.bar_code_re, (8,13))
name = self.input_str('Name> ', Product.name_re, (1,30)) name = self.input_str('Name> ', Product.name_re, (1,Product.name_length))
price = self.input_int('Price> ', (1,100000)) price = self.input_int('Price> ', (1,100000))
product = Product(bar_code, name, price) product = Product(bar_code, name, price)
self.session.add(product) self.session.add(product)
@ -616,7 +616,7 @@ class EditProductMenu(Menu):
('store', 'Store')]) ('store', 'Store')])
what = selector.execute() what = selector.execute()
if what == 'name': if what == 'name':
product.name = self.input_str('Name> ', Product.name_re, (1,30)) product.name = self.input_str('Name> ', Product.name_re, (1,product.name_length))
elif what == 'price': elif what == 'price':
product.price = self.input_int('Price> ', (1,100000)) product.price = self.input_int('Price> ', (1,100000))
elif what == 'store': elif what == 'store':
@ -713,7 +713,7 @@ class ShowUserMenu(Menu):
else: else:
print 'Products purchased:' print 'Products purchased:'
for product in products: for product in products:
print '%-30s %3i' % (product, products[product]) print ('%-'+str(Product.name_length)+'s %3i') % (product, products[product])
class UserListMenu(Menu): class UserListMenu(Menu):
@ -865,11 +865,11 @@ class ProductListMenu(Menu):
self.print_header() self.print_header()
text = '' text = ''
product_list = self.session.query(Product).all() product_list = self.session.query(Product).all()
line_format = '%-30s | %6s | %-15s\n' line_format = '%-15s | %5s | %-'+str(Product.name_length)+'s\n'
text += line_format % ('name', 'price', 'bar code') text += line_format % ('bar code', 'price', 'name')
text += '---------------------------------------------------------\n' text += '-----------------------------------------------------------------------\n'
for p in product_list: for p in product_list:
text += line_format % (p.name, p.price, p.bar_code) text += line_format % (p.bar_code, p.price, p.name)
less(text) less(text)