c80_estate 0.1.0.37 → 0.1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb73e2ca07a154798c194522fcfe29c59e06581
-  data.tar.gz: fa2d0a72a40ff67bb6078c78bad41025e0c65c93
+  metadata.gz: 351e2c7265b6f64ef7191d5c3f899f36e4fd76e2
+  data.tar.gz: f2e6a94924983fa39e75b706e9eb461835962e63
 SHA512:
-  metadata.gz: 9e80cb776bd57f8dcb5f91e696eafc27d4bf005456b24f5cdebf0685dbe08458bf1b831b9d411547f5775f39c95a84897443345488ab1c23fa9a49f0b9c156e5
-  data.tar.gz: fb6efb30f933617458df8f1fbc24aa051b3c58c69819429bd800ec10c7332f46900fde47c554481aa36d45920fdb1ca9ea0a9b6819b890ea831350493af5ab3e
+  metadata.gz: 0608b111b13fc223e721bdd789ec258d2f7d01d920e7857a4b07485948e930daf028ab0e89d6104456102e4452d29407d56978e2e58b362aa0d06987af405f8e
+  data.tar.gz: d52a19c1e0beb4dafcaff5f05156e05379317600c1a5d8889b5362cd030a4b3c488f24e717eb24767c682777687f4a7374ebd7f7a319c85dac910d4502997774

data/app/models/c80_estate/area.rb

@@ -31,10 +31,13 @@ module C80Estate
     validates :atype, :presence => true
     validate :has_astatus?
 
+    after_create :calc_square_value       # эти три метода вызовем также и после создания записи,
+    after_create :calc_price_value        # чтобы при создании sevent\pstat были уже рассчитаны
+    after_create :calc_power_price_value  # все необходимые числа
     after_create :create_initial_sevent
-    after_update :calc_square_value
-    after_update :calc_price_value
-    after_update :calc_power_price_value
+    after_update :calc_square_value       # пересчитаем после того, как запись обновится
+    after_update :calc_price_value        #
+    after_update :calc_power_price_value  #
     after_update :check_and_remove_item_props, :if => :atype_id_changed?
     after_update :check_and_generate_sevent
 

data/app/models/c80_estate/property.rb

@@ -62,7 +62,9 @@ module C80Estate
       c = self.all.count
       if c > 0
         self.all.each do |prop|
-          sum += prop.average_price(atype_id:atype_id)
+          if prop.average_price.present?
+            sum += prop.average_price(atype_id: atype_id)
+          end
         end
         res = sum / c
       end
@@ -80,7 +82,9 @@ module C80Estate
       c = self.all.count
       if c > 0
         self.all.each do |prop|
-          sum += prop.average_price_busy(atype_id:atype_id)
+          if prop.average_price_busy.present?
+            sum += prop.average_price_busy(atype_id: atype_id)
+          end
         end
         res = sum / c
       end
@@ -111,7 +115,9 @@ module C80Estate
       price_sum = 0.0
 
       ars.each do |area|
-        price_sum += area.price_value
+        if area.price_value.present?
+          price_sum += area.price_value
+        end
       end
 
       if ars.count != 0
@@ -138,7 +144,9 @@ module C80Estate
       ars.each do |area|
         if area.is_busy?
           busy_areas_count += 1
-          price_sum += area.price_value
+          if area.price_value.present?
+            price_sum += area.price_value
+          end
         end
       end
 
@@ -193,7 +201,9 @@ module C80Estate
     def square_value
       sum = 0.0
       areas.all.each do |area|
-        sum += area.square_value
+        if area.square_value.present?
+          sum += area.square_value
+        end
       end
       sum
     end
@@ -201,7 +211,9 @@ module C80Estate
     def power_price_value
       sum = 0.0
       areas.all.each do |area|
-        sum += area.power_price_value
+        if area.power_price_value.present?
+          sum += area.power_price_value
+        end
       end
       sum
     end

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.37'
+  VERSION = '0.1.0.38'
 end

metadata

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