diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Dawn/models.py | 5 | ||||
| -rw-r--r-- | python/Dawn/views.py | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/python/Dawn/models.py b/python/Dawn/models.py index 8a6deb56..bf9eb693 100644 --- a/python/Dawn/models.py +++ b/python/Dawn/models.py @@ -62,9 +62,8 @@ class BondDeal(db.Model): cp_code = db.Column(db.String(12), db.ForeignKey('counterparties.code'), info={'choices': [(None, None)], 'label': 'counterparty'}, nullable = False) - trade_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)) + trade_date = db.Column(db.Date, nullable = False) + settle_date = db.Column(db.Date, nullable = False) cusip = db.Column(db.String(9), info={'validators': Length(9,9), 'filters': [lambda x: x or None]}) isin = db.Column(db.String(12), info={'validators': Length(12, 12), diff --git a/python/Dawn/views.py b/python/Dawn/views.py index 9f0a0240..6f718422 100644 --- a/python/Dawn/views.py +++ b/python/Dawn/views.py @@ -4,6 +4,7 @@ from .models import ModelForm, BondDeal, Counterparties from sqlalchemy import create_engine from sqlalchemy.exc import IntegrityError import pandas as pd +from pandas.tseries.offsets import BDay import os import datetime import redis @@ -35,16 +36,14 @@ class BondForm(ModelForm): @app.route('/trades/<int:tradeid>', methods=['GET', 'POST']) @app.route('/trades/', defaults={'tradeid': None}, methods=['GET', 'POST']) def trade_manage(tradeid): + trade = BondDeal.query.get(tradeid) if tradeid else BondDeal() + bond_form = BondForm(obj = trade) + bond_form.cp_code.choices = cp_choices() if tradeid: - trade = BondDeal.query.get(tradeid) - bond_form = BondForm(obj = BondDeal.query.get(tradeid)) - #we change the default to update bond_form.action.choices = [('UPDATE', 'UPDATE'), ('CANCEL', 'CANCEL')] old_ticket_name = trade.ticket - else: - trade = BondDeal() - bond_form = BondForm() - bond_form.cp_code.choices = cp_choices() + bond_form.trade_date.data = pd.datetime.today().date() + bond_form.settle_date.data = pd.datetime.today().date()+ 3 * BDay() if bond_form.is_submitted(): if bond_form.validate(): bond_form.populate_obj(trade) |