wco_models 3.1.0.263 → 3.1.0.265

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74411b5f6d7e9b1d2c6de54a15dc3438e00440d48220f545e7c6088fd2c6b519
-  data.tar.gz: 95a99dc3e85cd510fe4aeb0c5a6233e105691953231eeecbeeb1bef75460e292
+  metadata.gz: 327c2ab838cce926d5afd9e979b7acb2979aa8e78d1745470ea29ccac2e81197
+  data.tar.gz: 42615e28beeb55afbdf91eb592c58b22dae4a89d168e2ba17ce9046a7ac68857
 SHA512:
-  metadata.gz: b1219a5f7c28b3b828c32db3357c40f9e4974470769dc65a11ee9580ffb5b26fa033d28a8d033ab9424c26a45f556ca2e134628cc963e5aae25254c300f4439c
-  data.tar.gz: fdd901493b1083ed8818bcf5c88e55766b2b1e6f008aa26d28fff389c008a61e205a9c37c52908c981f49a82ee0a15189aa76b249fde88011fca84b5ed32434b
+  metadata.gz: 9ca18a2f3190d96d1c8a2d9b62823886b8bb77870b22246a4af13f1f55081c65dd8bfc7b15e0db9fd232d0efc0968c7c4dd0ac8c9e0da1063c486b08fe2c5d9c
+  data.tar.gz: 8c4c8a85bcd9087b837e6c70b42082967c9b2d502c9cc12651a946cceab10c6d85ca1d18646fa18f6b56862b51cd8436e9071a7eaa8bda059dbd6a1252cd65b3

data/app/assets/stylesheets/wco/main.scss

@@ -70,18 +70,6 @@ table.bordered {
   }
 }
 
-table {
-  thead.sticky {
-    background: #ccc;
-
-    th {
-      position: sticky;
-      top: 0;
-      background: white;
-      z-index: 10;
-    }
-  }
-}
 
 /* C */
 
@@ -95,6 +83,11 @@ textarea.monospace {
   padding: 0.6em;
 }
 
