ish_manager 0.1.8.408 → 0.1.8.410

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3d7c68be921a90644c3f158f0873a5db4d5dc44932da10a73d13bde9f0d018
-  data.tar.gz: 99db7fb659636ca52a848953cbb5d978e36d4d2c5239b4ef578ba3bd84f35360
+  metadata.gz: 8324ef683622d8aca6298965f060b9f7bb28c8d2ec6bbd99011b34914ccd6b70
+  data.tar.gz: af207371888cee567d554cb1f0313fd717399dd42c93fc9b06f3b16fca0212fa
 SHA512:
-  metadata.gz: 854daef4bf1d14994b09369fec6ace543eaca5b5d490b8e1ce9aedf56d508ee8b177951dcdc8040842fcbd066301847f5d99ef103848079ea8728eb3a96ea308
-  data.tar.gz: d552b63ad9e052697fd6e39316c69a5e87d7eb6622b855ccee94d2c894628cd3e6e759e0106b6e286baad7daf14cececed44aba047e3e807fa3a5809aeda7e60
+  metadata.gz: 01d1fa18a16bcf11c0f991972eae21b57ed17024b33da5249d5396f85c812e8644448547f2fed3164ba565ee2daa89205b8b047e56d6727ee3f759b51f641d29
+  data.tar.gz: bae46a73d36c3bcdfd0f098fd9d75f2e86cab52f6e50a0b8c8eb07810b64ba0f2195f80e51fe87f5af0c4d02974d923612fd74ec7b63d1b2c7f3b83dffde2548

data/app/assets/javascripts/ish_manager/application.js

@@ -97,12 +97,16 @@ $(function () {
     }
   }
 
+  $(".close").click(function(ev) {
+    $(this).parent().slideToggle()
+  })
 
   $(".collapse-expand").each(function() {
     const thisId = $(this).attr('id')
     const state = localStorage.getItem("collapse-expand#"+thisId)
     if (state === 'collapsed') {
-      $(this).next().slideToggle();
+      $(this).next().slideToggle()
+      $(this).addClass('collapsed')
     }
   })
   $(".collapse-expand").click(function (_e) {
@@ -110,8 +114,10 @@ $(function () {
     const state = localStorage.getItem("collapse-expand#"+thisId)
     if (state === 'collapsed') {
       localStorage.removeItem("collapse-expand#"+thisId)
+      $(this).removeClass('collapsed')
     } else {
       localStorage.setItem("collapse-expand#"+thisId, "collapsed")
+      $(this).addClass('collapsed')
     }
     $(this).next().slideToggle();
   }).children().click(function (e) {

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

@@ -82,23 +82,11 @@ ul:not(.browser-default).bullets, {
 
 
 /* A */
-
-.collapse-expand::after {
-  content: " [<>]";
-}
-.expand-next + form {
-  // border: 1px solid red !important;
-  // display: none !important;
-}
-.expand-hide {
-  display: none;
-  position: absolute;
-  min-width: 250px;
-}
-
 .alert {
   border: 1px solid red;
   padding: .8em;
+  margin: 0.8em;
+  position: relative;
 }
 
 .application--debug {
@@ -145,12 +133,11 @@ table.bordered {
   padding: 0.5em;
 }
 
-/* B */
-
 .btn {
   border: 1px solid red;
 }
 
+
 /* C */
 
 .c {
@@ -168,6 +155,11 @@ table.bordered {
   text-align: center;
 }
 
+.close {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 
 .collapse-expand {
   cursor: pointer;
@@ -177,6 +169,17 @@ table.bordered {
   }
 }
 
+.collapse-expand::after {
+  content: " [<]";
+}
+.collapsed::after {
+  content: " [>]";
+}
+.expand-next + form {
+  // border: 1px solid red !important;
+  // display: none !important;
+}
+
 /* D */
 
 table.dataTable {
@@ -196,6 +199,13 @@ table.dataTable {
 }
 
 
+
+.expand-hide {
+  display: none;
+  position: absolute;
+  min-width: 250px;
+}
+
 /* E */
 .eg {
   font-size: 0.8em;
@@ -294,7 +304,8 @@ textarea.large {
   border-bottom: 2px solid red;
   margin-bottom: 1em;
 
-  a {
+  a,
+  span.label {
     background: white;
     padding: .2em;
   }
@@ -319,6 +330,8 @@ textarea.large {
       }
     }
   }
+
+
 }
 @media only screen and (max-width: 400px) {
   .main-header ul li {
@@ -386,6 +399,8 @@ textarea.large {
 .notice {
   border: 1px solid green;
   padding: .8em;
+  margin: 0.8em;
+  position: relative;
 }
 
 /* P */

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

@@ -1,4 +1,11 @@
 
+.iro-purses--form {
+  textarea {
+    min-width: 500px;
+    min-height: 500px;
+  }
+}
+
 .iro-purses-show {
   font-size: 14px;
 
@@ -104,4 +111,225 @@
     display: flex;
     justify-content: space-between;
   }
-}
+}
+
+.gameuiW {
+  border: 1px solid cyan;
+  border-radius: 0.5em;
+
+  position: relative;
+
+  margin-bottom: 100px;
+
+  width: 1000px;
+  height: 200px;
+
+  z-index: 0;
+
+  .elephant {
+    // border: 2px solid yellow;
+
+    background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04103931/200x125-elephant-1rmTiny.png');
+    width: 200px;
+    height: 125px;
+
+    position: absolute;
+
+    left: 700px;
+    bottom: 0;
+
+    &::after { /* arrow-up */
+      content: "";
+      position: absolute;
+      bottom: 0;
+      right: calc( 50% - 25px );
+
+      width: 0;
+      height: 0;
+      border-left: 25px solid transparent;
+      border-right: 25px solid transparent;
+
+      border-bottom: 25px solid red;
+    }
+  }
+
+  .elephantNext {
+    // border: 5px solid white;
+    border-radius: 50%;
+
+    display: none;
+
+    position: absolute;
+    bottom: -50px;
+    margin-left: 50px;
+    transform: scale(1.2);
+    opacity: 0.33;
+    background-color: green;
+
+  }
+
+  .grid {
+    background: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04110701/500x250-gridTiny.png');
+    background-size: 100%;
+    background-position: bottom center;
+
+    width: 1000px;
+    height: 200px;
+
+    position: absolute;
+    bottom: 0;
+    left: 0;
+
+    z-index: -1;
+  }
+
+  .ground {
+    border-bottom: 5px solid gray;
+
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 100%;
+    bottom: -50px;
+
+    background: gray;
+  }
+
+  .groundedW {
+    position: absolute;
+
+    right: -250px;
+    bottom: 0;
+
+    .grounded {
+      border: 2px solid pink;
+      background: rgba(255,255,255, 0.75);
+      border-radius: 50%;
+
+      width: 100px;
+      height: 100px;
+
+      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
+      background-size: cover;
+
+      .groundedStart {
+        // border: 2px solid white;
+        position: absolute;
+        background: #999;
+        bottom: 50px;
+        top: 11px;
+        left: 50%;
+        right: -40px;
+
+        z-index: -1;
+      }
+
+      .groundedCurrent {
+        position: absolute;
+        background: red;
+        bottom: 45px;
+        top: 52px;
+        left: 50%;
+        right: -30px;
+      }
+    }
+  }
+
+  .spearmanW {
+    border: 2px solid yellow;
+
+    position: absolute;
+    display: inline-block;
+
+    left: 800px;
+
+    .spearman {
+      // border: 2px solid orange;
+      background: rgba(255,255,255, 0.75);
+      border-radius: 50%;
+
+      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
+      background-size: cover;
+
+      width: 100px;
+      height: 100px;
+
+      position: absolute;
+      left: -50px;
+
+      // &::after { /* arrow-up */
+      //   content: "";
+      //   position: absolute;
+      //   bottom: 0;
+      //   right: calc( 50% - 25px );
+
+      //   width: 0;
+      //   height: 0;
+      //   border-left: 25px solid transparent;
+      //   border-right: 25px solid transparent;
+
+      //   border-bottom: 25px solid red;
+      // }
+
+      .spearmanStart {
+        position: absolute;
+        background: #999;
+        bottom: 50px;
+        top: 11px;
+        right: 50%;
+        left: -134px;
+
+        z-index: -1;
+      }
+
+      .spearmanCurrent {
+        position: absolute;
+        background: red;
+        bottom: 45px;
+        top: 52px;
+        right: 50%;
+        left: -97px;
+      }
+    }
+  }
+
+  .windW {
+    // border: 2px solid blue;
+
+    position: absolute;
+    left: 910px; /* ( <price> - 20 ) * 200 */
+    bottom: 0;
+
+    &::after { /* arrow-up */
+      border-bottom: 25px solid yellow;
+
+      content: "";
+      position: absolute;
+      bottom: 0;
+      // right: 50%;
+      left: -25px;
+
+      // width: 0;
+      // height: 0;
+      border-left: 25px solid transparent;
+      border-right: 25px solid transparent;
+    }
+
+    .wind {
+
+      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04104623/200x200-windTiny.png');
+      background-position: bottom center;
+
+      opacity: 0.5;
+
+      width: 200px;
+      height: 200px;
+
+      margin-left: -25px;
+
+      .windC {
+      }
+    }
+  }
+
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -23,9 +23,9 @@ class IshManager::ApplicationController < ActionController::Base
     render 'home'
   end
 
-  #
-  # private
-  #
+  ##
+  ## private
+  ##
   private
 
   def access_denied exception
@@ -33,6 +33,13 @@ class IshManager::ApplicationController < ActionController::Base
     redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
   end
 
+  def current_profile
+    return @current_profile if @current_profile
+    if current_user&.email
+      return @current_profile = Ish::UserProfile.find_by({ email: current_user.email })
+    end
+  end
+
   def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
     payload[:exp] = exp.to_i
     JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
@@ -66,6 +73,7 @@ class IshManager::ApplicationController < ActionController::Base
   def set_lists
     @blank_template       = Tmpl.new
 
+    @email_campaigns_list = [[nil,nil]] + Ish::EmailCampaign.all.map { |c| [ c.slug, c.id ] }
     @email_actions_list   = [[nil,nil]] + Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
     @email_templates_list = [[nil,nil]] + Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
     @galleries_list       = Gallery.all.list

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -1,37 +1,20 @@
 
 class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
-  def do_send
-
-    # case @ctx.type
-    # when ::Ish::EmailContext::TYPE_SINGLE
-    #   flash[:notice] = 'Scheduled a single send - v2'
-    #   @ctx.send_at = Time.now
-    #   @ctx.save
-    # when ::Ish::EmailContext::TYPE_CAMPAIGN
-    #   flash[:notice] = 'Scheduled campaign send'
-    #   IshManager::EmailCampaignJob.new.perform(params[:id])
-    # end
-  end
+  before_action :set_lists
 
   def index
     authorize! :index, Ish::EmailCampaign
-    @campaigns = Ish::EmailCampaign.where( :profile => @current_profile, :is_trash => false )
-    if params[:is_done]
-      @campaigns = @campaigns.where( :is_done => true )
-    else
-      @campaigns = @campaigns.where( :is_done => false )
-    end
+    @campaigns = Ish::EmailCampaign.all
   end
 
   def new
-    @new_campaign = Ish::EmailCampaign.new
-    authorize! :new, @new_campaign
+    @campaign = Ish::EmailCampaign.new
+    authorize! :new, @campaign
   end
 
   def create
     @campaign = Ish::EmailCampaign.new params[:campaign].permit!
-    @campaign.profile = @current_profile
     authorize! :create, @campaign
     if @campaign.save
       flash[:notice] = "created campaign"
@@ -41,9 +24,26 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  def do_send
+    @campaign = Ish::EmailCampaign.find params[:id]
+    authorize! :send, @campaign
+    @campaign.leads.each do |lead|
+      tmpl = @campaign.email_template
+
+      ctx = Ctx.create!({
+        email_template: tmpl,
+        send_at: Time.now,
+        lead_id: lead.id,
+        from_email: tmpl.from_email,
+        subject: tmpl.subject,
+      })
+    end
+
+  end
+
   def show
-    authorize! :redirect, IshManager::Ability
-    redirect_to :action => :edit, :id => params[:id]
+    @campaign = Ish::EmailCampaign.find params[:id]
+    authorize! :show, @campaign
   end
 
   def edit

data/app/controllers/ish_manager/iro_positions_controller.rb

@@ -5,14 +5,13 @@ class ::IshManager::IroPositionsController < IshManager::ApplicationController
 
   def create
     @position = Iro::Position.new({
-      iro_purse: @purse = Iro::Purse.find_or_create_by({ user_id: current_user.id }),
       type: 'Iro::CoveredCall',
     })
     authorize! :update, @position
 
-    if @position.update params[:position].permit!
+    if @position.update params[:iro_position].permit!
       flash[:notice] = 'Successfully updated position.'
-      redirect_to controller: 'iro_purses', action: :show
+      redirect_to controller: 'iro_purses', action: :show, id: params[:iro_position][:iro_purse_id]
     else
       flash[:alert] = "Cannot update position: #{@position.errors.full_messages.join(', ')}."
       render action: 'edit'
@@ -33,9 +32,9 @@ class ::IshManager::IroPositionsController < IshManager::ApplicationController
     @position = Iro::Position.find params[:id]
     authorize! :update, @position
 
-    if @position.update params[:position].permit!
+    if @position.update params[:iro_position].permit!
       flash[:notice] = 'Successfully updated position.'
-      redirect_to controller: 'iro_purses', action: :show
+      redirect_to controller: 'iro_purses', action: :show, id: @position[:iro_purse_id]
     else
       flash[:alert] = "Cannot update position: #{@position.errors.full_messages.join(', ')}."
       render action: 'edit'

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -3,13 +3,36 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create
+    @iro_purse = Iro::Purse.new({
+      profile_id: current_profile.id,
+    })
+    authorize! :create, @iro_purse
+
+    if @iro_purse.update params[:iro_purse].permit!
+      flash[:notice] = 'Successfully created iro_purse.'
+      redirect_to action: :show, id: @iro_purse.id
+    else
+      flash[:alert] = "Cannot create iro_purse: #{@iro_purse.errors.full_messages.join(', ')}."
+      render action: 'edit'
+    end
+  end
+
+  def edit
+    @iro_purse = Iro::Purse.find params[:id]
+    authorize! :edit, @iro_purse
+  end
+
+  def new
+    @iro_purse = Iro::Purse.new
+    authorize! :new, @iro_purse
+  end
+
   def show
-    @purse = Iro::Purse.find_or_create_by({ user_id: current_user.id })
+    @purse = Iro::Purse.find params[:id]
     authorize! :my, @purse
 
-    @strategies = Iro::CoveredCallStrategy.where({
-      iro_purse_id: Iro::Purse.find_by( user_id: current_user.id ).id,
-    })
+    @strategies = @purse.strategies
 
     underlyings = Tda::Stock.get_quotes( @strategies.map(&:ticker).compact.uniq.join(",") )
     # json_puts! underlyings, 'out'
@@ -19,6 +42,21 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
 
     @positions = @purse.positions.order({ expires_on: :asc, strike: :asc })
     @positions.map &:refresh
+
+    render @purse.parsed_config[:kind] || 'show'
+  end
+
+  def update
+    @iro_purse = Iro::Purse.find params[:id]
+    authorize! :update, @iro_purse
+
+    if @iro_purse.update params[:iro_purse].permit!
+      flash[:notice] = 'Successfully updated iro_purse.'
+      redirect_to action: :show, id: @iro_purse.id
+    else
+      flash[:alert] = "Cannot update iro_purse: #{@iro_purse.errors.full_messages.join(', ')}."
+      render action: 'edit'
+    end
   end
 
 end

data/app/controllers/ish_manager/leads_controller.rb

@@ -9,7 +9,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     authorize! :bulkop, ::Lead
     case params[:op]
     when Lead::OP_ADD_TO_CAMPAIGN
-      c = EmailCampaign.find params[:email_campaign_id]
+      c = Ish::EmailCampaign.find params[:email_campaign_id]
       params[:lead_ids].each do |lead_id|
         c_lead = EmailCampaignLead.new( lead_id: lead_id, email_campaign_id: c.id )
         flag = c_lead.save

data/app/mailers/ish_manager/office_mailer.rb

@@ -61,7 +61,10 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
     ac.instance_variable_set( :@ctx, @ctx )
 
     rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
-    @ctx.update( rendered_str: rendered_str, sent_at: Time.now.to_s )
+    @ctx.update({
+      rendered_str: rendered_str,
+      sent_at: Time.now.to_s,
+    })
 
     mail( from: @ctx.from_email,
           to: @ctx.to_email,

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

@@ -2,16 +2,11 @@
 .row.max-width
   .col-sm-12
     - if notice
-      - if notice.class == Array
-        %ul.notice
-          - notice.map do |n|
-            %li= n
-      - else
-        %p.notice= notice
+      .notice
+        = notice
+        .close [x]
     - if alert
-      - if alert.class == Array
-        %ul.alert
-          - alert.map do |n|
-            %li= n
-      - else
-        %p.alert= alert
+      .alert
+        = alert
+        .close [x]
+