c80_estate 0.1.0.4 → 0.1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874477f69a0669398c5c3ecffeb2749cb5083cde
-  data.tar.gz: 9b447c9a40b61e65e2750b23de3a75558e23af6f
+  metadata.gz: 92af0bcd120ccea43d4e9ca0659b0b327cb2bc99
+  data.tar.gz: 1044a9f90b63402bd786df086fc27d3e011dc534
 SHA512:
-  metadata.gz: 67de432c20fcc77bc29dcb3ae67360974e382f5f0ed1986ce09f5e9be10359142e7797c56610ee8f1bb6a55f359f6be283a5d5e8e7219f0a7497eeae8b39af8a
-  data.tar.gz: 29ba6d1171311bca2b3abbdf56985da00dda295e45b36384d69b8f944a799d704981f5cb3a627f9ae423afe97504f5819a61f8eacfebcde643000d8f544fa162
+  metadata.gz: f5f1d56d4a4365128365fc574ed8864df30608746d15d238e78c9ade84caf728e45e058e437f02c3ca5277bb1d01c979f735fe0ada5f3e4f22fd84717d66daf8
+  data.tar.gz: 9b2fce81d9f2ac426a48f1d9c1c832cddb02bff36c35750b3f5e9d2bb68d2d65af692b3cd0108412ee8d26a09bb874db24f9faf5b07495924e91c2e47db2da43

data/app/admin/c80_estate/areas.rb

@@ -18,12 +18,40 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
 
   config.sort_order = 'id_asc'
 
-  filter :title
+  filter :atype_id,
+         :label => 'Тип площади',
+         :as => :select,
+         :collection => -> {C80Estate::Atype.all.map { |p| ["#{p.title}", p.id]}},
+         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :property_id,
+         :label => 'Объект недвижимости',
          :as => :select,
          :collection => -> {C80Estate::Property.all.map { |p| ["#{p.title}", p.id]}},
          :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+
+  filter :item_prop_square_val_in,
+         :as => :string,
+         :label => 'Площадь (м.кв.)'
+
+  filter :item_prop_price_val_in,
+         :as => :string,
+         :label => 'Цена'
+
+  filter :item_prop_oenter_in,
+         :as => :select,
+         :collection => [['Есть',11],['Нет',10]],
+         :label => 'Отдельный вход с улицы',
+         :input_html => { :class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
+
+  filter :item_prop_floor_val_in,
+         :as => :select,
+         :collection => -> { C80Estate::ItemProp.all_uniq_values(5) },
+         :label => 'Этаж',
+         :input_html => { :class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
+
+  # filter :title
   filter :assigned_person_id,
+         :label => 'Назначенный пользователь',
          :as => :select,
          :collection => -> {AdminUser.all.map{|u| ["#{u.email}", u.id]}},
          :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}

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

@@ -105,5 +105,9 @@ body.admin_areas {
       legend { display: none !important; }
     }
 
+    a.delete_link {
+      display: none;
+    }
+
   }
 }

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

@@ -0,0 +1,18 @@
+body.admin_prop_names {
+
+  &.index {
+
+    a.delete_link {
+      display: none !important;
+    }
+
+  }
+
+
+  &.show {
+    .action_items {
+      display: none !important;
+    }
+  }
+
+}

data/app/models/c80_estate/area.rb

@@ -76,6 +76,37 @@ module C80Estate
       sum
     end
 
+    def self.where_price(v)
+      self.joins(:item_props)
+          .where(c80_estate_item_props: {prop_name_id: 1})
+          .where(c80_estate_item_props: {value: v})
+    end
+
+    def self.where_square(v)
+      C80Estate::Area.joins(:item_props)
+          .where(c80_estate_item_props: {prop_name_id: 9})
+          .where(c80_estate_item_props: {value: v})
+    end
+
+    def self.where_oenter(v)
+      # Rails.logger.debug "\t\t [2]: v = #{v}"
+      r = C80Estate::Area.joins(:item_props)
+              .where(c80_estate_item_props: {prop_name_id: 8})
+      if v.to_i == 11
+        r = r.where(c80_estate_item_props: {value: 1})
+      else
+        r = r.where.not(c80_estate_item_props: {value: 1})
+      end
+      r
+    end
+
+    def self.where_floor(v)
+      # Rails.logger.debug "\t\t [2]: v = #{v}"
+      C80Estate::Area.joins(:item_props)
+          .where(c80_estate_item_props: {prop_name_id: 5})
+          .where(c80_estate_item_props: {value: v})
+    end
+
     def atype_title
       res = "-"
       if atype.present?
@@ -124,6 +155,46 @@ module C80Estate
       res
     end
 
