c80_map_floors 0.1.0.3 → 0.1.0.4

data/app/assets/stylesheets/view/elems/building_info.scss

@@ -24,25 +24,6 @@
     background-color: #54658E;
   }
 
-  ul {
-    list-style: none;
-    margin-left: 0;
-    padding-left: 0;
-    /*@include frankRegular(15px);*/
-
-    li {
-      overflow: hidden;
-
-      -webkit-transition: all 0.3s;
-      -moz-transition: all 0.3s;
-      transition: all 0.3s;
-
-      span {
-        color: #6f6f6f;
-      }
-    }
-  }
-
   h5 {
     border-top: 1px solid #14233C;
     color: #1f283e;

data/app/controllers/c80_map_floors/ajax_controller.rb

@@ -24,6 +24,7 @@ module C80MapFloors
     def link_area
       Rails.logger.debug "<AjaxController.link_area> params = #{params}"
 
+      # TODO:: т.к. ПОКА используем этот gem только в stroy101, то должно быть не Rent::Area
       rent_area = Rent::Area.find(params[:rent_area_id])
       map_area = C80Map::Area.find(params[:map_area_id])
       rent_area.map_areas.delete_all

data/app/models/c80_map_floors/area.rb

@@ -5,16 +5,25 @@ module C80MapFloors
 
     belongs_to :floor
     belongs_to :area_representator, :polymorphic => true
-    # validates :coords, uniqueness: true
     acts_as_base_map_object
 
-    # after_save :update_json
+    def my_as_json
 
-    # protected
+      result = {
+          id:         self.id,
+          tag:        self.tag,
+          floor_id:   self.floor_id,
+          class_name: self.class_name,
+          coords:     self.coords,
+          data:       nil
+      }
 
-    # def update_json
-    #   MapJson.update_json
-    # end
+      if self.area_representator.present?
+        result[:data] = self.area_representator.my_as_json2
+      end
+
+      result.as_json
+    end
 
   end
 end

data/app/models/c80_map_floors/area_representator.rb

@@ -19,7 +19,7 @@ module C80MapFloors
       def acts_as_map_area_representator
         class_eval do
 
-          has_many :map_areas, :as => :area_representator, :class_name => 'C80MapFloors::Area', :dependent => :destroy
+          has_many :map_areas, :as => :area_representator, :class_name => 'C80MapFloors::Area', :dependent => :nullify
           after_save :update_json
 
           def self.unlinked_areas
@@ -33,7 +33,7 @@ module C80MapFloors
           end
 
           def update_json
-            MapJson.update_json
+            # MapJson.update_json # NOTE:: возможно, временно отключён
           end
 
         end
@@ -42,6 +42,8 @@ module C80MapFloors
 
     module InstanceMethods
 
+=begin
+# legacy от с80_map
       def to_hash_a
         res = {
             id: id,
@@ -58,6 +60,21 @@ module C80MapFloors
         }
         res
       end
+=end
+
+      def my_as_json2
+        result = {
+            id:             self.id,
+            title:          self.name,
+            square:         self.square,
+            square_free:    self.square_free,
+            desc:           self.desc,
+            floor_height:   self.floor_height,
+            price_string:   self.price_string,
+            communications: self.communications
+        }
+        result.as_json
+      end
 
       # свободна ли площадь, привязанная к полигону на карте
       def is_free?

data/app/models/c80_map_floors/base_map_object.rb

@@ -13,11 +13,16 @@ module C80MapFloors
       def acts_as_base_map_object
         class_eval do
 
-          # has_many :map_buildings, :as => :building_representator, :class_name => 'C80MapFloors::MapBuilding', :dependent => :destroy
-          after_save :update_json
+          # NOTE:: возможно, временно
+          # after_save :update_json
+
+          # TODO:: оставить в этом файле только InstanceMethods с class_name
+
+          # TODO?
           # after_destroy :update_json
+
           # validates :coords, uniqueness: true
-          validates_uniqueness_of :coords, :allow_nil => true, :allow_blank => true
+          validates_uniqueness_of :coords, :allow_nil => true, :allow_blank => true #-> глючит для Этажей - у них могут быть одинаковые coords
 
           def update_json
             MapJson.update_json

data/app/models/c80_map_floors/building_representator.rb

@@ -19,15 +19,15 @@ module C80MapFloors
       def acts_as_map_building_representator
         class_eval do
 
-          has_many :map_buildings, :as => :building_representator, :class_name => 'C80MapFloors::MapBuilding', :dependent => :destroy
+          has_one :map_building, :as => :building_representator, :class_name => 'C80MapFloors::MapBuilding', :dependent => :nullify
           after_save :update_json
 
           def self.unlinked_buildings
             res = []
             self.all.each do |building|
-              # if building.map_buildings.count == 0
+              unless building.map_building.present?
                 res << building
-              # end
+              end
             end
             res
           end
@@ -42,6 +42,21 @@ module C80MapFloors
 
     module InstanceMethods
 
+      def my_as_json
+        result = {
+            id:             self.id,
+            title:          self.title,
+            square:         self.square,
+            square_free:    self.square_free,
+            desc:           self.desc,
+            floor_height:   self.floor_height,
+            price_string:   self.price_string,
+            communications: self.communications
+        }
+        result.as_json
+      end
+
+=begin
       def to_hash
 
         Rails.logger.debug "<BuildingRepresentator.to_hash> self.free_square = #{self.free_square}"
@@ -63,6 +78,15 @@ module C80MapFloors
         }
         res
       end
