caboose-rets 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bd4515041f372ac88cb4bc7e047a030ef58d60
-  data.tar.gz: edb24cf7f3dc4d58b09e5f3d5146819d3aba2682
+  metadata.gz: c88a7adc237f7151f802530ce4f66506a4965e50
+  data.tar.gz: f637b42ec76bb71590e0756619f5bfd2fab4d8c4
 SHA512:
-  metadata.gz: 8c2c14872923df85e33ec63cb85134d49b397980b7ecf5e0198d3b6af48dbb037faca574321b7de53d2635d964165492d18b8aa8b180c544e0e21d299f4908e0
-  data.tar.gz: 573e8b0b2578f0db017991cc04e80c1f96c3967a2d3664d62020ecabdf2cfad515deccf43f3235d345f26c38d728846f7ea5e633425545f928f693da756250c8
+  metadata.gz: 218139c1c9dc02635b90e395c48aa5eec228a2742192ed080b60508fae6d5627b3cc86a9deaa7258e8c63f7ae9866bf010a4c24ff2a98e9d14b87affb6e55933
+  data.tar.gz: 0e80e99ac99579ca6fae979fa5d25f21a3eb8c6261613a2ff90760545ebfff83d914a24a3699107ebcb022d6f940fafc8dda70b40f7900d14223e73b9a9d42c7

data/app/controllers/caboose_rets/agents_controller.rb

@@ -46,7 +46,7 @@ module CabooseRets
         'desc'  => 'false',
         'base_url' => '/admin/agents',
         'items_per_page' => 50,
-        'additional_where' => [ (where) ],
+        'additional_where' => [ (where) ]
       })
       render :json => {
         :pager => pager,

data/app/controllers/caboose_rets/open_houses_controller.rb

@@ -13,16 +13,66 @@ module CabooseRets
       @open_houses = OpenHouse.find(params[:mls_number])
     end
     
-    # get /admin/open-houses
+    # @route GET /admin/open-houses
     def admin_index
-      render :layout => 'caboose/admin'      
+      return unless (user_is_allowed_to 'view', 'rets_open_houses')     
+      render :layout => 'caboose/admin'       
     end
-    
-    # get /admin/open-houses/refresh
+
+    # @route GET /admin/open-houses/json
+    def admin_json 
+      render :json => false and return if !user_is_allowed_to 'view', 'rets_open_houses'
+      where = "(listing_mui in (select mls_number from rets_properties where list_office_mls_id = '#{@site.rets_office_id}'))" # '#{@site.rets_office_id}')"
+      pager = Caboose::Pager.new(params, {
+        'listing_mui' => ''
+      }, {
+        'model' => 'CabooseRets::OpenHouse',
+        'sort'  => 'start_time',
+        'desc'  => 'true',
+        'base_url' => '/admin/open-houses',
+        'items_per_page' => 50,
+        'additional_where' => [ where ]
+      })
+      render :json => {
+        :pager => pager,
+        :models => pager.items
+      } 
+    end
+
+    # @route GET /admin/open-houses/:id/json
+    def admin_json_single
+      render :json => false and return if !user_is_allowed_to 'edit', 'rets_open_houses'
+      prop = OpenHouse.find(params[:id])
+      render :json => prop
+    end
+
+    # @route GET /admin/open-houses/refresh
     def admin_refresh                  
-      RetsImporter.update_helper('OpenHouse', DateTime.parse(1.month.ago.strftime('%F %T')))
+      RetsImporter.update_helper('OpenHouse', DateTime.parse(7.days.ago.strftime('%F %T')))
+      resp = Caboose::StdClass.new
+      resp.success = "New open houses are being imported!"
+      render :json => resp
+    end
+
+    # @route GET /admin/open-houses/:id
+    def admin_edit
+      return unless (user_is_allowed_to 'edit', 'rets_open_houses')
+      @openhouse = OpenHouse.find(params[:id])
+      render :layout => 'caboose/admin'       
+    end
+
+    # @route PUT /admin/open-houses/:id
+    def admin_update
+      return unless (user_is_allowed_to 'edit', 'rets_open_houses')
       resp = Caboose::StdClass.new
-      resp.success = "The open houses have been refreshed successfully."
+      openhouse = OpenHouse.find(params[:id])
+      params.each do |k,v|
+        case k
+          when "hide" then openhouse.hide = v
+        end
+      end
+      openhouse.save
+      resp.success = true
       render :json => resp
     end
 

data/app/controllers/caboose_rets/properties_controller.rb

@@ -20,6 +20,8 @@ module CabooseRets
     		end
     	end
       where = @site && @site.id == 558 ? "(style = 'Condo' OR res_style = 'Condo')" : "(id is not null)"
+      # where2 = params[:keyword].blank? ? "(id is not null)" : "(mls_number ILIKE ? or public_remarks ILIKE ? or street_name ILIKE ? or subdivision ILIKE ?)"
+      # terms2 = params[:keyword].blank? ? nil : ["%#{params[:keyword]}%","%#{params[:keyword]}%","%#{params[:keyword]}%","%#{params[:keyword]}%"]
       sortby = @site && @site.id == 558 ? "original_entry_timestamp" : CabooseRets::default_property_sort
       @pager = Caboose::PageBarGenerator.new(params, {
         'area'                     => '',
@@ -70,7 +72,7 @@ module CabooseRets
         'skip'            => ['status'],
         'base_url'        => '/properties',
         'items_per_page'  => 10,
-        'additional_where' => [ (where) ]
+        'additional_where' => [ where ]
       })
 
       @properties = @pager.items
@@ -191,7 +193,11 @@ module CabooseRets
     def facebook_listings_feed
       rc = CabooseRets::RetsConfig.where(:site_id => @site.id).first
       if params[:fieldtype] == 'agent' && rc && !rc.agent_mls.blank?
-        @properties = CabooseRets::Property.where("list_agent_mls_id = ?", rc.agent_mls).order("original_entry_timestamp DESC").take(100)
+        if @site.id == 558
+          @properties = CabooseRets::Property.where("list_agent_mls_id in (?)", ['118593705','118511951','118598750','SCHMANDTT','118599999','118509093','118518704','118515504']).order("original_entry_timestamp DESC").take(100)
+        else
+          @properties = CabooseRets::Property.where("list_agent_mls_id = ?", rc.agent_mls).order("original_entry_timestamp DESC").take(100)
+        end
       elsif params[:fieldtype] == 'office' && rc && !rc.office_mls.blank?
         @properties = CabooseRets::Property.where("list_office_mls_id = ?", rc.office_mls).order("original_entry_timestamp DESC").take(100)
       else

data/app/models/caboose_rets/open_house.rb

@@ -3,7 +3,7 @@ class CabooseRets::OpenHouse < ActiveRecord::Base
   self.table_name = "rets_open_houses"
   
   has_one :property, :primary_key => 'listing_mui', :foreign_key => 'mls_number'  
-  attr_accessible :id, :matrix_unique_id
+  attr_accessible :id, :matrix_unique_id, :hide
   
   # def property
   #   models = [CabooseRets::Property]

data/app/models/caboose_rets/rets_importer.rb

@@ -132,8 +132,6 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     k = m.remote_key_field
     d = date_modified.in_time_zone(CabooseRets::timezone).strftime("%FT%T")
 
-    self.log "d: #{d}"
-
     quer = "(#{m.date_modified_field}=#{d}+)"
     quer += "OR(PhotosChangeTimestamp=#{d}+)" if class_type == 'Property'
 

data/app/models/caboose_rets/rets_plugin.rb

@@ -13,7 +13,7 @@ class CabooseRets::RetsPlugin < Caboose::CaboosePlugin
     }    
     item['children'] << { 'id' => 'agents', 'icon' => 'users',    'href' => '/admin/agents'           , 'text' => 'Agents'                , 'modal' => false }  if user.is_allowed('rets_agents','view')
     # item['children'] << { 'id' => 'offices'          , 'href' => '/admin/offices'          , 'text' => 'Offices'               , 'modal' => false }
-    # item['children'] << { 'id' => 'open-houses'      , 'href' => '/admin/open-houses'      , 'text' => 'Open Houses'           , 'modal' => false }
+    item['children'] << { 'id' => 'open-houses', 'icon' => 'calendars', 'href' => '/admin/open-houses'      , 'text' => 'Open Houses'           , 'modal' => false } if user.is_allowed('rets_open_houses','view')
     item['children'] << { 'id' => 'properties'      , 'icon' => 'rets', 'href' => '/admin/properties'      , 'text' => 'Properties'  , 'modal' => false }  if user.is_allowed('rets_properties','view')
     # item['children'] << { 'id' => 'commercial'       , 'href' => '/admin/commercial'       , 'text' => 'Commercial Property'   , 'modal' => false }
     # item['children'] << { 'id' => 'commercial'       , 'href' => '/admin/multi-family'     , 'text' => 'Multi-Family Property' , 'modal' => false }

data/app/models/caboose_rets/schema.rb

@@ -95,7 +95,8 @@ class CabooseRets::Schema < Caboose::Utilities::Schema
         [ :open_house_type    , :text ],
         [ :provider_key       , :text ],
         [ :refreshments       , :text ],
-        [ :start_time         , :text ]
+        [ :start_time         , :text ],
+        [ :hide, :boolean     , { :default => false }]
       ],
       CabooseRets::Property => [
         [ :access                               , :text],

data/app/views/caboose_rets/open_houses/admin_index.html.erb

@@ -1,15 +1,46 @@
+<%= raw @crumbtrail.print({
+  '/admin' => 'Admin',
+  '/admin/open-houses' => 'Open Houses'  
+}) %>
 
 <h1>Open Houses</h1>
-<p><input type='button' value='Refresh Open Houses' onclick='refresh_open_house();' /></p>
-<div id='message'></div>
+
+<p><a class="caboose-btn" href='#' onclick='refresh_open_house();return false;'>Import new open houses from MLS</a></p>
+<div id="message"></div>
+
+<div id='open-houses'></div>
+
+<br /><br />
+
+<% content_for :caboose_css do %>
+<style>
+ #open-houses_new  { display: none; }
+</style>
+<% end %>
+
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag 'caboose/model/all' %>
 <script type='text/javascript'>
 
+	function date_format(date) {
+  var u = new Date(date);
+  var d = new Date(u.getTime() + u.getTimezoneOffset() * 60000)
+  var string = '';
+  if (d) {
+    d.setHours(0);
+    string += (d.getMonth() + 1);
+    string += "/";
+    string += d.getDate();
+    string += "/";
+    string += d.getFullYear();
+  }
+  return string;
+}
+
 function refresh_open_house()
 {
-  $('#message').html("<p class='loading'>Refreshing open houses...</p>");
+  $('#message').html("<p class='note loading'>Refreshing open houses...</p>");
   $.ajax({
     url: '/admin/open-houses/refresh',
     type: 'get',    
@@ -20,5 +51,27 @@ function refresh_open_house()
   });
 }
 
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'open-houses',
+    base_url: '/admin/open-houses',
+    allow_bulk_edit: false,
+    allow_bulk_delete: false,
+    allow_duplicate: false,
+    allow_advanced_edit: false,
+    allow_bulk_import: false,
+    no_models_text: "No matching open-houses were found.",
+    fields: [
+      { show: true  , editable: false, bulk_edit: false, name: 'listing_mui'        , nice_name: 'MLS Number'        , sort: 'listing_mui'        , type: 'text'   , value: function(r) { return r.listing_mui    }, width: 200 },
+      { show: true  , editable: false, bulk_edit: false, name: 'start_time'        , nice_name: 'Date'        , sort: 'start_time'        , type: 'text'   , value: function(r) { return date_format(r.start_time)    }, width: 200 },
+      { show: true  , editable: true, bulk_edit: true, name: 'hide'        , nice_name: 'Hide'        , sort: 'hide'        , type: 'checkbox'   , text: function(r) { return r.hide ? 'Yes' : 'No'   }, value: function(r) { return r.hide ? true : false   }, width: 200 }
+    ],
+    search_fields: [                                                           
+      { name: 'listing_mui'      , nice_name: 'MLS Number'  , type: 'text'  }
+    ]
+  });
+});
 </script>
-<% end %>
+<% end %>

data/app/views/caboose_rets/properties/facebook_listings_feed.rss.builder

@@ -1,11 +1,13 @@
 domain = Caboose::Domain.where(:site_id => @site.id, :primary => true).first.domain
 hp = Caboose::Page.where(:site_id => @site.id, :title => "Home").first
 xml.instruct! :xml, :version => "1.0"
-#xml.rss :version => "2.0", "xmlns:g" => "http://base.google.com/ns/1.0" do
   xml.listings do
-    xml.title @site.description
-    xml.link(("https://" + domain), :rel => "self")
-  #  xml.language "en"
+    xml.title @site.id == 558 ? "The Gray Group" : @site.description
+    if @site.id == 558
+      xml.link("https://www.thegraygroupal.com", :rel => "self")
+    else
+      xml.link(("https://" + domain), :rel => "self")
+    end
     for property in @properties
       xml.listing do
         kind = "#{property.res_style} #{property.style} #{property.property_type} #{property.property_subtype}" 

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.56'
-end
+  VERSION = '0.1.57'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms
@@ -74,7 +74,6 @@ files:
 - app/views/caboose_rets/offices/admin_edit.html.erb
 - app/views/caboose_rets/offices/admin_index.html.erb
 - app/views/caboose_rets/open_houses/admin_index.html.erb
-- app/views/caboose_rets/open_houses/admin_new.html.erb
 - app/views/caboose_rets/properties/_image_gallery.html.erb
 - app/views/caboose_rets/properties/_search_form.html.erb
 - app/views/caboose_rets/properties/admin_edit.html.erb

data/app/views/caboose_rets/open_houses/admin_new.html.erb

@@ -1,31 +0,0 @@
-
-<h1>New Open House</h1>
-<p><input type='text' id='mls'        name='mls'        placeholder='Property MLS#' style="width: 400px;" /></p>
-<p>Open House on <input type='text' id='date_time'  name='date_time'  placeholder='Date and Time' style="width: 400px;" /> at [address]</p>
-<div id='message'></div>
-<p><input type='submit' value='Add Post' onclick='add_open_house();' /></p>
-
-<% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model/all" %>
-<script type='text/javascript'>
-
-function add_open_house()
-{
-  $('#message').html("<p class='loading'>Adding post...</p>");
-  $.ajax({
-    url: '/admin/open-houses',
-    type: 'post',
-    data: {
-      authenticity_token: "<%= form_authenticity_token %>",
-      mls: $('#mls').val(),
-      date_time: $('#date_time').val()
-    },
-    success: function(resp) {
-      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect) window.location = resp.redirect
-    }
-  });
-}
-
-</script>
-<% end %>