db/migrate/20091025205706_add_alternate_barcode_id_to_families.rb
test/unit/family_test.rb
@@ -31,7 +31,8 @@ class FamiliesController < ApplicationController
if params[:legacy_id]
@family = Family.find_by_legacy_id(params[:id])
elsif params[:barcode_id]
- @family = Family.find_by_barcode_id_and_deleted(params[:id], false)
+ @family = Family.find_by_barcode_id_and_deleted(params[:id], false) ||
+ Family.find_by_alternate_barcode_id_and_deleted(params[:id], false)
else
@family = Family.find_by_id(params[:id])
end
@@ -101,7 +102,7 @@ class FamiliesController < ApplicationController
format.xml { render :xml => @family.to_xml } if can_export?
format.js do # only used by barcode entry right now
render :update do |page|
- page.replace_html :notice, "Family saved. Assigned number: #{@family.barcode_id}"
+ page.replace_html :notice, "Family saved."
page[:notice].show
end
end
app/controllers/families_controller.rb
@@ -51,14 +51,40 @@ class Family < ActiveRecord::Base
sharable_attributes :mobile_phone, :address, :anniversary
validates_uniqueness_of :barcode_id, :allow_nil => true
- validates_length_of :barcode_id, :in => 10..50, :allow_nil => true
- validates_format_of :barcode_id, :with => /^\d+$/, :allow_nil => true
+ validates_uniqueness_of :alternate_barcode_id, :allow_nil => true
+ validates_length_of :barcode_id, :alternate_barcode_id, :in => 10..50, :allow_nil => true
+ validates_format_of :barcode_id, :alternate_barcode_id, :with => /^\d+$/, :allow_nil => true
+
+ validates_each [:barcode_id, :alternate_barcode_id] do |record, attribute, value|
+ if attribute.to_s == 'barcode_id' and record.barcode_id
+ if record.barcode_id == record.alternate_barcode_id
+ record.errors.add(attribute, 'cannot be same as alternate barcode id')
+ elsif Family.count('*', :conditions => ['alternate_barcode_id = ?', record.barcode_id]) > 0
+ record.errors.add(attribute, 'is already taken')
+ end
+ elsif attribute.to_s == 'alternate_barcode_id' and record.alternate_barcode_id
+ if Family.count('*', :conditions => ['barcode_id = ?', record.alternate_barcode_id]) > 0
+ record.errors.add(attribute, 'is already taken')
+ end
+ end
+ # if barcode_id and (barcode_id == alternate_barcode_id or Family.count('*', :conditions => ['alternate_barcode_id = ?', barcode_id]) > 0)
+ # errors.add(:barcode_id, 'cannot be same as alternate barcode id')
+ # end
+ # if alternate_barcode_id and (alternate_barcode_id == barcode_id or Family.count('*', :conditions => ['barcode_id = ?', alternate_barcode_id]) > 0)
+ # errors.add(:alternate_barcode_id, 'cannot be same as barcode id')
+ # end
+ end
def barcode_id=(b)
write_attribute(:barcode_id, b.to_s.strip.any? ? b : nil)
write_attribute(:barcode_assigned_at, Time.now.utc)
end
+ def alternate_barcode_id=(b)
+ write_attribute(:alternate_barcode_id, b.to_s.strip.any? ? b : nil)
+ write_attribute(:barcode_assigned_at, Time.now.utc)
+ end
+
def address
address1.to_s + (address2.to_s.any? ? "\n#{address2}" : '')
end
app/models/family.rb
@@ -9,7 +9,10 @@
<span title="<%= @family.barcode_assigned_at.to_s %>">
<%= time_ago_in_words @family.barcode_assigned_at %> ago
</span>
+ <br/>
<% end %>
+ <%= link_to_function 'alternate card »', "Element.show('family_alternate_barcode_id');Element.hide(this);", :class => 'discreet' %>
+ <%= form.text_field :alternate_barcode_id, :size => 15, :style => 'display:none;' %>
</p>
<p><em>Remember, this card number is not to be written down or given to any
unauthorized persons.</em></p>
app/views/families/_barcode_entry.erb
9f43aad3685353d701c50904c3ebaefa85a16e87
Tim Morgan
tim@timmorgan.org
http://github.com/seven1m/onebody/commit/24198f5c0f820fee73ac6c3859829f882e7360bd
24198f5c0f820fee73ac6c3859829f882e7360bd
2009-10-25T15:03:16-07:00
2009-10-25T15:03:16-07:00
Alternate barcode id for families.
5749fdd581cf701b67445a552bd84ba5083a98fe
Tim Morgan
tim@timmorgan.org