fix: rr, and stp when editing a record

Author: sdsaati

src/risk_manager/trade/templates/trade/layout.html

@@ -18,7 +18,7 @@
       <script>
         /* Running */
         $(document).ready(function(){
-          $("input").keyup(compute_amount)
+          $("#form2 input").keyup(compute_amount)
         });
       </script>
     {% endif %}

src/risk_manager/trade/templates/trade/new.html

@@ -74,7 +74,7 @@
 {% block trade_position_content %}
   <div class="px-1 py-0 text-center">{% trans "Account reserve" %} : <span>{{ user_broker.reserve }}</span></div>
   <div class="px-1 py-0 text-center">{% trans "Account balance" %} : <span>{{ user_broker.balance }}</span></div>
-  <div class="px-1 py-0 text-center">{% trans "Account balance for trade" %} : <span>14</span></div>
+  <div class="px-1 py-0 text-center">{% trans "Account available balance for trade" %} : <span>14</span></div>
   <div class="accordion" id="accordionExample">
     <div class="accordion-item">
       <h2 class="accordion-header">
@@ -85,14 +85,14 @@ <h2 class="accordion-header">
       <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
         <div class="accordion-body">
 
-          <form id="dataform" class="card-body needs-validation" action={% url 'new_trade_commit' %} method="post" onsubmit="return validateForm();" novalidate>
+          <form id="form1" class="card-body needs-validation" action={% url 'new_trade_commit' %} method="post" onsubmit="return validateForm();" novalidate>
             {% csrf_token %}
             <div class="row">
               <div class="mb-3">
                 <label for="stop" class="form-label">{% trans "Enter the Stop Loss % Here:" %}</label>
                 <div class="input-group">
                   <span class="input-group-text" id="basic-addon3">%</span>
-                  <input name="stop" type="text" class="form-control" id="balance" aria-describedby="basic-addon3 basic-addon4" autofocus required>
+                  <input name="stop_loss_percentage" type="text" class="form-control" id="balance" aria-describedby="basic-addon3 basic-addon4" autofocus required>
                   <div class="invalid-feedback">
                     {% trans "Please provide a valid % of stop loss." %}
                   </div>
@@ -101,13 +101,18 @@ <h2 class="accordion-header">
               </div>
               <div class="mb-3">
                 <label for="rrr" class="form-label">{% trans "Enter the Risk/Reward Ratio:" %}</label>
-                <input name="rr" type="text" class="form-control" id="rrr" aria-describedby="basic-addon3 basic-addon4" required>
+                <input name="risk_reward" type="text" class="form-control" id="rrr" aria-describedby="basic-addon3 basic-addon4" required>
                 <div class="invalid-feedback">
                   {% trans "Please provide a valid risk reward ratio." %}
                 </div>
               </div>
 
-              <div class="col-12 w-100">{% trans "Account balance" %} : <span id="bal">{{ user_broker.balance }}</span></div>
+
+              <!-- Amount -->
+              <span class="absolute w-32 text-center bg-black/50 px-2.5 py-1 text-white font-bold text-base rounded top-[2%] left-[4%]">{% trans 'Amount' %}</span>
+              <input name="amount" class="w-44 absolute bg-black/50 px-2.5 text-white py-1 rounded top-[13%] left-[1%]" type="text">
+
+              <div class="col-12 w-100">{% trans "amount balance for this trade" %} : <span id="bal">{{ 'Amount' }}</span></div>
               <button class="btn btn-primary w-100 mt-3">{% trans "Save" %}</button>
             </div>
           </form>
@@ -124,7 +129,7 @@ <h2 class="accordion-header">
       <div id="collapseTwo" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
         <div class="accordion-body">
 
-          <form id="dataform" class="card-body" action={% url 'new_trade_commit' %} method="post" onsubmit="return validateForm();">
+          <form id="form2" class="card-body" action={% url 'new_trade_commit' %} method="post" onsubmit="return validateForm();">
             {% csrf_token %}
             <div class="row">
               <div class="px-1 py-0 text-center"><span>{% trans "Symbol" %} : <input name='symbol' oninput="this.value = this.value.toUpperCase();" class="bg-black/25 px-2.5 rounded" placeholder="BTC"></span></div>

src/risk_manager/trade/trade_states.py

@@ -9,7 +9,7 @@
 from decimal import getcontext
 from copy import copy, deepcopy
 from django.db.models import QuerySet  # for typehint of records
-from trade.models import Symbol, Trade, UserBroker
+from trade.models import Broker, RR_Stop_Factory, Symbol, Trade, UserBroker
 
 logger = logging.getLogger("django")
 getcontext().prec = 4
@@ -28,11 +28,22 @@ def __init__(
         trade_before_edit_record: Trade,
         trade_class: Trade,
     ):
+
         self.trade_edited_record: Trade = trade_edited_record
         self.trade_before_edit_record: Trade = trade_before_edit_record
         self.trade_class: Trade = trade_class
         self.user = self.trade_edited_record.ub.user
         self.broker = self.trade_edited_record.ub.broker
+        factory = RR_Stop_Factory().create(
+            entry=d(self.trade_edited_record.entry),
+            stop=d(self.trade_edited_record.stop),
+            target=d(self.trade_edited_record.target),
+            risk_reward=d(self.trade_edited_record.risk_reward),
+            stop_percentage=d(self.trade_edited_record.stop_percent),
+            result=self.trade_edited_record.result,
+        )
+        self.trade_edited_record.risk_reward = factory.get_risk_reward()
+        self.trade_edited_record.stop_percent = factory.get_stop_percentage()
         self.goto(Decision())  # The first state that decides what we do
 
     def goto(self, state: State):
@@ -71,7 +82,7 @@ def log(self, msg: Any = None) -> None:
         else:
             logger.warn(f">> {str(self)}")
             if self.prev() is not None:
-                logger.warn("PrevRecordID=" + str(self.prev().id))
+                logger.warn("PrevRecordID=" + str(self.prev().id))  # type: ignore
             logger.warn("BeforeEditID=" + str(self.before().id))
             logger.warn("AfterEditID =" + str(self.after().id))
 

src/risk_manager/trade/views.py

@@ -118,7 +118,7 @@ def new_commit(req):
         stop=d(p.get("stop", None)),
         target=d(p.get("target", None)),
         risk_reward=d(p.get("risk_reward", None)),
-        stop_loss_percentage=d(p.get("stop_loss_percentage", None)),
+        stop_percentage=d(p.get("stop_loss_percentage", None)),
         result=None,
     )
     # Relationship, and we know that already there exists a user and a symbol