+=end
+
+=begin
+      def serializable_hash(options = nil)
+        super({
+                  :except => [:created_at, :updated_at]
+              })
+      end
+=end
 
     end
 

data/app/models/c80_map_floors/floor.rb

@@ -5,6 +5,7 @@ module C80MapFloors
 
     belongs_to :map_building
     has_many :areas, :class_name => 'C80MapFloors::Area', :dependent => :destroy
+    belongs_to :map_floor_representator, :polymorphic => true
     acts_as_base_map_object
 
     # validates :coords, uniqueness: true
@@ -32,6 +33,22 @@ module C80MapFloors
       end
       res
     end
+    
+    def img_bg_url
+      res = nil
+      if img_bg.present?
+        res = img_bg.url
+      end
+      res      
+    end
+    
+    def img_overlay_url
+      res = nil
+      if img_overlay.present?
+        res = img_overlay.url
+      end
+      res      
+    end
 
     # private
 
@@ -42,5 +59,40 @@ module C80MapFloors
       # MapJson.update_json
     end
 
+    def my_as_json
+
+      result = {
+          ord: self.ord,
+          id: self.id,
+          title: self.title,
+          tag: self.tag,
+          class_name: self.class_name,
+          map_building_id: self.map_building_id,
+          img_bg: {
+              url: self.img_bg_url
+          },
+          img_overlay: {
+              url: self.img_overlay_url
+          },
+          img_bg_width: img_bg_width,
+          img_bg_height: img_bg_height,
+          coords: self.coords,
+          areas: [],
+          data: nil
+      }
+
+      self.areas.each do |area|
+        result[:areas] << area.my_as_json
+      end
+
+      # если имеются ДАННЫЕ - прицепим их к JSON
+      if self.map_floor_representator.present?
+        result[:data] = self.map_floor_representator.my_as_json3
+      end
+
+      result.as_json
+
+    end
+
   end
 end

data/app/models/c80_map_floors/floor_representator.rb

@@ -0,0 +1,65 @@
+module C80MapFloors
+
+  module FloorRepresentator
+
+    extend ActiveSupport::Concern
+
+    #  ERROR: Cannot define multiple 'included' blocks for a Concern
+    # included do
+    #
+    # end
+
+    def self.included(klass)
+      klass.extend ClassMethods
+      klass.send(:include, InstanceMethods)
+    end
+
+    module ClassMethods
+
+      def acts_as_map_floor_representator
+        class_eval do
+
+          has_one :floor, :as => :map_floor_representator, :class_name => 'C80MapFloors::Floor', :dependent => :nullify
+          # after_save :update_json # NOTE:: возможно, временно
+
+          def self.unlinked_floors
+            res = []
+            self.all.each do |sfloor|
+              unless sfloor.floor.present?
+                res << sfloor
+              end
+            end
+            res
+          end
+
+          def update_json
+            MapJson.update_json
+          end
+
+        end
+      end
+    end
+
+    module InstanceMethods
+
+      # noinspection RubyResolve
+      def my_as_json3
+        result = {
+            id:               self.id,
+            ord:              self.ord,
+            title:            self.title,
+            square:           self.square,
+            square_free:      self.square_free,
+            areas_count:      self.areas.count,
+            areas_free_count: self.areas.free_areas.count,
+            price_string:     self.price_string
+        }
+        result.as_json
+      end
+
+    end
+
+  end
+end
+
+ActiveRecord::Base.send :include, C80MapFloors::FloorRepresentator

