ish_manager 0.1.8.403 → 0.1.8.405

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3b2381f54eb7b66d392fbaa4051bd78ee53f1ad8b455f8a55db82a0c9fca62
-  data.tar.gz: 65a33aebdf8b15526dee6e37f62824b304f2a0672eef3e55ebd866dd072d5fe8
+  metadata.gz: 70242298b4fbef9e7055284f6e8a603aa20e5ce5782c82cd2461bd69717e7a4f
+  data.tar.gz: 8f9d6291f35c98cafc912b3f331421d74ab8048f699ddc52b198b2f2fffc00d0
 SHA512:
-  metadata.gz: a7284a7a74330a4878a4b2136e17aa3c8ac47079fcbb36fb758c7c8b8252bbcc84eb66c578789971af86bad0fa2b39568285d72024be5185fb7f632c01d5beaa
-  data.tar.gz: 047b94313ffef19b69373fdc99d918d9c4f9c4ab76e87d75256e086a8d0e9b12a0c891eb02bc259c32a8edb5bbc6b870733fc485b8cee2765300c58b147c9075
+  metadata.gz: 66421a7174df41ff783faafc109ef30f61ccbe0035cfdb91ad9ac8c16f0f3c7dfaf59af82b74854cf849b881762a88cb2a93e5a4df4d56299f180476127778cd
+  data.tar.gz: 488f4c3488c0e389c070a12979083e39c026579773c164dc6134fa3f0a48b472a1ec1f14dc8c906ec95a8127694cbec58cb90db999fc82f75c8641711e6d0638

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/helpers/ish_manager/application_helper.rb

@@ -30,10 +30,6 @@ module IshManager
     #   "/manager/email_contexts/for_lead/#{lead.id.to_s}"
     # end
 
-    def pretty_date input
-      return input.strftime("%Y-%m-%d")
-    end
-
     def pp_errors errors
       return errors
     end
@@ -53,6 +49,12 @@ module IshManager
       date&.strftime('%Y-%m-%d')
     end
     def pp_date a; pretty_date a; end
+    def pp_datetime date
+      date&.strftime('%Y-%m-%d %l:%M%P %z')
+    end
+    def pp_time date
+      date&.strftime('%l:%M%P %z')
+    end
 
     def pp_amount a
       return '-' if !a

data/app/mailers/ish_manager/application_mailer.rb

@@ -12,7 +12,7 @@ module IshManager
       @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
       mail( :to => '314658@gmail.com',
             :bcc => profiles.map { |p| p.email },
-            :subject => 'You got new shared galleries on pi manager' ).deliver
+            :subject => 'You got new shared galleries on pi manager' )
     end
 
     def option_alert option
@@ -32,7 +32,7 @@ module IshManager
     end
 
     def test_email
-      mail( to: 'piousbox@gmail.com', subject: "Test email at #{Time.now}" )
+      mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
     end
 
   end

data/app/mailers/ish_manager/office_mailer.rb

@@ -54,8 +54,9 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       template_name: template )
   end
 
+  ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
-    @ctx = ::Ish::EmailContext.find ctx_id
+    @ctx = Ctx.find ctx_id
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@ctx, @ctx )
 
@@ -69,18 +70,3 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
   end
 
 end
-
-
-## 2022-11-10 _vp_ backup
-# def send_context_email ctx_id
-#   @email_ctx = ::Ish::EmailContext.find ctx_id
-#   template = "render/_#{@email_ctx.email_template.slug}"
-#   ac = ActionController::Base.new
-#   ac.instance_variable_set( :@email_ctx, @email_ctx )
-#   rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
-#   @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
-#   mail( to: @email_ctx.to_email,
-#         bcc: 'piousbox@gmail.com',
-#         subject: @email_ctx.subject,
-#         template_name: template )
-# end

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

@@ -3,6 +3,7 @@
   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/email_contexts/index.haml

@@ -44,7 +44,9 @@
               = link_to email_context_path(ctx) do
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
             %td= ctx.email_template.slug
