c80_estate 0.1.0.31 → 0.1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab32649dd670b211fb2362cc860cd6de94322e5
-  data.tar.gz: c8a4986688706033bcd9ac5238ed39e56e8e3169
+  metadata.gz: d2ef695e039493141a0a39cbad27235f9f5899e7
+  data.tar.gz: 900f43cf5e639200fd5fb2fe4696dfa3541154cd
 SHA512:
-  metadata.gz: a16049837e93cc0f89dfe085e30e763c447a29f8c4752ae5cc417a631ef1076e3c0c6ed3caa7af273d2d2254b485211d6b12e7aa7907a0083a8e8b08c84ddc43
-  data.tar.gz: 8f064118071720e7e47c0a61611c69449721b6fb6ab1401a3d5623540e5f3ed345f20e7e4c190f25f672876e91042b578e9033998316fe975defef30cdf05534
+  metadata.gz: c8020e8834ba2bae804b40ba1794c7bb7b50353fd0fd57930481438470dfec3b37061b368e7341a5107202e28e53d26b11bb71ecb494d3a73d1a9a7e9045f9c5
+  data.tar.gz: e19d8422873c93cf79c120c506fd3497b36d4802bf240af8c33bd8179f72e182fb2644094e4387def04620c1cd11c30f7dc5c3913bf29a64128e3039f8536cb7

data/app/admin/c80_estate/areas.rb

@@ -2,6 +2,9 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
+  config.sort_order = 'title_asc'
+  config.per_page = 100
+
   menu :label => 'Площади', priority: 3
 
   permit_params :title,

data/app/admin/c80_estate/properties.rb

@@ -51,22 +51,33 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
     column 'Площадей' do |prop|
       prop.areas.count
     end
+
+    unless (->{ current_admin_user.can_view_statistics?}).call
+      column 'Свободно' do |prop|
+        prop.areas.free_areas.count
+      end
+    end
+
     column 'Метраж' do |prop|
       "#{prop.square_value.to_s(:rounded, precision: 2)} м.кв."
     end
-    column '<abbr title="Сумма всех цен площадей">Цена объекта</abbr>'.html_safe do |prop|
-      "#{prop.power_price_value.to_s(:rounded, precision: 2)} руб"
-    end
-    # column :address
-    # column :gps do |prop|
-    #   "#{prop.latitude},#{prop.longitude}"
-    # end
-    column :average_price do |prop|
-      "#{prop.average_price.to_s(:rounded, precision: 2)} руб"
-    end
-    column :average_price_busy do |prop|
-      "#{prop.average_price_busy.to_s(:rounded, precision: 2)} руб"
+
+    if (->{ current_admin_user.can_view_statistics?}).call
+      column '<abbr title="Сумма всех цен площадей">Цена объекта</abbr>'.html_safe do |prop|
+        "#{prop.power_price_value.to_s(:rounded, precision: 2)} руб"
+      end
+      # column :address
+      # column :gps do |prop|
+      #   "#{prop.latitude},#{prop.longitude}"
+      # end
+      column :average_price do |prop|
+        "#{prop.average_price.to_s(:rounded, precision: 2)} руб"
+      end
+      column :average_price_busy do |prop|
+        "#{prop.average_price_busy.to_s(:rounded, precision: 2)} руб"
+      end
     end
+
     column :assigned_person do |prop|
       prop.assigned_person_title
     end

data/app/assets/javascript/c80_estate/backend/admin/shared/areas/area_show.js

@@ -366,3 +366,28 @@ var fAreasShow = function () {
     });
 
 };
+
+// hardcode
+// вызовется в can_edit_area.js.erb
+var fAreasShow__minorCssFix = function (property_id) {
+
+    setTimeout(function () {
+
+        var $div_vendor_logo = $('div#div_vendor_logo');
+        var $a_img = $div_vendor_logo.find('a.no-clickable').find('img');
+        console.log($a_img);
+
+        if (property_id == 1) { // строительный
+            $div_vendor_logo.css('top','148px');
+        }
+
+        if (property_id == 5) { // терминал
+            $div_vendor_logo.css('left','-172px');
+            $a_img.css('width', '106px');
+        }
+
+        $div_vendor_logo.css('opacity','1.0');
+
+    }, 500);
+};
+

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_main.scss

@@ -32,7 +32,8 @@ div#div_main_show_area {
     float: left;
     margin-right: 30px;
     width: calc(621px * 0.7);
