ish_manager 0.1.8.378 → 0.1.8.380

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d1d8103d7dde529e81e9074568b647db2b98bd9d1c6019664c417837243b15
-  data.tar.gz: 82c682267071f417b7f908ade31ae60a6139a7dfdd3794aedc9580fe7fe2abc6
+  metadata.gz: 2f1ccdbb8b5690e2af9de00c78266a89f897fbe9faf0aae8de83f8353e0e9c47
+  data.tar.gz: 68da18a96da28c456018c3792507b190bb87c7927020b481eb240ac92d842788
 SHA512:
-  metadata.gz: 80b6707997cda1e32efa5e2bee8776f77b5823f6e761fee72e8ffdbd2d0ddc7ac6b0a732a5f3a6fe7314a8664f059378f4bb7384fbe3dcf2dcfa631503203669
-  data.tar.gz: f923c98b7eaf195c22da13c9761b45af889844b049b5eda104db927275f5f3fe5c97ff2c76686d93b42bc479cd3a570d7d577f19851ffa335e3407097579a123
+  metadata.gz: d8ed260c26f354e7ceab70994df4a2bba7d4d527f7f6ef10f6523102ddb5fd18fd1e5a330a874aafd3d84498f80306e45d5791c64c0cd254f1c2fa8c59cf3ff8
+  data.tar.gz: 125401f5699b1eded426dd8137c71763f1971c8fb875c1137411f1b421d9dad3d71e475d340db23c0f3a71e32c5d6d581fb0fd360a74bd0db4b61ffd1f9fb1d2

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

@@ -11,6 +11,7 @@
  *= require ish_manager/email
  *
  *= require ish_manager/galleries
+ *= require ish_manager/iro
  *= require ish_manager/leads_leadsets
  *= require ish_manager/maps
  *= require ish_manager/markers
@@ -21,6 +22,7 @@
  *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
+
  *
 **/
 
@@ -81,6 +83,7 @@ ul:not(.browser-default).bullets, {
 .expand-hide {
   display: none;
   position: absolute;
+  min-width: 250px;
 }
 
 .alert {
@@ -122,8 +125,10 @@ body.application-fullwidth {
 }
 
 table.bordered {
-  td {
-    border: 1px solid black;
+  tbody {
+    td {
+      border: 1px solid black;
+    }
   }
 }
 

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

@@ -0,0 +1,49 @@
+
+.iro-purses-my {
+  font-size: 16px; // @TODO: make uniform _vp_ 2023-03-19
+
+  table {
+
+    td {
+      padding: 0 .5em;
+    }
+
+    tbody {
+      .must-roll,
+      .next-symbol {
+        text-align: center;
+      }
+
+      .net,
+      .netp {
+        font-weight: bold;
+        text-align: right;
+      }
+
+      .should-roll > .aC {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+
+
+
+  .must-roll,
+  .should-roll,
+  .next-symbol {
+    background: #eee;
+  }
+
+  .q {
+    font-weight: bold;
+  }
+
+  .strategy {
+    pre {
+      font-size: 12px;
+      background: #eee;
+    }
+  }
+
+}

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

@@ -1,9 +1,7 @@
 
-// .scheduled-email-actions--form {
-//   display: none;
-//   position: absolute;
-//   min-width: 250px;
-// }
+.scheduled-email-actions--form {
+  min-width: 300px;
+}
 
 .scheduled-emails-new {
 

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

@@ -1,10 +1,29 @@
 
-.ish_manager-videos-show {
-  border-bottom: 2px solid red;
-  margin: 0 auto;
+.videos-index {
+  .header {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .item {
+    margin-bottom: 1em;
+
+    .title {
+      word-break: break-word;
+    }
+  }
+
+  .pagination {
+    margin: 1em 0;
+  }
+}
+
+div.videos-show {
+  // border-bottom: 2px solid red;
   padding-bottom: .8em;
-  width: 640px;
 
+  margin: 0 auto;
+  width: 640px;
 
   .title {
     font-size: 1.4em;

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -6,7 +6,22 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
   def my
     @purse = Iro::Purse.find_or_create_by({ user_id: current_user.id })
     authorize! :my, @purse
-    @positions = @purse.positions
+    @positions = @purse.positions.order({ expires_on: :asc, strike: :asc })
+    @strategies = Iro::CoveredCallStrategy.where({
+      iro_purse_id: Iro::Purse.find_by( user_id: current_user.id ).id,
+    })
   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/controllers/ish_manager/iro_strategies_controller.rb

@@ -0,0 +1,41 @@
+
+class ::IshManager::IroStrategiesController < IshManager::ApplicationController
+
+  def create
+    @strategy = Iro::CoveredCallStrategy.new params[:iro_strategy].permit!
+    @strategy.iro_purse_id = Iro::Purse.where( user_id: current_user.id ).first.id
+    authorize! :create, @strategy
+    flag = @strategy.save
+    if flag
+      flash[:notice] = 'Success.'
+      redirect_to my_purse_path
+    else
+      flash[:alert] = "No luck: #{@strategy.full_errors.messages.join(', ')}."
+      render action: 'new'
+    end
+  end
+
+  def edit
+    @strategy = Iro::CoveredCallStrategy.find params[:id]
+    authorize! :edit, @strategy
+  end
+
+  def new
+    @strategy = Iro::CoveredCallStrategy.new
+    authorize! :new, @strategy
+  end
+
+  def update
+    @strategy = Iro::CoveredCallStrategy.find params[:id]
+    authorize! :update, @strategy
+    flag = @strategy.update params[:iro_strategy].permit!
+    if flag
+      flash[:notice] = 'Success.'
+      redirect_to my_purse_path
+    else
+      flash[:alert] = "No luck: #{@strategy.full_errors.messages.join(', ')}."
+      render action: 'new'
+    end
+  end
+
+end

data/app/controllers/ish_manager/videos_controller.rb

@@ -3,7 +3,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  # alphabetized : )
+  # Alphabetized : )
 
   def create
     @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
@@ -40,13 +40,14 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def index
     authorize! :index, Video.new
-    @videos = Video.unscoped.where( is_trash: false, :user_profile => @current_profile ).order_by( :created_at => :desc )
+    @videos = Video.unscoped.where( is_trash: false, :user_profile => @current_profile
+    ).order_by( :created_at => :desc )
 
     if params[:q]
       @videos = @videos.where({ :name => /#{params[:q]}/i })
     end
 
-    @videos = @videos.page( params[:videos_page] ).per( 10 )
+    @videos = @videos.page( params[:videos_page] ).per( 9 )
 
     respond_to do |format|
       format.html do

data/app/helpers/ish_manager/application_helper.rb

@@ -55,8 +55,17 @@ module IshManager
     def pp_date a; pretty_date a; end
 
     def pp_amount a
+      return '-' if !a
       "$ #{'%.2f' % a}"
     end
+    def pp_money a; pp_amount a; end
+    def pp_percent a
+      "#{(a*100).round(2)}%"
+    end
+
+    def pp_bool a
+      a ? 'Y' : '-'
+    end
 
   end
 end

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

@@ -0,0 +1 @@
+app/views/ish_manager/application/_meta.haml

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

@@ -20,8 +20,6 @@
     .leadsC
       = render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
 
-
-
   .messages.max-width
     - @email_messages.each do |msg|
       - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
@@ -42,7 +40,7 @@
 
           .relative
             %i.fa.fa-clock-o.expand-next
-            = render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+            .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
           .datetime
             .date= msg.date&.strftime('%Y-%m-%d')

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

@@ -1,11 +1,68 @@
 
-.iro-purses-my.max-width
+.iro-purses-my.padded
   .header
-    %h2.title
-      My purse value: $#{@purse.current_value}
+    %h2.title My purse value: $#{@purse.current_value}
+
+  .strategies
+    - @strategies.each do |strat|
+      .strategy
+        = link_to '[~]', edit_iro_strategy_path( strat )
+        <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
+
 
   .positions
     %h3 Positions (#{@positions.length})
-    %ul
-      - @positions.each do |p|
-        %li= p.inspect
+
+    %table.bordered
+      %thead
+        %tr
+          %td id
+          %td Strat
+          %td 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.net Net
+          %td.netp % Net
+          %td Curr #{"\u0394"}
+          %td Days at Open
+          %td.must-roll Must roll?
+          %td.should-roll Should roll?
+          %td.next-symbol Next Symbol
+          %td.next-outcome Next Outcome
+          %td.state State
+      %tbody
+        - @positions.each do |p|
+          %tr
+            %td= p.id
+            %td= p.iro_strategy_id
+            %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.q= p.quantity
+            %td= pp_date p.opened_on
+            %td= p.opened_price
+            %td= 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
+            %td= sprintf('%.2f', p.current_delta ) rescue nil
+            %td= (p.expires_on.to_date - p.opened_on).to_i
+            %td.must-roll= pp_bool p.must_roll?
+            %td.should-roll
+              .aC
+                .a= p.should_rollp ? p.should_rollp : '-'
+                .a= pp_bool p.should_roll?
+            %td.next-symbol= p.next_symbol
+            %td.next-outcome= pp_money p.next_outcome
+            %td.state= p.status
+
+

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

@@ -0,0 +1,28 @@
+
+- 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
+      = f.label :buffer_above_water
+      = f.number_field :buffer_above_water, placeholder: "0.49", step: 0.01
+    .field
+      = f.label :next_max_delta
+      = f.number_field :next_max_delta, placeholder: "0.25", step: 0.01
+    .field
+      = f.label :next_min_price
+      = f.number_field :next_min_price, placeholder: "20.0", step: 0.01
+    .field
+      = f.label :threshold_delta
+      = f.number_field :threshold_delta, placeholder: "0.14", step: 0.01
+    .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/app/views/ish_manager/iro_strategies/edit.haml

@@ -0,0 +1,6 @@
+
+.iro-strategies-edit.max-width
+  .header
+    %h3.title Edit Strategy #{@strategy.id}
+
+  = render 'form', strategy: @strategy

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

@@ -0,0 +1,6 @@
+
+.iro-strategies-new.max-width
+  .header
+    %h3.title New Strategy
+
+  = render 'form', strategy: @strategy

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

@@ -1,6 +1,6 @@
 
 = form_for video do |f|
-  = render 'form_errors', :item => @video
+  -# = render 'form_errors', :item => @video
 
   .row
     .col.m6
@@ -34,9 +34,6 @@
     .col.s4
       = f.check_box :is_trash
       = f.label :is_trash
-    .col.s4
-      = f.check_box :is_feature
-      = f.label :is_feature
 
   .action
     = f.submit

data/app/views/ish_manager/videos/_index.haml

@@ -2,31 +2,31 @@
 - videos ||= @videos
 
 .videos--index
+  .header
+    %h5.title
+      Videos (#{videos.count})
+      = link_to '[+]', new_video_path
+    = render 'search', path: videos_path
 
-  %h5
-    Videos (#{videos.count})
-    = link_to '[+]', new_video_path
-
-  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+  = paginate videos, param_name: :videos_page, views_prefix: 'ish_manager'
 
   .row
     - videos.each do |video|
-      .col.s6
-        .item.panel
-          .panel-content
-            .float-left
-              - if video.youtube_id.present?
-                -## doesn't work with private videos, which are most
-                -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
-                = render 'ish_manager/videos/embed_mini', video: video
-              - else
-                .thumb= image_tag video.thumb.url(:thumb)
-            .a
-              = link_to video.name, video_path( video )
-            = render 'meta_edit', item: video
-            = render 'meta', item: video
-            .c
-
-  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
-%hr
+      .col-md-4.item
+        .float-left
+          - if video.youtube_id.present?
+            %iframe{:allowfullscreen => "true", :frameborder => "0", :height => "150", :src => "//www.youtube.com/embed/#{video.youtube_id}", :width => "200"}
+          - else
+            .thumb= image_tag video.thumb.url(:thumb)
+        .title
+          = link_to video.name, video_path( video )
+        .meta-edit
+          .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          = link_to '[~]', edit_video_path( video )
+
+        = render 'meta', item: video
+
+
+  = paginate videos, param_name: :videos_page, views_prefix: 'ish_manager'
+
 

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

@@ -1,7 +1,7 @@
 
--# videos / edit
-  
-.row
-  .large-12.columns
-    %h2 Edit video
-    = render 'form', :video => @video
+
+.videos-edit.max-width
+  .header
+    %h3.title Edit Video
+
+  = render 'form', :video => @video

data/app/views/ish_manager/videos/index.haml

@@ -1,7 +1,3 @@
 
-.videos-index
-  = render 'ish_manager/sites/header', :site => @site if @site
-
-  = render 'search', path: videos_path
-
+.videos-index.padded
   = render 'index', :videos => @videos

data/app/views/ish_manager/videos/new.haml

@@ -1,5 +1,6 @@
 
-.row
-  .large-12.columns
-    %h2= t('videos.new')
-    = render 'form', :video => @video
+.videos-new.max-width
+  .header
+    %h3.title New Video
+
+  = render 'form', :video => @video

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

@@ -1,19 +1,24 @@
 
-- content_for :title do
-  #{@video.name}
+- video ||= @video
 
-.ish_manager-videos-show
-  = link_to '[Back]', videos_path
+.videos-show.max-width
+  .row
+    = link_to '[Back]', videos_path
 
-  = render 'embed', :video => @video
+  - if video.youtube_id.present?
+    %iframe{:allowfullscreen => "", :frameborder => "0", :height => "315", :src => "//www.youtube.com/embed/#{video.youtube_id}", :width => "560"}
+  - else
+    %iframe{:allowfullscreen => "true", :frameborder => "0", :height => "480", :src => "#{video.video.url}", :width => "640"}
 
-  .row
-    = image_tag @video.thumb.url(:thumb)
+  .flex-row
+    .a= image_tag video.thumb.url(:thumb)
     .a
       .title
-        = @video.name.blank? ? t('videos.no_title') : @video.name
-      .flex-row
-        = render 'meta_edit', item: @video
-        = render 'ish_manager/application/meta', :item => @video
-      .flex-row= link_to @video.video_file_name, @video.video.url
+        = video.name.blank? ? t('videos.no_title') : video.name
+        .meta-edit
+          .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          = link_to '[~]', edit_video_path( video )
+
+      = render 'ish_manager/application/metaline', :item => video
+      .flex-row= link_to video.video_file_name, video.video.url
 

data/app/views/ish_manager/videos/trash/_embed.haml

@@ -0,0 +1,5 @@
+
+- if video.youtube_id.present?
+  = render 'embed_youtube', video: video
+- else
+  = render 'embed_s3', video: video

data/config/routes.rb

@@ -27,6 +27,8 @@ IshManager::Engine.routes.draw do
   get 'iro_watches', to: 'iro_watches#index'
   get 'iro_purse',   to: 'iro_purses#my', as: :my_purse
 
+  resources :iro_strategies
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.378
+  version: 0.1.8.380
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,6 +290,7 @@ files:
 - app/assets/stylesheets/ish_manager/email_messages.scss
 - app/assets/stylesheets/ish_manager/email_templates.scss
 - app/assets/stylesheets/ish_manager/galleries.scss
+- app/assets/stylesheets/ish_manager/iro.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/leads_leadsets.scss
 - app/assets/stylesheets/ish_manager/maps.scss
@@ -319,6 +320,7 @@ files:
 - app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
 - app/controllers/ish_manager/iro_purses_controller.rb
+- app/controllers/ish_manager/iro_strategies_controller.rb
 - app/controllers/ish_manager/iro_watches_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/leadset_tags_controller.rb
@@ -385,6 +387,7 @@ files:
 - app/views/ish_manager/application/_main_header_admin.haml
 - app/views/ish_manager/application/_main_header_guy.haml
 - app/views/ish_manager/application/_meta.haml
+- app/views/ish_manager/application/_metaline.haml
 - app/views/ish_manager/application/_paginate.haml
 - app/views/ish_manager/application/_profile_pic.haml
 - app/views/ish_manager/application/_search.haml
@@ -462,10 +465,13 @@ files:
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml
+- app/views/ish_manager/iro_mailer/condor_followup_alerb.html.erb
+- app/views/ish_manager/iro_mailer/option_alert.html.erb
+- app/views/ish_manager/iro_mailer/stock_alert.html.erb
 - app/views/ish_manager/iro_purses/my.haml
-- app/views/ish_manager/iron_warbler_mailer/condor_followup_alerb.html.erb
-- app/views/ish_manager/iron_warbler_mailer/option_alert.html.erb
-- app/views/ish_manager/iron_warbler_mailer/stock_alert.html.erb
+- app/views/ish_manager/iro_strategies/_form.haml
+- app/views/ish_manager/iro_strategies/edit.haml
+- app/views/ish_manager/iro_strategies/new.haml
 - app/views/ish_manager/kaminari/_first_page.html.erb
 - app/views/ish_manager/kaminari/_gap.html.erb
 - app/views/ish_manager/kaminari/_last_page.html.erb
@@ -547,22 +553,22 @@ files:
 - app/views/ish_manager/user_profiles/show.haml
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/users/index.haml
-- app/views/ish_manager/videos/_embed.haml
-- app/views/ish_manager/videos/_embed_half.erb
-- app/views/ish_manager/videos/_embed_mini.erb
-- app/views/ish_manager/videos/_embed_s3.erb
-- app/views/ish_manager/videos/_embed_youtube.erb
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_index.haml
-- app/views/ish_manager/videos/_index_title.haml
-- app/views/ish_manager/videos/_list.haml
-- app/views/ish_manager/videos/_list_small.haml
-- app/views/ish_manager/videos/_meta_edit.haml
-- app/views/ish_manager/videos/_preview.haml
 - app/views/ish_manager/videos/edit.haml
 - app/views/ish_manager/videos/index.haml
 - app/views/ish_manager/videos/new.haml
 - app/views/ish_manager/videos/show.haml
+- app/views/ish_manager/videos/trash/_embed.haml
+- app/views/ish_manager/videos/trash/_embed_half.erb
+- app/views/ish_manager/videos/trash/_embed_mini.erb
+- app/views/ish_manager/videos/trash/_embed_s3.erb
+- app/views/ish_manager/videos/trash/_embed_youtube.erb
+- app/views/ish_manager/videos/trash/_index_title.haml
+- app/views/ish_manager/videos/trash/_list.haml
+- app/views/ish_manager/videos/trash/_list_small.haml
+- app/views/ish_manager/videos/trash/_meta_edit.haml
+- app/views/ish_manager/videos/trash/_preview.haml
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/done/20230316 application.haml
 - app/views/layouts/ish_manager/email_iframe.haml

data/app/views/ish_manager/videos/_embed.haml

@@ -1,5 +0,0 @@
-
-- if !video.youtube_id.blank?
-  = render 'embed_youtube', video: video
-- else
-  = render 'embed_s3', video: video