ish_manager 0.1.8.404 → 0.1.8.406

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b0e695973583101608da564e5460f74838147a078b52a29cab8c1aab34e9534
-  data.tar.gz: 16a23aa8e36df3e4ecee24a754516026017e40b9cc3f45e7a6b5cc81862d02e4
+  metadata.gz: 452842738cc969d323c35b20aca3b4c7e5171521e6afe6dfb00f048c40fa8860
+  data.tar.gz: 52480eb146f0f3894ff57dc94c03c5a87cb02da9c1360eb77e3fee9d1eed886e
 SHA512:
-  metadata.gz: 1cca17f65defbd1073a29f7fc5a6269864651083aaf6fdf1b5b2aeb63b432cb08e347d4e60c6b374405d25a4fae98414434fafc3490ca242e18e1b22740dd4e5
-  data.tar.gz: 2ca8c6173c2317cd453fef7b4c6057db8f0858d1b2b9ffa315e3aa5b86a00eea6c5ce5f0714ca05bc414b618a5483874e95386aaadfb7b5e19c528b4424edaff
+  metadata.gz: f96a74fb459d49b5e1eb6b6f50865d748df924774e9a0ccea5a19af2c649465696e71db4722402ff688cbb4d4886a544429868495a8efc6795b333776756dd3d
+  data.tar.gz: adba42062b8f133158e0b3226aecf6c0aa43c2083cee88e61034f24e6c77bddc0fe13f1b564b154421b034ee46582284e16da686e889b1d8463ef317677d75e7

data/app/assets/stylesheets/ish_manager/iro.scss

@@ -1,19 +1,59 @@
 
