c80_map 0.1.0.14 → 0.1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7686812f742adff8c59d9be8151320bcc0a2e4
-  data.tar.gz: 5f9ddf71af71b5997b8d457192eee0c2ba108c22
+  metadata.gz: 5c21b38d6f69779edb81051a4470de447878450f
+  data.tar.gz: 20ba2d4f2ad1c69afa5fe771bab2813c1442ac08
 SHA512:
-  metadata.gz: b374bd87626fa16d08e669f8985345ea8648364713749f16332b49bc23a8d102bc8de45b85e43367110fb26fb41e633b718e9927377cc0df12973e4d9f4c83be
-  data.tar.gz: 5c49d966704c0caedb70a17ccf97aae599687666516186bf102278f3b2c0c1bd8373ace8b76c8cb8aee7e7317c21f6373fd5dec12648c79fd7851dd75858c300
+  metadata.gz: d13d44acbc3d2f0c5803d1840872768ea45cb49b4fc86badf64e89e731203f3ba26d14d7b1c6d30a7ab3061427db72cf593cab0a374f64628501d5f4a31cc494
+  data.tar.gz: 00dec2fb04b6cb7abbbb8221571f7224a360b39851badc59151b177cc43ee05f696d44846cbc32ec193a7a1717a395c7afcdbaaf58012d34d142c8dc2b046da5

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

@@ -976,10 +976,22 @@ var clog = function () {
                 $building_info.css('display','block');
                 $building_info.find("h2").text(building_hash["title"]);
 
-                var v;
-                for (var p in building_hash["props"]) {
+                var v, $ili, p;
+                for (p in building_hash["props"]) {
+
                     v = building_hash["props"][p];
-                    $building_info.find("#" + p).find('span').text(v);
+                    $ili = $building_info.find("#" + p);
+                    $ili.find('span').text(v);
+                    //console.log("."+v+".");
+
+                    // Не показывать пользователю карты незаполненные поля
+                    var li_css_display = 'block';
+                    if (v == '' || v == '-1' || v === 'null' || v == null) {
+                        li_css_display = 'none';
+                    }
+                    $ili.css('display',li_css_display);
+
+
                 }
 
                 $building_info.find("#square_free").css('height', 'auto');

data/app/assets/stylesheets/map.scss

@@ -1164,6 +1164,7 @@ g.mapplic-clickable:hover > * {
   background-color: #ededed;
   display: none;
   font-size: 14px;
+  min-width: 417px;
 
   -webkit-transition: all 0.8s cubic-bezier(.25, .8, .25, 1);
   -moz-transition: all 0.8s cubic-bezier(.25, .8, .25, 1);

data/app/models/c80_map/area_representator.rb

@@ -42,7 +42,7 @@ module C80Map
 
     module InstanceMethods
 
-      def to_hash
+      def to_hash_a
         res = {
             id: id,
             title: title,

data/app/models/c80_map/building_representator.rb

@@ -43,17 +43,21 @@ module C80Map
     module InstanceMethods
 
       def to_hash
+
+        Rails.logger.debug "<BuildingRepresentator.to_hash> self.free_square = #{self.free_square}"
+
         res = {
-            id: id,
-            title: title,
+            id: self.id,
+            title: self.title,
             props: {
-                square: square,
-                floor_height: floor_height,
-                gate_type: gate_type,
-                desc: desc,
-                column_step: column_step,
-                communications: communications,
-                price: price_string
+                square: self.square,
+                free_square: self.free_square,
+                floor_height: self.floor_height,
+                gate_type: self.gate_type,
+                desc: self.desc,
+                column_step: self.column_step,
+                communications: self.communications,
+                price: self.price_string
             }
         }
         res

data/app/models/c80_map/map_json.rb

@@ -14,16 +14,18 @@ module C80Map
       # [{id, object_type=object_type, coords, building_hash, img, childs:[<areas>]},..]
       buildings_to_location_json = []
       Building.all.each do |b|
+        # Rails.logger.debug "[TRACE] <MapJson.update_json> building: #{b}; building_representator: #{b.building_representator}"
 
         # сначала соберём детей - Area
         childs = []
         b.areas.each do |area|
-          # Rails.logger.debug "<MapJson.update_json> area #{area}"
+          # Rails.logger.debug "[TRACE] <MapJson.update_json> [1] area #{area}; area_representator: #{area.area_representator}"
 
           # соберём хэш привязанной к полигону площади
           har = {}
           if area.area_representator.present?
-            har = area.area_representator.to_hash
+            # Rails.logger.debug "[TRACE] <MapJson.update_json> [2] area #{area}; area_representator: #{area.area_representator}"
+            har = area.area_representator.to_hash_a
             har["is_free"] = area.area_representator.is_free?
           end
 

data/lib/c80_map/version.rb

@@ -1,3 +1,3 @@
 module C80Map
-  VERSION = "0.1.0.14"
+  VERSION = "0.1.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0.14
+  version: 0.1.0.15
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler