ish_manager 0.1.8.401 → 0.1.8.403

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be589998f18fd38b580126da0bfa392b6ad70bc1f599d3c2fa706c45a34590b7
-  data.tar.gz: 1b17229b7e15682dffd49bb9267dc421f7d5e7411537ba9ddbdc9b86430ee0b8
+  metadata.gz: 8a3b2381f54eb7b66d392fbaa4051bd78ee53f1ad8b455f8a55db82a0c9fca62
+  data.tar.gz: 65a33aebdf8b15526dee6e37f62824b304f2a0672eef3e55ebd866dd072d5fe8
 SHA512:
-  metadata.gz: be2e3ba6f631f0e157d70b3c6d6a4891a4f3e5cde14ca40a72f4636b14449a55859287535792fb600db763e205dd2b3efc222ddb230b9c3febd9af456afa18f0
-  data.tar.gz: 281506080e7953135bd07161896c6e01467cc62c03ff8500907e0dfe3d8d5a21cbb7b8679b99564d46b37704d6c972ec7bf1d9c3ba93062b3ef36c2d55da4dd4
+  metadata.gz: a7284a7a74330a4878a4b2136e17aa3c8ac47079fcbb36fb758c7c8b8252bbcc84eb66c578789971af86bad0fa2b39568285d72024be5185fb7f632c01d5beaa
+  data.tar.gz: 047b94313ffef19b69373fdc99d918d9c4f9c4ab76e87d75256e086a8d0e9b12a0c891eb02bc259c32a8edb5bbc6b870733fc485b8cee2765300c58b147c9075

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