data/app/models/c80_map_floors/map_building.rb

@@ -1,16 +1,21 @@
+# noinspection RubyResolve
 require 'c80_map_floors/base_map_object'
 require 'integer'
 
 module C80MapFloors
+  # noinspection RubyResolve
   class MapBuilding < ActiveRecord::Base
 
+    include ActiveModel::Dirty
+
     has_many :floors, :class_name => 'C80MapFloors::Floor', :dependent => :destroy
     belongs_to :building_representator, :polymorphic => true
-    # validates :coords, uniqueness: true
-    # after_save :update_json
 
     after_create :calc_coords_img
 
+    after_create :auto_assign_floors_by_ord
+    after_update :auto_assign_floors_by_ord
+
     acts_as_base_map_object
 
     mount_uploader :img, C80MapFloors::BuildingImageUploader
@@ -19,11 +24,42 @@ module C80MapFloors
       C80MapFloors::Areas.joins(:c80_map_floors_floors).where(:building_id => self.if)
     end
 
-    def as_json(options = nil)
+    def my_as_json
+
+      result = {
+          id: self.id,
+          title: self.title,
+          tag: self.tag,
+          class_name: self.class_name,
+          coords_img: self.coords_img,
+          coords: self.coords,
+          floors: [],
+          data: nil
+      }
+
+      self.floors.each do |floor|
+        result[:floors] << floor.my_as_json
+      end
+
+      if self.building_representator.present?
+        result[:data] = self.building_representator.my_as_json
+      end
+
+      result.as_json
+
+    end
+
+    # ISSUE: rails as_json except not working
+    # ANSWER: For those looking here for a quick work around, it's burried in the comments,
+    # but basically, you can work around by:
+    # renaming your custom as_json to serializable_hash
+    # github.com/rails/rails/pull/2200#issuecomment-3131652 – ChristopherJ Oct 16 '13 at 5:55
+=begin
+    def serializable_hash(options = nil)
 
       super({
-                :except => [:created_at,:updated_at,:building_representator_type],
-                :methods => :class_name,
+                :except => [:created_at,:updated_at,:building_representator_type, :building_representator_id],
+                :methods => [:class_name],
                 :include => [
                     :floors => {
                         :except => [:created_at,:updated_at],
@@ -38,6 +74,7 @@ module C80MapFloors
                 ]
             }.merge(options || {} ))
     end
+=end
 
     def calc_coords_img
 
@@ -59,7 +96,7 @@ module C80MapFloors
 
         xmin = ix < xmin ? ix : xmin
         ymin = iy < ymin ? iy : ymin
-        
+
         xmax = ix > xmax ? ix : xmax
         ymax = iy > ymax ? iy : ymax
 
@@ -81,11 +118,94 @@ module C80MapFloors
 
     end
 
-    # private
+    private
 
     # def update_json
     #   MapJson.update_json
     # end
 
+    # связать Полигоны этажей (принадлежащие этому Полигону здания),
+    # с ord-соответствующими этажами Здания (которое привязано к этому Полигону здания)
+    def auto_assign_floors_by_ord
+      Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> связать ПолигоныЭтажей с соответствующими ДаннымиЭтажей.'
+
+      # если у Полигона сменилось Здание
+      if self.building_representator_id_changed?
+        Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> У Полигона сменилось Здание.'
+
+        if self.building_representator_id_was.nil?
+          Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> У Полигона не было данных до этого.'
+        else
+          Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> У Полигона уже были какие-то данные до этого. TODO очистить привязки.'
+          # TODO:: если у ПолигонаЗдания БЫЛО Здание до этого - очистить привязки к данным у соответствующих ПолигоновЭтажей и ПолигоновПлощадей
+        end
+
+        # фиксируем текущие данные этого ПолигонаЗдания
+        bdata = self.building_representator
+
+        if bdata.present?
+          Rails.logger.debug "[TRACE] <map_building.auto_assign_floors_by_ord> Данные ПолигонаЗдания: {title=#{bdata.title}, id=#{bdata.id}}"
+          Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> Обходим ПолигоныЭтажей этого ПолигонаЗдания и назначаем им данныеЭтажей по ord.'
+
+          # теперь ПРЕДВАРИТЕЛЬНО проверим, есть ли у ПолигонаЗдания ПолигоныЭтажи
+          if self.floors.count > 0
+            Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> У ПолигонаЗдания имеются ПолигоныЭтажей.'
+
+            # еще ПРЕДВАРИТЕЛЬНО проверим, есть ли в ДанныхЗдания этажи
+            if bdata.sfloors.count > 0
+              Rails.logger.debug '[TRACE] <map_building.auto_assign_floors_by_ord> В Данных ПолигонаЗдания имеются данные об Этажах.'
+
+              # ПРОСТО проверим, совпадает ли количество ЭтажейПолигонов и ЭтажейДанных
+              if self.floors.count != bdata.sfloors.count
+                Rails.logger.debug "[TRACE] [WARNING] <map_building.auto_assign_floors_by_ord> количество ЭтажейПолигонов (count=#{self.floors.count}) и ЭтажейДанных (count=#{bdata.sfloors.count}) НЕ совпадает."
+              end
+
+              link_floor_sfloor(bdata)
+
+            else
+              Rails.logger.debug '[TRACE] [ERROR] <map_building.auto_assign_floors_by_ord> В ДанныхЗдания нет этажей.'
+            end
+
+          else
+            Rails.logger.debug '[TRACE] [ERROR] <map_building.auto_assign_floors_by_ord> У ПолигонаЗдания нет ПолигоновЭтажей.'
+          end
+
+        else
+          Rails.logger.debug '[TRACE] [WARNING] <map_building.auto_assign_floors_by_ord> У ПолигонаЗдания нет данных.'
+        end
+
+      end
+
+    end
+
+    def link_floor_sfloor(building_representator)
+      Rails.logger.debug "[TRACE] <map_building.link_floor_sfloor> СВЯЗЫВАЕМ ПОЛИГОНЫ-ЭТАЖЕЙ C ДАННЫМИ. MapBuilding.id=#{self.id}"
+
+      # обходим ПолигоныЭтажей этого ПолигонаЗдания и назначаем им данныеЭтажей по ord
+      Rails.logger.debug '[TRACE] <map_building.link_floor_sfloor> Перебираем ПолигоныЭтажей...'
+      self.floors.each do |floor|
+        Rails.logger.debug "[TRACE] <map_building.link_floor_sfloor> Фиксируем ПолигонЭтажа ord=#{floor.ord}."
+
+        # фиксируем ord-соответствующие данныеЭтажа  (dev.. но сначала добавим в данныеЗдания данныеЭтажей)
+        may_be_sfloors = building_representator.sfloors.where(:ord => floor.ord)
+        if may_be_sfloors.count > 0
+
+          # данныеЭтажа
+          sfloor = may_be_sfloors.first
+          Rails.logger.debug "[TRACE] <map_building.link_floor_sfloor> Фиксируем ДанныеЭтажа: #{sfloor.my_as_json3}."
+
+          #-> связываем
+          Rails.logger.debug '[TRACE] <map_building.link_floor_sfloor> Связываем..'
+          floor.map_floor_representator = sfloor
+          floor.save!
+          # SQL (0.5ms)  UPDATE `c80_map_floors_floors` SET `map_floor_representator_id` = 2, `map_floor_representator_type` = 'Sfloor', `updated_at` = '2016-11-28 16:54:43.700446' WHERE `c80_map_floors_floors`.`id` = 3
+
+        else
+          Rails.logger.debug '[TRACE] [ERROR] <map_building.auto_assign_floors_by_ord> В ДанныхЗдания нет соответствующего этажа.'
+        end
+
+      end
+    end
+
   end
 end

data/app/models/c80_map_floors/map_json.rb

@@ -11,8 +11,8 @@ module C80MapFloors
 
       # поместим в него детей - здания со всеми детьми и внуками
       buildings = []
-      C80MapFloors::MapBuilding.all.each do |building|
-        buildings << building.as_json
+      C80MapFloors::MapBuilding.all.each do |map_building|
+        buildings << map_building.my_as_json
       end
 
       locs_hash["buildings"] = buildings

data/app/views/c80_map_floors/ajax/shared/_select_list_unlinked_buildings.html.erb

@@ -1,7 +1,7 @@
 <select id="unlinked_buildings" class="selectpicker" data-style="btn-default">
 <% buildings.each do |building| %>
       <% tt = building.title %>
-      <% if building.map_buildings.count > 0 %>
+      <% unless building.map_building.present? %>
         <% tt += ' (полигон назначен)' %>
       <% end %>
     <option value="<%= building.id%>"><%= tt %></option>

data/db/migrate/20161015190003_add_building_representator_to_c80_map_floors_buildings.rb

@@ -1,6 +1,6 @@
 class AddBuildingRepresentatorToC80MapFloorsBuildings < ActiveRecord::Migration
   def change
     add_reference :c80_map_floors_map_buildings, :building_representator, index: true
-    add_column :c80_map_floors_map_buildings, :building_representator_type, :string, :default => 'Rent::Building'
+    add_column :c80_map_floors_map_buildings, :building_representator_type, :string, :default => 'Building'
   end
 end

data/db/migrate/20161128181616_add_map_floor_representator_to_c80_map_floors_floors.rb

@@ -0,0 +1,6 @@
+class AddMapFloorRepresentatorToC80MapFloorsFloors < ActiveRecord::Migration
+  def change
+    add_reference :c80_map_floors_floors, :map_floor_representator, index: true
+    add_column :c80_map_floors_floors, :map_floor_representator_type, :string, :default => 'Floor'
+  end
+end

data/lib/c80_map_floors/version.rb

@@ -1,3 +1,3 @@
 module C80MapFloors
-  VERSION = '0.1.0.3'
+  VERSION = '0.1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map_floors
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - app/assets/javascripts/buttons/zoom_buttons.js
 - app/assets/javascripts/c80_map_floors.js.coffee
 - app/assets/javascripts/events/app_event.js
+- app/assets/javascripts/lib/obj_size.js
 - app/assets/javascripts/lib/spin.js
 - app/assets/javascripts/map_objects/area.js
 - app/assets/javascripts/map_objects/building.js
@@ -132,6 +133,7 @@ files:
 - app/assets/javascripts/src/image_loader.js
 - app/assets/javascripts/src/main.js
 - app/assets/javascripts/src/state_controller.js
+- app/assets/javascripts/src/utils/i18n.js
 - app/assets/javascripts/src/utils/map_utils.js
 - app/assets/javascripts/src/utils/opacity_buttons_utils.js
 - app/assets/javascripts/src/utils/utils.js
@@ -141,9 +143,11 @@ files:
 - app/assets/javascripts/svg_elements/polygon.js
 - app/assets/javascripts/ui/tabs/tabs.js
 - app/assets/javascripts/view/building_info/building_info.js
+- app/assets/javascripts/view/building_info/mobj_info_parser.js
 - app/assets/javascripts/view/save_preloader.js
 - app/assets/stylesheets/c80_map_floors.scss
 - app/assets/stylesheets/map.scss
+- app/assets/stylesheets/ui/tabs_js.scss
 - app/assets/stylesheets/view/buttons/area_order_button.scss
 - app/assets/stylesheets/view/buttons/back_to_map_button.scss
 - app/assets/stylesheets/view/elems/building_info.scss
@@ -161,6 +165,7 @@ files:
 - app/models/c80_map_floors/base_map_object.rb
 - app/models/c80_map_floors/building_representator.rb
 - app/models/c80_map_floors/floor.rb
+- app/models/c80_map_floors/floor_representator.rb
 - app/models/c80_map_floors/map_building.rb
 - app/models/c80_map_floors/map_json.rb
 - app/models/c80_map_floors/setting.rb
@@ -192,6 +197,7 @@ files:
 - db/migrate/20161015190004_create_c80_map_floors_floors.rb
 - db/migrate/20161019111010_add_title_to_c80_map_floors_buildings.rb
 - db/migrate/20161020184040_add_coords_img_to_c80_map_floors_buildings.rb
+- db/migrate/20161128181616_add_map_floor_representator_to_c80_map_floors_floors.rb
 - db/seeds/c80_map_floors_01_fill_map_settings.rb
 - db/seeds/c80_map_floors_02_create_test_area.rb
 - lib/c80_map_floors.rb