+    ransacker :item_prop_price_val,
+              formatter: proc { |price|
+                results = C80Estate::Area.where_price(price).map(&:id)
+                results = results.present? ? results : nil
+              }, splat_params: true do |parent|
+      parent.table[:id]
+    end
+
+    ransacker :item_prop_square_val,
+              formatter: proc { |square|
+                results = C80Estate::Area.where_square(square).map(&:id)
+                results = results.present? ? results : nil
+              }, splat_params: true do |parent|
+      parent.table[:id]
+    end
+
+    ransacker :item_prop_floor_val,
+              formatter: proc { |v|
+                results = C80Estate::Area.where_floor(v).map(&:id)
+                results = results.present? ? results : nil
+              }, splat_params: true do |parent|
+      parent.table[:id]
+    end
+
+    ransacker :item_prop_oenter,
+              formatter: proc { |option|
+                # Неважно: -1
+                # Да: 1
+                # Нет: 0
+                Rails.logger.debug "\t\t [1]: option = #{option}"
+
+                if option.to_i == 10 || option.to_i == 11
+                  results = C80Estate::Area.where_oenter(option).map(&:id)
+                end
+
+                results = results.present? ? results : nil
+              }, splat_params: true do |parent|
+      parent.table[:id]
+    end
+
     protected
 
     # при создании площади генерится начальное событие

data/app/models/c80_estate/item_prop.rb

@@ -7,6 +7,11 @@ module C80Estate
 
     before_save :before_save_format_value
 
+    def self.all_uniq_values(prop_name_id)
+      self.where(prop_name_id: prop_name_id)
+          .map { |ip| ip.value }.uniq
+    end
+
     private
 
     def self.capz

data/config/locales/ru.yml

@@ -0,0 +1,104 @@
+ru:
+  activerecord:
+    models:
+      area:
+        one: "площадь"
+        other: "Площади"
+      c80_news_tz/nphoto: ""
+      c80_news_tz/gallery: ""
+      c80_news_tz/gphoto: "картинку"
+      c80_news_tz/cphoto: ""
+      c80_news_tz/fphoto: ""
+      c80_news_tz/adress: ""
+      property:
+        one: "объект"
+        other: "Объекты"
+      uom:
+        one: 'единицу измерения'
+        other: 'Единицы измерения'
+      prop_name:
+        one: 'имя свойства'
+        other: 'Имена свойств'
+      role_type:
+        one: 'роль'
+        other: 'Роли'
+      astatus:
+        one: 'статус'
+        other: 'Статусы'
+      atype:
+        one: 'тип'
+        other: 'Типы площадей'
+      admin_user:
+        one: 'пользователя'
+        other: 'Пользователи'
+    attributes:
+      c80_estate/area:
+        title: "Название"
+        atype: 'Тип'
+        property: 'Объект'
+        astatus: 'Статус'
+        assigned_person: 'Ответственный'
+        created_at: 'Время создания'
+        updated_at: 'Изменён'
+      c80_news_tz/nphoto:
+        image: 'Файл'
+      c80_news_tz/adress:
+        locality: 'Город'
+        street: 'Улица'
+        telephone_1: 'Телефон №1'
+        telephone_2: 'Телефон №2'
+        telephone_3: 'Телефон №3'
+        latitude: 'Широта'
+        longitude: 'Долгота'
+        email_1: 'Email №1'
+        email_2: 'Email №2'
+        site_1: 'Сайт №1'
+        site_2: 'Сайт №2'
+      c80_news_tz/company:
+        title: 'Название'
+        activity_type: 'Род деятельности'
+        desc: 'Описание'
+        facts: 'Публикации'
+      c80_news_tz/gallery:
+        title: 'Название галереи'
+      c80_news_tz/fact:
+        title: 'Заголовок'
+        created_at: 'Дата создания'
+        short: 'Кратко'
+        rubrics: 'Рубрики'
+        issues: 'Номер'
+        issue: 'Номер'
+        leader_abz: 'Лидер абзац'
+        full: ''
+        companies: ''
+      c80_news_tz/issue:
+        number: 'Номер'
+        pdf: 'PDF'
+        pdfs: 'PDF'
+        facts: 'Публикации'
+      c80_news_tz/rubric:
+        title: 'Название'
+        facts: 'Публикации'
+      c80_news_tz/location:
+        title: 'Название'
+        facts: 'Публикация'
+      c80_news_tz/r_live:
+        title: 'Название'
+        r_advertisers: 'Рекламодатель'
+      c80_news_tz/r_advertiser:
+        title: 'Название'
+        logo: 'Лого'
+        r_blurbs: 'Публикации'
+      c80_news_tz/r_blurb:
+        title: 'Заголовок'
+        created_at: 'Дата создания'
+        short: 'Кратко'
+        rubrics: 'Рубрики'
+        issues: 'Номер'
+        issue: 'Номер'
+        leader_abz: 'Лидер абзац'
+        full: ''
+        r_advertisers: ''
+      c80_news_tz/spot:
+        title: 'Название'
+        rubrics: 'Рубрика'

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.4"
+  VERSION = "0.1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.4
+  version: 0.1.0.5
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - app/assets/javascript/c80_estate/lib/jquery.canvasjs.min.js
 - app/assets/javascript/c80_estate_active_admin.js.coffee
 - app/assets/stylesheets/c80_estate/backend/admin_areas.scss
+- app/assets/stylesheets/c80_estate/backend/admin_prop_names.scss
 - app/assets/stylesheets/c80_estate/backend/admin_pstats.scss
 - app/assets/stylesheets/c80_estate/backend/admin_sevents.scss
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss
@@ -129,6 +130,7 @@ files:
 - bin/console
 - bin/setup
 - c80_estate.gemspec
+- config/locales/ru.yml
 - config/routes.rb
 - db/migrate/20160629033535_create_c80_estate_properties.rb
 - db/migrate/20160629033538_create_c80_estate_areas.rb