areas.rb in c80_estate-0.1.0.20

- old
+ new

@@ -125,14 +125,14 @@
          :collection => -> { C80Estate::ItemProp.all_uniq_values(5) },
          :label => 'Этаж',
          :input_html => {:class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
 
   # filter :title
-  filter :assigned_person_id,
+  filter :assigned_person_id_in,
          :label => 'Назначенный пользователь',
          :as => :select,
-         :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
+         :collection => -> { AdminUser.all.map { |u| ["#{u.email} (#{u.assigned_areas_count})", u.id] } },
          :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :created_at
   filter :updated_at
 
   scope "All", :all_areas
@@ -145,11 +145,14 @@
       link_to area.title, "/admin/areas/#{area.id}", title: I18n.t("active_admin.view")
     end
     column :atype do |area|
       area.atype_title
     end
-    column 'Цена' do |area|
+    column '<abbr title="За м.кв. в месяц">Цена м.кв.</abbr>'.html_safe do |area|
       "#{area.price_value} руб"
+    end
+    column '<abbr title="Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.">Цена площади</abbr>'.html_safe do |area|
+      "#{area.power_price_value} руб"
     end
     column 'Метраж' do |area|
       "#{area.square_value} м<sup>2</sup>".html_safe
     end
     column :property do |area|
\ No newline at end of file