c80_estate 0.1.0 → 0.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca313a4bd48d2e8e5c1d37b1e0c7544a7e100bb
-  data.tar.gz: fed41c35fe08c402368bda60135399b817b6e482
+  metadata.gz: 7026b2c7a64312ec5ce4d64dc56c1348a8e80802
+  data.tar.gz: c1ea25b1914fa8c6150f3397e84b5986fc7cf225
 SHA512:
-  metadata.gz: 689a4c55920d460c884c02172edb1b4116069fc4fa90309cedb228e1fbc0b5676c29898c89eff48fb48acb1e9309cb2af643e0af87b023575a3e0aad516ec4b1
-  data.tar.gz: 3c0a30e95776515cf627c85f6dfc8339f2ec0a17b1b6445a2a430d081071c5a8a73b1e78eb59ff1e63e7523b517d042aa83fb0d29978c7cee9ec35548835c950
+  metadata.gz: d908754c97482adeffd78c824df3e3418ce57334840c530439bb0b49fbff876ce73ead761ed014da6431cb956a56b0aca821d5894e84cf3e9ac96be0d5cc87a8
+  data.tar.gz: c5834bb08f8632b2c97c159b0cd37e36dc3a56b3f11d43df12f3352bd695866e300348731e93c1ae1a8a4263a461e476d644c2385912591039c14c02b6e18886

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .idea
+*.gem

data/app/admin/c80_estate/areas.rb

@@ -8,17 +8,46 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
                 :desc,
                 :owner_id,
                 :owner_type,
+                :assigned_person_id,
+                :assigned_person_type,
                 :atype_id,
                 :property_id,
+                :astatus_ids => [],
                 :aphotos_attributes => [:id,:image,:_destroy],
                 :item_props_attributes => [:value, :_destroy, :prop_name_id, :id]
 
   config.sort_order = 'id_asc'
 
+  filter :title
+  filter :property_id,
+         :as => :select,
+         :collection => -> {C80Estate::Property.all.map { |p| ["#{p.title}", p.id]}},
+         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :assigned_person_id,
+         :as => :select,
+         :collection => -> {AdminUser.all.map{|u| ["#{u.email}", u.id]}},
+         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :created_at
+  filter :updated_at
+
+  scope  "All", :all_areas
+  scope  "Free", :free_areas
+  scope  "Busy", :busy_areas
+
   index do
+    selectable_column
     column :title
     column :atype do |area|
-      area.atype.title
+      area.atype_title
+    end
+    column :property do |area|
+      area.property_title
+    end
+    column :astatuses do |area|
+      area.astatus_title
+    end
+    column :assigned_person do |area|
+      area.assigned_person_title
     end
     actions
   end
@@ -27,11 +56,17 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
 
     f.inputs 'Свойства' do
       f.input :title
-      f.input :atype, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '300px'}
-      f.input :property, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '300px'}
+      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'}
+      f.input :assigned_person,
+              :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
+              :collection => AdminUser.all.map{|u| ["#{u.email}", u.id]}
+      f.input :assigned_person_type, :input_html => { :value => "AdminUser" }, as: :hidden
+      f.input :astatuses,
+              :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px', :multiple => false}
       f.input :desc, :as => :ckeditor
 
-      f.inputs "Характеристики" do
+      f.inputs "Свойства" do
 
         f.has_many :item_props, :allow_destroy => true do |item_prop|
           item_prop.input :prop_name

data/app/admin/c80_estate/astatuses.rb

@@ -0,0 +1,38 @@
+# ПОДкатегории строительных материалов
+ActiveAdmin.register C80Estate::Astatus, :as => 'Astatus' do
+
+  menu :label => "Статусы", :parent => "Настройки"
+
+  permit_params :title
+
+  config.sort_order = 'id_asc'
+
+  # controller do
+  #   cache_sweeper :strsubcat_sweeper, :only => [:update,:create,:destroy]
+  # end
+
+  before_filter :skip_sidebar!, :only => :index
+
+  # filter :title
+
+  # controller do
+  #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
+  # end
+
+  index do
+    selectable_column
+    id_column
+    column :title
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+
+    f.inputs "Свойства" do
+      f.input :title
+    end
+
+    f.actions
+  end
+
+end

data/app/admin/c80_estate/atypes.rb

@@ -13,9 +13,9 @@ ActiveAdmin.register C80Estate::Atype, :as => 'Atype' do
   #   cache_sweeper :strsubcat_sweeper, :only => [:update,:create,:destroy]
   # end
 
-  # before_filter :skip_sidebar!, :only => :index
+  before_filter :skip_sidebar!, :only => :index
 
-  filter :title
+  # filter :title
 
   # controller do
   #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]

data/app/admin/c80_estate/prop_names.rb

@@ -9,10 +9,11 @@ ActiveAdmin.register C80Estate::PropName, as: 'PropName' do
 
   config.sort_order = 'title_asc'
 
-  filter :title
-  filter :atypes
-  filter :is_excluded_from_filtering
-  filter :is_normal_price
+  before_filter :skip_sidebar!, :only => :index
+  # filter :title
+  # filter :atypes
+  # filter :is_excluded_from_filtering
+  # filter :is_normal_price
 
   # controller do
   #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
@@ -34,7 +35,7 @@ ActiveAdmin.register C80Estate::PropName, as: 'PropName' do
 
     f.inputs "Свойства" do
       f.input :title
-      f.input :uom, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '300px'}
+      f.input :uom, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '400px'}
       f.input :is_excluded_from_filtering,
               :hint => "Если да, то это свойство не будет фигурировать в списке фильтрации".html_safe
 

data/app/admin/c80_estate/properties.rb

@@ -9,17 +9,35 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
                 :address,
                 :latitude,
                 :longitude,
-                :atype_id,
+                # :atype_id,
                 :owner_id,
-                :owner_type
+                :owner_type,
+                :assigned_person_id,
+                :assigned_person_type
 
   config.sort_order = 'id_asc'
 
+  filter :title
+  filter :created_at
+  filter :updated_at
+  filter :assigned_person_id,
+         :as => :select,
+         :collection => -> {AdminUser.all.map{|u| ["#{u.email}", u.id]}},
+         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+
   index do
+    selectable_column
     column :title
-    column :atype do |prop|
-      prop.atype.title
+    column :address
+    column :gps do |prop|
+      "#{prop.latitude},#{prop.longitude}"
+    end
+    column :assigned_person do |prop|
+      prop.assigned_person_title
     end
+    # column :atype do |prop|
+    #   prop.atype.title
+    # end
     actions
   end
 
@@ -27,9 +45,23 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
 
     f.inputs 'Свойства' do
       f.input :title
-      f.input :atype, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '300px'}
+      f.input :assigned_person,
+              :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
+              :collection => AdminUser.all.map{|u| ["#{u.email}", u.id]}
+      f.input :assigned_person_type, :input_html => { :value => "AdminUser" }, as: :hidden
+      # f.input :atype, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '400px'}
       f.input :owner_id, :input_html => { :value => current_admin_user.id }, as: :hidden
       f.input :owner_type, :input_html => { :value => "AdminUser" }, as: :hidden
+      f.input :address
+      f.input :latitude
+      f.input :longitude
+
+      f.has_many :pphotos, :allow_destroy => true do |gp|
+        gp.input :image,
+                 :as => :file,
+                 :hint => image_tag(gp.object.image.thumb512)
+      end
+
     end
 
     f.actions

data/app/admin/c80_estate/role_types.rb

@@ -12,9 +12,9 @@ ActiveAdmin.register C80Estate::RoleType, :as => 'RoleType' do
   #   cache_sweeper :strsubcat_sweeper, :only => [:update,:create,:destroy]
   # end
 
-  # before_filter :skip_sidebar!, :only => :index
+  before_filter :skip_sidebar!, :only => :index
 
-  filter :title
+  # filter :title
 
   # controller do
   #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]

data/app/admin/c80_estate/uoms.rb

@@ -7,7 +7,8 @@ ActiveAdmin.register C80Estate::Uom, :as => 'Uom' do
 
   config.sort_order = 'title_desc'
 
-  filter :title
+  before_filter :skip_sidebar!, :only => :index
+  # filter :title
 
   index do
     # selectable_column

data/app/models/c80_estate/area.rb

@@ -3,6 +3,7 @@ module C80Estate
     belongs_to :property
     belongs_to :atype
     belongs_to :owner, :polymorphic => true
+    belongs_to :assigned_person, :polymorphic => true
     has_many :item_props, :dependent => :destroy
     accepts_nested_attributes_for :item_props,
                                   :reject_if => lambda { |attributes|
@@ -22,5 +23,50 @@ module C80Estate
     has_many :comments, :dependent => :destroy   # площадь можно прокомментировать
     has_and_belongs_to_many :astatuses,         # единственный статус: либо занята, либо свободна
                             :join_table => 'c80_estate_areas_astatuses'
+
+    def self.all_areas
+      self.all
+    end
+
+    def self.free_areas
+      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'free'})
+    end
+
+    def self.busy_areas
+      self.joins(:astatuses).where(:c80_estate_astatuses => { tag: 'busy'})
+    end
+
+    def atype_title
+      res = "-"
+      if atype.present?
+        res = atype.title
+      end
+      res
+    end
+
+    def property_title
+      res = "-"
+      if property.present?
+        res = property.title
+      end
+      res
+    end
+
+    def astatus_title
+      res = "-"
+      if astatuses.count > 0
+        res = astatuses.first.title
+      end
+      res
+    end
+
+    def assigned_person_title
+      res = "-"
+      if assigned_person.present?
+        res = assigned_person.email
+      end
+      res
+    end
+
   end
 end

data/app/models/c80_estate/atype.rb

@@ -11,7 +11,7 @@ module C80Estate
                             :after_remove => :after_remove_prop_names
 
     has_many :areas, :dependent => :destroy
-    has_many :properties, :dependent => :destroy
+    # has_many :properties, :dependent => :destroy
     has_many :atphotos, :dependent => :destroy   # одна или несколько фоток
 
     extend FriendlyId

data/app/models/c80_estate/item_prop.rb

@@ -2,7 +2,7 @@ module C80Estate
   class ItemProp < ActiveRecord::Base
 
     belongs_to :area
-    belongs_to :property
+    # belongs_to :property
     belongs_to :prop_name
 
     before_save :before_save_format_value

data/app/models/c80_estate/owner.rb

@@ -18,10 +18,12 @@ module C80Estate
 
       def act_as_owner
         class_eval do
+
           # эти взаимосвязи можно трактовать, как "создатель объектов этих классов"
           has_many :areas, :as => :owner, :class_name => 'C80Estate::Area', :dependent => :nullify
           has_many :properties, :as => :owner, :class_name => 'C80Estate::Property', :dependent => :nullify
           has_many :comments, :as => :owner, :class_name => 'C80Estate::Comment', :dependent => :destroy
+
           # эта взаимосвязь трактуется, как "роль, назначенная персоне"
           has_many :roles, :as => :owner, :class_name => 'C80Estate::Role', :dependent => :destroy
           accepts_nested_attributes_for :roles,
@@ -30,10 +32,16 @@ module C80Estate
                                         },
                                         :allow_destroy => true
 
+          # эта взаимосвязь трактуется, как "площадь, назначенная сотруднику"
+          has_many :assigned_areas, :as => :assigned_person, :class_name => 'C80Estate::Area', :dependent => :nullify
+
+          # эта взаимосвязь трактуется, как "площадь, назначенная сотруднику"
+          has_many :assigned_properties, :as => :assigned_person, :class_name => 'C80Estate::Property', :dependent => :nullify
+
           after_create :create_role
 
           def create_role
-            Rails.logger.debug('<Owner.create_role>')
+            # Rails.logger.debug('<Owner.create_role>')
             r = C80Estate::Role.create({ role_type_id: nil })
             roles << r
           end

data/app/models/c80_estate/property.rb

@@ -2,6 +2,7 @@ module C80Estate
   class Property < ActiveRecord::Base
     belongs_to :atype
     belongs_to :owner, :polymorphic => true
+    belongs_to :assigned_person, :polymorphic => true
     has_many :item_props, :dependent => :destroy
     has_many :pphotos, :dependent => :destroy   # одна или несколько фоток
     accepts_nested_attributes_for :pphotos,
@@ -11,5 +12,14 @@ module C80Estate
                                   :allow_destroy => true
     has_many :areas, :dependent => :destroy
     has_many :comments, :dependent => :destroy
+
+    def assigned_person_title
+      res = "-"
+      if assigned_person.present?
+        res = assigned_person.email
+      end
+      res
+    end
+
   end
 end

data/db/migrate/20160629033535_create_c80_estate_properties.rb

@@ -8,7 +8,9 @@ class CreateC80EstateProperties < ActiveRecord::Migration
       t.string :longitude
       t.string :owner_type
       t.references :owner, index: true
-      t.references :atype, index: true
+      # t.references :atype, index: true
+      t.string :assigned_person_type
+      t.references :assigned_person, index: true
       t.timestamps
     end
   end

data/db/migrate/{20160629033533_create_c80_estate_areas.rb → 20160629033538_create_c80_estate_areas.rb}

@@ -7,6 +7,8 @@ class CreateC80EstateAreas < ActiveRecord::Migration
       t.references :atype, index: true
       t.string :owner_type
       t.references :owner, index: true
+      t.string :assigned_person_type
+      t.references :assigned_person, index: true
       t.timestamps
     end
   end

data/db/migrate/20160629092323_create_c80_item_props.rb

@@ -3,7 +3,7 @@ class CreateC80ItemProps < ActiveRecord::Migration
     create_table :c80_estate_item_props, :options => 'COLLATE=utf8_unicode_ci' do |t|
       t.string :value
       t.references :area, index: true
-      t.references :property, index: true
+      # t.references :property, index: true
       t.references :prop_name, index: true
 
       t.timestamps null: false

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0"
+  VERSION = "0.1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.1
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - README.md
 - Rakefile
 - app/admin/c80_estate/areas.rb
+- app/admin/c80_estate/astatuses.rb
 - app/admin/c80_estate/atypes.rb
 - app/admin/c80_estate/prop_names.rb
 - app/admin/c80_estate/properties.rb
@@ -103,8 +104,8 @@ files:
 - bin/setup
 - c80_estate.gemspec
 - config/routes.rb
-- db/migrate/20160629033533_create_c80_estate_areas.rb
 - db/migrate/20160629033535_create_c80_estate_properties.rb
+- db/migrate/20160629033538_create_c80_estate_areas.rb
 - db/migrate/20160629034444_create_c80_prop_names.rb
 - db/migrate/20160629041414_create_c80_estate_uoms.rb
 - db/migrate/20160629090606_create_c80_estate_aphotos.rb