@@ -42,10 +42,20 @@ a[target='_blank'] {
 }
 html {
   height: 100%;
+  width: 100%;
+  // display: flex;
+  background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
 }
 body {
   background: #dedede;
   font-size: 20px;
+  width: 100%;
+}
+
+body.application-fullwidth {
+  // height: 100%;
+  // display: flex;
+  // flex-direction: column;
 }
 hr {
   background: red;
@@ -95,11 +105,6 @@ ul:not(.browser-default).bullets, {
   width: 100vwh;
   overflow-x: auto;
 }
-body.application-fullwidth {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
 .application-home {
   .bordered-card {
     max-width: 400px;

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -70,6 +70,8 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
     if params[:notsent]
       @ctxs = @ctxs.where( sent_at: nil )
+    else
+      @ctxs = @ctxs.where( :sent_at.ne => nil )
     end
 
     if params[:lead_id]

data/app/controllers/ish_manager/iro_positions_controller.rb

@@ -0,0 +1,45 @@
+
+class ::IshManager::IroPositionsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  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!
+      flash[:notice] = 'Successfully updated position.'
+      redirect_to controller: 'iro_purses', action: :show
+    else
+      flash[:alert] = "Cannot update position: #{@position.errors.full_messages.join(', ')}."
+      render action: 'edit'
+    end
+  end
+
+  def edit
+    @position = Iro::Position.find params[:id]
+    authorize! :edit, @position
+  end
+
+  def new
+    @position = Iro::Position.new
+    authorize! :new, @position
+  end
+
+  def update
+    @position = Iro::Position.find params[:id]
+    authorize! :update, @position
+
+    if @position.update params[:position].permit!
+      flash[:notice] = 'Successfully updated position.'
+      redirect_to controller: 'iro_purses', action: :show
+    else
+      flash[:alert] = "Cannot update position: #{@position.errors.full_messages.join(', ')}."
+      render action: 'edit'
+    end
+  end
+
+end

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -3,10 +3,11 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  def my
+  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,
     })

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

@@ -2,7 +2,7 @@
 #Config{ data: { jwt_token: @jwt_token } }
 
 .manager--main-footer
-  .container
+  .max-width
 
     %i.fa.fa-compress.collapse-expand#mainFooter
       Account & Session

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

@@ -58,7 +58,7 @@
           = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          = link_to 'Contexts', notsent_email_contexts_path
+          = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
         -# %li
         -#   = link_to 'Campaigns', email_campaigns_path

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

@@ -3,16 +3,22 @@
 
   .header.collapse-expand-trash#emailContextsIndex
     %h2.title
+      - if params[:notsent]
+        <u>notsent</u>
+        = link_to '[sent]', sent_email_contexts_path
+      - else
+        = link_to '[notsent]', notsent_email_contexts_path
+        <u>sent</u>
       Email Contexts (#{@ctxs.length})
       - if @lead
         For lead `#{@lead.name}`
       = link_to '[+]', new_email_context_path
-      = link_to '[unsent]', notsent_email_contexts_path
+
 
   .W0
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
 
-    %table.bordered.data-table
+    %table.bordered
       %thead
         %tr
           %th.actions
@@ -20,6 +26,8 @@
           %th.to To
           %th.subject Subject
           %th.template Template
+          %th.send_at Send at
+          %th.sent_at Sent at
       %tbody
         - @ctxs.each do |ctx|
           %tr
@@ -36,6 +44,8 @@
               = 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= pp_date ctx.sent_at
 
 
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager

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

@@ -20,7 +20,7 @@
         %li <b>Send at:</b> #{@ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li <b>Sent at:</b> #{@ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li
-          = button_to 'Send', email_context_send_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+          = button_to 'Send', send_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
           = link_to '[~]', edit_email_context_path(@ctx)
 
   .max-width

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

@@ -0,0 +1,34 @@
+
+- url = position.new_record? ? iro_positions_path : iro_position_path( position )
+
+.iro-positions--form
+  = form_for position, as: :position, url: url do |f|
+    .flex-row
+      .field Position ##{position.id}
+      .field
+        = f.label :strategy
+        = f.select :iro_strategy_id, options_for_select( Iro::CoveredCallStrategy.list, selected: position.iro_strategy_id ), {}, class: 'select2'
+      .field
+        = f.label :ticker
+        = f.text_field :ticker
+
+      .field
+        = f.label :strike
+        = f.number_field :strike, step: 0.01
+
+      .field
+        = f.label :expires_on
+        = f.text_field :expires_on
+      .field
+        = f.label :status
+        = f.select :status, options_for_select( Iro::Position.statuses_list, selected: position.status ), {}, class: 'select2'
+
+      .field
+        = f.label :opened_price
+        = f.text_field :opened_price
+      .field
+        = f.label :opened_on
+        = f.text_field :opened_on
+
+      .actions
+        = f.submit 'Submit'

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

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

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

@@ -0,0 +1,3 @@
+
+.iro-positions-new.padded
+  = render 'form', position: @position

data/app/views/ish_manager/iro_purses/{my.haml → show.haml}

@@ -1,9 +1,10 @@
 
 .iro-purses-my.padded
   .header
-    %h2.title My purse value: $#{@purse.current_value}
+    %h2.title Purse value: $#{@purse.current_value}
 
   .strategies
+    .title Strategies
     - @strategies.each do |strat|
       .strategy
         = link_to '[~]', edit_iro_strategy_path( strat )
@@ -11,13 +12,15 @@
 
 
   .positions
-    %h3 Positions (#{@positions.length})
+    %h3
+      Positions (#{@positions.length})
+      = link_to '[+]', new_iro_position_path
 
     %table.bordered
       %thead
         %tr
           %td id
-          %td Strat
+          %td Strategy
           %td Ticker
           %td Kind/Type
           %td Strike
@@ -40,8 +43,10 @@
       %tbody
         - @positions.each do |p|
           %tr
-            %td= p.id
-            %td= p.iro_strategy_id
+            %td
+              = p.id
+              = link_to '[~]', edit_iro_position_path(p)
+            %td= p.strategy
             %td= p.ticker
             %td= p.type == "Iro::CoveredCall" ? "CALL" : "other"
             %td= p.strike

data/config/routes.rb

@@ -25,10 +25,11 @@ IshManager::Engine.routes.draw do
   # end
   # resources :orders
 
+  resources :iro_positions
 
   # get 'iro_watches', to: 'iro_watches#index'
   resources :iro_watches
-  get 'iro_purse',   to: 'iro_purses#my', as: :my_purse
+  get 'iro_purse',   to: 'iro_purses#show', as: :my_purse
 
   resources :iro_strategies
 
@@ -73,9 +74,10 @@ IshManager::Engine.routes.draw do
   get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
   get  'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
-  post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send
-  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: false }
+  post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :send_email_context
+  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: true }
   get  'email_contexts/notsent',                 to: 'email_contexts#index',      as: :notsent_email_contexts, defaults: { notsent: true }
+  get  'email_contexts/sent',                    to: 'email_contexts#index',      as: :sent_email_contexts,    defaults: { notsent: false }
   resources :email_contexts
 
   get    'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe

data/lib/tasks/office_tasks.rake

@@ -51,16 +51,14 @@ namespace :office do
   task email_worker: :environment do
     while true do
 
-      ctxs = ::Ish::EmailContext.scheduled.unsent
-      puts! ctxs.count, 'ctxs'
+      ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
         IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
-        print '.'
+        print '^'
       end
 
-      # sleep 1.minute
-      sleep 10.seconds
-      print '^'
+      sleep 60 # seconds
+      print '.'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.401
+  version: 0.1.8.403
 platform: ruby
 authors:
 - piousbox
@@ -320,6 +320,7 @@ files:
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
+- app/controllers/ish_manager/iro_positions_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
@@ -478,7 +479,10 @@ files:
 - 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/iro_positions/_form.haml
+- app/views/ish_manager/iro_positions/edit.haml
+- app/views/ish_manager/iro_positions/new.haml
+- app/views/ish_manager/iro_purses/show.haml
 - app/views/ish_manager/iro_strategies/_form.haml
 - app/views/ish_manager/iro_strategies/edit.haml
 - app/views/ish_manager/iro_strategies/new.haml