-            %td= pp_date ctx.send_at
+            %td.send_at
+              .a= pp_date ctx.send_at
+              .a= pp_time ctx.send_at
             %td= pp_date ctx.sent_at
 
 

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'

data/lib/tasks/office_tasks.rake

@@ -1,9 +1,4 @@
 
-def puts! a, b=''
-  puts "+++ +++ #{b}"
-  puts a.inspect
-end
-
 namespace :office do
 
   desc 'scheduled email actions, rolling perform'
@@ -11,34 +6,10 @@ namespace :office do
     while true do
 
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
-        sch.update_attributes({ state: Sch::STATE_INACTIVE })
 
-        # send now
-        ctx = Ctx.new({
-          email_template_id: sch.act.tmpl.id,
-          lead_id: sch.lead.id,
-          send_at: Time.now,
-          subject: sch.act.tmpl.subject,
-          from_email: sch.act.tmpl.from_email,
-          scheduled_email_action_id: sch.act.id,
-        })
-        ctx.save!
-
-        # schedule next actions & update the action
-        sch.act.ties.each do |tie|
-          next_act = tie.next_email_action
-          next_at  = eval(tie.next_at_exe)
-          next_sch = Sch.find_or_initialize_by({
-            lead_id: sch.lead_id,
-            email_action_id: next_act.id,
-          })
-          next_sch.perform_at = next_at
-          next_sch.state      = Sch::STATE_ACTIVE
-          next_sch.save!
-        end
+        sch.send_and_roll
 
         print '+'
-
       end
 
       # sleep 1.minute
@@ -47,13 +18,15 @@ namespace :office do
     end
   end
 
+  ## 2023-04-02 _vp_ Continue.
   desc "send emails"
-  task email_worker: :environment do
+  task ctxs: :environment do
     while true do
 
       ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
-        IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
+        out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
+        Rails.env.production? ? out.deliver_later : out.deliver_now
         print '^'
       end
 

data/lib/tasks-done/migrate.rake

@@ -30,5 +30,25 @@ namespace :migrate do
     end
   end
 
+  desc "every user needs a user_profile"
+  task :generate_user_profiles => :environment do
+    User.all.map do |u|
+      unless u.profile
+        p = ::Ish::UserProfile.new :email => u.email, :user => u, :role_name => :guy
+        u.profile = p
+        u.save && p.save && print('.')
+      end
+    end
+    puts 'OK'
+  end
+
+  desc 'assign my creator_profile to Gameui::Marker where missing'
+  task :gameui_markers_creator_profile => :environment do
+    ms = Gameui::Marker.where( creator_profile_id: nil )
+    profile = User.find_by( email: 'piousbox@gmail.com' ).profile
+    ms.update_all( creator_profile_id: profile.id )
+  end
+
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.403
+  version: 0.1.8.405
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -598,7 +598,6 @@ files:
 - lib/systemd/system/stockwatcher.service
 - lib/systemd/system/watch_stocks.service
 - lib/tasks-done/migrate.rake
-- lib/tasks/ish_manager_tasks.rake
 - lib/tasks/office_tasks.rake
 homepage: http://wasya.co
 licenses:

data/lib/tasks/ish_manager_tasks.rake

@@ -1,29 +0,0 @@
-
-def puts! a, b=''
-  puts "+++ +++ #{b}"
-  puts a.inspect
-end
-
-namespace :ish_manager do
-
-  desc "every user needs a user_profile"
-  task :generate_user_profiles => :environment do
-    User.all.map do |u|
-      unless u.profile
-        p = ::Ish::UserProfile.new :email => u.email, :user => u, :role_name => :guy
-        u.profile = p
-        u.save && p.save && print('.')
-      end
-    end
-    puts 'OK'
-  end
-
-  desc 'assign my creator_profile to Gameui::Marker where missing'
-  task :gameui_markers_creator_profile => :environment do
-    ms = Gameui::Marker.where( creator_profile_id: nil )
-    profile = User.find_by( email: 'piousbox@gmail.com' ).profile
-    ms.update_all( creator_profile_id: profile.id )
-  end
-
-
-end