ish_manager 0.1.8.243 → 0.1.8.244

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea7280723a81047ae129c4bc0de3b3c3c0329aeb69f10c260ca8a9f5a159d27
-  data.tar.gz: 9319e58a879bc865678839607091684c5a529f2ab62788cbedc904ab14bc5e70
+  metadata.gz: 63fbcf375a430c186dd0bfca172e3b5826a7bbc417d252eb3e3960af2d7e86bf
+  data.tar.gz: 19314dbe96dc251ea4bd6cfadc466d9a7f4123de691ba8ca61619976d00ed860
 SHA512:
-  metadata.gz: d4ef061a68c19be3792a144506adbc1df91e8cfcf0e234ad3a7476391687a1baf34f46e960bbc7c0df03319b24abfb0a451e7d6b6c2155429363742350d95a84
-  data.tar.gz: d4049361f28d18b007f4fb042243d4b612e30bba6d81f75223874b76c64f2790147e7abd6fd77f8a4598e23e2a117f63815761d3c510526ad666cfd36713540e
+  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

@@ -50,7 +50,7 @@ namespace :ish_manager do
   end
 =end
 
-  desc 'watch the stocks 2, and trigger actions - not alphavantage, tda now. 2021-08-08'
+  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 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.243
+  version: 0.1.8.244
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-08 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