iron_warbler 2.0.7.51 → 2.0.7.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e79457c024254243edfd06b728c5b236da335b03880678f7bffdb72d4fb6b1
-  data.tar.gz: ed9263babe2e1bcff873de6924a0160596aa535675a690b3c96319b4e0b53391
+  metadata.gz: c0703c3e0ebcb7c822c9a20d2b15d0c2793f85c19e15f117eee26e9b31d8550e
+  data.tar.gz: 62926b4b746be26e4415d3f9daad710cd24f052c3405c10127d0ca324f41b474
 SHA512:
-  metadata.gz: 7d5a2fbb95f4278e70d0055b591c3f337c257e37112e49f1f34f1ae3ba672ca03abafc5165611a94b20e29d8b0073f70f56db0cad37cca59a3ec66d3e0386ea2
-  data.tar.gz: 78d43e5d0142b8481593e5239c997e9756615307d97a0919dc970be22e645fb3ae2847d08992e28bc0b05a017636bd6ba8756a5411c965f5236eeaba75bc57ba
+  metadata.gz: 3749f60970e6476f1679d8adf4388c2a7ebdc033b74e63b8baf4aa466dc2a808c04597594286f9e25a9e094909a1ba76194a94225095cebabf4114b179883be6
+  data.tar.gz: b2a1469adf02dc2cb227893d088afb6268b03c9b01a7b784eefbea01f1219efa448707b00f2b83fa42c41d012968dd4a0a1ed53eda7dfba5189872f06f2d25b7

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

@@ -52,7 +52,7 @@
       width: 160px;
     }
     th.next_position {
-      width: 160px;
+      min-width: 200px;
     }
     th.next_symbol {
       width: 120px;

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

@@ -53,15 +53,55 @@
     width: 5px;
     background: yellow;
   }
-  .PositionW.short_debit_put_spread {
-    background: rgba(255,153,0, 0.25);
-  }
   .PositionW {
     top: 0;
     border: 2px solid black;
-    background: rgba(0,255,255, 0.25);
+
     position: absolute;
     height: 100%;
+
+    .Position {
+      position: absolute;
+      left: 0;
+      top: 0;
+
+      width: 100%;
+      height: 100%;
+
+      .Quantities {
+        // background: rgba(0,0,0, 0.1);
+
+        width: 33%;
+        height:  100%;
+        position: absolute;
+
+        display: flex;
+        justify-content: space-evenly;
+        flex-direction: column;
+
+        .item {
+          width: 100%;
+          border-bottom: 1px solid #333;
+        }
+
+      }
+
+    }
+  }
+  .PositionW.long_credit_put_spread {
+    background: linear-gradient(to left, rgba(0,255,255, 0.6), transparent);
+    // background: linear-gradient(to left, rgba(0,0,0, 0.5), transparent);
+    .Quantities {
+      left: 0;
+    }
+  }
+  .PositionW.short_credit_call_spread {
+    background: linear-gradient(to right, rgba(0,255,255, 0.5), transparent);
+    background: linear-gradient(to right, rgba(0,0,0, 0.5), transparent);
+    background: linear-gradient(to right, rgba(236,164,60, 0.6), transparent);
+    .Quantities {
+      right: 0;
+    }
   }
   .reviewing {
     .PositionW {
@@ -70,23 +110,14 @@
     }
   }
 
