trad: moved options to top of list view

1 files changed, 69 insertions, 63 deletions

diff --git a/app/trading/templates/trading/list.html b/app/trading/templates/trading/list.html
index f8957bd..d5dd07d 100644
--- a/app/trading/templates/trading/list.html
+++ b/app/trading/templates/trading/list.html
@@ -1,39 +1,55 @@
 {% extends 'trading/base.html' %}
         {% block content %}
-        <h3>Stock Trades</h3>
+
+        <h3>Options Trades</h3>
         <table>
             <thead>
                 <tr>
                   <th>Symbol</th>
                   <th>Open Date</th>
+                  <th>Details</th>
+                  <th>Delta</th>
                   <th>Entry Price</th>
                   <th>Stop</th>
                   <th>Target</th>
-                  <th>Shares</th>
+                  <th>Contract $</th>
                   <th>Total Invested</th>
-                  <th>$ at Risk</th>
-                  <th>$ Goal</th>
-                  <th>% Goal</th>
+                  <th>Risk per</th>
+                  <th>$ Trade Risk</th>
+                  <th>% Trade Risk</th>
+                  <th>% Portfolio Risk</th>
+                  <th>Profit Goal</th>
                   <th>Risk/Reward</th>
                   <th>Price Calc</th>
                   <th>Notes</th>
                 </tr>
             </thead>
-        {% for object in open_trades %}
-            <tr {%if object.is_wanderer %}class="wanderer-trade"{% endif %}>
+        {% for object in options_trades %}
+        <tr class="{%if object.is_wanderer %}wanderer-trade {% endif %}{%if object.status == 2%}watching{% endif %}">
             <td><a href="https://www.tradingview.com/chart/?symbol={{object.symbol}}" target="_blank">{{object.symbol}}</a></td>
             <td><a href="{{object.get_absolute_url}}">{{object.date|date:"m-d-Y"}}</a></td>
+            <td>
+                <div class="{{object.call_put}}">
+                    <span>{{object.number_contracts}}</span>
+                    <span>{{object.expiration_date|date:"M j"}}</span>
+                    <span>{{object.days_until_expiration}}</span>
+                    <span>{{object.get_call_put_display|first}}</span>
+                    <span>${{object.strike_price}}</span>
+                </div>
+            <td>{{object.delta}}</td>
             <td>${{object.entry_price}}</td>
             <td>${{object.stop_price}}</td>
             <td>${{object.target_price}}</td>
-            <td>{{object.shares}}</td>
+            <td>${{object.contract_price}}</td>
             <td>${{object.amount_invested}}</td>
-            <td>${{object.risk_dollars}}</td>
-            <td>${{object.goal_dollars}}</td>
-            <td>{{object.goal_percent}}</td>
+            <td>${{object.risk_per_contract}}</td>
+            <td>${{object.risk_total}}</td>
+            <td>{{object.trade_risk_percent}}%</td>
+            <td>{{object.portfolio_risk_percent}}%</td>
+            <td>${{object.profit_goal}}</td>
             <td>{{object.risk_reward}}</td>
             <td>
-                <input class="price_calc" data-eprice="{{object.entry_price}}" data-shares="{{object.shares}}"><span class="profit"></span>
+                <input class="price_calc" data-delta="{{object.delta}}" data-cprice="{{object.contract_price}}" data-options=true data-eprice="{{object.entry_price}}" data-total="{{object.amount_invested}}" data-ncontracts="{{object.number_contracts}}"><span class="profit"></span>
             </td>
             <td class="notes">
                 {% if object.notes %}
@@ -42,10 +58,39 @@
                 </div>
                 {% endif %}
             </td>
+            {%if object.status == 2%}<td>
+                <a href="https://live.luxagraf.net/admin/trading/luxoptionstrade/{{object.pk}}/delete/">&#8709;</a>
+            </td>{% endif %}
         </tr>
         {% endfor %}
-        {% for object in watch_trades %}
-        <tr class="{%if forloop.first %}border-row {%endif%}{%if object.is_wanderer %}wanderer-trade{% endif %}">
+        </table>
+
+
+
+
+
+
+        <h3>Stock Trades</h3>
+        <table>
+            <thead>
+                <tr>
+                  <th>Symbol</th>
+                  <th>Open Date</th>
+                  <th>Entry Price</th>
+                  <th>Stop</th>
+                  <th>Target</th>
+                  <th>Shares</th>
+                  <th>Total Invested</th>
+                  <th>$ at Risk</th>
+                  <th>$ Goal</th>
+                  <th>% Goal</th>
+                  <th>Risk/Reward</th>
+                  <th>Price Calc</th>
+                  <th>Notes</th>
+                </tr>
+            </thead>
+        {% for object in open_trades %}
+            <tr {%if object.is_wanderer %}class="wanderer-trade"{% endif %}>
             <td><a href="https://www.tradingview.com/chart/?symbol={{object.symbol}}" target="_blank">{{object.symbol}}</a></td>
             <td><a href="{{object.get_absolute_url}}">{{object.date|date:"m-d-Y"}}</a></td>
             <td>${{object.entry_price}}</td>
@@ -67,61 +112,23 @@
                 </div>
                 {% endif %}
             </td>
-            <td>
-                <a class="btn" href="https://live.luxagraf.net/admin/trading/luxtrade/{{object.pk}}/delete/">&#8709;</a>
-            </td>
         </tr>
         {% endfor %}
-        </table>
-        <h3>Options Trades</h3>
-        <table>
-            <thead>
-                <tr>
-                  <th>Symbol</th>
-                  <th>Open Date</th>
-                  <th>Details</th>
-                  <th>Delta</th>
-                  <th>Entry Price</th>
-                  <th>Stop</th>
-                  <th>Target</th>
-                  <th>Contract $</th>
-                  <th>Total Invested</th>
-                  <th>Risk per</th>
-                  <th>$ Trade Risk</th>
-                  <th>% Trade Risk</th>
-                  <th>% Portfolio Risk</th>
-                  <th>Profit Goal</th>
-                  <th>Risk/Reward</th>
-                  <th>Price Calc</th>
-                  <th>Notes</th>
-                </tr>
-            </thead>
-        {% for object in options_trades %}
-        <tr class="{%if object.is_wanderer %}wanderer-trade {% endif %}{%if object.status == 2%}watching{% endif %}">
+        {% for object in watch_trades %}
+        <tr class="{%if forloop.first %}border-row {%endif%}{%if object.is_wanderer %}wanderer-trade{% endif %}">
             <td><a href="https://www.tradingview.com/chart/?symbol={{object.symbol}}" target="_blank">{{object.symbol}}</a></td>
             <td><a href="{{object.get_absolute_url}}">{{object.date|date:"m-d-Y"}}</a></td>
-            <td>
-                <div class="{{object.call_put}}">
-                    <span>{{object.number_contracts}}</span>
-                    <span>{{object.expiration_date|date:"M j"}}</span>
-                    <span>{{object.days_until_expiration}}</span>
-                    <span>{{object.get_call_put_display|first}}</span>
-                    <span>${{object.strike_price}}</span>
-                </div>
-            <td>{{object.delta}}</td>
             <td>${{object.entry_price}}</td>
             <td>${{object.stop_price}}</td>
             <td>${{object.target_price}}</td>
-            <td>${{object.contract_price}}</td>
+            <td>{{object.shares}}</td>
             <td>${{object.amount_invested}}</td>
-            <td>${{object.risk_per_contract}}</td>
-            <td>${{object.risk_total}}</td>
-            <td>{{object.trade_risk_percent}}%</td>
-            <td>{{object.portfolio_risk_percent}}%</td>
-            <td>${{object.profit_goal}}</td>
+            <td>${{object.risk_dollars}}</td>
+            <td>${{object.goal_dollars}}</td>
+            <td>{{object.goal_percent}}</td>
             <td>{{object.risk_reward}}</td>
             <td>
-                <input class="price_calc" data-delta="{{object.delta}}" data-cprice="{{object.contract_price}}" data-options=true data-eprice="{{object.entry_price}}" data-total="{{object.amount_invested}}" data-ncontracts="{{object.number_contracts}}"><span class="profit"></span>
+                <input class="price_calc" data-eprice="{{object.entry_price}}" data-shares="{{object.shares}}"><span class="profit"></span>
             </td>
             <td class="notes">
                 {% if object.notes %}
@@ -130,16 +137,15 @@
                 </div>
                 {% endif %}
             </td>
-            {%if object.status == 2%}<td>
-                <a href="https://live.luxagraf.net/admin/trading/luxoptionstrade/{{object.pk}}/delete/">&#8709;</a>
-            </td>{% endif %}
+            <td>
+                <a class="btn" href="https://live.luxagraf.net/admin/trading/luxtrade/{{object.pk}}/delete/">&#8709;</a>
+            </td>
         </tr>
         {% endfor %}
         </table>
 
 
 
-
         <h3>Trade History</h3>
         <table>
             <thead>