This commit is contained in:
Martin
2016-07-10 23:41:51 +02:00
parent 9ae2fea044
commit 663b07fe47
3 changed files with 8 additions and 6 deletions
+1
View File
@@ -1,5 +1,6 @@
# coding=UTF-8
class ValidationError(Exception):
def __init__(self, message):
+6 -5
View File
@@ -27,11 +27,12 @@ class Material(db.Model):
query_class = MaterialQuery
WALLPAPER_MATERIALS = ['standard-wallpaper', 'self-adhesive-wallpaper', 'premium-wallpaper']
WALLPAPER_MATERIALS = ['standard-wallpaper',
'self-adhesive-wallpaper', 'premium-wallpaper']
CANVAS_MATERIALS = ['standard-canvas']
id = db.Column('materialid', db.Integer, primary_key=True)
name = db.Column('material', db.String(255), nullable=False)
name = db.Column('material', db.String(255), nullable=False)
material_price = db.relationship('MaterialPrice', uselist=False)
@property
@@ -53,11 +54,11 @@ class Material(db.Model):
class MaterialPrice(db.Model):
__tablename__ = 'v_materialprice';
__tablename__ = 'v_materialprice'
groupid = db.Column(db.Integer)
materialid = db.Column(db.Integer, db.ForeignKey('product-materials.materialid'))
materialid = db.Column(db.Integer, db.ForeignKey(
'product-materials.materialid'))
price = db.Column(db.Numeric)
__table_args__ = (db.PrimaryKeyConstraint(groupid, materialid),)