-  .Position {
-    position: absolute;
-    left: 0;
-    top: 0;
-
-    width: 100%;
-    height: 100%;
-  }
-
-
-  .MaxGain,
-  .Breakeven {
+  .MaxGain {
     position: absolute;
     right: 0;
     bottom: 0;
-    border: 2px dotted green;
-    background: rgba(50,55,55, 0.5);
+    border: 2px dotted #eee;
+    border: 2px dotted rgb(61,98,66);
+    background: rgba(255,255,255, 0.5);
+    background: rgba(61,98,66, 0.5);
     height: 25%;
   }
   .PositionW.is-short .MaxGain {

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

@@ -5,6 +5,13 @@
 .purses--summary2 {
   // border: 1px solid yellow;
 
+
+  .collapse-expand {
+    transform-origin: left bottom;
+    transform: rotate(270deg);
+    width: 0;
+  }
+
   label {
     position: absolute;
   }
@@ -22,7 +29,7 @@
     z-index: 11;
     height: 400px;
     position: relative;
-    background: rgba(255,255,255, 0.75);
+    // background: rgba(255,255,255, 0.75);
 
   }
   .PurseSummary {

data/app/controllers/iro/application_controller.rb

@@ -9,6 +9,7 @@ class Iro::ApplicationController < Wco::ApplicationController
   layout 'iro/application'
 
   before_action :set_lists, except: %i| schwab_sync |
+  before_action :set_vcfg
 
   def home
     authorize! :home, Iro
@@ -33,5 +34,13 @@ class Iro::ApplicationController < Wco::ApplicationController
     @purses = Iro::Purse.all.order_by( slug: :asc )
   end
 
+  def set_vcfg
+    params[:vcfg] ||= {
+      statuses: [ 'active', 'pending' ],
+      template: Iro::Purse::TEMPLATE_GAMEUI,
+    }
+    params[:vcfg].permit!
+  end
+
 
 end

data/app/controllers/iro/positions_controller.rb

@@ -39,9 +39,9 @@ class Iro::PositionsController < Iro::ApplicationController
     @position = Iro::Position.find params[:id]
     authorize! :close, @position
     @position.inner.sync
-    @position.inner.update({ begin_price: @position.inner.end_price })
+    # @position.inner.update({ begin_price: @position.inner.end_price })
     @position.outer.sync
-    @position.outer.update({ begin_price: @position.outer.end_price })
+    # @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} ..."
@@ -118,7 +118,20 @@ class Iro::PositionsController < Iro::ApplicationController
 
   def index
     authorize! :index, Iro::Position
-    @positions = Iro::Position.active
+    params[:vcfg] ||= {} # "view config"
+    template = params[:vcfg][:template] || Iro::Purse::TEMPLATE_TABLE
+
+    @purse = Iro::Purse.find_by( slug: 'all' )
+    @positions = Iro::Position.all().includes( :strategy, :inner, :outer, :stock, :purse
+      ).order_by( expires_on: :asc, ticker: :asc, long_or_short: :asc, inner_strike: :asc )
+
+    if params[:vcfg][:statuses]
+      @positions = @positions.where( :status.in => params[:vcfg][:statuses] )
+    end
+
+    puts! @positions
+
+    @page_title = 'All Positions'
   end
 
   ## only callable from _new.haml, with position partially pre-filled
@@ -138,23 +151,24 @@ class Iro::PositionsController < Iro::ApplicationController
     set_position_lists
   end
 
-  ## only credit-spread
+  ## only open   credit-spread,
+  ##      roll a 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 @position.update({ pending_price: params[:pending_price] })
+
+    if @position.schwab_order_id
+      Tda::Order.cancel_order!( @position.schwab_order_id )
+      outs = Tda::Order.place_order!( @position.schwab_query )
+      flag = @position.update({
+        schwab_order_id: outs[:schwab_order_id],
+        schwab_status:   outs[:schwab_status],
+        status:          Iro::Position::STATUS_PENDING,
+      })
+      flash_notice "Updated schwab order!"
+    end
 
-    flash_notice flag
-    # redirect_to controller: :purses, action: :show, template: 'show', view_status: 'pending', id: @position.purse_id
     redirect_to request.referrer
   end
 
@@ -180,21 +194,21 @@ class Iro::PositionsController < Iro::ApplicationController
     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
+  ## credit-spread
+  def open
     @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
+    @position.update({ pending_price: @position.open_price })
+    @query = @position.schwab_query # Tda::Order.credit_spread_q @position
   end
 
   ## 2025-10-14 long_credit_put_spread
   ## 2026-02-21 short_credit_call_spread
+  ## That's for looking at the ui, with buttons 'select'
   def prepare
     @position = Iro::Position.find params[:id]
     authorize! :roll, @position
@@ -212,23 +226,23 @@ class Iro::PositionsController < Iro::ApplicationController
     self.send("_prepare_#{@position.strategy.kind}")
   end
 
+  ## Manually selected one, I suppose
+  ## _TODO: pos is autonext position, but should be this position?
+  ## rename to: def select ?
   def prepare2
+    if params[:prev_id]
+      prev = Iro::Position.find params[:prev_id]
+      prev.update({ autonxt_id: params[:id] })
+      Iro::Position.where( prev_id: params[:prev_id], status: 'proposed' ).update_all( status: 'prepare' )
+    end
+
     @position = Iro::Position.find params[:id]
     authorize! :roll, @position
     @position.update({
       status: Iro::Position::STATUS_PROPOSED,
+      intent: @position.strategy.intent,
+      pending_price: @position.roll_price,
     })
-    if params[:prev_id]
-      prev = Iro::Position.find params[:prev_id]
-      prev.update({ autonxt_id: params[:id] })
-      @position.reload
-    else
-      if @position.autoprev
-        ;
-      else
-        throw 'Must pass prev_id here.'
-      end
-    end
 
     @query = case @position.strategy.kind
       when Iro::Strategy::KIND_LONG_CREDIT_PUT_SPREAD,
@@ -241,6 +255,28 @@ class Iro::PositionsController < Iro::ApplicationController
       end
   end
 
+  ## 2026-04-08 try-close only so far.
+  ## pos is this position, not autonext.
+  def prepare2_intent
+    @position = Iro::Position.find params[:id]
+    authorize! :roll, @position
+    case @position.strategy.intent
+      when Iro::Strategy::INTENT_CLOSE
+
+        @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
+
+      else
+        throw 'unknown intent - trt'
+      end
+
+  end
+
+
   ## credit-spread
   def place3
     @position = Iro::Position.find params[:id]

data/app/controllers/iro/purses_controller.rb

@@ -22,7 +22,7 @@ class Iro::PursesController < Iro::ApplicationController
   end
 
   def edit
-    @purse = Iro::Purse.find(params[:id])
+    @purse = Iro::Purse.unscoped.find(params[:id]) rescue Iro::Purse.unscoped.find_by( slug: params[:id] )
     authorize! :edit, @purse
   end
 
@@ -33,26 +33,20 @@ class Iro::PursesController < Iro::ApplicationController
 
   ## table or gameui
   def show
-    @purse = Iro::Purse.find(params[:id])
+    @purse = Iro::Purse.unscoped.find(params[:id]) rescue Iro::Purse.unscoped.find_by( slug: params[:id] )
     authorize! :show, @purse
-    params[:template]    ||= 'show'
-    params[:view_status] ||= 'active'
     @unit      = @purse.unit # 12  ## pixels per dollar
     @height    = @purse.height # 100  ## pixels
     @n_dollars = 50 ## * unit * 2 = length of the grid
 
-    @positions = @purse.positions.where( status: params[:view_status]
+    @positions = @purse.positions.where( :status.in => params[:vcfg][:statuses]
       ).includes( :strategy
       ).order_by( expires_on: :asc, ticker: :asc, long_or_short: :asc, inner_strike: :asc )
 
-    if 'all' == params[:view_status]
-      @positions = @positions.where( :status.in => Iro::Position::STATUSES )
-    end
-
     calc_summary
 
     @page_title = @purse.to_s
-    render params[:template]
+    render params[:vcfg][:template]
   end
 
   def sync
@@ -80,12 +74,12 @@ class Iro::PursesController < Iro::ApplicationController
       count = count+1
     end
 
-    flash[:notice] = 'Probably synced the purse.'
+    flash[:notice] = 'Synced the purse.'
     redirect_to request.referrer
   end
 
   def update
-    @purse = Iro::Purse.find(params[:id])
+    @purse = Iro::Purse.unscoped.find(params[:id]) rescue Iro::Purse.unscoped.find_by( slug: params[:id] )
     authorize! :update, @purse
     if @purse.update params[:purse].permit!
       flash[:notice] = 'ok'

data/app/controllers/iro/stocks_controller.rb

@@ -64,11 +64,8 @@ class Iro::StocksController < Iro::ApplicationController
     authorize! :refresh, Iro::Stock
     tickers = Iro::Stock.all.map { |s| s.ticker }.join(',')
     outs = Tda::Stock.get_quotes tickers
-    puts! outs, 'got all tickers'
 
     outs.map do |out|
-      puts! out, 'a ticker'
-
       Iro::Stock.where( ticker: out[:symbol] ).update_all( last: out[:last] )
     end
     flash_notice 'refreshed stocks'

data/app/views/iro/_main_header.haml

@@ -22,19 +22,21 @@
           -#   = link_to "Purses (#{Iro::Purse.all.length})", purses_path
           %li
             = render '/iro/strategies/header'
+          %li
+            = link_to 'Positions', iro.positions_path
 
 
         .ml-3
           = link_to "Purses (#{Iro::Purse.all.length})", purses_path
           = link_to '[+]', purses_path
           %ul
-            - @purses.each do |p|
+            - @purses.each do |purse|
               %li
-                = p
+                = purse
                  
-                = link_to '[#]', purse_path(p)
+                = link_to '[#]', purse_path(purse,  vcfg: params[:vcfg].merge({ template: Iro::Purse::TEMPLATE_TABLE }))
                  
-                = link_to '[ui]', purse_gameui_path(p)
+                = link_to '[oo]', purse_path(purse, vcfg: params[:vcfg].merge({ template: Iro::Purse::TEMPLATE_GAMEUI }))
 
         -#
           = link_to 'Strategies', strategies_path

data/app/views/iro/positions/_gameui_covered_call.haml

@@ -32,9 +32,3 @@
                 .label
                   net
                   = pp_amount pos.net_amount
-
-            -# .Breakeven{ style: "width: #{ pos.inner.begin_price * u }px" }
-            -#   .label
-            -#     Breakeven:
-            -#     = pos.inner.begin_price
-

data/app/views/iro/positions/_gameui_long_credit_put_spread.haml

@@ -8,8 +8,7 @@
 -# 2026-02-16 I have not verified any of this
 -#
 
-.collapse-expand.d-flex.--gameui-long-credit-put-spread{ id: "gameui-pos-#{pos.id}" }
-  [<>]
+.d-flex.--gameui-long-credit-put-spread{ id: "gameui-pos-#{pos.id}" }
   .maxwidth= render "/iro/positions/header", pos: pos
 .--gameui-long-credit-put-spread
   = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos
@@ -28,6 +27,9 @@
           .Position
             .MaxGain{ style: "width: #{pos.max_gain * u}px" }
             .RollGuide
+            .Quantities
+              - (pos.q-1).times do
+                .item
 
             - if pos.net_amount >= 0
               .Net.NetPositive{ style: "width: #{ pos.net_amount() *u}px;" }

data/app/views/iro/positions/_gameui_short_credit_call_spread.haml

@@ -10,8 +10,7 @@
 -## 2026-04-05 move loss inside, gain outside
 -##
 
-.collapse-expand.d-flex.--gameui-short-credit-call-spread{ id: "gameui-pos-#{pos.id}" }
-  [<>]
+.d-flex.--gameui-short-credit-call-spread{ id: "gameui-pos-#{pos.id}" }
   .maxwidth= render "/iro/positions/header", pos: pos
 .--gameui-short-credit-call-spread
   = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos
@@ -30,6 +29,9 @@
           .Position
             .MaxGain{ style: "width: #{pos.max_gain * u}px" }
             .RollGuide
+            .Quantities
+              - (pos.q-1).times do
+                .item
 
             - if pos.net_amount >= 0
               .Net.NetPositive{ style: "width: #{ pos.net_amount*u }px; left: #{-1* pos.net_amount() *u + border_px}px" }

data/app/views/iro/positions/_header.haml

@@ -1,9 +1,11 @@
 
 .positions--header.maxwidth
+
   = pos
-  = render '/iro/strategies/show', collapse_key: pos.id, strategy: pos.strategy
+  -# = render '/iro/strategies/show', collapse_key: pos.id, strategy: pos.strategy
   = link_to '[prepare]', position_prepare_to_roll_path(pos) if pos.persisted?
-  -# .d-inline-block= button_to 'close', close_position_path(pos), data: { confirm: 'Are you sure?' }
   = link_to '[close]', close_position_path(pos)
   = link_to '[~]',    edit_position_path(pos) if pos.persisted?
-  -# = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos
+  .d-inline-block= button_to 'x', position_path(pos), method: :delete, data: { confirm: 'Are you sure?' }
+  .gray &nbsp;<i>#{pos.status}</i>&nbsp;
+

data/app/views/iro/positions/_header_short_credit_call_spread.haml

@@ -6,13 +6,13 @@
 .maxwidth.positions--header.--header-short-credit-call-spread
   %ul
     %li
-      <b>begin $:</b> [#{pp_amount pos.inner.begin_price} -> #{pp_amount pos.outer.begin_price}]
+      <b>begin $:</b> [#{pp_amount pos.inner.begin_price} >> #{pp_amount pos.outer.begin_price}]
       <b>D:</b> [[#{pos.inner.begin_delta} >> #{pos.outer.begin_delta}]]
       <b>net_ea/max_gain_ea:</b> #{pp_amount pos.net_amount * 100}/#{pp_amount pos.max_gain * 100} :: #{pp_percent pos.net_percent}
       <b>breakeven:</b> #{pp_amount pos.breakeven}
       <b>max_loss:</b> #{pp_amount pos.max_loss * 100*q}
     %li
-      <b>end $:</b> [#{pp_amount pos.inner.end_price} -> #{pp_amount pos.outer.end_price}]
+      <b>end $:</b> [#{pp_amount pos.inner.end_price} >> #{pp_amount pos.outer.end_price}]
       <b>D:</b> [[#{pos.inner.end_delta} >> #{pos.outer.end_delta}]]
       <b>net*q</b> #{pp_amount pos.net_amount * 100*q}
       <b>max_gain*q:</b> #{pp_amount pos.max_gain * 100*q}

data/app/views/iro/positions/_prepare_header_long_credit_put_spread.haml

@@ -5,12 +5,12 @@
 .maxwidth.--prepare-header-long-credit-put-spread
   %ul.m-0.p-0
     %li
-      <b>begin_outer_price:</b> #{pp_amount pos.outer.begin_price}
-      <b>begin_inner_price:</b> #{pp_amount pos.inner.begin_price}
-      <b>max_gain:</b> #{pp_amount pos.max_gain * 100}
-      <b>breakeven:</b> #{pp_amount pos.breakeven}
-      <b>Net:</b> #{pp_amount pos.next_gain_loss_amount}
+      #{pos.expires_on} [#{pp_amount pos.outer.strike} << #{pp_amount pos.inner.strike}] &nbsp;
+      <b>net_ea:</b> #{pp_amount pos.next_gain_loss_amount} &nbsp;
+      <b>max_loss_ea:</b> #{pp_amount pos.max_loss * 100} &nbsp;
     %li
-      #{pos.expires_on} <b>#{pos.strategy.kind}</b> [#{pp_amount pos.outer.strike} <- #{pp_amount pos.inner.strike}]
-      <b>max_loss:</b> #{pp_amount pos.max_loss * 100}
-    %li
+      <b>begin $:</b> [#{pp_amount pos.outer.begin_price} << #{pp_amount pos.inner.begin_price}] &nbsp;
+      <b>D:</b> [[#{pos.outer.begin_delta} << #{pos.inner.begin_delta}]] &nbsp;
+      <b>max_gain_ea:</b> #{pp_amount pos.max_gain * 100} &nbsp;
+      <b>breakeven:</b> #{pp_amount pos.breakeven} &nbsp;
+

data/app/views/iro/positions/_prepare_header_short_credit_call_spread.haml

@@ -5,15 +5,13 @@
 .maxwidth.--prepare-header-short-credit-call-spread
   %ul.m-0.p-0
     %li
-      -# 2026-02-24 this ordering
-      <b>begin_inner_price:</b> #{pp_amount pos.inner.begin_price}
-      <b>begin_outer_price:</b> #{pp_amount pos.outer.begin_price}
-      <b>max_gain_ea:</b> #{pp_amount pos.max_gain * 100}
-      <b>breakeven:</b> #{pp_amount pos.breakeven}
-      <b>Net Ea:</b> #{pp_amount pos.next_gain_loss_amount}
-    %li
-      -# 2026-02-24 this ordering
-      #{pos.expires_on} <b>#{pos.strategy.kind}</b> [#{pp_amount pos.inner.strike} -> #{pp_amount pos.outer.strike}]
-      <b>max_loss_ea:</b> #{pp_amount pos.max_loss * 100}
+      #{pos.expires_on} [#{pp_amount pos.inner.strike} >> #{pp_amount pos.outer.strike}] &nbsp;
+      <b>net_ea:</b> #{pp_amount pos.next_gain_loss_amount} &nbsp;
+      <b>max_loss_ea:</b> #{pp_amount pos.max_loss * 100} &nbsp;
     %li
+      <b>begin $:</b> [#{pp_amount pos.inner.begin_price} >> #{pp_amount pos.outer.begin_price}] &nbsp;
+      <b>D:</b> [[#{pos.inner.begin_delta} >> #{pos.outer.begin_delta}]] &nbsp;
+      <b>max_gain_ea:</b> #{pp_amount pos.max_gain * 100} &nbsp;
+      <b>breakeven:</b> #{pp_amount pos.breakeven} &nbsp;
+
 

data/app/views/iro/positions/_table.haml

@@ -8,6 +8,9 @@
           = form_tag positions_path, method: :delete, id: 'positionsXmultiSubmit' do
             = hidden_field_tag "positions_xmulti", ''
             = submit_tag 'X-multi', data: { confirm: 'Are you sure?' }
+
+        %th.intent
+          Intent
         %th.ticker
           .a Stock
         %th
@@ -52,6 +55,7 @@
             %td{ colspan: 18 }
               .h-50px
 
+        -## Renders the same thing regardless of strategy!
         = render "iro/positions/table_tr_#{position.strategy.kind}", position: position