diff options
Diffstat (limited to 'python/Dawn')
| -rw-r--r-- | python/Dawn/models.py | 1 | ||||
| -rw-r--r-- | python/Dawn/templates/wire_blotter.html | 4 | ||||
| -rw-r--r-- | python/Dawn/templates/wire_entry.html | 12 | ||||
| -rw-r--r-- | python/Dawn/views.py | 6 |
4 files changed, 3 insertions, 20 deletions
diff --git a/python/Dawn/models.py b/python/Dawn/models.py index 11dd2a91..ddd624cb 100644 --- a/python/Dawn/models.py +++ b/python/Dawn/models.py @@ -264,7 +264,6 @@ class CashFlowDeal(db.Model): 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) BaseModelForm = model_form_factory(FlaskForm) diff --git a/python/Dawn/templates/wire_blotter.html b/python/Dawn/templates/wire_blotter.html index 9f70621d..e4e3e2b8 100644 --- a/python/Dawn/templates/wire_blotter.html +++ b/python/Dawn/templates/wire_blotter.html @@ -5,20 +5,20 @@ <tr> <td>Deal ID</td> <td>Trade Date</td> - <td>Settle Date</td> <td>Strategy</td> <td>Account</td> <td>Amount</td> + <td>Currency</td> </tr> </thead> {% for trade in trades %} <tr> <td><a href="{{url_for('wire_manage', wire_id=trade.id)}}">{{trade.dealid}}</a></td> <td>{{trade.trade_date}}</td> - <td>{{trade.settle_date}}</td> <td>{{trade.folder}}</td> <td>{{trade.account.name}}</td> <td>{{trade.amount}}</td> + <td>{{trade.currency}}</td> </tr> {% endfor %} </table> diff --git a/python/Dawn/templates/wire_entry.html b/python/Dawn/templates/wire_entry.html index 1e69ccd0..d22d0ee9 100644 --- a/python/Dawn/templates/wire_entry.html +++ b/python/Dawn/templates/wire_entry.html @@ -48,18 +48,6 @@ </div> </div> - <div class="form-group"> - - <label class="control-label col-md-4" for="settle_date"> - settle_date - </label> - - <div class="col-md-6"> - <input class="form-control" id="settle_date" name="settle_date" value="{{settle_date}}" type="date"> - </div> - - </div> - <div class="form-group "> <div class="col-md-3"> diff --git a/python/Dawn/views.py b/python/Dawn/views.py index a820b380..d2214604 100644 --- a/python/Dawn/views.py +++ b/python/Dawn/views.py @@ -189,7 +189,6 @@ def gen_cashflow_deals(form): action = form.get("action") to_date = lambda s: datetime.datetime.strptime(s, "%Y-%m-%d") trade_date = form.get("trade_date", None, to_date) - settle_date = form.get("settle_date", None, to_date) for direction in ["incoming", "outgoing"]: count = 1 while True: @@ -206,7 +205,6 @@ def gen_cashflow_deals(form): else: raise ValueError("direction needs to be 'outgoing' or 'incoming'") yield CashFlowDeal(trade_date=trade_date, - settle_date=settle_date, action=action, folder=r[0], code=r[1], @@ -234,8 +232,7 @@ def wire_manage(wire_id): incoming_wires=split_direction( gen_cashflow_deals(request.form), "incoming"), action=request.form.get('action'), - trade_date=request.form.get('trade_date'), - settle_date=request.form.get('settle_date')) + trade_date=request.form.get('trade_date')) else: if request.form.get('upload_globeop') == 'y': q = get_queue() @@ -251,7 +248,6 @@ def wire_manage(wire_id): outgoing_wires=split_direction([wire], "outgoing") if wire_id else [], incoming_wires=split_direction([wire], "incoming") if wire_id else [], trade_date=wire.trade_date if wire_id else datetime.date.today(), - settle_date=wire.settle_date if wire_id else '', action_url=url_for('wire_manage', wire_id=wire_id), action=wire.action if wire_id else None) |