c80_estate 0.1.0.22 → 0.1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe8917ffaa47a57c2ea9dbe69c253ea82df4496
-  data.tar.gz: 22753244eddd3fb0be188a693b56e12d6793e2f0
+  metadata.gz: 92d6434e1377535f34963ca6e84233a7987abcc2
+  data.tar.gz: da6acc1bc02c04026baf613091e5dbecd8512bbb
 SHA512:
-  metadata.gz: 85cf184d15a8e6bdef07f5c755d6b7b2a1604922d703fc4b32c59c073134999d2cb1e90dcf3f2b90110ad5d9b8b2755885331e0245ba3c71efdc8e5987aa7f33
-  data.tar.gz: fa5e83e1437a05d697b741fa6efaacbe5a14a3ab81a3351f4b6d6f0a23e6bc2bd0c42876bb7e2ecf2749c145cd991c3111558da5e8855e50b2f13f065c27d37d
+  metadata.gz: 3e6a6b3111937749e24fd15d9236e2908276fa42cabd92b572ac673ff4a4f79d6513003440cb51336888e4857f78cf8d280e70e24085d0f5b9d161d10d3b63a8
+  data.tar.gz: 40c33263fe9e036a93fc78420348892ef68617d046d7518ab21d1a30a1719390f33ef3d4042703c1659b55bf7e4961f792afa23404efd728b1bf001adab47fe1

data/app/admin/c80_estate/properties.rb

@@ -52,15 +52,21 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
       prop.areas.count
     end
     column 'Метраж' do |prop|
-      "#{prop.square_value} м.кв."
+      "#{prop.square_value.to_s(:rounded, precision: 2)} м.кв."
     end
     column '<abbr title="Сумма всех цен площадей">Цена объекта</abbr>'.html_safe do |prop|
-      "#{prop.power_price_value} руб"
+      "#{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
     column :assigned_person do |prop|
       prop.assigned_person_title
     end

data/app/assets/stylesheets/c80_estate/backend/admin_areas.scss

@@ -164,6 +164,33 @@ body.admin_areas {
       -o-transition: opacity .2s ease-in;
       transition: opacity .2s ease-in;
 
+      .astatus_span {
+        font-size: 20px;
+        font-weight: bold;
+        margin-right: 0;
+
+        .pvalue {
+          font-weight: 600 !important;
+        }
+
+        &.free {
+          margin-left: 58px;
+
+          .pvalue {
+            color: #00b729 !important;
+          }
+        }
+
+        &.busy {
+          margin-left: 78px;
+
+          .pvalue {
+            color: #b72600 !important;
+          }
+        }
+
+      }
+
     }
 
   }

data/app/helpers/c80_estate/areas_helper.rb

@@ -122,19 +122,29 @@ module C80Estate
               title: 'Метраж',
               abbr: 'Объем площади',
               value: area.square_value,
-              uom: 'м.кв.'
+              uom: 'м.кв.',
+              css:''
           },
           {
               title: 'Цена',
               abbr: 'За метр квадратный в месяц',
               value: area.price_value,
-              uom: 'руб'
+              uom: 'руб',
+              css:''
           },
           {
               title: 'Цена площади',
               abbr: 'Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.',
               value: area.power_price_value,
-              uom: 'руб'
+              uom: 'руб',
+              css:''
+          },
+          {
+              title: '',
+              abbr: '',
+              value: area.astatus_title,
+              uom: '',
+              css:"astatus_span #{area.astatus_tag}",
           }
       ]
       rows.each do |row|
@@ -143,9 +153,10 @@ module C80Estate
         value = row[:value]
         abbr = row[:abbr]
         uom = row[:uom]
+        css = row[:css]
 
         # нормальная цена
-        result += '<li>'
+        result += "<li class='#{css}'>"
         result += "<p class='ptitle medium'><abbr title='#{abbr}'>#{title}</abbr></p>" # Цена за шт | Цена за м²
         result += "<p><span class='pvalue bold'>#{value}<span> <span class='puom'>#{uom}</span></p>" # 1212,80 руб
 

data/app/helpers/c80_estate/properties_helper.rb

@@ -93,6 +93,18 @@ module C80Estate
               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: 'руб'
           }
       ]
       rows.each do |row|

data/app/models/c80_estate/area.rb

@@ -229,6 +229,14 @@ module C80Estate
       res
     end
 
+    def is_free?
+      astatus_tag == 'free'
+    end
+
+    def is_busy?
+      astatus_tag == 'busy'
+    end
+
     def assigned_person_title
       res = "-"
       if assigned_person.present?

data/app/models/c80_estate/property.rb

@@ -30,6 +30,60 @@ module C80Estate
       ac
     end
 
+    # применим для коллекций
+    # def self.average_price
+    #
+    #   areas_counter = 0
+    #   price_sum = 0
+    #
+    #   self.all.each do |prop|
+    #     prop.areas.all.each do |area|
+    #       price_sum += area.price_value
+    #       areas_counter += 1
+    #     end
+    #   end
+    #
+    #   if areas_counter != 0
+    #     price_sum*1.0 / areas_counter
+    #   else
+    #     0
+    #   end
+    # end
+
+    def average_price
+      price_sum = 0
+      areas.all.each do |area|
+        price_sum += area.price_value
+      end
+
+      if areas.all.count != 0
+        price_sum*1.0 / areas.all.count
+      else
+        0
+      end
+
+    end
+
+    def average_price_busy
+
+      busy_areas_count = 0
+      price_sum = 0
+
+      areas.all.each do |area|
+        if area.is_busy?
+          busy_areas_count += 1
+          price_sum += area.price_value
+        end
+      end
+
+      if busy_areas_count != 0
+        price_sum*1.0 / busy_areas_count
+      else
+        0
+      end
+
+    end
+
     def assigned_person_title
       res = "-"
       if assigned_person.present?

data/config/locales/ru.yml

@@ -59,6 +59,8 @@ ru:
         updated_at: 'Изменён'
         owner: 'Создатель'
         astatuses: 'Статус'
+        average_price: 'Средняя ставка'
+        average_price_busy: 'Средняя ставка занятых'
       c80_estate/aphoto:
         image: 'Файл'
       c80_news_tz/nphoto:

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.22'
+  VERSION = '0.1.0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.22
+  version: 0.1.0.23
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler