diff options
Diffstat (limited to 'python/Dawn/models.py')
| -rw-r--r-- | python/Dawn/models.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/python/Dawn/models.py b/python/Dawn/models.py index 66db7983..b9b6323c 100644 --- a/python/Dawn/models.py +++ b/python/Dawn/models.py @@ -41,16 +41,22 @@ BOND_STRAT = ENUM('M_STR_MAV', 'M_STR_SMEZZ', 'CSO_TRANCH', ASSET_CLASS = ENUM('CSO', 'Subprime', 'CLO', 'Tranches', 'Futures', 'Cash', 'FX', 'Cleared', name='asset_class') +def myticket(ctx): + return "{0}.{1}".format(ctx.current_parameters['dealid'], + str(datetime.datetime.now())) + class BondDeal(db.Model): __tablename__ = 'bonds' - dealid = db.Column(db.String(28), primary_key=True) + id = db.Column('id', db.Integer, primary_key=True) + dealid = db.Column(db.String(28)) folder = db.Column(BOND_STRAT, nullable=False) custodian = db.Column(db.String(12), nullable=False) cashaccount = db.Column(db.String(10), nullable=False) counterparty = db.Column(db.String, db.ForeignKey("counterparties.code"), info={'choices': [(None, None)]}) trade_date = db.Column(db.Date, nullable = False, default = datetime.date.today) - settle_date = db.Column(db.Date, nullable = False, default = datetime.date.today) + settle_date = db.Column(db.Date, nullable = False, default = + lambda : datetime.date.today()+datetime.timedelta(3)) cusip = db.Column(db.String(9), info={'validators': Length(9,9)}) isin = db.Column(db.String(12), info={'validator': Length(12, 12)}) description = db.Column(db.String(32)) @@ -60,7 +66,7 @@ class BondDeal(db.Model): account = db.Column(db.String(10)) accrued = db.Column(db.Float) asset_class = db.Column(ASSET_CLASS) - ticket = db.Column(MyBinary, info={'form_field_class': FileField}) + ticket = db.Column(db.String, info={'form_field_class': FileField}) BaseModelForm = model_form_factory(Form) class ModelForm(BaseModelForm): |