diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Dawn/models.py | 1 | ||||
| -rw-r--r-- | python/Dawn/templates/wire_entry.html | 14 | ||||
| -rw-r--r-- | python/Dawn/views.py | 8 |
3 files changed, 18 insertions, 5 deletions
diff --git a/python/Dawn/models.py b/python/Dawn/models.py index 4a5727b9..11dd2a91 100644 --- a/python/Dawn/models.py +++ b/python/Dawn/models.py @@ -262,6 +262,7 @@ class CashFlowDeal(db.Model): folder = db.Column(CASH_STRAT, nullable=False) code = db.Column(db.String(5), db.ForeignKey('accounts.code'), nullable=False) amount = db.Column(db.Float, nullable=False) + currency = db.Column(CCY, nullable=False) trade_date = db.Column(db.Date, nullable=False) settle_date = db.Column(db.Date, nullable=False) account = db.relationship(Accounts) diff --git a/python/Dawn/templates/wire_entry.html b/python/Dawn/templates/wire_entry.html index 84176890..1e69ccd0 100644 --- a/python/Dawn/templates/wire_entry.html +++ b/python/Dawn/templates/wire_entry.html @@ -90,9 +90,9 @@ </label> <div class="col-md-6"> <select class="form-control" id="folder" name="folder"> - <option value="None">{{strat}}</option> + <option value="None"></option> {% for strat in strategies %} - <option value="{{strat[0]}}">{{strat[1]}}</option> + <option value="{{strat}}">{{strat}}</option> {% endfor %} </select> </div> @@ -121,6 +121,16 @@ <div class="col-md-6"> <input class="form-control" id="amount" name="amount" value="" type="text"> </div> + </div> + <div class="form-group "> + <label class="control-label col-md-4" for="currency">currency</label> + <div class="col-md-6"> + <select class="form-control" id="currency" name="currency"> + {% for curr in currencies %} + <option value="{{curr}}">{{curr}}</option> + {% endfor %} + </select> + </div> <div class="col-md-2"> <input id="btn" type="button" class="btn" value="+"> </div> diff --git a/python/Dawn/views.py b/python/Dawn/views.py index 5acec034..a820b380 100644 --- a/python/Dawn/views.py +++ b/python/Dawn/views.py @@ -8,7 +8,7 @@ import socket from flask import (request, render_template, redirect, url_for, send_from_directory, send_file, g, jsonify) -from .models import (ModelForm, CASH_STRAT, +from .models import (ModelForm, CASH_STRAT, CCY, BondDeal, CDSDeal, SwaptionDeal, FutureDeal, CashFlowDeal, Counterparties, Accounts) @@ -226,7 +226,8 @@ def wire_manage(wire_id): app.logger.error(e) db.session.rollback() return render_template('wire_entry.html', - strategies=[(e, e) for e in CASH_STRAT.enums], + strategies=CASH_STRAT.enums, + currencies=CCY.enums, accounts=account_codes(), outgoing_wires=split_direction( gen_cashflow_deals(request.form), "outgoing"), @@ -244,7 +245,8 @@ def wire_manage(wire_id): wire = CashFlowDeal() if wire_id is None else CashFlowDeal.query.get(wire_id) return render_template('wire_entry.html', - strategies=[(e, e) for e in CASH_STRAT.enums], + strategies=CASH_STRAT.enums, + currencies=CCY.enums, accounts=account_codes(), outgoing_wires=split_direction([wire], "outgoing") if wire_id else [], incoming_wires=split_direction([wire], "incoming") if wire_id else [], |