From 396d838416fa4e41418f507a05a8d34bc4d47eb6 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Wed, 2 Nov 2022 18:24:56 +0000
Subject: [PATCH] Change positions fields

---
 core/templates/partials/position-list.html | 8 ++++----
 core/views/positions.py                    | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/templates/partials/position-list.html b/core/templates/partials/position-list.html
index 27f61a7..0ef8a35 100644
--- a/core/templates/partials/position-list.html
+++ b/core/templates/partials/position-list.html
@@ -16,9 +16,9 @@
       {% if item.unrealized_pl > 0 %}has-background-success-light
       {% elif item.unrealized_pl < 0 %}has-background-danger-light
       {% endif %}">
-      <td>{{ item.account_id }}</td>
+      <td>{{ item.account }}</td>
       <td>{{ item.symbol }}</td>
-      <td>{{ item.current_price }}</td>
+      <td>{{ item.price }}</td>
       <td>{{ item.qty }}</td>
       <td>{{ item.market_value }}</td>
       <td>{{ item.unrealized_pl }}</td>
@@ -51,7 +51,7 @@
             </span>
           </button>
           {% if type == 'page' %}
-            <a href="{% url 'position_action' type=type account_id=item.account_id asset_id=item.asset_id %}">
+            <a href="{% url 'position_action' type=type account_id=item.account_id symbol=item.symbol %}">
               <button
                 class="button is-success">
                 <span class="icon-text">
@@ -64,7 +64,7 @@
           {% else %}
             <button
               hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-              hx-get="{% url 'position_action' type=type account_id=item.account_id asset_id=item.asset_id %}"
+              hx-get="{% url 'position_action' type=type account_id=item.account_id symbol=item.symbol %}"
               hx-trigger="click"
               hx-target="#{{ type }}s-here"
               hx-swap="innerHTML"
diff --git a/core/views/positions.py b/core/views/positions.py
index 372bd5b..fcee4b9 100644
--- a/core/views/positions.py
+++ b/core/views/positions.py
@@ -21,6 +21,8 @@ def get_positions(user, account_id=None):
         if not success:
             items.append({"name": account.name, "status": "error"})
             continue
+        for position in positions:
+            position["account"] = account.name
 
         for item in positions:
             items.append(item)
@@ -40,6 +42,7 @@ class Positions(LoginRequiredMixin, View):
         template_name = f"wm/{type}.html"
         unique = str(uuid.uuid4())[:8]
         items = get_positions(request.user, account_id)
+        print("ITEMS", items)
         if type == "page":
             type = "modal"
         context = {
@@ -60,7 +63,7 @@ class PositionAction(LoginRequiredMixin, View):
     window_content = "window-content/view-position.html"
     parser_classes = [FormParser]
 
-    async def get(self, request, type, account_id, asset_id):
+    async def get(self, request, type, account_id, symbol):
         """
         Get live information for a trade.
         """
@@ -70,7 +73,8 @@ class PositionAction(LoginRequiredMixin, View):
         unique = str(uuid.uuid4())[:8]
 
         account = Account.get_by_id(account_id, request.user)
-        success, info = account.client.get_position_info(asset_id)
+        success, info = account.client.get_position_info(symbol)
+        print("ACCT INFO", info)
         if not success:
             message = "Position does not exist"
             message_class = "danger"