diff options
| -rw-r--r-- | python/Dawn/models.py | 2 | ||||
| -rw-r--r-- | python/Dawn/views.py | 3 | ||||
| -rw-r--r-- | python/exchange.py | 2 | ||||
| -rw-r--r-- | python/process_queue.py | 10 |
4 files changed, 7 insertions, 10 deletions
diff --git a/python/Dawn/models.py b/python/Dawn/models.py index 28d57990..6e5ad0ad 100644 --- a/python/Dawn/models.py +++ b/python/Dawn/models.py @@ -320,7 +320,7 @@ class SpotDeal(db.Model): info={'choices': [('IBKRNY', 'Interactive Brokers')], 'label': 'counterparty'}, nullable=False) trade_date = db.Column(db.Date, nullable=False) - settlement_date = db.Column(db.Date, nullable=False) + settle_date = db.Column(db.Date, nullable=False) spot_rate = db.Column(db.Float, nullable=False) buy_currency = db.Column(CCY, nullable=False) buy_amount = db.Column(db.Float, nullable=False) diff --git a/python/Dawn/views.py b/python/Dawn/views.py index 3cecf2b5..7c84db6d 100644 --- a/python/Dawn/views.py +++ b/python/Dawn/views.py @@ -191,9 +191,6 @@ def get_form(trade, kind): upfront_settle_date=today.date() + 3 * bus_day) if kind == 'cds': form.account_code.choices = fcm_accounts() - elif kind == 'spot': - form = Form(trade_date=today.date(), - settlement_date=today.date() + 2 * bus_day) else: form = Form(trade_date=today.date(), settle_date=today.date() + 2 * bus_day) diff --git a/python/exchange.py b/python/exchange.py index 18c88669..bb1b660c 100644 --- a/python/exchange.py +++ b/python/exchange.py @@ -1,4 +1,4 @@ -from exchangelib import Credentials, Configuration, Account, DELEGATE +from exchangelib import Credentials, Configuration, Account, DELEGATE, Message from pathlib import Path import json diff --git a/python/process_queue.py b/python/process_queue.py index 143f941a..224ece94 100644 --- a/python/process_queue.py +++ b/python/process_queue.py @@ -31,7 +31,7 @@ HEADERS = {'bond_trades': [ 'Fund', 'Portfolio', 'Reserved', 'Reserved', 'ClientReference', 'ClearingMode', 'FaceAmount', 'Pool Factor', 'FactorAsOfDate', 'Delivery'], 'cds_trades': [ - 'Deal Type', 'Deal ID', 'Action', 'Client', 'Reserved', 'Reserved', + 'Deal Type', 'Deal Id', 'Action', 'Client', 'Reserved', 'Reserved', 'Folder', 'Custodian', 'Cash Account', 'Counterparty', 'Comments', 'State', 'Trade Date', 'Reserved', 'Reserved', 'EffectiveDate', 'MaturityDate', 'Currency', 'Notional', 'FixedRate', 'PaymentRollDateConvention', 'DayCount', @@ -48,7 +48,7 @@ HEADERS = {'bond_trades': [ 'BlockAmount', 'NettingId', 'AnnouncementDate', 'ExecTS', 'DefaultProbability', 'ClientMargin', 'Factor', 'ISDADefinition'], 'swaption_trades': [ - 'Deal Type', 'Deal ID','Action', 'Client', 'Fund', 'Portfolio', + 'Deal Type', 'Deal Id','Action', 'Client', 'Fund', 'Portfolio', 'Folder', 'Custodian', 'Cash Account', 'Counterparty', 'Comments', 'State', 'Trade Date', 'Reserved', 'Reserved', 'Reserved', 'Notional', 'PremiumSettlementDate', 'ExpirationDate', @@ -76,7 +76,7 @@ HEADERS = {'bond_trades': [ 'BreakClauseFrequency', 'BlockId', 'BlockAmount', 'Cross Currency Premium Payment', 'Premium Payment Amount', 'Netting Id', 'BreakClauseDate'], 'future_trades': [ - "Deal Type", "Deal ID", "Action", "Client", "Reserved", "Reserved", + "Deal Type", "Deal Id", "Action", "Client", "Reserved", "Reserved", "Folder", "Custodian", "Cash Account", "Counterparty", "Comments", "State", "Trade Date", "Settlement Date", "Reserved", "GlopeOp Security Identifier", "Reserved", "Reserved", "Reserved", @@ -88,7 +88,7 @@ HEADERS = {'bond_trades': [ "Initial Margin", "Initial Margin Currency", "Future Event", "Commission Entries", "BlockId", "Block Amount"], 'wires': [ - "Deal Type", "Deal ID", "Action", "Client", "Reserved", "Reserved", + "Deal Type", "Deal Id", "Action", "Client", "Reserved", "Reserved", "Folder", "Custodian", "Cash Account", "Counterparty", "Comments", "State", "Trade Date", "Settlement Date", "Reserved", "Reserved", "Currency", "Amount", "Associated Deal Type", "Associated Deal Id", @@ -145,7 +145,7 @@ def build_line(obj, queue_name='bond_trades'): obj['Fund'] = 'SERCGMAST' obj['State'] = 'Valid' rename_cols = {'action': 'Action', - 'dealid': 'Deal ID', + 'dealid': 'Deal Id', 'folder': 'Folder', 'custodian': 'Custodian', 'cashaccount': 'Cash Account', |