+.crossed,
+.crossout {
+  text-decoration: line-through;
+}
+
 /* D */
 
 .d-flex {
@@ -252,10 +245,36 @@ label.required {
 
 
 /* S */
+
 .spacer-small {
   height: 20px;
 }
 
+div.sticky,
+h2.sticky,
+h3.sticky,
+h4.sticky,
+h5.sticky {
+  position: sticky;
+  top: 0.5em;
+  z-index: 10;
+
+  border-radius: 0.5em;
+  padding: 0.5em;
+  background: rgba(255,255,255, 0.5);
+}
+
+table.sticky thead,
+table thead.sticky {
+  background: #ccc;
+
+  th {
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+}
+
 /* T */
 
 .title {

data/app/helpers/wco/application_helper.rb

@@ -34,8 +34,8 @@ module Wco::ApplicationHelper
   end
 
   def pp_amount a, config = { precision: 2 }
-    return '-' if !a
-    return '-' if a.class == String
+    return '___' if !a
+    return '___' if a.class == String
     return number_to_currency a, precision: config[:precision]
     # "$#{'%.2f' % a}"
   end

data/app/models/iro/position.rb

@@ -5,12 +5,6 @@ class Iro::Position
   include Mongoid::Paranoia
   store_in collection: 'iro_positions'
 
-  ## @trash, use next_gain_loss_amount instead
-  # field :prev_gain_loss_amount, type: :float
-  # def prev_gain_loss_amount
-  #   out  = autoprev.outer.end_price - autoprev.inner.end_price
-  #   out += inner.begin_price - outer.begin_price
-  # end
   field :next_gain_loss_amount, type: :float
 
 
@@ -231,33 +225,35 @@ class Iro::Position
     # puts! outs, '#calc_nxt.outs -> 2'
 
     ## next_inner_strike
-    outs = outs.select do |out|
-      if Iro::Strategy::CREDIT == pos.credit_or_debit
-        if Iro::Strategy::SHORT == pos.long_or_short
-          ## short credit call
-          out[:strikePrice] >= strategy.next_inner_strike
-        elsif Iro::Strategy::LONG == pos.long_or_short
-          ## long credit put
-          out[:strikePrice] <= strategy.next_inner_strike
+    if strategy.next_inner_strike.present?
+      outs = outs.select do |out|
+        if Iro::Strategy::CREDIT == pos.credit_or_debit
+          if Iro::Strategy::SHORT == pos.long_or_short
+            ## short credit call
+            out[:strikePrice] >= strategy.next_inner_strike
+          elsif Iro::Strategy::LONG == pos.long_or_short
+            ## long credit put
+            out[:strikePrice] <= strategy.next_inner_strike
+          end
+        else
+          raise 'zt3 - @TODO: implement, debit spreads'
         end
-      else
-        raise 'zt3 - @TODO: implement, debit spreads'
       end
+      puts! outs[0][:strikePrice], 'after calc next_inner_strike'
+      # puts! outs, 'outs'
     end
-    puts! outs[0][:strikePrice], 'after calc next_inner_strike'
-    # puts! outs, 'outs'
 
-    ## next_buffer_above_water
+    ## next_usd_above_mark
     outs = outs.select do |out|
       if Iro::Strategy::SHORT == pos.long_or_short
-        out[:strikePrice] > strategy.next_buffer_above_water + strategy.stock.last
+        out[:strikePrice] > strategy.next_usd_above_mark + strategy.stock.last
       elsif Iro::Strategy::LONG == pos.long_or_short
-        out[:strikePrice] < strategy.stock.last - strategy.next_buffer_above_water
+        out[:strikePrice] < strategy.stock.last - strategy.next_usd_above_mark
       else
         raise 'zt4 - this cannot happen'
       end
     end
-    puts! outs[0][:strikePrice], 'after calc next_buffer_above_water'
+    puts! outs[0][:strikePrice], 'after calc next_usd_above_mark'
     puts! outs, 'outs'
 
     ## next_inner_delta
@@ -310,7 +306,9 @@ class Iro::Position
         status:      'proposed',
         stock:        strategy.stock,
         inner_strike: inner_attrs[:strike],
+        inner_attributes: inner_attrs,
         outer_strike: outer_attrs[:strike],
+        outer_attributes: outer_attrs,
         begin_on:     Time.now.to_date,
         expires_on:   next_expires_on,
         purse:        purse,

data/app/models/iro/purse.rb

@@ -14,8 +14,7 @@ class Iro::Purse
 
   has_many :positions,  class_name: 'Iro::Position', inverse_of: :purse
 
-  # has_and_belongs_to_many :strategies, class_name: 'Iro::Strategy', inverse_of: :purses
-  # belongs_to :stock, class_name: 'Iro::Stock', inverse_of: :strategies
+  has_many :strategies, class_name: 'Iro::Strategy', inverse_of: :purse
 
   field :unit,             type: :integer, default: 10
   ## with unit 10,  .001
@@ -34,35 +33,6 @@ class Iro::Purse
     available_amount
   end
 
-  # def balance
-  #   0.01
-  # end
-
-  def delta_wt_avg( begin_end, long_short, inner_outer )
-    max_loss_total = 0
-
-    out = positions.send( long_short ).map do |pos|
-      max_loss_total += pos.max_loss * pos.q
-      pos.max_loss * pos.q * pos.send( inner_outer ).send( "#{begin_end}_delta" )
-    end
-    # puts! out, 'delta_wt_avg 1'
-    out = out.reduce( &:+ ) / max_loss_total rescue 0
-    # puts! out, 'delta_wt_avg 2'
-    return out
-  end
-  ## delta to plot percentage
-  ## convert to normal between 0 and 3 std
-  def delta_to_plot_p( *args )
-    x = delta_wt_avg( *args ).abs
-    if x < 0.5
-      y = 1
-    else
-      y = 2 - 1/( 1.5 - x )
-    end
-    y_ = "#{ (y*100) .to_i}%"
-    return y_
-  end
-
   def to_s
     slug
   end

data/app/models/iro/strategy.rb

@@ -5,7 +5,7 @@ class Iro::Strategy
   include Mongoid::Paranoia
   store_in collection: 'iro_strategies'
 
-  field :description
+  field :descr
 
   LONG  = 'long'
   SHORT = 'short'
@@ -17,11 +17,11 @@ class Iro::Strategy
   field     :credit_or_debit, type: :string, default: 'credit'
   validates :credit_or_debit, presence: true
 
-
   has_many :positions,     class_name: 'Iro::Position', inverse_of: :strategy,     dependent: :destroy
-  has_one  :next_position, class_name: 'Iro::Position', inverse_of: :next_strategy ## _TODO: makes no sense...
+  ## _TODO: makes no sense...
+  has_one  :next_position, class_name: 'Iro::Position', inverse_of: :next_strategy
   belongs_to :stock,       class_name: 'Iro::Stock',    inverse_of: :strategies
-  # has_and_belongs_to_many :purses, class_name: 'Iro::Purse',    inverse_of: :strategies
+  belongs_to :purse, class_name: 'Iro::Purse',    inverse_of: :strategies
 
   KIND_COVERED_CALL             = 'covered_call'
   KIND_IRON_CONDOR              = 'iron_condor'
@@ -79,7 +79,6 @@ class Iro::Strategy
 
   field     :threshold_usd_above_mark, type: :float
   validates :threshold_usd_above_mark, presence: true
-  def buffer_above_water; threshold_usd_above_mark; end
 
   field :threshold_pos_delta, type: :float # offensive: roll b/c markets are going my way
   field :threshold_neg_delta, type: :float # defensive: roll b/c markets are going against me
@@ -87,14 +86,13 @@ class Iro::Strategy
   field :threshold_dte,       type: :integer, default: 1
 
   field :next_inner_delta,        type: :float
-  field :next_inner_strike,       type: :float
+  field :next_inner_strike,       type: :float ## can be nil, poor design?
   field :next_outer_delta,        type: :float
   field :next_outer_strike,       type: :float
   field :next_spread_amount,      type: :float # e.g. $20 for a $2000 NVDA spread
 
-  field     :next_threshold_usd_above_mark, type: :float
-  validates :next_threshold_usd_above_mark, presence: true
-  def next_buffer_above_water; next_threshold_usd_above_mark; end
+  field     :next_usd_above_mark, type: :float
+  validates :next_usd_above_mark, presence: true
 
   def begin_delta_covered_call p
     p.inner.begin_delta
@@ -207,6 +205,7 @@ class Iro::Strategy
   ## decisions
   ##
 
+  ## do not use!
   def calc_rollp_covered_call p
     stock.reload
 
@@ -214,10 +213,10 @@ class Iro::Strategy
       return [ 0.99, '0 DTE, must exit' ]
     end
 
-    if ( stock.last - buffer_above_water ) < p.inner.strike
+    if ( stock.last - threshold_usd_above_mark ) < p.inner.strike
       return [ 0.98, "Last #{'%.2f' % stock.last} is " +
-        "#{'%.2f' % [p.inner.strike + buffer_above_water - stock.last]} " +
-        "below #{'%.2f' % [p.inner.strike + buffer_above_water]} water" ]
+        "#{'%.2f' % [p.inner.strike + threshold_usd_above_mark - stock.last]} " +
+        "below #{'%.2f' % [p.inner.strike + threshold_usd_above_mark]} water" ]
     end
 
     if p.inner.end_delta < threshold_pos_delta
@@ -231,7 +230,7 @@ class Iro::Strategy
     return [ 0.33, '-' ]
   end
 
-  ## _TODO
+  ## do not use!
   def calc_rollp_long_debit_call_spread p
     stock.reload
 
@@ -242,10 +241,10 @@ class Iro::Strategy
       return [ 0.99, '1 DTE, must exit' ]
     end
 
-    if ( stock.last - buffer_above_water ) < p.inner.strike
+    if ( stock.last - threshold_usd_above_mark ) < p.inner.strike
       return [ 0.95, "Last #{'%.2f' % stock.last} is " +
-          "#{'%.2f' % [stock.last - p.inner.strike - buffer_above_water]} " +
-          "below #{'%.2f' % [p.inner.strike + buffer_above_water]} water" ]
+          "#{'%.2f' % [stock.last - p.inner.strike - threshold_usd_above_mark]} " +
+          "below #{'%.2f' % [p.inner.strike + threshold_usd_above_mark]} water" ]
     end
 
     if p.inner.end_delta < threshold_pos_delta
@@ -259,14 +258,15 @@ class Iro::Strategy
     return [ 0.33, '-' ]
   end
 
-  ## 2025-10-12 _TODO
+  ## 2025-10-12 continue
+  ## 2026-04-05 continue
   def calc_rollp_long_credit_put_spread p
     stock.reload
 
     # puts! p, '#calc_rollp_long_credit_put_spread'
     # puts! p.inner, 'p.inner'
-    puts! stock, 'stock'
-    puts! attributes, 'strategy attributes'
+    # puts! stock, 'stock'
+    # puts! attributes, 'strategy attributes'
 
     if ( p.expires_on.to_date - Time.now.to_date ).to_i < 1
       return [ 0.99, '0 DTE, must exit' ]
@@ -275,24 +275,28 @@ class Iro::Strategy
       return [ 0.99, '1 DTE, must exit' ]
     end
 
-    if ( stock.last - buffer_above_water ) < p.inner.strike
-      return [ 0.95, "Last #{'%.2f' % stock.last} is " +
-          "#{'%.2f' % [stock.last - p.inner.strike - buffer_above_water]} " +
-          "below #{'%.2f' % [p.inner.strike + buffer_above_water]} water" ]
+    if ( stock.last - threshold_usd_above_mark ) < p.inner.strike
+      return [ 0.95, ":threshold_usd_above_mark <br />Last $#{'%.2f' % stock.last} is " +
+        "#{'%.2f' % [stock.last - p.inner.strike]} near #{p.inner.strike} but should be greater than #{threshold_usd_above_mark} ." ]
     end
 
-    if p.inner.end_delta < threshold_pos_delta
-      return [ 0.79, "Delta #{p.inner.end_delta} is lower than #{threshold_pos_delta} threshold." ]
+    if p.inner.end_delta.abs < threshold_pos_delta
+      return [ 0.79, ":threshold_pos_delta <br />Offensive roll: delta #{p.inner.end_delta} is lower than #{threshold_pos_delta} ." ]
+    end
+    if p.inner.end_delta.abs > threshold_neg_delta
+      return [ 0.79, ":threshold_neg_delta <br />Defensive roll: delta #{p.inner.end_delta} is higher than #{threshold_neg_delta} ." ]
     end
 
-    if 1 - p.inner.end_price/p.inner.begin_price > threshold_netp
-      return [ 0.51, "made enough #{'%.02f' % [(1.0 - p.inner.end_price/p.inner.begin_price )*100]}% profit^" ]
+    if threshold_netp.present?
+      if 1 - p.inner.end_price/p.inner.begin_price > threshold_netp
+        return [ 0.51, ":threshold_netp <br />made enough #{'%.02f' % [(1.0 - p.inner.end_price/p.inner.begin_price )*100]}% profit^" ]
+      end
     end
 
     return [ 0.33, '-' ]
   end
 
-  ## _TODO
+  ## do not use!
   def calc_rollp_short_debit_put_spread p
     stock.reload
 
@@ -300,10 +304,10 @@ class Iro::Strategy
       return [ 0.99, "< #{threshold_dte}DTE, must exit" ]
     end
 
-    if stock.last + buffer_above_water > p.inner.strike
+    if stock.last + threshold_usd_above_mark > p.inner.strike
       return [ 0.98, "Last #{'%.2f' % stock.last} is " +
-          "#{'%.2f' % [stock.last + buffer_above_water - p.inner.strike]} " +
-          "above #{'%.2f' % [p.inner.strike - buffer_above_water]} water" ]
+          "#{'%.2f' % [stock.last + threshold_usd_above_mark - p.inner.strike]} " +
+          "above #{'%.2f' % [p.inner.strike - threshold_usd_above_mark]} water" ]
     end
 
     if p.inner.end_delta.abs < threshold_pos_delta.abs
@@ -318,6 +322,7 @@ class Iro::Strategy
   end
 
   ## 2026-02-21 ok
+  ## 2026-04-05 ok
   def calc_rollp_short_credit_call_spread p
     puts! p, 'calc_rollp_short_credit_call_spread...'
     stock.reload
@@ -326,10 +331,9 @@ class Iro::Strategy
       return [ 0.99, "< #{threshold_dte}DTE, must exit" ]
     end
 
-    if stock.last + buffer_above_water > p.inner.strike
-      return [ 0.95, "Last #{'%.2f' % stock.last} is " +
-          "#{'%.2f' % [stock.last + buffer_above_water - p.inner.strike]} " +
-          "above #{'%.2f' % [p.inner.strike - buffer_above_water]} water" ]
+    if stock.last + threshold_usd_above_mark > p.inner.strike
+      return [ 0.95, ":threshold_usd_above_mark <br />Last $#{'%.2f' % stock.last} is " +
+          "#{'%.2f' % [p.inner.strike - stock.last]} near #{p.inner.strike} but should be greater than #{threshold_usd_above_mark} ." ]
     end
 
     ## defensive
@@ -343,8 +347,10 @@ class Iro::Strategy
       return [ 0.69, "Delta #{p.inner.end_delta} is lower than #{threshold_pos_delta} offensive threshold." ]
     end
 
-    if p.net_percent > threshold_netp
-      return [ 0.51, "made enough #{'%.0f' % [p.net_percent*100]}% > #{"%.2f" % [threshold_netp*100]}% profit," ]
+    if threshold_netp.present?
+      if p.net_percent > threshold_netp
+        return [ 0.51, "made enough #{'%.0f' % [p.net_percent*100]}% > #{"%.2f" % [threshold_netp*100]}% profit," ]
+      end
     end
 
     return [ 0.33, '-' ]
@@ -362,7 +368,7 @@ class Iro::Strategy
   #   "#{kind} #{stock}"
   # end
   def to_s
-    "#{kind} #{stock}"
+    "#{kind} #{stock} #{descr}"
   end
   def self.list long_or_short = nil
     these = long_or_short ? where( long_or_short: long_or_short ) : all

data/app/models/tda/order.rb

@@ -33,6 +33,7 @@ class Tda::Order
     puts! results, 'results'
   end
 
+  ## obsolete, I don't do covered calls anymore?
   def self.roll_covered_call_q pos
     roll_price = pos.inner.begin_price - pos.autoprev.inner.end_price
     query = {
@@ -67,12 +68,12 @@ class Tda::Order
     return query
   end
 
-  def self.roll_short_credit_call_spread_q pos
+  def self.roll_credit_call_spread_q pos
     query = {
-      orderType: "NET_CREDIT", ## pos.roll_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
+      orderType: pos.roll_price > 0 ? "NET_CREDIT" : "NET_DEBIT",
       session: "NORMAL",
       duration: "DAY",
-      price: ( pos.roll_price + 100 ).to_s, ## _TODO this order will never fill (net credit only)
+      price: pos.roll_price.abs.to_s,
       orderStrategyType: "SINGLE",
       orderLegCollection: [
         ## close

data/app/models/wco_email/config.rb

@@ -0,0 +1,15 @@
+
+class WcoEmail::Config
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_email_config'
+
+  field :key
+  validates :key, { presence: true, uniqueness: true }
+
+  field :value
+  validates :value, { presence: true }
+
+  field :descr
+
+end

data/app/views/wco/profiles/_form.haml

@@ -18,11 +18,14 @@
 
       .field
         %label leadset
-        = f.select :leadset, options_for_select(Wco::Leadset.list, selected: profile.leadset_id )
+        = f.select :leadset, options_for_select(Wco::Leadset.list, selected: profile.leadset_id ), {}, { class: 'select2' }
 
     %hr
     .row
       .col-6
+        .field
+          %label schwab_account_hash
+          = f.text_field :schwab_account_hash
         .field
           %label schwab_access_token
           = f.text_field :schwab_access_token
@@ -33,6 +36,8 @@
           %label schwab_id_token
           = f.text_field :schwab_id_token
       .col-6
+        .field
+          %label  
         .field
           %label schwab_exec_access_token
           = f.text_field :schwab_exec_access_token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.263
+  version: 3.1.0.265
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-05 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -516,6 +516,7 @@ files:
 - app/models/wco/utils.rb
 - app/models/wco/video.rb
 - app/models/wco_email/campaign.rb
+- app/models/wco_email/config.rb
 - app/models/wco_email/context.rb
 - app/models/wco_email/conversation.rb
 - app/models/wco_email/email_action.rb