ish_manager 0.1.8.239 → 0.1.8.244

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 208869e35c7304b99714faecff1b8635497a095e308a7399df41c1edd3984a81
-  data.tar.gz: 8be22120c502b62a75c2fe6c6d22a0965f56e562e9ee1d52c236bb1a0250f6f3
+  metadata.gz: 63fbcf375a430c186dd0bfca172e3b5826a7bbc417d252eb3e3960af2d7e86bf
+  data.tar.gz: 19314dbe96dc251ea4bd6cfadc466d9a7f4123de691ba8ca61619976d00ed860
 SHA512:
-  metadata.gz: d1ba12ebbc738f2e4d0308100cba6a7bc3e67805bfe21bfd40d7254fbbd9fd92a49b31d12bc3969886a2934f0936bee55356d94fccc816dcf5fe2949cc1424ab
-  data.tar.gz: d413b13bae7f33a29603bb8ec2adaeca6606f52bdfcc2d3e7502818ceaba6bc559a736e6fce52f6622c08c4caf55c80a8a940d8a18993ba00a4e24a4810f882e
+  metadata.gz: 74dbbf731cdf117c165a7ec7fa8117c3425559ef1848ffc22342dc597fd0c6e440c43ef1e1c6b0dfa730e642888de1485d18ed192e15065ece9eb198e4412865
+  data.tar.gz: 48a6f72e6bfa6f8260b1c8d25c1639665d1cc097a2ac90bb0548652836e4415e888879a593fd3d78b3d1991db8b7ae413ad355cd463586b45ee42c1854e254b1

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -3,9 +3,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def new
     @newsitem = Newsitem.new
-    @sites    = Site.list
-    @cities   = City.list
-    @tags     = Tag.list
+
+    @cities_list   = City.list
+    @maps_list     = ::Gameui::Map.list
+    @sites_list    = Site.list
+    @tags_list     = Tag.list
+
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem.city = @city
@@ -30,6 +33,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource ||= Tag.find params[:tag_id]                if params[:tag_id]
     @resource ||= Tag.find params[:newsitem][:tag_id]     if !params[:newsitem][:tag_id].blank?
     @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
+    @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
 
     authorize! :create_newsitem, @resource
@@ -52,7 +56,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     else
       root_path
     end
-    
+
     flag = @newsitem.save && @resource.save
     if flag
       @resource.touch
@@ -66,7 +70,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       render :action => :new
     end
   end
-  
+
   def destroy
     authorize! :destroy, Newsitem
     if params[:city_id]
@@ -121,7 +125,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     end
     authorize! :update, @newsitem
     flag = @newsitem.update_attributes params[:newsitem].permit!
-    
+
     if flag
       flash[:notice] = 'Success'
     else
@@ -130,7 +134,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
     redirect_to url
   end
-  
+
   def edit
     out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
     @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
@@ -144,7 +148,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem = @city.newsitems.find( params[:id] )
     end
     authorize! :edit, @newsitem
-    
+
   end
 
   def index

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

@@ -37,4 +37,6 @@
       %a{id: "large_#{photo.id}" }
       .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
       = link_to "large", photo.photo.url(:large)
+       | 
+      = link_to "original", photo.photo.url(:original)
       .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -12,7 +12,7 @@
         - @map.errors.full_messages.each do |message|
           %li= message
 
-  
+
   .row
     .col-md-3
       .field
@@ -32,7 +32,8 @@
         = f.number_field :h
   .field
     = f.label :description
-    = f.text_field :description
+    = f.text_area :description, class: 'tinymce'
+
   .field
     = f.label :img_path
     = f.text_field :img_path

data/app/views/ish_manager/maps/{_map_flat_row.haml → _map_meta_row.haml}

@@ -4,5 +4,6 @@
   .a= button_to '~', edit_map_path(map), method: :get
   .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
   .a= button_to '+marker', new_map_marker_path(map), method: :get
+  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
   .a= link_to '[api]', api_map_path(map)
   .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }

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

@@ -3,17 +3,4 @@
   %h1 Maps #{link_to '[+]', new_map_path}
   - @maps.each do |map|
     .item
