iron_warbler 2.0.7.21 → 2.0.7.23

data/app/views/iro/stocks/_grid_is_long.haml

@@ -1,7 +1,7 @@
 
 - nearest_strike = stock.last.round
-- u       = @purse.unit
-- every_n = @purse.mark_every_n_usd
+- u       = position.purse.unit
+- every_n = position.purse.mark_every_n_usd
 
 .grid-mark.mark0
   .label

data/app/views/iro/stocks/_grid_is_short.haml

@@ -1,7 +1,7 @@
 
 - nearest_strike = stock.last.round
-- u       = @purse.unit
-- every_n = @purse.mark_every_n_usd
+- u       = position.purse.unit
+- every_n = position.purse.mark_every_n_usd
 
 .grid-mark.mark0
   .label

data/app/views/iro/stocks/index.haml

@@ -1,6 +1,7 @@
 
-.stocks--index
-  %h5 Stocks [+]
+.stocks--index.padded
+  .maxwidth
+    %h5 Stocks
 
   %ul
     - @stocks.each do |stock|

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

@@ -8,6 +8,9 @@
     .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
@@ -19,15 +22,18 @@
     .field
       = f.label :buffer_above_water
       = f.number_field :buffer_above_water, placeholder: "0.49", step: 0.01
+    -# .field
+    -#   = f.label :next_max_outer_delta
+    -#   = f.number_field :next_max_outer_delta, placeholder: "0.25", step: 0.01
     .field
-      = f.label :next_max_outer_delta
-      = f.number_field :next_max_outer_delta, placeholder: "0.25", step: 0.01
+      = f.label :next_inner_delta
+      = f.number_field :next_inner_delta, placeholder: "0.25", step: 0.01
     .field
-      = f.label :next_max_inner_delta
-      = f.number_field :next_max_inner_delta, placeholder: "0.25", step: 0.01
+      = f.label :next_inner_strike
+      = f.number_field :next_inner_strike, placeholder: "20.0", step: 0.01
     .field
-      = f.label :next_min_strike
-      = f.number_field :next_min_strike, placeholder: "20.0", step: 0.01
+      = f.label :next_spread_amount
+      = f.number_field :next_spread_amount, placeholder: "20", step: 0.1
     .field
       = f.label :threshold_delta
       = f.number_field :threshold_delta, placeholder: "0.14", step: 0.01

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

@@ -10,9 +10,9 @@
 
     %li <b>buffer_above_water:</b> #{strategy.buffer_above_water}
 
-    %li <b>next_max_inner_delta:</b> #{strategy.next_max_inner_delta}
-    %li <b>next_max_outer_delta:</b> #{strategy.next_max_outer_delta}
-    %li <b>next_min_strike:</b> #{strategy.next_min_strike}
+    %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}

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

@@ -9,16 +9,25 @@
         %th.actions  
         %th kind
         %th slug
-        %th next_max_inner_delta
+        %th next_inner_delta
+        %th.actions  
     %tbody
       - strategies.each do |sss|
         %tr
-          %td.actions.d-flex
-            = link_to '[~]', edit_strategy_path(sss)
-            = button_to 'x', strategy_path(sss), method: :delete, data: { confirm: 'Are you sure?' }
+          %td.actions
+            .d-flex
+              = link_to '[~]', edit_strategy_path(sss)
+              = button_to 'x', strategy_path(sss), method: :delete, data: { confirm: 'Are you sure?' }
           %td= sss.kind
-          %td= sss.slug
-          %td= sss.next_max_inner_delta
+          %td= link_to sss.slug, strategy_path(sss)
+          %td= sss.next_inner_delta
+          %td
+            = form_tag propose_position_path do
+              = hidden_field_tag :strategy_id, sss.id
+              .d-flex
+                %label new position for
+                = select_tag :purse_id, options_for_select(@purses_list), class: 'select2'
+                = submit_tag 'Go'
 
   .h-50px
 

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

@@ -0,0 +1,14 @@
+
+.strategies-show.maxwidth
+  .header
+    %h5.title Strategy #{@strategy}
+    %ul
+      -# %li Purse #{@strategy.purses}
+      -# %li= link_to 'Next position', strategy_next_position_path(@strategy)
+
+  .row
+    .col-md-6
+      = render '/iro/strategies/form', strategy: @strategy
+    .col-md-6
+      %h5 Next Position:
+

data/app/views/layouts/iro/application.haml

@@ -48,6 +48,10 @@
 
     %span.absolute.collapse-expand#mainW
     = yield
+    %br
+    %br
 
     = render '/wco/main_footer'
     = render '/iro/analytics' if Rails.env.production?
+    %br
+    %br

data/config/routes.rb

@@ -9,8 +9,10 @@ Iro::Engine.routes.draw do
 
   resources :option_watches
 
-  get  'positions/:id/roll', to: 'positions#roll', as: :roll_position
-  post 'positions/:id/roll', to: 'positions#do_roll'
+  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
   resources :positions
   resources :profiles
@@ -19,7 +21,9 @@ Iro::Engine.routes.draw do
   get 'purses/:id', to: 'purses#show', as: :purse, defaults: { template: 'show' }
   resources :purses
 
+  get 'stocks/refresh', to: 'stocks#refresh', as: :refresh_stocks
   resources :stocks
+
   resources :strategies
 
   namespace :api do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.7.21
+  version: 2.0.7.23
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: business_time
@@ -204,8 +204,10 @@ files:
 - app/assets/javascript/iron_warbler/gameui.js
 - app/assets/stylesheets/iron_warbler/application.css
 - app/assets/stylesheets/iron_warbler/positions.scss
+- app/assets/stylesheets/iron_warbler/positions_gameui.scss
 - app/assets/stylesheets/iron_warbler/purses_gameui.scss
 - app/assets/stylesheets/iron_warbler/purses_gameui.scss-bk
+- app/assets/stylesheets/iron_warbler/purses_summary.scss
 - app/assets/stylesheets/iron_warbler/utils.scss
 - app/controllers/iro/alerts_controller.rb
 - app/controllers/iro/api/stocks_controller.rb
@@ -218,7 +220,7 @@ files:
 - app/controllers/iro/stocks_controller.rb
 - app/controllers/iro/strategies_controller.rb
 - app/helpers/iro/application_helper.rb
-- app/jobs/tda_job.rb
+- app/jobs/tda_job.rb-bk
 - app/mailers/iro/alert_mailer.rb
 - app/mailers/iro/application_mailer.rb
 - app/models/iro/alert.rb
@@ -251,15 +253,20 @@ files:
 - app/views/iro/positions/_header_covered_call.haml
 - app/views/iro/positions/_header_long_debit_call_spread.haml
 - app/views/iro/positions/_header_short_debit_put_spread.haml
+- app/views/iro/positions/_prepare_covered_call.haml
+- app/views/iro/positions/_prepare_long_debit_call_spread.haml
+- app/views/iro/positions/_prepare_short_debit_put_spread.haml
 - app/views/iro/positions/_reasons.haml
 - app/views/iro/positions/_table.haml
 - app/views/iro/positions/edit.haml
 - app/views/iro/positions/new.haml
-- app/views/iro/positions/roll.haml
-- app/views/iro/positions/trash/_header_short_debit_put_spread.haml
+- app/views/iro/positions/prepare.haml
+- app/views/iro/positions/roll-cc.haml-bk
+- app/views/iro/positions/roll.haml-trash
 - app/views/iro/purses/_form.haml
 - app/views/iro/purses/_form_extra_fields.haml
 - app/views/iro/purses/_header.haml
+- app/views/iro/purses/_summary.haml
 - app/views/iro/purses/edit.haml
 - app/views/iro/purses/gameui.haml
 - app/views/iro/purses/gameui.haml-bk
@@ -277,6 +284,7 @@ files:
 - app/views/iro/strategies/edit.haml
 - app/views/iro/strategies/index.haml
 - app/views/iro/strategies/new.haml
+- app/views/iro/strategies/show.haml
 - app/views/layouts/iro/application.haml
 - config/initializers/assets.rb
 - config/routes.rb

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

@@ -1,83 +0,0 @@
-
-- u        = @purse.unit # 50 ## pixels per dollar
-- strategy = @position.strategy
-
-.purses-gameui.padded
-  = render '/iro/purses/header', purse: @position.purse
-
-  .a
-    - position = @position
-    - stock = position.stock
-    %h4= stock
-
-    .header
-      = position.quantity
-      = stock
-      = position.expires_on.to_datetime.strftime("%b %d")
-      = link_to '[roll]', roll_position_path(position)
-      = link_to '[~]',    edit_position_path(position)
-
-    - nearest_strike = stock.last.round
-    .StockCoordinatesW
-
-      .StockCoordinates
-        .grid-mark.mark0
-          .label= nearest_strike
-        - (1...@n_dollars).each_with_index do |idx|
-          .grid-mark{ class: "mark#{idx}", style: "left: -#{idx * u}px" }
-            .label
-              = nearest_strike + idx
-          .grid-mark{ class: "mark-#{idx}", style: "left: #{idx * u}px" }
-            .label
-              = nearest_strike - idx
-        .Origin{ style: "left: #{ ( nearest_strike - stock.last )* u}px" }
-          .label
-            Last:
-            = stock.last
-
-
-          .PositionW{ style: "width: #{ position.begin_inner_price * u}px; left: #{ (stock.last - position.inner_strike - position.begin_inner_price) * u}px" }
-
-            .Position
-              - if position.net_amount >= 0
-                .Net.NetPositive{ style: "width: #{ (position.net_amount / 100) * u }px; right: 0" }
-                  .label
-                    net
-                    = pp_amount position.net_amount
-              - else
-                .Net.NetNegative{ style: "width: #{ (-1 * position.net_amount / 100) * u }px; left: 100%" }
-                  .label
-                    net
-                    = pp_amount position.net_amount
-  .c
-
-  - @positions.each do |position|
-    .reviewing
-      - stock = position.stock
-      - nearest_strike = stock.last.round
-      .StockCoordinatesW
-        .StockCoordinates
-          .grid-mark.mark0
-            .label= nearest_strike
-          - (1...@n_dollars).each_with_index do |idx|
-            .grid-mark{ class: "mark#{idx}", style: "left: -#{idx * u}px" }
-              .label
-                = nearest_strike + idx
-            .grid-mark{ class: "mark-#{idx}", style: "left: #{idx * u}px" }
-              .label
-                = nearest_strike - idx
-          .Origin{ style: "left: #{ ( nearest_strike - stock.last )* u}px" }
-            .label
-              Last:
-              = stock.last
-            - amnt = position.gain_loss_amount
-            - border = amnt >= 0 ? "#{amnt * u}px solid green" : "#{amnt * -1 * u}px solid red"
-            .PositionW{ style: "width: #{ position.begin_inner_price * u}px; left: #{ (stock.last - position.inner_strike - position.begin_inner_price) * u}px; border: #{border}; border-bottom-width: 2px" }
-              .Position
-    .c
-
-
-
-
-%br
-%br

data/app/views/iro/positions/trash/_header_short_debit_put_spread.haml

@@ -1,9 +0,0 @@
-
-.maxwidth
-  %ul.m-0.p-0
-    %li <b>outer,inner_strike:</b> #{pp_amount pos.outer_strike} -> #{pp_amount pos.inner_strike}
-    %li
-      <b>begin_outer,inner_price:</b> #{pp_amount pos.begin_outer_price} -> #{pp_amount pos.begin_inner_price}
-      &nbsp;&nbsp;
-      <b>max gain:</b> #{pp_amount pos.max_gain}
-    %li <b>Net:</b> #{pp_amount pos.net_amount} &nbsp;&nbsp; <i>#{pp_percent pos.net_percent}</i>