app/views/geofence/_form.rhtml
@@ -20,15 +20,21 @@ class GeofenceController < ApplicationController
def new
@devices = Device.get_devices(session[:account_id])
+ @geofence = Geofence.new(:account_id => session[:account_id],:device_id => 0,:radius => 0.1)
+ if not params[:lat].blank? and not params[:lng].blank?
+ @geofence.latitude = params[:lat].to_f
+ @geofence.longitude = params[:lng].to_f
+ @geofence.address = params[:addr]
+ end
if request.post?
- geofence = Geofence.new
- add_and_edit(geofence)
- if geofence.save
- flash[:success] = "#{geofence.name} created succesfully"
- redirect_to geofence_url
+ add_and_edit
+ if @geofence.save
+ flash[:success] = "#{@geofence.name} created succesfully"
+ redirect_to params[:ref_url]
else
flash[:error] = 'Location not created'
end
+ else
end
end
@@ -51,7 +57,7 @@ class GeofenceController < ApplicationController
end
if check_action_for_user
if request.post?
- add_and_edit(@geofence)
+ add_and_edit
if @geofence.save
flash[:success] = "#{@geofence.name} updated succesfully"
redirect_to params[:ref_url]
@@ -148,13 +154,14 @@ class GeofenceController < ApplicationController
page
end
- def add_and_edit(geofence)
+ def add_and_edit
fence = params[:bounds].split(",")
- geofence.latitude, geofence.longitude, geofence.radius = fence[0], fence[1], fence[2]
- geofence.name = params[:name]
- geofence.address = params[:address]
- geofence.account_id = params[:radio] == "1" ? session[:account_id] : 0
- geofence.device_id = params[:radio] == "2" ? params[:device] : 0
+ @geofence.latitude, @geofence.longitude, @geofence.radius = fence[0], fence[1], fence[2]
+ @geofence.name = params[:name]
+ @geofence.address = params[:address]
+ @geofence.account_id = params[:radio] == "1" ? session[:account_id] : 0
+ @geofence.device_id = params[:radio] == "2" ? params[:device] : 0
+ @geofence.notify_enter_exit = (params[:notify_enter_exit] == 'on')
end
end
app/controllers/geofence_controller.rb
@@ -4,7 +4,7 @@ class HomeController < ApplicationController
def index
user = User.find(session[:user_id])
if session[:group_value] or user.default_home_selection.nil?
- redirect_to :action=> (user.default_home_action || 'locations')
+ redirect_to :action=> (user.default_home_action || session[:last_home_action] || 'locations')
else
redirect_to :action=> 'show_devices',:group_type => user.default_home_selection
end
@@ -55,6 +55,7 @@ class HomeController < ApplicationController
private
def setup_home_info
+ session[:last_home_action] = params[:action]
@device_count = Device.count(:all, :conditions => ['provision_status_id = 1 and account_id = ?', session[:account_id]])
assign_the_selected_group_to_session
end
app/controllers/home_controller.rb
@@ -25,6 +25,16 @@ module ApplicationHelper
minutes = duration.to_i % 60
sprintf('%02d:%02d',hours,minutes)
end
+
+ def standard_location(device,reading)
+ if reading.nil? or reading.short_address == ', '
+ 'GPS Not Available'
+ elsif reading.nearby_geofence(device.account_id)
+ %(<a href="/geofence/detail/#{reading.nearby_geofence.id}" title="View this location" class="link-all1">#{reading.nearby_geofence.name}</a><br/>#{reading.nearby_geofence.address})
+ else
+ %(<a href="/geofence/new?lat=#{reading.latitude}&lng=#{reading.longitude}&addr=#{reading.short_address}" title="Add a new location" class="link-all1">#{reading.short_address}</a>)
+ end
+ end
def box_pagination_links(paginator, options={})
options.merge!(ActionView::Helpers::PaginationHelper::DEFAULT_OPTIONS) {|key, old, new| old}
@@ -102,6 +112,7 @@ module ApplicationHelper
def show_device(device)
+ return "DEFAULT NEEDS TO BE REPLACED"
content = ""
content << %(<tr class="#{cycle('dark_row', 'light_row')}" id="row#{device.id}"> <td>)
content << %(<a href="/reports/all/#{device.id}">#{device.name}</a></td><td>)
app/helpers/application_helper.rb
@@ -19,12 +19,24 @@ module HomeHelper
end
content
end
+
+ def show_device_location(device)
+ show_device(device,true)
+ end
+
+ def show_device_status(device)
+ show_device(device,false)
+ end
- def show_device(device)
+ def show_device(device,show_location)
content = ""
content << %(<tr class="#{cycle('dark_row', 'light_row')}" id="row#{device.id}"> <td>)
if device.latest_gps_reading
- content << %(<a href="javascript:centerMap(#{device.id});highlightRow(#{device.id});" title="Center map on this device" class="link-all1">#{device.name}</a>)
+ if show_location
+ content << %(<a href="javascript:centerMap(#{device.id});highlightRow(#{device.id});" title="Center map on this device" class="link-all1">#{device.name}</a>)
+ else
+ content << %(<a href="/reports/trip/#{device.id}" title="View details" class="link-all1">#{device.name}</a>)
+ end
else
content << %(#{device.name})
end
@@ -32,7 +44,7 @@ module HomeHelper
content << %(<td>)
if device.latest_gps_reading
- content << %(#{device.latest_gps_reading.short_address})
+ content << standard_location(device,device.latest_gps_reading)
else
content << %(N/A)
end
app/helpers/home_helper.rb
@@ -6,6 +6,8 @@ class Reading < ActiveRecord::Base
has_one :stop_event
include ApplicationHelper
+ MAX_NEARBY_RADIUS = 0.25
+
acts_as_mappable :lat_column_name => :latitude,:lng_column_name => :longitude
def self.generate_direction_string(dir)
@@ -50,24 +52,32 @@ class Reading < ActiveRecord::Base
end
end
+ def nearby_geofence(account_id = 0)
+ unless @nearby_geofence
+ distance_function = "distance(latitude,longitude,#{self.latitude},#{self.longitude})"
+ @nearby_geofence = Geofence.find(:first,:conditions => "radius <= #{MAX_NEARBY_RADIUS} and #{distance_function} <= radius and (device_id = #{self.device_id} or account_id = #{account_id})",:order => distance_function)
+ @nearby_geofence ||= :false
+ end
+ return nil if @nearby_geofence == :false
+ return @nearby_geofence
+ end
def short_address
- if(admin_name1.nil?)
+ if admin_name1.nil?
latitude.to_s + ", " + longitude.to_s
else
begin
addressParts = Array.new
- if(!street.nil?)
- if(!street_number.nil?)
+ unless street.blank?
+ if street_number.blank?
+ addressParts << street
+ else
streetAddress = [street_number, street]
- streetAddress.delete("")
addressParts << streetAddress.join(' ')
- else
- addressParts << street
end
end
- addressParts << place_name
- addressParts << admin_name1
+ addressParts << place_name unless place_name.blank?
+ addressParts << admin_name1 unless place_name.blank?
addressString = addressParts.join(', ')
addressString.empty? ? latitude.to_s + ", " + longitude.to_s : addressString
rescue
app/models/reading.rb
@@ -1,65 +1 @@
-<div class="container">
-<div id="ub_account_tbl">
- <div><h3>Edit Location</h3></div>
- <div>
- <form method="post" id="geofence_form" onSubmit="return validate();">
- <div> <input type="radio" id="radio" name="radio" value="1" <% if @geofence.account_id != 0 %>checked<%end%> onclick="enableDevice(this);"/> Account Level <input type="radio" id="radio" name="radio" onclick="<%if @devices.empty?%>alert('You can\'t create device level location.');<%else%>enableDevice(this);<%end%>" value="2" <% if @geofence.device_id != 0 %>checked<%end%> /> Vehicle Level</div>
-
- <div class="ub_editform">Choose the vehicle: <br/>
- <select id="device" name="device" class="text_width" <% if @geofence.account_id != 0 && @geofence.device_id == 0%>disabled<% end %>>
- <% @devices.each do |device| %>
- <option value="<%= device.id %>" <%= "selected='selected'" if @geofence.device_id == device.id %>><%= device.name %></option>
- <% end %>
- </select>
- </div>
-
- <div>Location name: <br/>
- <input name="name" type="text" class="text_width" value="<%= @geofence.name %>" />
- </div>
- <input type="hidden" name="ref_url" value="<%= session[:referral_url] %>">
-
- <div>Location address: <br/>
- <input id="address" name="address" class="text_width" value="<%= @geofence.address %>" type="text" />
- </div>
-
- <div>
- <input type="button" name="Preview" value="preview" onclick="geocode(document.getElementById('address').value); return false;" />
- </div>
-
-
- <div>Radius: <br/>
- <select id="radius" name="radius" >
- <% RADIUS_ARRAY.each do |rad|%>
- <option value="<%=rad%>" <%= "selected='selected'" if @geofence.radius == rad %>><%= rad%></option>
- <%end%>
- </select> (miles)
- </div>
- </div>
-
- <input type="hidden" name="bounds" />
-
- <div>
- <input name="Create geofence" type="submit" value="update location" style="cursor:pointer;"/>
- <a href="<%= session[:referral_url] %>" >cancel</a>
- </div>
- </form>
-</div>
-
-<div class="main_map">
- <div id="geofence_map" class="googlemap"></div>
- </div>
-</div>
-
-<% if !@geofence.nil? %>
- <script>
- var device_flag = 1
- var remove_listener = 'false'
- <% if @geofence.device && @geofence.device.latest_gps_reading %>
- var device = {name: '<%= escape_javascript(@geofence.device.name ) %>', lat: <%= @geofence.device.latest_gps_reading.latitude %>, lng: <%= @geofence.device.latest_gps_reading.longitude %>, address: '<%= @geofence.device.latest_gps_reading.short_address %>'};
- <% else %>
- var device = {name: '<%= escape_javascript @geofence.name %>', lat: <%= @geofence.latitude %>, lng: <%= @geofence.longitude %>};
- <%end%>
- var gf_index = 0;
- geofences.push({id: <%= @geofence.id%>, name: '<%= escape_javascript(@geofence.name) %>', bounds: '<%= @geofence.bounds %>'});
- </script>
-<% end %>
+<%= render :partial => 'form' %>
app/views/geofence/edit.rhtml
@@ -11,6 +11,7 @@
<td>For</td>
<td>Address</td>
<td>Radius</th>
+ <td>Notify?</td>
<td> </td>
</tr>
@@ -26,6 +27,7 @@
</td>
<td ><%= geofence.get_lat_lng %></td>
<td ><%= geofence.radius.to_s + ' ' + 'miles' %></td>
+ <td><%= geofence.notify_enter_exit ? 'yes' : 'no' %></td>
<td >
<a href="<%= delete_url(:id=>geofence.id)%>" onclick="return confirm('Are you sure you want to delete this location ?');">delete</a>
</td>
app/views/geofence/index.rhtml
@@ -1,78 +1 @@
-<div class="container">
- <div id="ub_account_tbl">
- <div>
- <h3>Add New Locations</h3>
- </div>
-
- <form method="post" id="geofence_form" onsubmit="return validate();">
- <div style="background-color: #EDF3FE; padding: 10px;">
- <div>
- <div>
- <strong>This location applies to:</strong>
- </div>
- <input type="radio" id="all" name="radio" value="1" checked onclick="enableDevice(this);"/> All vehicles in this account<br />
- <input type="radio" id="single" name="radio" onclick="<%if @devices.empty?%>alert('You can\'t create vehicle-level locations');<%else%>enableDevice(this);<%end%>" value="2" /> A single vehicle
-
- <select id="device" name="device" class="text_width" disabled style="margin-top: 5px;">
- <% @devices.each do |device| %>
- <option value="<%= device.id %>" <% if params[:id].to_i == device.id %>selected="selected"<% end %>><%= device.name %></option>
- <% end %>
- </select>
- </div>
-
- <div>
- <div>
- <strong>Location name:</strong>
- </div>
- <input name="name" type="text" class="text_width" />
- </div>
-
- <div>
- <div>
- <strong>Location address:</strong>
- </div>
- <input id="address" name="address" type="text" class="text_width" />
- </div>
-
- <div>
- <div>
- <strong>Radius:</strong>
- </div>
- <select id="radius" name="radius">
- <% RADIUS_ARRAY.each do |rad|%>
- <option value="<%=rad%>"><%= rad%></option>
- <%end%>
- </select> (miles)
- </div>
-
- <div style="margin-top: 10px;">
- <input type="button" name="Preview" value="preview" onclick="geocode(document.getElementById('address').value); return false;" />
- </div>
- </div>
-
- <input type="hidden" name="bounds"/>
-
- <div style="margin-top: 15px;">
- <input name="Create geofence" type="submit" value="create location"/>
- <a href="<%= session[:referral_url] %>" >cancel</a>
- </div>
- </form>
- </div>
-
- <div class="main_map">
- <div id="geofence_map" class="googlemap"></div>
- </div>
-</div>
-
-<script>
- var device_flag = 0;
- var remove_listener = 'false';
- var device = 'false';
- var gf_index = 0;
- geofences.push({id: 0, name: '', bounds: '37.0625, -95.677068,0.1'});
- <% if params[:id] %>
- document.getElementById("single").checked = true;
- document.getElementById("device").disabled = false;
- <% end %>
-</script>
-
+<%= render :partial => 'form' %>
app/views/geofence/new.rhtml
@@ -9,6 +9,6 @@
<th>Last Status</th>
<th>Last Report</th>
</tr>
- <%= render :partial => "group_rows",:locals => {:column_span => 4,:callback => "show_device"} %>
+ <%= render :partial => "group_rows",:locals => {:column_span => 4,:callback => "show_device_location"} %>
</table>
app/views/home/locations.rhtml
@@ -8,6 +8,6 @@
<th>Last Status</th>
<th>Last Report</th>
</tr>
- <%= render :partial => "group_rows",:locals => {:column_span => 4,:callback => "show_device"} %>
+ <%= render :partial => "group_rows",:locals => {:column_span => 4,:callback => "show_device_status"} %>
</table>
app/views/home/status.rhtml
@@ -3,24 +3,12 @@
<td><a href="/reports/trip_detail/<%= trip.id %>" style="font-size:11px;">details</a></td>
<td nowrap><%= standard_date(trip.reading_start.created_at,last_start) %></td>
<td nowrap><%= standard_time(trip.reading_start.created_at) %></td>
- <td>
- <% if trip.reading_start.short_address == ', '%>
- GPS Not Available
- <% else %>
- <a href="/geofence/new?lat=<%= trip.reading_start.latitude %>&lon=<%= trip.reading_start.longitude %>"><%= trip.reading_start.short_address %></a>
- <% end %>
- </td>
+ <td><%= standard_location(trip.device,trip.reading_start) %></td>
<script>readings.push({id: <%= trip.id %>, start: true, lat: <%= trip.reading_start.latitude %>, lng: <%= trip.reading_start.longitude %>, address: '<%= escape_javascript trip.reading_start.short_address %>', dt: displayLocalDT(<%= trip.reading_start.created_at.to_i*1000 %>), event: '<%= trip.reading_start.event_type %>'});</script>
<% if trip.reading_stop %>
<td><%= standard_duration(trip.duration) %></td>
<td><%= sprintf('%2.1f',trip.distance) %></td>
- <td>
- <% if trip.reading_stop.short_address == ', '%>
- GPS Not Available
- <% else %>
- <a href="/geofence/new?lat=<%= trip.reading_stop.latitude %>&lon=<%= trip.reading_stop.longitude %>"><%= trip.reading_stop.short_address %></a>
- <% end %>
- </td>
+ <td><%= standard_location(trip.device,trip.reading_stop) %></td>
<script>readings.push({id: <%= trip.id %>, stop: true, lat: <%= trip.reading_stop.latitude %>, lng: <%= trip.reading_stop.longitude %>, address: '<%= escape_javascript trip.reading_stop.short_address %>', dt: displayLocalDT(<%= trip.reading_stop.created_at.to_i*1000 %>), event: '<%= trip.reading_stop.event_type %>'});</script>
<td nowrap><%= standard_time(trip.reading_stop.created_at) %></td>
<td><%= standard_duration(trip.idle) %></td>
app/views/reports/_trip_row.rhtml
@@ -2,10 +2,14 @@ class AddUserDefaults < ActiveRecord::Migration
def self.up
add_column :users,:default_home_action,:string
add_column :users,:default_home_selection,:string
+
+ add_column :geofences,:notify_enter_exit,:boolean,:null => false,:default => false
end
def self.down
remove_column :users,:default_home_action
remove_column :users,:default_home_selection
+
+ remove_column :geofences,:notify_enter_exit
end
end
db/migrate/20090320194931_add_user_defaults.rb
@@ -76,16 +76,17 @@ ActiveRecord::Schema.define(:version => 20090320194931) do
end
create_table "geofences", :force => true do |t|
- t.string "name", :limit => 30
- t.integer "device_id", :limit => 11
+ t.string "name", :limit => 30
+ t.integer "device_id", :limit => 11
t.datetime "created_at"
t.datetime "updated_at"
t.string "address"
- t.integer "fence_num", :limit => 11
- t.decimal "latitude", :precision => 15, :scale => 10
- t.decimal "longitude", :precision => 15, :scale => 10
+ t.integer "fence_num", :limit => 11
+ t.decimal "latitude", :precision => 15, :scale => 10
+ t.decimal "longitude", :precision => 15, :scale => 10
t.float "radius"
- t.integer "account_id", :limit => 11
+ t.integer "account_id", :limit => 11
+ t.boolean "notify_enter_exit", :default => false, :null => false
end
create_table "group_devices", :force => true do |t|
db/schema.rb
@@ -135,12 +135,12 @@ function createMarker(p) {
function validate() {
form = document.getElementById('geofence_form');
if(form.name.value == '') {
- alert('Please specify a name for your geofence');
+ alert('Please specify a name for your location');
return false;
}
if(form.bounds.value == '') {
- alert('Please preview your geofence before saving');
+ alert('Please preview your location before saving');
return false;
}
@@ -163,6 +163,7 @@ function displayGeofence(index) {
zoom = 14;
gmap.setCenter(point, zoom);
+ form.bounds.value = geofences[index].bounds;
}
function go(url) {
public/javascripts/geofence.js
@@ -15,6 +15,8 @@ var zoom_val = get_cookie("zvalue");
function load()
{
+ if (document.getElementById("map") == undefined)
+ return;
if (GBrowserIsCompatible()) {
gmap = new GMap2(document.getElementById("map"));
gmap.addControl(new GLargeMapControl());
public/javascripts/main.js
@@ -55,34 +55,34 @@ class GeofenceControllerTest < Test::Unit::TestCase
end
def test_new
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_equal flash[:success] , "qwerty created succesfully"
end
def test_invalid_device
- post :new, {:id => "1", :name =>"", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name =>"", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_equal flash[:error], "Location not created"
end
def test_create
#apparent bug in rail makes flash go away after first post in this test
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_redirected_to :controller => "geofence", :action => "index"
assert_equal( "qwerty created succesfully", @response.flash[:success] )
#assert_equal 1, devices(:device1).geofences[0].radius
#assert_equal 1, devices(:device1).geofences[0].latitude
#assert_equal 1, devices(:device1).geofences[0].longitude
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_redirected_to :controller => "geofence", :action => "index"
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_redirected_to :controller => "geofence", :action => "index"
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_redirected_to :controller => "geofence", :action => "index"
- post :new, {:id => "1", :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
+ post :new, {:id => "1", :ref_url => '/geofence', :name => "qwerty", :bounds=>"1,1,1", :address=>"1600 Penn Ave"}, { :user => users(:dennis), :account_id => "1" }
assert_redirected_to :controller => "geofence", :action => "index"
end
test/functional/geofence_controller_test.rb
90c380b3869050ea6ab416167ecd5e641cb0a68f
semmons
semmons@43da8e2a-8e9e-4132-97af-63a25ad0a55a
http://github.com/redinger/numerex_test/commit/084a0e5d57657c11f6d70da4618ec74ddfebd5aa
084a0e5d57657c11f6d70da4618ec74ddfebd5aa
2009-03-21T16:04:12-07:00
2009-03-21T16:04:12-07:00
support for optional geofence notification and display of nearby geofence
24c71710dee34a5898c5fc5521228f525a92f101
semmons
semmons@43da8e2a-8e9e-4132-97af-63a25ad0a55a