-    height: calc(377px * 0.7);
+    /*height: calc(377px * 0.7);*/
+    height: auto;
     border: 3px solid #F2F2F2;
 
     img {
@@ -46,7 +47,8 @@ div#div_main_show_area {
 
   div#main_props {
     float: left;
-    overflow: hidden;
+    /*overflow: hidden;*/
+    position: relative;
 
     ul {
       list-style: none;

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_vendor_logo.scss

@@ -5,6 +5,17 @@ div#div_vendor_logo {
   float: left;
   padding-top: 0;
 
+  position: absolute;
+  top: 157px;
+  left: -192px;
+
+  opacity: 0;
+  -webkit-transition: opacity .2s ease-in;
+  -moz-transition: opacity .2s ease-in;
+  -ms-transition: opacity .2s ease-in;
+  -o-transition: opacity .2s ease-in;
+  transition: opacity .2s ease-in;
+
   > a {
     width: 150px !important;
     border: none !important;

data/app/helpers/c80_estate/properties_helper.rb

@@ -68,7 +68,7 @@ module C80Estate
     end
 
     #
-    def ph_render_price_props(property)
+    def ph_render_price_props(property, mark_draw_statistics = false)
 
       result = ''
 
@@ -87,26 +87,30 @@ module C80Estate
               abbr: 'Количество площадей на объекте',
               value: property.areas.count,
               uom: ''
-          },
-          {
-              title: 'Цена объекта',
-              abbr: 'Сумма всех цен площадей объекта',
-              value: property.power_price_value.to_s(:rounded, precision: 2),
-              uom: 'руб'
-          },
-          {
-              title: 'Средняя ставка',
-              abbr: 'Средняя арендная ставка за 1 кв. м',
-              value: property.average_price.to_s(:rounded, precision: 2),
-              uom: 'руб'
-          },
-          {
-              title: 'Средняя ставка занятых',
-              abbr: ' Средняя арендная ставка за 1 кв. м занятых площадей',
-              value: property.average_price_busy.to_s(:rounded, precision: 2),
-              uom: 'руб'
           }
       ]
+
+      if mark_draw_statistics
+        rows << {
+            title: 'Цена объекта',
+            abbr: 'Сумма всех цен площадей объекта',
+            value: property.power_price_value.to_s(:rounded, precision: 2),
+            uom: 'руб'
+        }
+        rows << {
+            title: 'Средняя ставка',
+            abbr: 'Средняя арендная ставка за 1 кв. м',
+            value: property.average_price.to_s(:rounded, precision: 2),
+            uom: 'руб'
+        }
+        rows << {
+            title: 'Средняя ставка занятых',
+            abbr: ' Средняя арендная ставка за 1 кв. м занятых площадей',
+            value: property.average_price_busy.to_s(:rounded, precision: 2),
+            uom: 'руб'
+        }
+      end
+
       rows.each do |row|
 
         title = row[:title]

data/app/models/c80_estate/area.rb

@@ -313,7 +313,8 @@ module C80Estate
     end
 
     def main_image_url
-      url = 'no_thumb.png'
+      url = "no_thumb_#{atype.id}.jpg"
+
       if aphotos.count > 0
         url = aphotos.first.image.thumb512
       end

data/app/views/c80_estate/ajax/can_edit_area.js.erb

@@ -1,5 +1,8 @@
 <% if @res %>
     fAreasShow_initActionItems(<%= @area.id %>);
+
+    fAreasShow__minorCssFix(<%= @area.property.id %>);
+
 <% else %>
 //    $main_content.css('opacity', '1.0');
 <% end %>

data/app/views/c80_estate/shared/properties/_single_property_on_page.html.erb

@@ -25,7 +25,7 @@
 </div>
 
 <div id="price_info" class="clearfix">
-  <%= ph_render_price_props(@item) %>
+  <%= ph_render_price_props(@item, current_admin_user.can_view_statistics?) %>
 </div>
 
 <div id="div_desc">

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.31'
+  VERSION = '0.1.0.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.31
+  version: 0.1.0.32
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,12 @@ files:
 - app/admin/c80_estate/sevents.rb
 - app/admin/c80_estate/uoms.rb
 - app/assets/images/no_thumb.png
+- app/assets/images/no_thumb_1.jpg
+- app/assets/images/no_thumb_2.jpg
+- app/assets/images/no_thumb_3.jpg
+- app/assets/images/no_thumb_4.jpg
+- app/assets/images/no_thumb_5.jpg
+- app/assets/images/no_thumb_6.jpg
 - app/assets/images/property_default_logo.png
 - app/assets/images/w227x182px.gif
 - app/assets/images/w621x377.gif