iron_warbler 2.0.7.49 → 2.0.7.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181da017ec4910921e41d9c33dfeb2bb8d0f00c5c8a8f09886a03b06b820de8d
-  data.tar.gz: 8bad8df4925989d0d47ee9f29bc5f8b965fb485d9b330326c1d3171c95379e6b
+  metadata.gz: 27e79457c024254243edfd06b728c5b236da335b03880678f7bffdb72d4fb6b1
+  data.tar.gz: ed9263babe2e1bcff873de6924a0160596aa535675a690b3c96319b4e0b53391
 SHA512:
-  metadata.gz: 38613099637e30d90aa8d46a49a044b87fe826fc81f3cbc1ae9feb4e2cf858678d1a7685cbeb063d5bcb2427248597a22a1dfd1dd4e3be1c5fe787d645391f21
-  data.tar.gz: 7132c4dd07498818c3ea0f4b9063c64557bf8c9066badee4549dfaf18fc696a133d7e3d9f2497be01384ce291def53d4b6dd1e1fb1ddfd1207669aaca759032a
+  metadata.gz: 7d5a2fbb95f4278e70d0055b591c3f337c257e37112e49f1f34f1ae3ba672ca03abafc5165611a94b20e29d8b0073f70f56db0cad37cca59a3ec66d3e0386ea2
+  data.tar.gz: 78d43e5d0142b8481593e5239c997e9756615307d97a0919dc970be22e645fb3ae2847d08992e28bc0b05a017636bd6ba8756a5411c965f5236eeaba75bc57ba

data/app/assets/stylesheets/iron_warbler/application.css

@@ -24,18 +24,9 @@ html {
   --iro-color-bg2: #fefefe;
 }
 
-/* body {
-  color: red !important;
-} */
-
 .iro--main-header {
   li {
     margin-bottom: 0.2em;
-
-    a {
-      background: white;
-      padding: 0 0.2em;
-    }
   }
 }
 

data/app/assets/stylesheets/iron_warbler/positions.scss

@@ -2,6 +2,10 @@
 .positions--header {
   position: relative;
   z-index: 1;
+  ul {
+    margin: 0;
+    padding: 0;
+  }
 }
 
 .begin-inner-price,

data/app/assets/stylesheets/iron_warbler/positions_gameui.scss

@@ -1,7 +1,7 @@
 
-.positions--prepare {
+.positions-prepare {
   .RollGuide {
-    height: 100vh;
+    height: 200vh;
     border: 1px dashed gray;
     position: absolute;
     right: 0;

data/app/assets/stylesheets/iron_warbler/purses.scss

@@ -2,11 +2,12 @@
 .purses--form-extra-fields {
   background: rgba(255,255,255, 0.5);
   padding: 0.3em 0;
-  margin-bottom: 0.5em;
+  // margin-bottom: 0.5em;
 
   line-height: 1.5em;
   input {
     height: 1.5em;
+    min-width: 90px;
   }
 
   > div {

data/app/assets/stylesheets/iron_warbler/purses_gameui.scss

@@ -1,6 +1,6 @@
 
 .purses-gameuiW {
-  border: 1px solid red;
+  border: 1px solid #333;
   width: 100%;
   // overflow-x: scroll;
   overflow-y: hidden;
@@ -8,6 +8,18 @@
 
 .purses-gameui {
 
+  .divider-expiry {
+    height: 5px;
+    width: 100%;
+    background: #333;
+  }
+  .divider-ticker {
+    height: 2px;
+    width: 100%;
+    background: #333;
+    margin-bottom: 20px;
+  }
+
   .Origin::before {
     position: absolute;
     top: -1em;
@@ -95,6 +107,7 @@
 
     // background: var(--iro-color-bg2);
     // border: 1px solid red;
+    margin-top: 1em;
     margin-bottom: 2em;
 
     position: relative;

data/app/assets/stylesheets/iron_warbler/purses_summary.scss

@@ -1,110 +1,144 @@
 
-.PurseSummaryW {
-  position: relative;
-  background: rgba(255,255,255, 0.75);
-  height: 400px;
-  width: 100%;
-  z-index: 5;
-}
-.PurseSummary {
-  position: absolute;
-  top: 200px;
-
+.summaries {
   display: flex;
+}
+.purses--summary2 {
+  // border: 1px solid yellow;
 
-  width: 100%;
-  height: 0;
-  border-bottom: 1px dotted black;
+  label {
+    position: absolute;
+  }
 
   .legendW {
-    position: relative;
-    // margin-top: 50%;
+    height: 100px;
+    margin-left: 60px;
 
-    .legend {
-      margin-top: -50%;
+    display: flex;
+  }
 
-      // position: absolute;
-      // top: -200px;
-      // width: 400px;
-      // height: 400px;
+  .PurseSummaryW {
+    margin-left: 1em;
+    width: 500px;
+    z-index: 11;
+    height: 400px;
+    position: relative;
+    background: rgba(255,255,255, 0.75);
 
-      background: white;
-      padding: 0.5em;
-    }
+  }
+  .PurseSummary {
+    position: absolute;
+    top: 50%;
+    width: 100%;
+    height: 0;
+    border-bottom: 1px solid black;
   }
 
+  /* shared */
+  .summary-long, .summary-short {
+    // border: 1px solid blue;
+    position: absolute;
 
-  /*
-   * summary amount and delta
-  **/
-  .summary-amount {
-    position: relative;
-    width: 100px;
-    margin-right: 2em;
+    display: flex;
 
-    .net-gl {
-      width: 100%;
-      background: rgba(0,0,0, 0.5);
-    }
+    width: 100%;
+    // height: 300px;
 
-    .delta {
+    .deltaW {
+      border: 2px solid black;
+      height: 0;
+      display: flex;
+      align-items: center;
       position: absolute;
-      left: 100px;
-      height: 100%;
+      top: 50%;
+      left: 110px;
 
-      > div {
-        border: 1px dotted yellow;
-        width: 0.5em;
-      }
-      .begin {
-        width: 1em;
+      .delta {
+        // border: 2px dashed green;
+        width: 20px;
 
-        background: black;
-      }
-      .end {
-        width: .5em;
-        left: .25em;
+        display: flex;
+        align-items: center;
+
+        .begin {
+          width: 100%;
+          background: rgba(0,0,0, 0.25);
+        }
+        .end {
+          width: 50%;
+          // background: rgba(0,0,0, 0.75);
+        }
 
-        background: rgba(255,0,0, 0.5);
       }
     }
 
-  }
+    /* shared */
+    .plot {
+      background: rgba(255,153,0, 0.5);
 
+      position: relative;
 
-  .loss {
-  }
-  .gain {
-  }
-  .max-gl {
-    position: absolute;
-    width: 100%;
+      width: 100px;
 
-    label {
-      position: absolute;
+      .max-gl {
+        width: 100%;
+        position: absolute;
+        background: rgba(255,255,0, 0.5);
+      }
+      .net-gl {
+        position: absolute;
+        width: 90%;
+      }
+      .gain {
+        background: rgba(0,0,0, 0.70);
+      }
+      .loss {
+        background: rgba(255,0,0, 0.5);
+      }
     }
-
-
   }
-  .max-gl.long {
-  }
-  .max-gl.short {
-    display: flex;
-    flex-direction: column-reverse;
-  }
-  .long {
-    position: absolute;
+
+  .summary-long {
     top: 0;
 
-    background: rgba(255,0,0, 0.5);
-    border: 1px solid red;
-    bottom: 0;
+    .legendW {
+      flex-direction: column;
+    }
+    .plot {
+      bottom: 0;
+      .gain {
+        bottom: 0;
+      }
+      .max-gl {
+        bottom: 0;
+      }
+    }
   }
-  .short {
-    background: rgba(255,153,0, 0.5);
-    border: 1px solid orange;
 
-    position: absolute;
+  .summary-short {
     bottom: 0;
+
+    display: flex;
+    align-items: flex-end;
+
+    .deltaW {
+      left: 140px;
+    }
+    label {
+      bottom: 0;
+    }
+    .legendW {
+      flex-direction: column-reverse;
+    }
+    .plot {
+      background: rgba(255,153,0, 0.5);
+      width: 100px;
+
+      .gain {
+        top: 0;
+      }
+      .loss {
+        bottom: 0;
+      }
+    }
   }
-}
+}

data/app/assets/stylesheets/iron_warbler/utils.scss

@@ -70,7 +70,7 @@
 /* M */
 
 .mini-inputs {
-  background: rgba(255,255,255, 0.25);
+  // background: rgba(255,255,255, 0.25);
 }
 
 .modal-absolute {
@@ -83,15 +83,16 @@
   position: absolute;
 
   min-width: 200px;
-  width: 400px;
+  // width: 400px;
 
   min-height: 200px;
-  height: 300px;
+  // height: 300px;
+
   /* overflow: auto; */
 
   background: white;
 
-  z-index: 2;
+  z-index: 200;
 
 }
 

data/app/controllers/iro/positions_controller.rb

@@ -1,26 +1,73 @@
 
 class Iro::PositionsController < Iro::ApplicationController
-  before_action :set_lists
+
+  def check
+    @position = Iro::Position.find params[:id]
+    authorize! :check, @position
+    outs = Tda::Order.check_status @position.schwab_order_id
+    puts! outs, 'outs'
+
+    if outs[:errors]
+      flash[:alert] = 'need to sync?!'
+      redirect_to request.referrer
+      return
+    end
+
+    attrs = { schwab_status: outs[:status] }
+    if 'FILLED' == outs[:status]
+      attrs[:status] = Iro::Position::STATUS_CLOSED
+      outs[:orderLegCollection].each do |leg|
+        hash = Iro::Option.symbol_to_h leg[:instrument][:symbol]
+        price = outs[:orderActivityCollection][0][:executionLegs].select do |exec_leg|
+          exec_leg[:instrumentId] == leg[:instrument][:instrumentId]
+        end[0][:price]
+        if @position.inner.matches_h( hash )
+          attrs[:inner_attributes] = { end_price: price }
+        end
+        if @position.outer.matches_h( hash )
+          attrs[:outer_attributes] = { end_price: price }
+        end
+      end
+    end
+    puts! attrs,' attrs'
+    @position.update(attrs)
+
+    redirect_to request.referrer
+  end
+
+  def close_prep2
+    @position = Iro::Position.find params[:id]
+    authorize! :close, @position
+    @position.inner.sync
+    @position.inner.update({ begin_price: @position.inner.end_price })
+    @position.outer.sync
+    @position.outer.update({ begin_price: @position.outer.end_price })
+    @position.update({ pending_price: @position.close_price, intent: Iro::Position::INTENT_CLOSE })
+    @query = Tda::Order.close_credit_spread_q @position
+    @page_title = "Closing #{@position} ..."
+  end
 
   def create
     @position = Iro::Position.new pos_params
     authorize! :create, @position
 
-    @position.inner_strike = params[:inner][:strike]
-    @position.outer_strike = params[:outer][:strike]
+    # @position.inner_strike = params[:inner][:strike]
+    # @position.outer_strike = params[:outer][:strike]
 
     o_attrs = {
       expires_on: @position.expires_on,
-      put_call: @position.put_call, # I need this. _vp_ 2024-04-26
-      stock_id: @position.stock_id,
+      put_call:   @position.put_call, # I need this. _vp_ 2024-04-26
+      stock_id:   @position.stock_id,
     }
-    @position.inner = Iro::Option.new params[:inner].permit!.merge( o_attrs )
-    @position.inner.end_price = @position.inner.begin_price
-    @position.inner.end_delta = @position.inner.begin_delta
+    @position.inner = Iro::Option.create!({ strike: params[:position][:inner_strike] }.merge( o_attrs ))
+    @position.inner.sync
+    @position.inner.begin_price = @position.inner.end_price
+    @position.inner.begin_delta = @position.inner.end_delta
     if [ Iro::Strategy::KIND_LONG_CREDIT_PUT_SPREAD, Iro::Strategy::KIND_SHORT_CREDIT_CALL_SPREAD ].include?( @position.strategy.kind )
-      @position.outer = Iro::Option.new params[:outer].permit!.merge( o_attrs )
-      @position.outer.end_price = @position.outer.begin_price
-      @position.outer.end_delta = @position.outer.begin_delta
+      @position.outer = Iro::Option.create!({ strike: params[:position][:outer_strike] }.merge( o_attrs ))
+      @position.outer.sync
+      @position.outer.begin_price = @position.outer.end_price
+      @position.outer.begin_delta = @position.outer.end_delta
     end
 
     if @position.save
@@ -53,6 +100,7 @@ class Iro::PositionsController < Iro::ApplicationController
   def edit
     @position = Iro::Position.find params[:id]
     authorize! :edit, @position
+    set_position_lists
   end
 
   def eval
@@ -68,6 +116,11 @@ class Iro::PositionsController < Iro::ApplicationController
     redirect_to request.referrer
   end
 
+  def index
+    authorize! :index, Iro::Position
+    @positions = Iro::Position.active
+  end
+
   ## only callable from _new.haml, with position partially pre-filled
   def new
     authorize! :new, Iro::Position
@@ -81,6 +134,63 @@ class Iro::PositionsController < Iro::ApplicationController
       # outer:    Iro::Option.new,
       stock_id: strategy.stock_id,
     }) )
+
+    set_position_lists
+  end
+
+  ## only credit-spread
+  def reprice
+    @position = Iro::Position.find params[:id]
+    authorize! :roll, @position
+    @position.update({ pending_price: params[:pending_price] })
+
+    Tda::Order.cancel_order!( @position.schwab_order_id )
+    outs = Tda::Order.place_order!( Tda::Order.credit_spread_q @position )
+
+    flag = @position.update({
+      schwab_order_id: outs[:schwab_order_id],
+      schwab_status: outs[:schwab_status],
+      status: Iro::Position::STATUS_PENDING,
+    })
+
+    flash_notice flag
+    # redirect_to controller: :purses, action: :show, template: 'show', view_status: 'pending', id: @position.purse_id
+    redirect_to request.referrer
+  end
+
+  def place_order
+    @position = Iro::Position.find params[:id]
+    authorize! :place_order, @position
+
+    query = case @position.intent
+    when Iro::Position::INTENT_CLOSE
+      Tda::Order.close_credit_spread_q @position
+    else
+      throw '_TODO: hls - placing order, not implemented'
+    end
+    outs = Tda::Order.place_order!( query )
+
+    flag = @position.update({
+      schwab_order_id: outs[:schwab_order_id],
+      schwab_status: outs[:schwab_status],
+      status: Iro::Position::STATUS_PENDING,
+    })
+
+    flash_notice flag
+    redirect_to controller: :purses, action: :show, template: 'show', view_status: 'pending', id: @position.purse_id
+  end
+
+  ## place2 = credit-spread
+  ## should be renamped to open_prep2
+  def place2
+    @position = Iro::Position.find params[:id]
+    authorize! :roll, @position
+    @position.inner.sync
+    @position.inner.update({ begin_price: @position.inner.end_price })
+    @position.outer.sync
+    @position.outer.update({ begin_price: @position.outer.end_price })
+    @position.update({ pending_price: @position.place2_price })
+    @query = Tda::Order.credit_spread_q @position
   end
 
   ## 2025-10-14 long_credit_put_spread
@@ -102,11 +212,6 @@ class Iro::PositionsController < Iro::ApplicationController
     self.send("_prepare_#{@position.strategy.kind}")
   end
 
-  ## 2026-02-26 continue...
-  ## short credit call spread
-  ## covered call ???
-  ## short credit call spread
-  ## long credit put spread
   def prepare2
     @position = Iro::Position.find params[:id]
     authorize! :roll, @position
@@ -136,15 +241,33 @@ class Iro::PositionsController < Iro::ApplicationController
       end
   end
 
+  ## credit-spread
+  def place3
+    @position = Iro::Position.find params[:id]
+    @position.update({ pending_price: params[:pending_price] })
+    authorize! :place_order, @position
+    outs = Tda::Order.place_order!( Tda::Order.credit_spread_q @position )
+
+    flag = @position.update({
+      schwab_order_id: outs[:schwab_order_id],
+      schwab_status: outs[:schwab_status],
+      status: Iro::Position::STATUS_PENDING,
+    })
+
+    flash_notice flag
+    redirect_to controller: :purses, action: :show, template: 'show', view_status: 'pending', id: @position.purse_id
+  end
+
   ## 2026-02-26 continue...
   ## short credit call spread
   def prepare3
     @position = Iro::Position.find params[:id]
     authorize! :place_order, @position
-    order_id = Tda::Order.place_order( Tda::Order.roll_credit_call_spread_q @position )
+    outs = Tda::Order.place_order!( Tda::Order.roll_credit_call_spread_q @position )
 
     flag = @position.update({
-      schwab_order_id: order_id,
+      schwab_order_id: outs[:schwab_order_id],
+      schwab_status: outs[:schwab_status],
       status: Iro::Position::STATUS_PENDING,
     })
 
@@ -414,11 +537,9 @@ class Iro::PositionsController < Iro::ApplicationController
     )
   end
 
-  def set_lists
-    super
-    @purses_list     = Iro::Purse.list
-    @strategies_list = Iro::Strategy.list(params[:long_or_short])
+  def set_position_lists
     @stocks_list     = Iro::Stock.list
+    @strategies_list = ( @position.purse.strategies.list + [[ @position.strategy.to_s, @position.strategy.id.to_s ]] ).uniq
   end
 
 end