-      .col
-        = render 'map_flat_row', map: map
-        %p= map.description
-        = image_tag map.img_path, width: 400
-      .col
-        .row
-          .a Markers (#{map.markers.length})
-          .a #{button_to '+', new_map_marker_path(map), method: :get}
-        %ul.markers
-          - map.markers.each do |marker|
-            %li
-              = marker.slug
-              = link_to '[~]', edit_marker_path(marker)
-
+      = render 'map_meta_row', map: map

data/app/views/ish_manager/maps/index.haml-trash

@@ -0,0 +1,17 @@
+
+.maps-index
+  %h1 Maps #{link_to '[+]', new_map_path}
+  - @maps.each do |map|
+    .item
+      .col
+        = render 'map_meta_row', map: map
+      .col
+        .row
+          .a Markers (#{map.markers.length})
+          .a #{button_to '+', new_map_marker_path(map), method: :get}
+        %ul.markers
+          - map.markers.each do |marker|
+            %li
+              = marker.slug
+              = link_to '[~]', edit_marker_path(marker)
+

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

@@ -1,13 +1,16 @@
 
 .maps-show
-  = render 'map_flat_row', map: @map
-  .descr= @map.description
+  = render 'map_meta_row', map: @map
+  %p.addToggle Description [<>]
+  .descr= raw @map.description
 
+  %p.addToggle The Map [<>]
   .the-map
     = image_tag @map.img_path, width: @map.w
     - @map.markers.each do |marker|
       .marker{ style: "position: absolute; left: #{marker.x}px; top: #{marker.y}px;" }= image_tag marker.img_path
 
+  %p.addToggle Markers (#{@map.markers.count}) [<>]
   .markers-list
     - @map.markers.each do |marker|
       .item
@@ -18,3 +21,9 @@
           .a= link_to '[api]', api_marker_path(marker)
         %ul.bullets
           %li <b>item_type:</b> #{marker.item_type}
+
+  %p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
+  .newsitems-list
+    - @map.newsitems.each do |newsitem|
+      .item
+        = newsitem.inspect

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

@@ -2,17 +2,21 @@
 = form_for newsitem, :html => { :multipart => true } do |f|
   .row
     .col-sm-6{ style: 'border-right: 1px solid red;' }
+      %br
+      = f.label :map
+      = f.select :map_id, options_for_select( @maps_list, selected:( @map ? @map.id : params[:map_id] || nil ) )
+      %br
       = f.label :site
-      = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : nil ) )
+      = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : params[:site_id] || nil ) )
       %br
       = f.label :city
-      = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : nil ) )
+      = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : params[:city_id] || nil ) )
       %br
       = f.label :tag
-      = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
+      = f.select :tag_id, options_for_select( @tags_list, selected:( @tag ? @tag.id : params[:tag_id] || nil ) )
       %br
       = f.label :user_profile
-      = f.select :user_profile_id, options_for_select( @user_profiles_list )
+      = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( @user_profile ? @user_profile.id : params[:user_profile_id] || nil ) )
 
     .col-sm-6
       = f.label :name
@@ -33,7 +37,7 @@
       = f.label :report
       = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
   .a
-    
+
   .a
     = f.submit :submit
-  
+

data/config/routes.rb

@@ -16,7 +16,7 @@ IshManager::Engine.routes.draw do
   end
 
   resources :covered_calls
-  
+
   resources :email_templates
   resources :events
 
@@ -27,12 +27,12 @@ IshManager::Engine.routes.draw do
   get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
   get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
   get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
-  get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES 
+  get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES
     }, as: :galleries_shared_titles
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
-  
+
   resources :invoices do
     # resources :payments
   end
@@ -45,6 +45,7 @@ IshManager::Engine.routes.draw do
   scope 'gameui' do
     resources 'maps' do
       resources 'markers'
+      resources 'newsitems'
     end
     resources 'markers' # redundant
   end
@@ -59,7 +60,7 @@ IshManager::Engine.routes.draw do
   resources :photos
   resources :payments
   ## profiles, see user_profiles
-  
+
   resources :reports
 
   resources :sites do
@@ -75,7 +76,7 @@ IshManager::Engine.routes.draw do
     resources :videos
     resources :tags
   end
-  
+
   # resources :stock_actions
   # resources :stock_options
   resources :stock_watches
@@ -98,5 +99,5 @@ IshManager::Engine.routes.draw do
 
   resources :venues
   resources :videos
-  
+
 end

data/lib/tasks/ish_manager_tasks.rake

@@ -42,7 +42,7 @@ namespace :ish_manager do
           # stock.stock_actions.where( :is_active => true ).each do |action|
           #   # @TODO: actions
           # end
-          
+
         end
       end
       sleep 60
@@ -50,6 +50,28 @@ namespace :ish_manager do
   end
 =end
 
+  desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
+  task watch_stocks: :environment do
+    while true
+      stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
+      stocks.each do |stock|
+        begin
+          Timeout::timeout( 10 ) do
+            out = Ish::Ameritrade::Api.get_quote({ symbol: stock.ticker })
+            r = out[:lastPrice]
+            if  stock.direction == :ABOVE &&  r >= stock.price ||
+                stock.direction == :BELOW && r <= stock.price
+              IshManager::ApplicationMailer.stock_alert( stock ).deliver
+           end
+          end
+        rescue Exception => e
+          puts! e, 'e in :watch_stocks'
+        end
+      end
+      sleep 60
+    end
+  end
+
   desc 'watch condors'
   task watch_condors: :environment do
     watcher = ::Ish::IronCondorWatcher.new
@@ -60,6 +82,7 @@ namespace :ish_manager do
     end
   end
 
+=begin
   desc 'yahoo-watch the stocks'
   task :stockwatcher => :environment do
     watcher = YahooStockwatcher.new
@@ -69,5 +92,6 @@ namespace :ish_manager do
       sleep 60 # seconds
     end
   end
+=end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.239
+  version: 0.1.8.244
 platform: ruby
 authors:
 - piousbox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -285,9 +285,10 @@ files:
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/maps/_form.haml
-- app/views/ish_manager/maps/_map_flat_row.haml
+- app/views/ish_manager/maps/_map_meta_row.haml
 - app/views/ish_manager/maps/edit.haml
 - app/views/ish_manager/maps/index.haml
+- app/views/ish_manager/maps/index.haml-trash
 - app/views/ish_manager/maps/new.haml
 - app/views/ish_manager/maps/show.haml
 - app/views/ish_manager/markers/_form.haml
@@ -333,14 +334,6 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
-- app/views/ish_manager/trash/ally/home.haml
-- app/views/ish_manager/trash/co_tailors/_product_form.haml
-- app/views/ish_manager/trash/co_tailors/home.haml
-- app/views/ish_manager/trash/covered_calls/index.haml
-- app/views/ish_manager/trash/friends/index.haml
-- app/views/ish_manager/trash/iron_condors/_form.haml
-- app/views/ish_manager/trash/iron_condors/index.haml
-- app/views/ish_manager/trash/orders/index.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
@@ -379,7 +372,7 @@ homepage: http://wasya.co
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -394,8 +387,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.2.25
+signing_key: 
 specification_version: 4
 summary: Summary of IshManager.
 test_files: []

data/app/views/ish_manager/trash/ally/home.haml

@@ -1,6 +0,0 @@
-
-%h5 Ally Home
-
-%ul
-  %li= link_to 'Stock Options (positions)', stock_options_path
-  %li= link_to 'Stock Watches', stock_watches_path

data/app/views/ish_manager/trash/co_tailors/_product_form.haml

@@ -1,21 +0,0 @@
-
-.panel.dropShadow
-  .panel-content
-    = form_for product, :url => product.persisted? ? co_tailors_product_path(product) : co_tailors_products_path do |f|
-      .row
-        .col-xs-6
-          .input-field
-            = f.text_field :kind
-            = f.label "kind (shirt, pants, suit)"
-          .input-field
-            = f.text_field :title
-            = f.label "title"
-          .input-field
-            = f.number_field :cost
-            = f.label "cost (cents)"
-          = f.submit
-        .col-xs-6
-          .input-field
-            = f.text_area :description, :style => "height: 200px;"
-            = f.label "description"
-

data/app/views/ish_manager/trash/co_tailors/home.haml

@@ -1,12 +0,0 @@
-
-%h4 CoTailors Home
-%h5 Products
-= render 'ish_manager/co_tailors/product_form', :product => CoTailors::Product.new
-%hr
-
-%ul
-  - @products.each do |product|
-    %li
-      = render 'ish_manager/co_tailors/product_form', :product => product
-      %hr
-  

data/app/views/ish_manager/trash/covered_calls/index.haml

@@ -1,2 +0,0 @@
-
-Covered Calls

data/app/views/ish_manager/trash/friends/index.haml

@@ -1,20 +0,0 @@
-
-%h5 Friends
-
-.panel
-  .panel-body
-    = form_for @new_friend, :as => :friend, :url => friends_path do |f|
-      .row
-        .col-sm-6
-          = f.text_field :email, :placeholder => 'email'
-        .col-sm-6
-          = f.submit 'Add Friend'
-          
-- @friends.each do |friend|
-  .panel
-    .panel-body
-      = friend.email
-      .row
-        .col-sm-6.description
-          Galleries shared with them:
-          = render 'ish_manager/galleries/index_title', :galleries => friend.shared_galleries.unscoped.where( :is_trash => false, :user_profile => current_user.profile )

data/app/views/ish_manager/trash/iron_condors/_form.haml

@@ -1,41 +0,0 @@
-
-%div{ class: condor.persisted? ? 'card' : '' }
-  - if condor.persisted?
-    .float-left= button_to '[X]', iron_condor_path(condor.id), method: :delete, data: { confirm: 'Are you sure?' }
-
-  - url = condor.persisted? ? iron_condor_path( condor ) : iron_condors_path
-  = form_for condor, url: url, :html => { :class => 'form-inline well' } do |f|
-    .row
-      .col
-        %label.control-label Ticker
-        = f.text_field :ticker, :class => 'form-control', placeholder: 'QQQ'
-      .col
-        %label.control-label # Contracts
-        = f.text_field :n_contracts, :class => 'form-control', placeholder: 1
-      .col
-        = f.label :status
-        = f.select :status, options_for_select( ['']+::Ish::IronCondor::STATUSES, selected: condor.status )
-      .col
-        %label.control-label Expires on
-        = f.text_field :expires_on, :class => 'form-control datepicker', placeholder: :expires_on, id: "expires_on_#{condor.id}"
-    .row
-      .col
-        = f.label :iv_annual
-        = f.number_field :iv_annual, placeholder: 18, step: :any
-
-      - if condor.persisted?
-        .col
-          %ul
-            %li <b>Call Sell Strike:</b> #{condor.call_sell_strike}
-            %li <b>Call Buy Strike:</b> #{condor.call_buy_strike}
-            %li <b>Put Sell Strike:</b> #{condor.put_sell_strike}
-            %li <b>Put Buy Strike:</b> #{condor.put_buy_strike}
-        .col
-          %ul
-            %li <b>Enter Price:</b> #{pp_amount condor.enter_price}
-            %li <b>Upper Panic Therhold:</b> #{pp_amount condor.upper_panic_threshold}
-            %li <b>Lower Panic Therhold:</b> #{pp_amount condor.lower_panic_threshold}
-
-      .col
-        = f.submit ">", :class => %w(btn blue)
-    .c

data/app/views/ish_manager/trash/iron_condors/index.haml

@@ -1,10 +0,0 @@
-
-%h1
-  Iron Condors
-
-- @condors.each do |condor|
-  = render 'form', condor: condor
-
-%hr
-New:
-= render 'form', condor: ::Ish::IronCondor.new

data/app/views/ish_manager/trash/orders/index.haml

@@ -1,7 +0,0 @@
-
-%h5 All Orders (#{@orders.length})
-
-%ul
-  - @orders.each do |order|
-    %li= order.inspect
-