iron_warbler 2.0.7.24 → 2.0.7.26

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

@@ -17,12 +17,11 @@
             Strategy
         %th.q Q
         %th.strikes
-          -# .a outer_strike, inner_strike
           Strike
         %th.begin_price
-          .a Begin outer price, delta
+          .a Begin price, delta
         %th.max-loss Max Loss
-        %th.max-gain Max Gain
+        -# %th.max-gain Max Gain
         %th
           .end_price End Price, delta
         %th
@@ -64,9 +63,8 @@
               = link_to '[~]', edit_position_path(position)
               = link_to '[dup]', duplicate_position_path(position)
             .d-flex
-              = link_to '[re]', refresh_position_path(pos)
-              - if true # position.next_reasons.present? && position.rollp > 0.5
-                = link_to '[roll]', prepare_to_roll_position_path(pos)
+              = link_to '[sync]', sync_position_path(pos)
+              = link_to '[roll]', prepare_to_roll_position_path(pos)
 
           %td.ticker
             = position.stock.ticker
@@ -88,32 +86,32 @@
             <b>#{position.quantity}</b>
           %td.strikes
             .long-or-short-item
-              .outer-strike= pp_amount position.outer_strike
-              .inner-strike= pp_amount position.inner_strike
+              .outer-strike= pp_amount position.outer.strike
+              .inner-strike= pp_amount position.inner.strike
 
           %td.begin_price
             .long-or-short-item
               .begin-outer-price
-                = pp_amount position.begin_outer_price
-                <b>D</b> #{pp_delta position.begin_outer_delta}
+                = pp_amount position.outer.begin_price
+                &nbsp;<b>D</b>&nbsp; #{pp_delta position.outer.begin_delta}
               .begin-inner-price
-                = pp_amount position.begin_inner_price
-                <b>D</b> #{pp_delta position.begin_inner_delta}
+                = pp_amount position.inner.begin_price
+                &nbsp;<b>D</b>&nbsp; #{pp_delta position.inner.begin_delta}
           %td
             .max-loss= pp_amount position.max_loss * pos.q * 100, precision: 0
-          %td
-            .max-gain= pp_amount position.max_gain * pos.q * 100, precision: 0
-            .max-gainp
-              -# = pp_percent( -1 * position.max_gain / position.max_loss ) rescue '-' # undef. for covered calls
+          -# %td
+          -#   .max-gain= pp_amount position.max_gain * pos.q * 100, precision: 0
+          -#   .max-gainp
+          -#     -# = pp_percent( -1 * position.max_gain / position.max_loss ) rescue '-' # undef. for covered calls
 
-          %td.end_price
+          %td.end
             .long-or-short-item
               .end-outer-price
-                = pp_amount position.end_outer_price
-                <b>D</b> #{pp_delta position.end_outer_delta}
+                = pp_amount position.outer.end_price
+                &nbsp;<b>D</b>&nbsp; #{pp_delta position.outer.end_delta}
               .end-inner-price
-                = pp_amount position.end_inner_price
-                <b>D</b> #{pp_delta position.end_inner_delta}
+                = pp_amount position.inner.end_price
+                &nbsp;<b>D</b>&nbsp; #{pp_delta position.inner.end_delta}
           %td.net
             .a= pp_amount position.net_amount * pos.q * 100, precision: 0 rescue '@TODO'
             .a <i>#{pp_percent position.net_amount / position.max_gain rescue '@TODO'}</i>
@@ -128,12 +126,13 @@
             - if position.next_reasons.present?
               %i.fa.fa-expand.collapse-expand{ id: "pos-reasons-#{position.id}" } reasons
               = render '/iro/positions/reasons', reasons: position.next_reasons
-            .a= position.next_symbol
-            .a= position.next_delta
+            .a= position.autonxt
             .a
-              = pp_amount position.next_mark
-              \=>
-              = pp_amount position.next_outcome * 100 * position.quantity rescue nil
+              - if pos.autonxt
+                = link_to '[autonxt]', prepare2_position_path(pos.autonxt)
+                = pp_amount pos.autonxt.prev_gain_loss_amount
+              -# \=>
+              -# = pp_amount position.next_outcome * 100 * position.quantity rescue nil
 
 
 

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

@@ -14,10 +14,12 @@
 
         = render "/iro/positions/gameui_#{pos.strategy.kind}", position: pos
 
-        - @positions.each_with_index do |pos, idx|
-          .reviewing
-            = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos, collapse_key: 'roll'
-            = render "/iro/positions/prepare_#{pos.strategy.kind}", pos: pos
+        %div{ class: pos.long_or_short }
+          .long-or-short-item{ style: "border-left: 0" }
+            - @positions.each_with_index do |pos, idx|
+              .reviewing
+                = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos, collapse_key: 'roll'
+                = render "/iro/positions/prepare_#{pos.strategy.kind}", pos: pos
 
 
 

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

@@ -0,0 +1,22 @@
+
+- pos = @position
+
+-## long call spread
+%ul
+  %li
+    buy to close
+    = pos.autoprev.inner
+  %li
+    sell to close
+    = pos.autoprev.outer
+  %li
+    buy to open
+    = pos.outer
+  %li
+    sell to open
+    = pos.inner
+  %li
+    Query
+    %pre= JSON.pretty_generate( @query )
+
+= button_to 'Place Order', prepare3_position_path(@position), data: { confirm: 'Are you sure?' }

data/app/views/iro/purses/_form_extra_fields.haml

@@ -4,12 +4,18 @@
   = f.number_field :unit
   px/usd
     
-
   %label height
   = f.number_field :height
-  px
+  px/q
+    
+
+  %label summary_unit
+  = f.number_field :summary_unit, step: 0.000001, style: "width: 120px"
+  px/usd
     
 
+
+
   %label mark_every_n_usd
   = f.number_field :mark_every_n_usd, step: 0.01
     
@@ -18,8 +24,6 @@
   = f.number_field :n_next_positions
     
 
-  %label summary_scale
-  = f.number_field :summary_scale, step: 0.0001, style: "width: 120px"
 
     
 

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

@@ -5,13 +5,27 @@
   %h5.title
     Purse `#{purse.slug}`
     = link_to '[~]', edit_purse_path(purse)
-    = link_to '[view]', purse_path(purse)
-    = link_to '[gameUI]', gameui_purse_path(purse)
+    = link_to '[table]', purse_path(purse)
+    = link_to '[gameUI]', purse_gameui_path(purse)
     (#{purse.positions.length})
 
-  = link_to '[+position]', new_position_path({ purse_id: purse.id })
-  -# = link_to '[+long]',     new_position_path({ purse_id: purse.id, long_or_short: Iro::Strategy::LONG })
-  = link_to '[+short]',    new_position_path({ purse_id: purse.id, long_or_short: Iro::Strategy::SHORT })
+.d-flex
+
+  .Card.d-flex
+    = form_for Iro::Position.new(strategy: Iro::Strategy.new), url: new_position_path, method: :get do |f|
+      .a +Position
+      = hidden_field_tag 'position[purse_id]', purse.id
+      .field
+        = f.select :strategy_id, options_for_select(@strategies_list)
+      -# .field
+      -#   = f.radio_button :long_or_short, :long
+      -#   %label long
+      -#   = f.radio_button :long_or_short, :short
+      -#   %label short
+      = f.submit 'Go'
+    -# = link_to '[+position]', new_position_path({ purse_id: purse.id })
+    -# = link_to '[+short]',    new_position_path({ purse_id: purse.id, long_or_short: Iro::Strategy::SHORT })
+
 
 - if true || params[:template] == 'gameui'
   .mini-inputs

data/app/views/iro/purses/_summary.haml

@@ -1,69 +1,76 @@
 
 - u = @purse.unit
-- s_mult = @purse.summary_scale
+- summary_unit = @purse.summary_unit
 - collapse_key ||= nil
 
-%i.fa.fa-expand.collapse-expand{ id: "pursesSummary_#{collapse_key}", style: "margin-left: -1em;" } Summary
-.PurseSummaryW
-
-  .PurseSummary
-    -## loss
-    .summary-amount
-      .max-gl.long.loss{ style: "height: #{@max_loss_long *-1*s_mult*u}px" }
-      .max-gl.short.loss{ style: "height: #{@max_loss_short *-1*s_mult*u}px" }
-      - if @loss_long
-        .net-gl.loss.long.loss-long{ style: "height: #{@loss_long *-1*s_mult*u}px" }
-      - if @loss_short
-        .net-gl.loss.short.loss-short{ style: "height: #{@loss_short *-1*s_mult*u}px" }
-
-    .summary-delta
-      .begin.long{ style: "height: #{@begin_delta_long *s_mult*10000*u}px" }
-      .begin.short{ style: "height: #{@begin_delta_short *s_mult*10000*u}px" }
-      .end.long{ style: "height: #{@end_delta_long *s_mult*10000*u}px" }
-      .end.short{ style: "height: #{@end_delta_short *s_mult*10000*u}px" }
-
-    -## gain
-    .summary-amount
-      .max-gl.long.gain{ style: "height: #{@max_gain_long *s_mult*u}px" }
-      .max-gl.short.gain{ style: "height: #{@max_gain_short *s_mult*u}px" }
-      - if @gain_long
-        .net-gl.gain.long.gain-long{ style: "height: #{@gain_long *s_mult*u}px" }
-      - if @gain_short
-        .net-gl.gain.short.gain-short{ style: "height: #{@gain_short *s_mult*u}px" }
-
-
-
-
-
-
-    .legendW
-      .legend
-        %ul
-          %li
-            <b>exposure long:</b> #{pp_amount @max_loss_long *-1}
-            <b>short:</b> #{pp_amount @max_loss_short *-1}
-          %li
-            <b>max loss long:</b> #{pp_amount [ @max_loss_long + @max_gain_short, 0].min }
-            <b>short:</b> #{pp_amount [ @max_loss_short + @max_gain_long, 0].min }
-          %li.gray
-            <b>max gain long:</b> #{pp_amount @max_gain_long}
-            <b>short:</b> #{pp_amount @max_gain_short}
-
-          %li
-            %hr
-            <b>gain long:</b> #{pp_amount @gain_long}
-            <b>short:</b> #{pp_amount @gain_short}
-          %li
-            <b>loss long:</b> #{pp_amount @loss_long}
-            <b>short:</b> #{pp_amount @loss_short}
+- if @purse.positions.present?
+  %i.fa.fa-expand.collapse-expand{ id: "pursesSummary_#{collapse_key}", style: "margin-left: -1em;" } Summary
+  .PurseSummaryW
+    .PurseSummary
+
+      .summary-amount
+        .max-gl.long.loss{  style: "height: #{@max_loss_long  *-1*summary_unit*u}px" }
+          %label Long Loss
+          .delta
+            .begin.long{  style: "height: #{@purse.delta_to_plot_p( :begin, :long, :inner )}" }
+            .end.long{    style: "height: #{@purse.delta_to_plot_p( :end,   :long, :inner )}" }
+
+        .max-gl.short.loss{ style: "height: #{@max_loss_short *-1*summary_unit*u}px" }
+          %label Short Loss
+          .delta
+            .begin.short{  style: "height: #{@purse.delta_to_plot_p( :begin, :short, :inner )}" }
+            .end.short{    style: "height: #{@purse.delta_to_plot_p( :end,   :short, :inner )}" }
+
+        - if @loss_long
+          .net-gl.loss.long.loss-long{   style: "height: #{@loss_long  *-1*summary_unit*u}px" }
+        - if @loss_short
+          .net-gl.loss.short.loss-short{ style: "height: #{@loss_short *-1*summary_unit*u}px" }
+
+      -# %label Gain
+      .summary-amount
+        .max-gl.long.gain{  style: "height: #{@max_gain_long  *summary_unit*u}px" }
+        .max-gl.short.gain{ style: "height: #{@max_gain_short *summary_unit*u}px" }
+        - if @gain_long
+          .net-gl.gain.long.gain-long{   style: "height: #{@gain_long  *summary_unit*u}px" }
+        - if @gain_short
+          .net-gl.gain.short.gain-short{ style: "height: #{@gain_short *summary_unit*u}px" }
+
+
+
+
+
+
+      .legendW
+        .legend
+          %ul
+            %li
+              <b>exposure long:</b> #{pp_amount @max_loss_long *-1}
+              <b>short:</b> #{pp_amount @max_loss_short *-1}
+            %li
+              <b>max loss long:</b> #{pp_amount [ @max_loss_long + @max_gain_short, 0].min }
+              <b>short:</b> #{pp_amount [ @max_loss_short + @max_gain_long, 0].min }
+            %li.gray
+              <b>max gain long:</b> #{pp_amount @max_gain_long}
+              <b>short:</b> #{pp_amount @max_gain_short}
+
+            %li
+              %hr
+              <b>gain long:</b> #{pp_amount @gain_long}
+              <b>short:</b> #{pp_amount @gain_short}
+            %li
+              <b>loss long:</b> #{pp_amount @loss_long}
+              <b>short:</b> #{pp_amount @loss_short}
+
+            %li
+              %hr
+              <b>Delta long begin:</b> #{pp_delta @purse.delta_wt_avg( :begin, :long, :inner )}
+              <b>end:</b> #{pp_delta @purse.delta_wt_avg( :end, :long, :inner )}
+            %li
+              <b>Delta short begin:</b> #{pp_delta @purse.delta_wt_avg( :begin, :short, :inner )}
+              <b>end:</b> #{pp_delta @purse.delta_wt_avg( :end, :short, :inner )}
 
-          %li
             %hr
-            <b>begin D long:</b> #{pp_delta @begin_delta_long}
-            <b>short:</b> #{pp_delta @begin_delta_short}
-            <b>net:</b> #{pp_delta @begin_delta_long - @begin_delta_short}
-          %li
-            <b>end D long:</b> #{pp_delta @end_delta_long}
-            <b>short:</b> #{pp_delta @end_delta_short}
-            <b>net:</b> #{pp_delta @end_delta_long - @end_delta_short}
+            %li
+              <b>Available amount:</b> #{@purse.available_amount}
+
 

data/app/views/iro/purses/show.haml

@@ -5,4 +5,4 @@
       = render '/iro/purses/header', purse: @purse
     .col-md-6
       = render '/iro/purses/summary', purse: @purse, collapse_key: 'views-show'
-  = render '/iro/positions/table', positions: @purse.positions
+  = render '/iro/positions/table', positions: @positions

data/app/views/iro/strategies/_form.haml

@@ -4,45 +4,52 @@
     .actions
       = f.submit
 
-
-    .field
-      %label Kind
-      = f.select :kind, options_for_select( Iro::Strategy::KINDS, selected: strategy.kind )
-    .field
-      %label stock
-      = f.select :stock_id, options_for_select(@stocks_list, selected: strategy.stock_id), class: 'select2'
-    .field
-      %label slug
-      = f.text_field :slug
-    .field
-      %label long or short?
-      = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: strategy.long_or_short)
+    .row
+      .col-md-6
+        .field
+          %label Kind
+          = f.select :kind, options_for_select( Iro::Strategy::KINDS, selected: strategy.kind )
+        .field
+          %label long or short?
+          = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: strategy.long_or_short)
+        .field
+          %label stock
+          = f.select :stock_id, options_for_select(@stocks_list, selected: strategy.stock_id), class: 'select2'
+
+      .col-md-6
+        .field
+          %label slug
+          = f.text_field :slug
+    %hr
 
 
     .field
       = f.label :buffer_above_water
       = f.number_field :buffer_above_water, placeholder: "0.49", step: 0.01
+    .field
+      = f.label :min_dte
+      = f.number_field :min_dte, placeholder: "0"
     -# .field
     -#   = f.label :next_max_outer_delta
     -#   = f.number_field :next_max_outer_delta, placeholder: "0.25", step: 0.01
     .field
       = f.label :next_inner_delta
-      = f.number_field :next_inner_delta, placeholder: "0.25", step: 0.01
+      = f.number_field :next_inner_delta, placeholder: "0.25", step: 0.001
     .field
       = f.label :next_inner_strike
       = f.number_field :next_inner_strike, placeholder: "20.0", step: 0.01
     .field
       = f.label :next_spread_amount
       = f.number_field :next_spread_amount, placeholder: "20", step: 0.1
+    .field
+      = f.label :next_buffer_above_water
+      = f.number_field :next_buffer_above_water, placeholder: "80", step: 0.01
     .field
       = f.label :threshold_delta
-      = f.number_field :threshold_delta, placeholder: "0.14", step: 0.01
+      = f.number_field :threshold_delta, placeholder: "0.14", step: 0.001
     .field
       = f.label :threshold_netp
-      = f.number_field :threshold_netp, placeholder: "0.69", step: 0.01
-    -# .field
-    -#   = f.label :current_underlying_strike
-    -#   = f.number_field :current_underlying_strike, placeholder: "16.66", step: 0.01
+      = f.number_field :threshold_netp, placeholder: "0.69", step: 0.001
 
     .actions
       = f.submit

data/app/views/iro/strategies/_show.haml

@@ -6,14 +6,16 @@
     = strategy
   %ul
     -# %li <b>ticker:</b> #{strategy.ticker}
-    %li <b>slug:</b> #{strategy.slug}
+    -# %li <b>slug:</b> #{strategy.slug}
 
     %li <b>buffer_above_water:</b> #{strategy.buffer_above_water}
+    %li <b>threshold_delta:</b> #{strategy.threshold_delta}
+    %li <b>threshold_netp:</b> #{strategy.threshold_netp}
+
+    %hr
 
     %li <b>next_inner_delta:</b> #{strategy.next_inner_delta}
     -# %li <b>next_outer_delta:</b> #{strategy.next_max_outer_delta}
     %li <b>next_inner_strike:</b> #{strategy.next_inner_strike}
-
-    %li <b>threshold_delta:</b> #{strategy.threshold_delta}
-    %li <b>threshold_netp:</b> #{strategy.threshold_netp}
+    %li <b>next_spread_amount:</b> #{strategy.next_spread_amount}
 

data/config/routes.rb

@@ -9,19 +9,22 @@ Iro::Engine.routes.draw do
 
   resources :option_watches
 
-  get  'positions/duplicate/:id', to: 'positions#new',   as: :duplicate_position
-  post 'positions/propose', to: 'positions#propose',     as: :propose_position
-  get  'positions/:id/prepare', to: 'positions#prepare', as: :prepare_to_roll_position, defaults: { template: 'gameui' }
-  post 'positions/:id/roll', to: 'positions#do_roll',    as: :roll_position
-  get  'positions/:id/refresh', to: 'positions#refresh', as: :refresh_position
+  match 'positions/:id/close', to: 'positions#close', as: :close_position, via: [ :get, :post ]
+  get  'positions/duplicate/:id', to: 'positions#new',    as: :duplicate_position
+  post 'positions/propose', to: 'positions#propose',      as: :propose_position
+  get  'positions/:id/prepare', to: 'positions#prepare',  as: :prepare_to_roll_position, defaults: { template: 'gameui' }
+  match  'positions/:id/prepare2', to: 'positions#prepare2', as: :prepare2_position, defaults: { template: 'gameui' }, via: [ :get, :post ]
+  match  'positions/:id/prepare3', to: 'positions#prepare3', as: :prepare3_position, defaults: { template: 'gameui' }, via: [ :get, :post ]
+  post 'positions/:id/roll', to: 'positions#do_roll',     as: :roll_position
+  get  'positions/:id/sync', to: 'positions#sync',  as: :sync_position
   resources :positions
   resources :profiles
 
-  get 'purses/:id/gameui', to: 'purses#show', as: :gameui_purse, defaults: { template: 'gameui' }
+  get 'purses/:id/gameui', to: 'purses#show', as: :purse_gameui, defaults: { template: 'gameui' }
   get 'purses/:id', to: 'purses#show', as: :purse, defaults: { template: 'show' }
   resources :purses
 
-  get 'stocks/refresh', to: 'stocks#refresh', as: :refresh_stocks
+  get 'stocks/sync', to: 'stocks#sync', as: :sync_stocks
   resources :stocks
 
   resources :strategies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.7.24
+  version: 2.0.7.26
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: business_time
@@ -217,6 +217,7 @@ files:
 - app/assets/config/iron_warbler_manifest.js
 - app/assets/javascript/iron_warbler/application.js
 - app/assets/javascript/iron_warbler/gameui.js
+- app/assets/stylesheets/iron_warbler/Card.scss
 - app/assets/stylesheets/iron_warbler/application.css
 - app/assets/stylesheets/iron_warbler/positions.scss
 - app/assets/stylesheets/iron_warbler/positions_gameui.scss
@@ -242,6 +243,7 @@ files:
 - app/models/iro/datapoint.rb
 - app/models/iro/date.rb
 - app/models/iro/option.rb
+- app/models/iro/option_black_scholes.rb
 - app/models/iro/position.rb
 - app/models/iro/price_item.rb
 - app/models/iro/purse.rb
@@ -256,12 +258,15 @@ files:
 - app/views/iro/alerts/index.haml
 - app/views/iro/api/stocks/show.jbuilder
 - app/views/iro/application/home.haml
+- app/views/iro/options/_show_mini.haml
 - app/views/iro/positions/_form.haml
 - app/views/iro/positions/_formpart_4data.haml
 - app/views/iro/positions/_gameui_covered_call.haml
 - app/views/iro/positions/_gameui_covered_call.haml-bk
 - app/views/iro/positions/_gameui_long_debit_call_spread.haml
+- app/views/iro/positions/_gameui_long_debit_call_spread.haml-trash
 - app/views/iro/positions/_gameui_short_debit_put_spread.haml
+- app/views/iro/positions/_gameui_short_debit_put_spread.haml-trash
 - app/views/iro/positions/_header.haml
 - app/views/iro/positions/_header_covered_call.haml
 - app/views/iro/positions/_header_long_debit_call_spread.haml
@@ -274,6 +279,7 @@ files:
 - app/views/iro/positions/edit.haml
 - app/views/iro/positions/new.haml
 - app/views/iro/positions/prepare.haml
+- app/views/iro/positions/prepare2.haml
 - app/views/iro/positions/roll-cc.haml-bk
 - app/views/iro/positions/roll.haml-trash
 - app/views/iro/purses/_form.haml

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

@@ -1,40 +0,0 @@
-
-- pos   = position
-- stock = pos.stock
-- nearest_strike = stock.last.round
-- u = pos.purse.unit # pixels per dollar
-
-
-.collapse-expand.d-flex{ id: "gameui-pos-#{pos.id}" }
-  [<>]
-  .maxwidth= render "/iro/positions/header", pos: pos
-.a
-  = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos
-  .StockCoordinatesW
-    .StockCoordinates{ style: "height: #{pos.q() *u}px " }
-      .grid= render "/iro/stocks/grid_#{pos.strategy.long_or_short}", stock: stock, position: pos
-
-      .Origin{ style: "left: #{ ( nearest_strike - stock.last )* u}px" }
-        .label Last: #{pp_amount stock.last}
-        .c
-
-        -## these are different
-        - left  = "#{ ( stock.last - pos.outer_strike ) * u}px"
-        - width = "#{ ( pos.outer_strike - pos.inner_strike ) * u}px"
-        .PositionW{ class: pos.strategy.kind, style: "left: #{left}; width: #{width}; " }
-          .Position
-            .MaxGain{ style: "width: #{pos.max_gain * u}px" }
-            .RollGuide
-
-            - if pos.net_amount >= 0
-              .Net.NetPositive{ style: "width: #{ (pos.net_amount / 100) * u }px; right: 0" }
-                .label
-                  net
-                  = pp_amount pos.net_amount
-            - else
-              .Net.NetNegative{ style: "width: #{ (-1 * pos.net_amount / 100) * u }px; left: 100%" }
-                .label
-                  net
-                  = pp_amount pos.net_amount
-.c
-