ish_manager 0.1.8.290 → 0.1.8.293

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b58036e1539dc6ab5736bdfb26e2cfd5f5d7f700675540e30c217e6547e9d4
-  data.tar.gz: 0a4462c36638c02afe159693f2294ef6137b295d28804bcdb765ca6e9c026f37
+  metadata.gz: 003ba4fc5ca38c36425d1f37b39d8b20b1867ce3fb40d335981f5642b056107a
+  data.tar.gz: 07f4a1584f2e74dca16ba689bc21191db95b70110f03fb50235852f25bf88ad2
 SHA512:
-  metadata.gz: 726d51acd9a2174e61aa7ffc37268e64ed9358c7ca6ae966debf97f91c98300497aee508e15743a8b0900ab74a96fddcd6484c10900d0fe44b72250fe0d4f998
-  data.tar.gz: 89b8ebe2784ff1c31098fcc9f6fd5dd8c4e4624e1aad2a6a2023ca62b8970cb85170c72489bad47947bf6377a7d1fdf78a664c7406657837a14f09bf657cfa18
+  metadata.gz: e18578b798026116b629a2a00c0c928175d07ea0ee6e9bc8dfafcbeaac09942b589737edcb15270ac1cd4f5a851bb187116c334f7a972294db793d9ff5101c4b
+  data.tar.gz: 8ddbc3c909e71fc40df9695fe98f963b833ee07973162f9452e9fd68c549c3ec9081b315eedc6417a63d2b55be8af46ef7dc87da91e97156e55739ab0fb9a70c

data/app/controllers/ish_manager/maps_controller.rb

@@ -4,6 +4,8 @@ class IshManager::MapsController < IshManager::ApplicationController
   before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
   before_action :set_lists
 
+  layout 'ish_manager/application_no_material', only: %w| index |
+
   # alphabetized
 
   def create
@@ -37,8 +39,10 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
   end
 
+  ## @TODO: @obsolete, remove
   def edit
     authorize! :edit, @map
+    redirect_to action: 'show'
   end
 
   def export
@@ -60,7 +64,15 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
     contents = JSON.parse contents
     contents.deep_symbolize_keys!
-    puts! contents, 'contents'
+
+    if params[:delete_existing]
+      map_ids = contents[:maps].map { |m| m[:_id] }
+      Map.where( :_id.in => map_ids ).destroy_all
+
+      marker_ids = contents[:markers].map { |m| m[:_id] }
+      Marker.where( :_id.in => marker_ids ).destroy_all
+    end
+
 
     ##
     ## process content
@@ -71,7 +83,6 @@ class IshManager::MapsController < IshManager::ApplicationController
     profiles = contents[:profiles]
     contents.delete :profiles
     profiles.each do |profile|
-      puts! profile, 'a profile'
       if Ish::UserProfile.where( _id: profile[:_id] ).first
         errors.push({ message: "profile #{profile[:email]} already exists." })
       else
@@ -94,11 +105,10 @@ class IshManager::MapsController < IshManager::ApplicationController
 
     # everything else
     contents.each do |k, v|
-      puts! [k,v], 'k-v'
+      # puts! [k, v], "Importing"
       item = Map.export_key_to_class[k].constantize
       v.map do |inn|
         n = item.new inn
-        puts! n, 'n'
         begin
           flag = n.save
         rescue Mongo::Error::OperationFailure => e
@@ -107,7 +117,6 @@ class IshManager::MapsController < IshManager::ApplicationController
         if flag
           errors.push({ class: k, id: inn[:_id], messages: 'ok' })
         else
-          puts! n.errors.full_messages.join(", ")
           errors.push({ class: k, id: inn[:_id], messages: "Could not save: |#{n.errors.full_messages.join(", ")}|." })
         end
       end

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

@@ -6,9 +6,13 @@
   %h1
     Maps (#{@maps.length})
     = link_to '[+]', new_map_path
+
   .red-border
     = form_tag import_map_path, :multipart => true do
       = file_field_tag :input
+      .a
+        = label_tag :delete_existing
+        = check_box_tag :delete_existing
       = submit_tag 'Import Map'
 
   - @maps.each do |map|

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

@@ -52,3 +52,6 @@
 = render 'form'
 
 = button_to 'Export Subtree', export_map_path(@map.id, format: :json)
+
+= render 'index_item', map: @map
+

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

@@ -10,14 +10,12 @@
         = f.label :name
         = f.text_field :name
       .field
-        = f.label :created_at
-        = f.text_field :created_at
+        = label_tag :photo
+        = file_field_tag :photo
       .field
         = f.label :descr
         = f.text_area :descr, :class => :tinymce
-      .field
-        = label_tag :photo
-        = file_field_tag :photo
+
 
     .col.s6
       .field
@@ -29,11 +27,6 @@
       .field
         = f.label :city
         = f.select :city_id, options_for_select( @cities_list, :selected => ( newsitem[:city_id] || params[:city_id] ) )
-      -# @TODO: tags must be multi-select, not 1x1
-      .field
-        = f.label :user_profile
-        = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( newsitem[:user_profile_id] || params[:user_profile_id] ) )
-
 
   %hr
   .row

data/app/views/layouts/ish_manager/application_no_material.haml

@@ -0,0 +1,43 @@
+!!!
+%html
+  %head
+    %title Ish Manager
+    %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
+    %meta{ :charset => 'UTF-8' }
+    %meta{ :description => 'some description' }
+    %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
+    %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
+    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
+    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
+    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
+    = stylesheet_link_tag "ish_manager/application", media: "all"
+
+    = javascript_include_tag "ish_manager/application"
+
+    = csrf_meta_tags
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
+    .bg-white
+      = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
+      .container
+        .row
+          .col.s12
+            - if notice
+              - if notice.class == Array
+                %ul
+                  - notice.map do |n|
+                    %li
+                      - n.map do |k,v|
+                        <b>#{k} :</b> #{v}
+              %p.notice= notice
+            - if alert
+              %p.alert= alert
+      .container
+        = yield
+    = render 'ish_manager/application/main_footer'
+    = render 'analytics' if Rails.env.production?
+    = render 'debug' if !Rails.env.production?
+

data/config/routes.rb

@@ -51,7 +51,7 @@ IshManager::Engine.routes.draw do
       resources 'newsitems'
     end
     post 'maps/import', to: 'maps#import', as: :import_map
-    get 'maps/:id', to: 'maps#edit'
+    get 'maps/:id', to: 'maps#show'
     post 'maps/:id/export', to: 'maps#export', as: :export_map
 
     resources 'markers'
@@ -84,8 +84,7 @@ IshManager::Engine.routes.draw do
     resources :tags
   end
 
-  # resources :stock_actions
-  # resources :stock_options
+  ## @TODO: move these to iron warbler
   resources :stock_watches
   resources :option_watches
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.290
+  version: 0.1.8.293
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -446,6 +446,7 @@ files:
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/application.haml-trash
 - app/views/layouts/ish_manager/application2.haml
+- app/views/layouts/ish_manager/application_no_material.haml
 - config/routes.rb
 - config/systemd/system/README.txt
 - config/systemd/system/stockwatcher.service