diff options
Diffstat (limited to 'python/Dawn/dawn.py')
| -rw-r--r-- | python/Dawn/dawn.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/python/Dawn/dawn.py b/python/Dawn/dawn.py index c937a88b..a68ec854 100644 --- a/python/Dawn/dawn.py +++ b/python/Dawn/dawn.py @@ -34,27 +34,31 @@ def trade_manage(tradeid): trade = BondDeal.query.get(tradeid) bond_form = BondForm(obj = BondDeal.query.get(tradeid)) #we change the default to update - bond_form.action.data = '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() if bond_form.is_submitted(): if bond_form.validate(): - if tradeid: - old_ticket_name = trade.ticket bond_form.populate_obj(trade) session = bond_form.get_session() - if tradeid and trade.ticket.filename == '': - trade.ticket = old_ticket_name + ticket_file = trade.ticket + trade.ticket = None + if not tradeid: + session.add(trade) + if ticket_file.filename == '': + if tradeid: + trade.ticket = old_ticket_name else: - ticket_name = "{0} {1}.pdf".format(trade.description, - str(datetime.datetime.now())) - trade.ticket.save(os.path.join(app.config['UPLOAD_FOLDER'], - ticket_name)) - trade.ticket = ticket_name - if not tradeid: - session.add(trade) + if tradeid: + trade.ticket = bump_rev(old_ticket_name) + else: + trade.ticket = "{0} {1}.pdf".format(str(trade.trade_date), + trade.description) + ticket_file.save(os.path.join(app.config['UPLOAD_FOLDER'], + trade.ticket)) try: session.commit() except IntegrityError: |