c80_estate 0.1.0.28 → 0.1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08645faa1d97b3ac9cbafa6cf68655e4a5108b8
-  data.tar.gz: c79aa2d2f76e257f79f5f9ff8c7490edb0a92916
+  metadata.gz: 369b7eee549a751f657741e22a0101841b37be5d
+  data.tar.gz: 31ff7efbc1e816261f8ce438dadc70f9fd0ba618
 SHA512:
-  metadata.gz: 605ecc95640a510e7d1aa29b72d427319d5c0e1403d46556f317d2382b22548a7f3a21a4bdb8321051e7622fd52c1e51593c359cef01bde6b18fabb311844eec
-  data.tar.gz: 3eaac5d2ce9e94f2ee5a859f0337ad8cb39c1cf5f39d189b014b4c8bc8516e8191783caec451ef326a57c93d618b29ff1e6a7b74019710081dae8d0463816d35
+  metadata.gz: a1e91158b43738a18a46649ab4ab68a8561eb052a5d9029742b46edd9e56863fdce616e832f2adc25f7b67daaded7810d41890c0a3a78dd29368ec8c58a53e2b
+  data.tar.gz: b9dfc87f7f2811c4aaa01efcf7241b429512bc382d2b56788dac3c334ffa2f394585eeeac1235bc7f642a84c21f901fdf5c926f7f9ef68b4b62cf97eec0ee6f1

data/app/admin/c80_estate/areas.rb

@@ -192,7 +192,7 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
       f.input :atype, :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
       f.input :property,
               :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
-              :collection => C80Estate::Property.where(:assigned_person_id => current_admin_user.id).map { |p| ["#{p.title}", p.id] }
+              :collection => C80Estate::Property.where_assig_user(current_admin_user).map { |p| ["#{p.title}", p.id] }
       # f.input :assigned_person,
       #         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
       #         :collection => AdminUser.all.map { |u| ["#{u.email}", u.id] }

data/app/helpers/c80_estate/app_helper.rb

@@ -27,7 +27,7 @@ module C80Estate
             list << {
                 id: prop.id,
                 title: prop.title,
-                busy_coef: busy_coef,
+                busy_coef: "#{busy_coef.to_s(:rounded, :precision => 2)} %",
                 props: {
                     all_areas: pstat.free_areas + pstat.busy_areas,
                     free_areas: pstat.free_areas,
@@ -68,11 +68,11 @@ module C80Estate
             list << {
                 id: prop.id,
                 title: prop.title,
-                busy_coef: busy_coef,
+                busy_coef: "#{busy_coef.to_s(:rounded, :precision => 2)} %",
                 props: {
                     all_areas_sq: pstat.free_areas_sq + pstat.busy_areas_sq,
-                    free_areas: pstat.free_areas_sq,
-                    busy_areas: pstat.busy_areas_sq
+                    free_areas_sq: pstat.free_areas_sq.to_s(:rounded, :precision => 2),
+                    busy_areas_sq: pstat.busy_areas_sq.to_s(:rounded, :precision => 2)
                 }
             }
             # Rails.logger.debug "<render_table_prop_busy_coef> #{prop.title}"

data/app/models/c80_estate/property.rb

@@ -88,6 +88,18 @@ module C80Estate
       res
     end
 
+    # для селекта формы админки Area выдать
+    # список объектов, на которые назначен пользователь
+    # если юзер - админ - ему выдаются все объекты
+    def self.where_assig_user(user)
+      if user.can_create_properties?
+        C80Estate::Property.all
+      else
+        C80Estate::Property.where(:assigned_person_id => current_admin_user.id)
+      end
+
+    end
+
     def average_price(atype_id: nil)
 
       if atype_id.nil?

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = '0.1.0.28'
+  VERSION = '0.1.0.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.28
+  version: 0.1.0.29
 platform: ruby
 authors:
 - C80609A