-.iro-purses-my {
-  font-size: 16px; // @TODO: make uniform _vp_ 2023-03-19
+.iro-purses-show {
+  font-size: 14px;
 
   table {
+    .id {
+      width: 20px;
+    }
+    .strategy {
+      width: 30px;
+    }
+
+    thead {
+      position: relative;
+      height: 50px;
+
+
+      .id,
+      .ticker,
+      .days-left,
+      .to-close,
+      .must-roll {
+        top: 0;
+      }
+
+      .price {
+        background: cyan;
+      }
+
+      td > div {
+        // border: 1px solid green;
+
+        position: absolute;
+      }
+    }
+
 
     td {
       padding: 0 .5em;
     }
 
     tbody {
+      .begin-delta {
+        min-width: 20px;
+      }
       .must-roll,
       .next-symbol {
         text-align: center;
       }
 
+      .must-roll,
+      .should-roll,
+      .next-symbol {
+        background: #eee;
+      }
+
       .net,
       .netp {
         font-weight: bold;
@@ -28,22 +68,31 @@
   }
 
 
-
-  .must-roll,
-  .should-roll,
-  .next-symbol {
-    background: #eee;
-  }
-
   .q {
     font-weight: bold;
   }
 
-  .strategy {
-    pre {
-      font-size: 12px;
-      background: #eee;
-    }
+  .strategies {
+
+    display: flex;
+    flex-wrap: wrap;
   }
 
 }
+.iro-strategies-edit,
+.iro-strategies-new {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.iro-strategies--form {
+  border: 1px solid blue;
+  border-radius: 0.5em;
+  padding: 0.5em;
+  margin-right: .5em;
+
+  .field {
+    display: flex;
+    justify-content: space-between;
+  }
+}

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -6,23 +6,20 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
   def show
     @purse = Iro::Purse.find_or_create_by({ user_id: current_user.id })
     authorize! :my, @purse
-    @positions = @purse.positions.order({ expires_on: :asc, strike: :asc })
-    @positions.map &:refresh
+
     @strategies = Iro::CoveredCallStrategy.where({
       iro_purse_id: Iro::Purse.find_by( user_id: current_user.id ).id,
     })
+
+    underlyings = Tda::Stock.get_quotes( @strategies.map(&:ticker).compact.uniq.join(",") )
+    # json_puts! underlyings, 'out'
+    underlyings.each do |ticker, v|
+      Iro::CoveredCallStrategy.where( ticker: ticker ).update( current_underlying_strike: v[:mark] )
+    end
+
+    @positions = @purse.positions.order({ expires_on: :asc, strike: :asc })
+    @positions.active.map &:refresh
   end
 
 end
 
-=begin
-    @strategy = {
-      buffer_above_water: 0.49, # be this much $ above current price, in next position
-      next_max_delta: 0.25, # of next position
-      next_min_price: 16,
-      threshold_delta: 0.14, # should roll at this delta
-      threshold_netp: 0.69, # should roll at the net %
-      target_profilt: 0.19, # unused
-      current_underlying_strike: 16.6,
-    }
-=end

data/app/views/ish_manager/application/_debug.haml

@@ -3,7 +3,6 @@
   Debug
 .application--debug
   %ul.browser-default
-    %li= link_to 'sidekiq', '/sidekiq', target: :_blank
     %li= params.inspect
     %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
     %li= "Env: #{Rails.env}"

data/app/views/ish_manager/application/_main_footer.haml

@@ -12,6 +12,7 @@
           %ul
             %li <b>Email:</b> #{@current_profile.email}
             %li <b>Role name:</b> #{@current_profile.role_name}
+            %li= link_to 'sidekiq', '/sidekiq', target: :_blank
 
         .col-sm-4
           %ul

data/app/views/ish_manager/iro_positions/_form.haml

@@ -3,7 +3,7 @@
 
 .iro-positions--form
   = form_for position, as: :position, url: url do |f|
-    .flex-row
+    .a
       .field Position ##{position.id}
       .field
         = f.label :strategy
@@ -19,9 +19,14 @@
       .field
         = f.label :expires_on
         = f.text_field :expires_on
+
+      .field
+        = f.label :quantity
+        = f.number_field :quantity
+
       .field
         = f.label :status
-        = f.select :status, options_for_select( Iro::Position.statuses_list, selected: position.status ), {}, class: 'select2'
+        = f.select :status, options_for_select( Iro::Position.states_list, selected: position.status ), {}, class: 'select2'
 
       .field
         = f.label :opened_price

data/app/views/ish_manager/iro_positions/edit.haml

@@ -1,3 +1,3 @@
 
-.iro-positions-edit.padded
+.iro-positions-edit.max-width
   = render 'form', position: @position

data/app/views/ish_manager/iro_purses/show.haml

@@ -1,41 +1,58 @@
 
-.iro-purses-my.padded
-  .header
-    %h2.title Purse value: $#{@purse.current_value}
+.iro-purses-show.padded
+  .max-width
+    .header
+      %h4.title Purse value: $#{@purse.current_value}
 
-  .strategies
-    .title Strategies
+
+  %h5.collapse-expand#strategies Strategies #{link_to '[+]', new_iro_strategy_path}
+  .strategies.items
     - @strategies.each do |strat|
-      .strategy
-        = link_to '[~]', edit_iro_strategy_path( strat )
-        <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
+      -# .strategy.item
+      -#   = link_to '[~]', edit_iro_strategy_path( strat )
+      -#   <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
+      .strategy.item= render 'ish_manager/iro_strategies/form', strategy: strat
 
 
+  %h5.collapse-expand#positions
+    Positions (#{@positions.length})
+    = link_to '[+]', new_iro_position_path
   .positions
-    %h3
-      Positions (#{@positions.length})
-      = link_to '[+]', new_iro_position_path
+
 
     %table.bordered
       %thead
         %tr
-          %td id
-          %td Strategy
-          %td Ticker
+          %td
+            .id id
+          %td
+            .strategy Strategy
+          %td
+            .ticker Ticker
           %td Kind/Type
           %td Strike
           %td ExpiresOn
-          %td Days Left
-          %td.q Q
-          %td Begin On
-          %td Begin $
-          %td Begin #{"\u0394"}
-          %td Current $
+          %td
+            .days-left Days Left
+          %td
+            .q Q
+          %td
+            .begin-on Begin On
+          %td
+            .price Price
+          %td
+            .to-open To Open
+          %td
+            .begin-delta #{"\u0394"}
+          %td
+            .to-close Current $ <br />(To Close)
           %td.net Net
           %td.netp % Net
-          %td Curr #{"\u0394"}
-          %td Days at Open
-          %td.must-roll Must roll?
+          %td #{"\u0394"}
+          %td
+            .days-at-open Days@Open
+          %td
+            .must-roll Must roll?
           %td.should-roll Should roll?
           %td.next-symbol Next Symbol
           %td.next-outcome Next Outcome
@@ -43,19 +60,20 @@
       %tbody
         - @positions.each do |p|
           %tr
-            %td
+            %td.id
               = p.id
               = link_to '[~]', edit_iro_position_path(p)
-            %td= p.strategy
+            %td.strategy= link_to p.strategy, edit_iro_strategy_path(p.strategy)
             %td= p.ticker
             %td= p.type == "Iro::CoveredCall" ? "CALL" : "other"
             %td= p.strike
             %td= p.expires_on.strftime('%b %d')
-            %td= (p.expires_on.to_date - Time.now.to_date).to_i
+            %td.days-left= (p.expires_on.to_date - Time.now.to_date).to_i
             %td.q= p.quantity
-            %td= pp_date p.opened_on
-            %td= p.opened_price
-            %td= sprintf('%.2f', p.opened_delta ) rescue nil
+            %td.begin-on= pp_date p.opened_on
+            %td.price= p.opened_price
+            %td.to-open= pp_amount( p.opened_price * 100 * p.quantity )
+            %td.begin-delta= sprintf('%.2f', p.opened_delta ) rescue nil
             %td= pp_money p.current_price
             %td.net= pp_money ( p.opened_price - p.current_price ) * 100 - 1.3
             %td.netp= pp_percent ( p.opened_price - p.current_price ) / p.opened_price

data/app/views/ish_manager/iro_strategies/_form.haml

@@ -2,6 +2,15 @@
 - url = strategy.new_record? ? iro_strategies_path : iro_strategy_path(strategy)
 .iro-strategies--form
   = form_for strategy, url: url, as: :iro_strategy do |f|
+    .field
+      = "#{strategy.id}." if strategy.id
+      = f.label :slug
+      = f.text_field :slug
+      .actions
+        = f.submit 'Submit', :data => { :confirm => 'Are you sure?' }
+    .field
+      = f.label :ticker
+      = f.text_field :ticker
     .field
       = f.label :buffer_above_water
       = f.number_field :buffer_above_water, placeholder: "0.49", step: 0.01
@@ -17,12 +26,7 @@
     .field
       = f.label :threshold_netp
       = f.number_field :threshold_netp, placeholder: "0.69", step: 0.01
-    .field
-      = f.label :target_profit
-      = f.number_field :target_profit, placeholder: "0.19", step: 0.01
     .field
       = f.label :current_underlying_strike
       = f.number_field :current_underlying_strike, placeholder: "16.66", step: 0.01
 
-    .actions
-      = f.submit 'Submit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.404
+  version: 0.1.8.406
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails