ish_manager 0.1.8.291 → 0.1.8.294

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2350852869b35c0d23dcc0f4ceb241e18421b85479016e496690e46ea692280
-  data.tar.gz: cca6886cbb25473fc84af5f65b81c2b3246c2b3e442138b47e2c632ad7ee3d83
+  metadata.gz: 10efaa6d13f13e13e3f52df8ec0f7ab53a181e8e91c56cfa06f22155275c9fa6
+  data.tar.gz: cf51a5eeaf45dfaf848c1a86b4d18fdeff58484589c7195dab89d6c7ac4412c2
 SHA512:
-  metadata.gz: 9919f8ad085a4d20ca85419c1db2b71e69b934c83a614860765f4fa411277d543204b5d98b0df402e95c0d122dcee9088a40633ba6151b5989e6203bed9a6f8b
-  data.tar.gz: 48d64edadefb32ab2477b2399028b9f1a18262b78768bb379a4f8c7e22ff3fc4c0dc263b269117beccf8e69b1eeff45e36d3f52ac8e195ac3eb7250ad67be04a
+  metadata.gz: dd315d76a411fcdb406f2c37bce0961fc2a8a9dafbb61c758f6235e8c42c479793538d20dd46c13c3386caadf292d95ac16dedf0caeeb3f7e041f95fdbf6eb93
+  data.tar.gz: d719654b830ef000c0cfad3d4a582503a12b041c1da70f04c747045d7761a9a42ac5c3748d4e3af0408603f2c2f827fb26a1394ae75d5355c7d027c360210104

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
@@ -49,6 +51,9 @@ class IshManager::MapsController < IshManager::ApplicationController
     send_data result
   end
 
+  ##
+  ## @TODO: move to models, yes?
+  ##
   def import
     authorize! :create, Map
 
@@ -62,7 +67,21 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
     contents = JSON.parse contents
     contents.deep_symbolize_keys!
-    puts! contents, 'contents'
+
+    ## Delete existing
+    if params[:delete_existing]
+      map_ids = contents[:maps].map { |m| m[:_id] }
+      marker_ids = contents[:markers].map { |m| m[:_id] }
+
+      maps = Map.where( :_id.in => map_ids )
+      maps.each do |m|
+        marker_ids += m.markers.map(&:_id)
+      end
+      maps.destroy_all
+
+      Marker.where( :_id.in => marker_ids ).destroy_all
+    end
+
 
     ##
     ## process content
@@ -73,7 +92,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
@@ -96,11 +114,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
@@ -109,7 +126,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/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?
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.291
+  version: 0.1.8.294
 platform: ruby
 authors:
 - piousbox
@@ -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