c80_map_floors 0.1.0.17 → 0.1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be162bbaa5d940d79cac747fcdbc85aa69bf6bb8
-  data.tar.gz: 1e253c7933921fac7629051f070848ec51458c68
+  metadata.gz: cff696e63608d8386e3d7baa206968ec7ad384de
+  data.tar.gz: fe024fdcf05afc19cec74aefb7bf80e979522fbf
 SHA512:
-  metadata.gz: 0acb53854ebcb2746ab9e3448d1d54004e2ad4bcb21d9205821aa680139213f336fab255c194e0a5209a6ab2ac576081e13a55fafc56d655934034963adf9193
-  data.tar.gz: bc7289d7752c1128d56e4a01e7c0c3de9fec8bfcb0fb75c39099da68d622fa574651f77a1f3d7bd2287ea9e694c8451ec01b7fd6284d8fcb5cdefcd95300698d
+  metadata.gz: 69575f20ece0dc07f340a126668bc2937d8c612c8c139b97cbf3b5cab2aa97d671554e96d0a865745ebba59894cc649974221d6e873e9cc3c59e1a26bbf896e3
+  data.tar.gz: f1f8d6eaa87c215abfe33b9b3e52427c01dad964b38351d1380edbbe3f44004fafae3436f1b7e9c95e49ad3bef3b645b4c6cfa52b04b9092cfe2d8951105052c

data/app/admin/c80_map_floors/floors.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register C80MapFloors::Floor, as: 'Floor' do
 
-  menu :label => "Этажи", :parent => 'Карта'#, :if => proc { current_admin_user.email == 'tz007@mail.ru' }
+  menu :label => 'Картинки Этажей', :parent => 'Карта'#, :if => proc { current_admin_user.email == 'tz007@mail.ru' }
 
   before_filter :skip_sidebar!, :only => :index
 
@@ -47,7 +47,15 @@ ActiveAdmin.register C80MapFloors::Floor, as: 'Floor' do
       f.input :img_bg, :hint => "#{image_tag(f.object.img_bg.thumb.url)}".html_safe
       # f.input :img_overlay, :hint => "#{image_tag(f.object.img_overlay.thumb.url)}".html_safe
       f.input :map_building,
-              :collection => C80MapFloors::MapBuilding.all.map { |building| ["#{building.title} (id=#{building.id})", building.id]}
+              :collection => C80MapFloors::MapBuilding.all.map { |building| ["title=#{building.title}, tag=#{building.title} (id=#{building.id})", building.id]},
+              :input_html => {
+                  :title => '',
+                  :class => 'selectpicker',
+                  :data => {
+                      :size => 30,
+                      :width => 300
+                  }
+              }
 
     end
 

data/app/admin/c80_map_floors/map_buildings.rb

@@ -16,6 +16,7 @@ ActiveAdmin.register C80MapFloors::MapBuilding, as: 'MapBuilding' do
     column :id
     column :tag
     column :title
+    column :building_representator
     column :coords do |mp|
       d = mp.coords
       "<div style='width:100px;overflow:hidden;'>#{d}</div>".html_safe

data/app/admin/c80_map_floors/settings.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register C80MapFloors::Setting, as: 'Setting' do
 
-  menu :label => "Свойства", :parent => 'Карта', :if => proc { current_admin_user.email == 'tz007@mail.ru' }
+  menu :label => 'Свойства карты', :parent => 'Карта', :if => proc { current_admin_user.email == 'tz007@mail.ru' }
 
   before_filter :skip_sidebar!, :only => :index
 

data/app/assets/javascripts/src/main.js

@@ -325,8 +325,8 @@ var InitMap = function (params) {
                 // т.е. меняем масштаб
                 if (self.mark_virgin) {
                     // рассчитаем масштаб, при котором можно вписать главный прямоугольник карты в прямоугольник рабочей области
-                    var scaleX = self.calcScale(self.o.mapwidth*0.05, self.o.mapwidth *.95, self.X10, self.X20);
-                    var scaleY = self.calcScale(self.o.mapheight*0.05, self.o.mapheight *.95, self.Y10, self.Y20);
+                    var scaleX = self.calcScale(self.o.mapwidth*0.15, self.o.mapwidth *.85, self.X10, self.X20);
+                    var scaleY = self.calcScale(self.o.mapheight*0.15, self.o.mapheight *.85, self.Y10, self.Y20);
                     var scale = (scaleX < scaleY) ? scaleX : scaleY;
                     self.scale = scale; /* NOTE:: вызывается во время window resize */
                 }
@@ -727,7 +727,7 @@ var InitMap = function (params) {
         var $building_info = $('.building_info'); // "layouts/shared/map_row/building_info"
         var $area_order_button = $('.area_order_button');
         var $container_buttons = $('#container_buttons');
-        var _is_debug_drawn = true;
+        var _is_debug_drawn = false;
         var _$address_p = $('#paddress'); // 20161003: после редизайна надо дополнительно позиционировать блок с адресом
 
         self.ivalidateViewArea = function () {

data/app/models/c80_map_floors/map_building.rb

@@ -8,7 +8,7 @@ module C80MapFloors
 
     include ActiveModel::Dirty
 
-    has_many :floors, :class_name => 'C80MapFloors::Floor', :dependent => :destroy
+    has_many :floors, :class_name => 'C80MapFloors::Floor', :dependent => :nullify
     belongs_to :building_representator, :polymorphic => true
 
     after_create :calc_coords_img

data/lib/c80_map_floors/version.rb

@@ -1,3 +1,3 @@
 module C80MapFloors
-  VERSION = '0.1.0.17'
+  VERSION = '0.1.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map_floors
 version: !ruby/object:Gem::Version
-  version: 0.1.0.17
+  version: 0.1.0.18
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler