app/views/volunteers/map.html.erb config/initializers/geokit_config.rb db/migrate/20090218133257_add_lat_lng_to_volunteer.rb public/images/apple-circle.gif public/images/download_icon.jpg public/javascripts/gmaps.js vendor/plugins/geokit-rails/.gitignore vendor/plugins/geokit-rails/MIT-LICENSE vendor/plugins/geokit-rails/README.markdown vendor/plugins/geokit-rails/Rakefile vendor/plugins/geokit-rails/VERSION_HISTORY.txt vendor/plugins/geokit-rails/about.yml vendor/plugins/geokit-rails/assets/api_keys_template vendor/plugins/geokit-rails/init.rb vendor/plugins/geokit-rails/install.rb vendor/plugins/geokit-rails/lib/geokit-rails/acts_as_mappable.rb vendor/plugins/geokit-rails/lib/geokit-rails/defaults.rb vendor/plugins/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb vendor/plugins/geokit-rails/test/acts_as_mappable_test.rb vendor/plugins/geokit-rails/test/database.yml vendor/plugins/geokit-rails/test/fixtures/companies.yml vendor/plugins/geokit-rails/test/fixtures/custom_locations.yml vendor/plugins/geokit-rails/test/fixtures/locations.yml vendor/plugins/geokit-rails/test/fixtures/stores.yml vendor/plugins/geokit-rails/test/ip_geocode_lookup_test.rb vendor/plugins/geokit-rails/test/schema.rb vendor/plugins/geokit-rails/test/test_helper.rb @@ -11,3 +11,4 @@ system/ config/database.yml mail_processing_command.txt collateral +clean_lists/* .gitignore @@ -1,8 +1,7 @@ Milestone 1 -* fix IE css problem with radio buttons -* finalize copy on welcome page -* update form fields (e.g. boolean) + + * add validations for new fields * add new field to tests @@ -22,3 +21,9 @@ Milestone 1 Milestone 2 * Send confirmation email: add email_confirmed + + +# Reporting + + +# Volunteer.find(:all, :origin => owner, :within => 1) TODO.txt @@ -1,10 +1,20 @@ class VolunteersController < ApplicationController before_filter :authenticate, :except => [:new, :create] + def map + @volunteers = Volunteer.find(:all) + respond_to do |format| + format.html {render :layout => false} + end + end + # GET /volunteers # GET /volunteers.xml def index - @volunteers = Volunteer.find(:all) + # @volunteers = Volunteer.find(:all) + # @volunteers = Volunteer.paginate_by_board_id @board.id, :page => params[:page], :order => 'updated_at DESC' + @volunteer_count = Volunteer.count + @volunteers = Volunteer.paginate :page => params[:page], :order => 'created_at DESC' respond_to do |format| format.html # index.html.erb app/controllers/volunteers_controller.rb @@ -1,2 +1,6 @@ module VolunteersHelper + + def html_info(volunteer) + "<strong>#{volunteer.first_name} #{volunteer.last_name} (#{link_to 'details', volunteer})</strong><br/>take dogs: #{volunteer.can_keep_dogs}<br/>take cats: #{volunteer.can_keep_cats}<br/>take other: #{volunteer.can_keep_other}" + end end app/helpers/volunteers_helper.rb @@ -1,5 +1,6 @@ require 'fastercsv' class Volunteer < ActiveRecord::Base + acts_as_mappable validates_presence_of :first_name, :last_name wraps_attribute :email_address, EmailAddress validates_presence_of :address_1, :suburb @@ -9,6 +10,16 @@ class Volunteer < ActiveRecord::Base wraps_attribute :work_phone, PhoneNumber, :allow_blank => true validate :must_have_at_least_one_phone_number + before_validation_on_create :geocode_address + + private + def geocode_address + geo=Geokit::Geocoders::MultiGeocoder.geocode (address) + # errors.add(:address, "Could not Geocode address") if !geo.success + self.lat, self.lng = geo.lat,geo.lng if geo.success + end + + CSV_FIELDS = (Volunteer.column_names - ["id", "created_at", "updated_at"]) def self.generate_csv(volunteers) @@ -21,6 +32,9 @@ class Volunteer < ActiveRecord::Base end end + def address + "#{address_1}, #{address_2}, #{suburb}, #{postcode}" + end def must_have_at_least_one_phone_number if mobile_phone.blank? && home_phone.blank? && work_phone.blank? app/models/volunteer.rb @@ -1,36 +1,32 @@ -<h1>Listing volunteers</h1> +<h1>Listing volunteers (<%= @volunteer_count %> in total)</h2> <%= link_to 'download csv file', '/volunteers.csv'%> + + +<%= will_paginate @volunteers, :class => 'apple_pagination' %> <table> <tr> - <th>First name</th> - <th>Last name</th> - <th>Address 1</th> - <th>Address 2</th> + <th>Name</th> <th>Suburb</th> <th>Postcode</th> - <th>Mobile phone</th> - <th>Home phone</th> - <th>Work phone</th> + <th>Dog</th> + <th>Cat</th> + <th>Other</th> </tr> - <% for volunteer in @volunteers %> <tr> - <td><%=h volunteer.first_name %></td> - <td><%=h volunteer.last_name %></td> - <td><%=h volunteer.address_1 %></td> - <td><%=h volunteer.address_2 %></td> + <td><%=h volunteer.first_name %> <%=h volunteer.last_name %></td> <td><%=h volunteer.suburb %></td> <td><%=h volunteer.postcode %></td> - <td><%=h volunteer.mobile_phone %></td> - <td><%=h volunteer.home_phone %></td> - <td><%=h volunteer.work_phone %></td> - <td><%= link_to 'Show', volunteer %></td> - <td><%= link_to 'Edit', edit_volunteer_path(volunteer) %></td> - <td><%= link_to 'Destroy', volunteer, :confirm => 'Are you sure?', :method => :delete %></td> + <td><%=h volunteer.can_keep_dogs %></td> + <td><%=h volunteer.can_keep_cats %></td> + <td><%=h volunteer.can_keep_other %></td> + <td><%#= link_to 'Show', volunteer %></td> + <td><%#= link_to 'Edit', edit_volunteer_path(volunteer) %></td> + <td><%#= link_to 'Destroy', volunteer, :confirm => 'Are you sure?', :method => :delete %></td> </tr> <% end %> </table> -<br /> +<%= will_paginate @volunteers, :class => 'apple_pagination' %> <%= link_to 'New volunteer', new_volunteer_path %> app/views/volunteers/index.html.erb @@ -17,7 +17,7 @@ set :database_yml_in_scm, false set :shared_dirs, 'system' # set :packages_for_project, %w(libmagick9-dev imagemagick libfreeimage3) # list of packages to be installed -# set :gems_for_project, %w(rmagick mini_magick image_science) # list of gems to be installed +set :gems_for_project, %w(fastercsv will_paginate) # list of gems to be installed # Update these if you're not running everything on one host. role :app, domain config/deploy.rb @@ -27,6 +27,9 @@ Rails::Initializer.run do |config| # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # config.gem "sqlite3-ruby", :lib => "sqlite3" # config.gem "aws-s3", :lib => "aws/s3" + config.gem 'mislav-will_paginate', :version => '~> 2.2.3', :lib => 'will_paginate', :source => 'http://gems.github.com' + config.gem "andre-geokit", :lib=>'geokit', :source => 'http://gems.github.com' + # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. config/environment.rb @@ -1,5 +1,5 @@ ActionController::Routing::Routes.draw do |map| - map.resources :volunteers + map.resources :volunteers, :collection => { :map => :get } map.resources :home map.root :controller => "home" config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090217061100) do +ActiveRecord::Schema.define(:version => 20090218133257) do create_table "volunteers", :force => true do |t| t.string "first_name" @@ -43,6 +43,8 @@ ActiveRecord::Schema.define(:version => 20090217061100) do t.boolean "dog_safe_gates", :limit => 255 t.string "special_skills" t.boolean "can_administer_medical_care" + t.float "lat" + t.float "lng" end end db/schema.rb @@ -58,11 +58,11 @@ h1 { clear: both; } -a img { +/*a img { border: none; float: left; width: 700px; -} +}*/ /*TABLES*/ table, tr, th, td { @@ -94,3 +94,93 @@ a { font-weight: bold; } +.digg_pagination { + background: white; + /* self-clearing method: */ } + .digg_pagination a, .digg_pagination span { + padding: .2em .5em; + display: block; + float: left; + margin-right: 1px; } + .digg_pagination span.disabled { + color: #999; + border: 1px solid #DDD; } + .digg_pagination span.current { + font-weight: bold; + background: #2E6AB1; + color: white; + border: 1px solid #2E6AB1; } + .digg_pagination a { + text-decoration: none; + color: #105CB6; + border: 1px solid #9AAFE5; } + .digg_pagination a:hover, .digg_pagination a:focus { + color: #003; + border-color: #003; } + .digg_pagination .page_info { + background: #2E6AB1; + color: white; + padding: .4em .6em; + width: 22em; + margin-bottom: .3em; + text-align: center; } + .digg_pagination .page_info b { + color: #003; + background: #6aa6ed; + padding: .1em .25em; } + .digg_pagination:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } + * html .digg_pagination { + height: 1%; } + *:first-child+html .digg_pagination { + overflow: hidden; } + +.apple_pagination { + background: #F1F1F1; + border: 1px solid #E5E5E5; + text-align: center; + padding: 1em; } + .apple_pagination a, .apple_pagination span { + padding: .2em .3em; } + .apple_pagination span.disabled { + color: #AAA; } + .apple_pagination span.current { + font-weight: bold; + background: transparent url(/images/apple-circle.gif) no-repeat 50% 50%; } + .apple_pagination a { + text-decoration: none; + color: black; } + .apple_pagination a:hover, .apple_pagination a:focus { + text-decoration: underline; } + +.flickr_pagination { + text-align: center; + padding: .3em; } + .flickr_pagination a, .flickr_pagination span { + padding: .2em .5em; } + .flickr_pagination span.disabled { + color: #AAA; } + .flickr_pagination span.current { + font-weight: bold; + color: #FF0084; } + .flickr_pagination a { + border: 1px solid #DDDDDD; + color: #0063DC; + text-decoration: none; } + .flickr_pagination a:hover, .flickr_pagination a:focus { + border-color: #003366; + background: #0063DC; + color: white; } + .flickr_pagination .page_info { + color: #aaa; + padding-top: .8em; } + .flickr_pagination .prev_page, .flickr_pagination .next_page { + border-width: 2px; } + .flickr_pagination .prev_page { + margin-right: 1em; } + .flickr_pagination .next_page { + margin-left: 1em; } public/stylesheets/application.css 031e559280e9146c7ea5dce54e7a2153daac41e9 Mike Bailey mike@bailey.net.au http://github.com/mbailey/fun4paws/commit/8072763ce93a4ac76304fdf35a1183988b6b7392 8072763ce93a4ac76304fdf35a1183988b6b7392 2009-02-18T07:21:53-08:00 2009-02-18T07:21:53-08:00 Added Geokit and google maps - find nearest volunteers Added pagination to volunteer list Show volunteer count Added link to CSV download 21903c958b4d8ce1cc8ff702073035a93c7c883b Mike Bailey mike@bailey.net.au