c80_map 0.1.0.2 → 0.1.0.10

data/app/assets/stylesheets/view/modal_window.scss

@@ -0,0 +1,13 @@
+div#modal_window {
+
+  .modal-body {
+    font-size: 12px;
+  }
+
+  div.dropdown-menu.open {
+    border: none;
+    shadow:none;
+    background-color: transparent;
+  }
+
+}

data/app/controllers/c80_map/map_ajax_controller.rb

@@ -2,7 +2,7 @@ module C80Map
   class MapAjaxController < ApplicationController
 
     def save_map_data
-      Rails.logger.debug "<MapAjaxController.save_map_data> params = #{params}"
+      # Rails.logger.debug "<MapAjaxController.save_map_data> params = #{params}"
 
       #{ "buildings"=>{"0"=>{"coords"=>["2496.5894495412845",...]}} }
       #{ "areas"=>{"0"=>{"coords"=>["2496.5894495412845",...]}} }
@@ -20,6 +20,7 @@ module C80Map
           updated_locations_json: nil
       }
 
+      # сначала создадим здания
       if params[:buildings].present?
         params[:buildings].each_key do |key|
           new_building_options = params[:buildings][key]
@@ -36,6 +37,7 @@ module C80Map
         end
       end
 
+      # затем создадим области
       if params[:areas].present?
         params[:areas].each_key do |key|
           new_area_options = params[:areas][key]
@@ -55,6 +57,8 @@ module C80Map
         end
       end
 
+      result[:updated_locations_json] = MapJson.fetch_json
+
       puts "<MapAjaxController.save_map_data> result = #{result.to_json}"
 
       respond_to do |format|

data/app/models/c80_map/area.rb

@@ -1,6 +1,7 @@
 module C80Map
   class Area < ActiveRecord::Base
     belongs_to :building
+    belongs_to :area_representator, :polymorphic => true
     validates :coords, uniqueness: true
     after_save :update_json
 

data/app/models/c80_map/area_representator.rb

@@ -0,0 +1,75 @@
+module C80Map
+
+  module AreaRepresentator
+
+    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_area_representator
+        class_eval do
+
+          has_many :map_areas, :as => :area_representator, :class_name => 'C80Map::Area', :dependent => :destroy
+          after_save :update_json
+
+          def self.unlinked_areas
+            res = []
+            self.all.each do |area|
+              if area.map_areas.count == 0
+                res << area
+              end
+            end
+            res
+          end
+
+          def update_json
+            MapJson.update_json
+          end
+
+        end
+      end
+    end
+
+    module InstanceMethods
+
+      def to_hash
+        res = {
+            id: id,
+            title: title,
+            props: {
+                square: square,
+                floor_height: floor_height,
+                gate_type: gate_type,
+                desc: desc,
+                # column_step: column_step,
+                # communications: communications,
+                price: price_string
+            }
+        }
+        res
+      end
+
+      # свободна ли площадь, привязанная к полигону на карте
+      def is_free?
+        res = true
+        if map_areas.count > 0
+          res = map_areas.first.is_free?
+        end
+        res
+      end
+    end
+
+  end
+end
+
+ActiveRecord::Base.send :include, C80Map::AreaRepresentator

data/app/models/c80_map/map_json.rb

@@ -2,6 +2,7 @@ module C80Map
 
   class MapJson < ActiveRecord::Base
 
+    # этот метод вызовается после update Area
     def self.update_json
       locations_path = Rails.root.join("public", "locations.json")
       locs = File.read(locations_path)
@@ -17,25 +18,32 @@ module C80Map
         # сначала соберём детей - Area
         childs = []
         b.areas.each do |area|
-          Rails.logger.debug "<MapJson.update_json> area #{area}"
+          # Rails.logger.debug "<MapJson.update_json> area #{area}"
+
+          har = {}
+          if area.area_representator.present?
+            har = area.area_representator.to_hash
+            har["is_free"] = area.area_representator.is_free?
+          end
 
           ab = {
               id: area.id,
               object_type: 'area',
               coords: area.coords.split(','),
-              area_hash: {
-                  id: 2,
-                  title: "Площадь #{area.id}.#{area.id}",
-                  is_free: true,
-                  props: {
-                      square: "124 кв.м.",
-                      floor_height: "6 кв. м",
-                      column_step: "2 м",
-                      gate_type: "распашные",
-                      communications: "Интернет, электричество, водоснабжение",
-                      price: "от 155 руб/кв.м в месяц"
-                  }
-              }
+              area_hash: har
+              # area_hash: {
+              #     id: 2,
+              #     title: "Площадь #{area.id}.#{area.id}",
+              #     is_free: true,
+              #     props: {
+              #         square: "124 кв.м.",
+              #         floor_height: "6 кв. м",
+              #         column_step: "2 м",
+              #         gate_type: "распашные",
+              #         communications: "Интернет, электричество, водоснабжение",
+              #         price: "от 155 руб/кв.м в месяц"
+              #     }
+              # }
           }
           childs << ab
         end
@@ -80,6 +88,12 @@ module C80Map
       end
     end
 
+    def self.fetch_json
+      locations_path = Rails.root.join("public", "locations.json")
+      locs = File.read(locations_path)
+      JSON.parse(locs)
+    end
+
   end
 
 end

data/app/views/c80_map/_map_row_index.html.erb

@@ -19,6 +19,7 @@
 
 <div id="map_wrapper">
   <%= render "c80_map/shared/save_preloader" %>
+  <%= render "c80_map/shared/modal_window" %>
   <div class="mcontainer">
     <div class="mmap">
       <div class="layers"></div>

data/app/views/c80_map/shared/_modal_window.html.erb

@@ -0,0 +1,28 @@
+<%= link_to 'Показать modal window',
+            '#modal_window',
+            :data => {
+                    :toggle => 'modal'
+            },
+            :class => 'hidden2 show_modal_window',
+            :title => 'Показать modal window'
+%>
+
+<div class="modal fade" id="modal_window" tabindex="-1" role="dialog" aria-labelledby="modalShowWindow" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="myModalLabel">%modal-title%</h4>
+      </div>
+
+      <div class="modal-body">
+        %modal-body%
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
+      </div>
+    </div>
+  </div>
+</div>

data/db/migrate/{20160620040202_create_c80_map_areas.rb → 20160620040225_create_c80_map_areas.rb}

@@ -1,8 +1,11 @@
 class CreateC80MapAreas < ActiveRecord::Migration
   def change
     create_table :c80_map_areas, :options => 'COLLATE=utf8_unicode_ci' do |t|
-      t.string :coords
+      t.text :tag
+      t.text :coords
       t.references :building, index: true
+      t.string :area_representator_type, :default => 'Rent::Area'
+      t.references :area_representator, index: true
       t.timestamps
     end
   end

data/lib/c80_map/version.rb

@@ -1,3 +1,3 @@
 module C80Map
-  VERSION = "0.1.0.2"
+  VERSION = "0.1.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.1.0.10
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,11 +68,14 @@ files:
 - Rakefile
 - app/admin/c80_map/buildings.rb
 - app/admin/c80_map/settings.rb
+- app/assets/javascripts/buttons/admin_buttons/button_area_link.js
 - app/assets/javascripts/buttons/admin_buttons/button_back_to_map.js
 - app/assets/javascripts/buttons/admin_buttons/button_cancel_create.js
+- app/assets/javascripts/buttons/admin_buttons/button_cancel_remove.js
 - app/assets/javascripts/buttons/admin_buttons/button_complete_create.js
 - app/assets/javascripts/buttons/admin_buttons/button_edit.js
 - app/assets/javascripts/buttons/admin_buttons/button_new.js
+- app/assets/javascripts/buttons/admin_buttons/button_remove.js
 - app/assets/javascripts/buttons/admin_buttons/button_save.js
 - app/assets/javascripts/buttons/zoom_buttons.js
 - app/assets/javascripts/c80_map.js.coffee
@@ -82,17 +85,22 @@ files:
 - app/assets/javascripts/map_objects/dot.js
 - app/assets/javascripts/src/main.js
 - app/assets/javascripts/src/state_controller.js
-- app/assets/javascripts/src/utils.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
+- app/assets/javascripts/svg_elements/area_label.js
 - app/assets/javascripts/svg_elements/helper.js
 - app/assets/javascripts/svg_elements/polygon.js
 - app/assets/javascripts/view/save_preloader.js
 - app/assets/stylesheets/c80_map.scss
 - app/assets/stylesheets/map.scss
+- app/assets/stylesheets/view/modal_window.scss
 - app/assets/stylesheets/view/save_preloader.scss
 - app/controllers/c80_map/application_controller.rb
 - app/controllers/c80_map/map_ajax_controller.rb
 - app/helpers/c80_map/application_helper.rb
 - app/models/c80_map/area.rb
+- app/models/c80_map/area_representator.rb
 - app/models/c80_map/building.rb
 - app/models/c80_map/map_json.rb
 - app/models/c80_map/setting.rb
@@ -100,14 +108,15 @@ files:
 - app/uploaders/c80_map/map_image_uploader.rb
 - app/views/c80_map/_map_row.html.erb
 - app/views/c80_map/_map_row_index.html.erb
+- app/views/c80_map/shared/_modal_window.html.erb
 - app/views/c80_map/shared/_save_preloader.html.erb
 - bin/console
 - bin/setup
 - c80_map.gemspec
 - config/routes.rb
 - db/migrate/20160617130000_create_c80_map_settings.rb
-- db/migrate/20160620040202_create_c80_map_areas.rb
-- db/migrate/20160620040206_create_c80_map_buildings.rb
+- db/migrate/20160620040217_create_c80_map_buildings.rb
+- db/migrate/20160620040225_create_c80_map_areas.rb
 - db/seeds/801_fill_map_settings.rb
 - lib/c80_map.rb
 - lib/c80_map/engine.rb