caboose-rets 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b9427dfa683fee1e5be758b91721d68fe8ce144
-  data.tar.gz: 17b46b6354a55b034e0d5443851d5de066a1790a
+  metadata.gz: 1ff44b589fbd88839a2b88f34a89dbbe86acf160
+  data.tar.gz: 6d1aff861f630f9b71740aabb5aef5e32d0f30ef
 SHA512:
-  metadata.gz: b274434916e0c7c0ca9c3f39d29cc6e44d3c260ab977288253a666888d426ccfa802a5176b57af81de03d80009c75b65e8de0010498e2e0e89a7f674bc25fc85
-  data.tar.gz: 2ccd0afd3c0410df03885d134acd9bdda95cf2fa915f885a07df7bde701e57a54967026475352e55783dc5339996d291f60dc59daf9fb19ea4857fc15f4d9ed6
+  metadata.gz: 637d77f8aa46d07f7ba78a921359507dc69a0ea69fe36472b0f4f834fa1a10c3622bb59ba297c5780ce40e52cd2cff98832eb540153a955c60788009854978e6
+  data.tar.gz: b0d3d5d8ed6fad15dbf3fbdcd3138ee8b4286e3415e35c7e84fe23ad33ccbd21ddccd17345738a106b02a5576240684ed5d8a3645cb91c1349369c595397de5a

data/app/controllers/caboose_rets/residential_controller.rb

@@ -19,10 +19,16 @@ module CabooseRets
     		end
     	end
     	
-      @pager = Caboose::PageBarGenerator.new(params, {
+      @pager = Caboose::PageBarGenerator.new(params, {           
+        'area'               => '',
+        'area_like'          => '',
         'name'               => '',
         'acreage_gte'        => '',
         'acreage_lte'        => '',
+        'city'               => '',
+        'city_like'          => '',
+        'county'             => '',
+        'county_like'        => '',
         'current_price_gte'  => '',
         'current_price_lte'  => '',
         'bedrooms_gte'       => '',
@@ -45,10 +51,13 @@ module CabooseRets
         'address_like'       => '',        
         'street_name_like'   => '',
         'street_num_like'    => '',
+        'zip'                => '',
+        'zip_like'           => '',        
         'date_created_gte'   => '',
         'date_created_lte'   => '',
         'date_modified_gte'  => '',
         'date_modified_lte'  => '',
+        
         'status'             => 'Active'
       },{
         'model'           => 'CabooseRets::ResidentialProperty',

data/app/models/caboose_rets/schema.rb

@@ -845,9 +845,10 @@ class CabooseRets::Schema < Caboose::Utilities::Schema
         [ :notify        , :boolean   ] 
       ],
       CabooseRets::SearchOption => [
-        [ :name   , :string ],
-        [ :field  , :string ],
-        [ :value  , :string ]         
+        [ :name            , :string ],
+        [ :field           , :string ],
+        [ :value           , :string ],
+        [ :flag_for_delete , :boolean , { :default => false }]
       ],
       Caboose::Site => [
         [ :use_rets , :boolean, { :default => false }]        

data/app/models/caboose_rets/search_option.rb

@@ -1,10 +1,13 @@
 class CabooseRets::SearchOption < ActiveRecord::Base
   self.table_name = "rets_search_options"
 
-  attr_accessible :id, :name, :field, :value
+  attr_accessible :id, :name, :field, :value, :flag_for_delete
                                  
   def self.update_search_options
     
+    # Flag all for delete
+    self.update_all(:flag_for_delete => true)
+    
     names = {
       'City'          => ['city'],
       'County'        => ['county'],
@@ -19,13 +22,25 @@ class CabooseRets::SearchOption < ActiveRecord::Base
       #'location',
     }
     names.each do |name, fields|
-      fields.each do |field|          
-        q = ["select distinct(#{field}) from rets_residential"]
-        rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
-        rows.each do |row|
-          so = self.where(:name => name, :field => field, :value => row[0]).first
-          self.create(    :name => name, :field => field, :value => row[0]) if so.nil?
-        end
+      fields.each do |field|
+        self.update_search_options_for_field(name, field)        
+      end
+    end
+    
+    # Delete all flagged
+    self.where(:flag_for_delete => true).destroy_all        
+  end
+  
+  def self.update_search_options_for_field(name, field)
+    q = ["select distinct(#{field}) from rets_residential where (status = ? or status = ?)", 'Pending', 'Active']
+    rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
+    rows.each do |row|
+      so = self.where(:name => name, :field => field, :value => row[0]).first
+      if so.nil?
+        self.create(:name => name, :field => field, :value => row[0])
+      else      
+        so.flag_for_delete = false
+        so.save
       end
     end
   end
@@ -33,8 +48,8 @@ class CabooseRets::SearchOption < ActiveRecord::Base
   def self.results(str, count_per_name = 10)      
     q = ["select * from (        
         select name, field, value, row_number() over (partition by name order by field) as rownum 
-        from rets_search_options
-        where lower(value) like ?
+        from rets_search_options        
+        where lower(value) like ?        
       ) tmp where rownum < #{count_per_name}", "%#{str}%"]      
     rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
     arr = rows.collect{ |row| { :name => row[0], :field => row[1], :value => row[2] }}    

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms