ActionItem916: changed birth_date to use select forms

Had to convert the birth_date setting to a database column for active_record do its magic and couple with the date_select helper that is used on the pick_date helper

ActionItem916: changed birth_date to use select forms
Had to convert the birth_date setting to a database column for active_record do its magic and couple with the date_select helper that is used on the pick_date helper
Moises Machado
1 parent 52591d04
Showing 7 changed files with 123 additions and 7 deletions Show diff stats
app/helpers/dates_helper.rb
app/models/person.rb
app/views/profile_editor/_person_form.rhtml
db/migrate/059_add_birth_date_to_person.rb
db/schema.rb
public/stylesheets/person_data.css
test/functional/profile_editor_controller_test.rb
@@ -86,8 +86,8 @@ module DatesHelper
     link_to show_month(next_month_date.year, next_month_date.month) + ' &rarr;', :year => next_month_date.year, :month => next_month_date.month
   end
-  def pick_date(object, method)
-    date_select(object, method, :use_month_names => MONTHS.map {|item| gettext(item)})
+  def pick_date(object, method, options = {}, html_options = {})
+    date_select(object, method, html_options.merge(options.merge(:use_month_names => MONTHS.map {|item| gettext(item)})))
   end
 end
@@ -105,8 +105,8 @@ class Person &lt; Profile
   N_('Formation'); N_('Custom formation'); N_('Custom area of study');
   settings_items :formation, :custom_formation, :custom_area_of_study
-  N_('Contact information'); N_('Birth date'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
-  settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country, :zip_code
+  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code
   def self.conditions_for_profiles(conditions, person)
     new_conditions = sanitize_sql(['role_assignments.accessor_id = ?', person])
@@ -14,7 +14,7 @@
 <%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone)) %>
 <%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone)) %>
 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
-<%= optional_field(@person, 'birth_date', f.text_field(:birth_date)) %>
+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 10)}) + '</div>')) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>
 <%= optional_field(@person, 'city', f.text_field(:city)) %>
@@ -0,0 +1,111 @@
+require File.dirname(__FILE__) + '/../../config/environment'
+
+class AddBirthDateToPerson < ActiveRecord::Migration
+
+  class ConvertDates
+    def self.convert(date_string)
+      return if date_string.blank?
+      return date_string if date_string.kind_of?(Date)
+      return unless date_string.kind_of?(String)
+      return if date_string =~ /[a-zA-Z]/
+
+      if date_string =~ /^\d\d([^\d]+)\d\d$/
+        date_string += $1 + (Date.today.year - 100).to_s
+      end
+
+      if date_string =~ /[^\d](\d\d)$/
+        year = $1.to_i
+        date_string = date_string[0..-3] + (year > (Date.today.year - 2000) ? year + 1900 : year + 2000).to_s
+      end
+
+      date_string.gsub!('/', '.')
+      Date.parse(date_string)
+    end
+  end
+
+  class Person < ActiveRecord::Base
+    set_table_name 'profiles'
+    serialize :data, Hash
+  end
+
+  def self.up
+    add_column :profiles, :birth_date, :date
+    Person.find(:all).select{|p| p.type = 'Person'}.each do |p|
+      p.birth_date = ConvertDates.convert(p.data[:birth_date].to_s)
+      p.save
+    end
+  end
+
+  def self.down
+    remove_column :profiles, :birth_date
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  require File.dirname(__FILE__) + '/../../test/test_helper'
+
+  class ConvertDatesTest <  Test::Unit::TestCase
+
+    should 'convert with slash' do
+      date = ConvertDates.convert('10/01/2009')
+      assert_equal [10, 1, 2009], [date.day, date.month, date.year]
+    end
+
+    should 'convert with hyphen' do
+      date = ConvertDates.convert('10-01-2009')
+      assert_equal [10, 1, 2009], [date.day, date.month, date.year]
+    end
+
+    should 'convert with dot' do
+      date = ConvertDates.convert('10.01.2009')
+      assert_equal [10, 1, 2009], [date.day, date.month, date.year]
+    end
+
+    should 'convert with slash and space' do
+      date = ConvertDates.convert('10/ 01/ 2009')
+      assert_equal [10, 1, 2009], [date.day, date.month, date.year]
+    end
+
+    should 'convert with empty to nil' do
+      date = ConvertDates.convert('')
+      assert_nil date
+    end
+
+    should 'convert with nil to nil' do
+      date = ConvertDates.convert(nil)
+      assert_nil date
+    end
+
+    should 'convert with two digits 1900' do
+      date = ConvertDates.convert('10/01/99')
+      assert_equal [10, 1, 1999], [date.day, date.month, date.year]
+    end
+
+    should 'convert with two digits 2000' do
+      date = ConvertDates.convert('10/01/09')
+      assert_equal [10, 1, 2009], [date.day, date.month, date.year]
+    end
+
+    should 'convert with two numbers' do
+      date = ConvertDates.convert('10/01')
+      assert_equal [10, 1, (Date.today.year - 100)], [date.day, date.month, date.year]
+    end
+
+    should 'convert to nil if non-numeric date' do
+      date = ConvertDates.convert('10 de agosto de 2009')
+      assert_nil date
+    end
+
+    should 'do nothing if date' do
+      date = ConvertDates.convert(Date.today)
+      assert_equal Date.today, date
+    end
+
+    should 'return nil when not string nor date' do
+      date = ConvertDates.convert(1001)
+      assert_nil date
+    end
+
+  end
+
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 58) do
+ActiveRecord::Schema.define(:version => 59) do
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -232,6 +232,7 @@ ActiveRecord::Schema.define(:version =&gt; 58) do
     t.text     "custom_footer"
     t.string   "theme"
     t.boolean  "public_profile",                  :default => true
+    t.date     "birth_date"
   end
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -8,3 +8,7 @@
   width: 108px;
 }
+#profile-data .select-birth-date select {
+  width: 70px;
+}
+
@@ -279,7 +279,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   should 'render person partial' do
     person = create_user('test_profile', :environment => Environment.default).person
-    Person.any_instance.expects(:active_fields).returns(['contact_phone', 'birth_date', 'address']).at_least_once
+    Person.any_instance.expects(:active_fields).returns(['contact_phone', 'address']).at_least_once
     get :edit, :profile => person.identifier
     person.active_fields.each do |field|
       assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone)) %>	14	<%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone)) %>
15	<%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone)) %>	15	<%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone)) %>
16	<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>	16	<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
17	-<%= optional_field(@person, 'birth_date', f.text_field(:birth_date)) %>	17	+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 10)}) + '</div>')) %>
18	<%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>	18	<%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address))) %>
19	<%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>	19	<%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code))) %>
20	<%= optional_field(@person, 'city', f.text_field(:city)) %>	20	<%= optional_field(@person, 'city', f.text_field(:city)) %>
@@ -0,0 +1,111 @@		@@ -0,0 +1,111 @@
	1	+require File.dirname(__FILE__) + '/../../config/environment'
	2	+
	3	+class AddBirthDateToPerson < ActiveRecord::Migration
	4	+
	5	+ class ConvertDates
	6	+ def self.convert(date_string)
	7	+ return if date_string.blank?
	8	+ return date_string if date_string.kind_of?(Date)
	9	+ return unless date_string.kind_of?(String)
	10	+ return if date_string =~ /[a-zA-Z]/
	11	+
	12	+ if date_string =~ /^\d\d([^\d]+)\d\d$/
	13	+ date_string += $1 + (Date.today.year - 100).to_s
	14	+ end
	15	+
	16	+ if date_string =~ /[^\d](\d\d)$/
	17	+ year = $1.to_i
	18	+ date_string = date_string[0..-3] + (year > (Date.today.year - 2000) ? year + 1900 : year + 2000).to_s
	19	+ end
	20	+
	21	+ date_string.gsub!('/', '.')
	22	+ Date.parse(date_string)
	23	+ end
	24	+ end
	25	+
	26	+ class Person < ActiveRecord::Base
	27	+ set_table_name 'profiles'
	28	+ serialize :data, Hash
	29	+ end
	30	+
	31	+ def self.up
	32	+ add_column :profiles, :birth_date, :date
	33	+ Person.find(:all).select{\|p\| p.type = 'Person'}.each do \|p\|
	34	+ p.birth_date = ConvertDates.convert(p.data[:birth_date].to_s)
	35	+ p.save
	36	+ end
	37	+ end
	38	+
	39	+ def self.down
	40	+ remove_column :profiles, :birth_date
	41	+ end
	42	+end
	43	+
	44	+if $PROGRAM_NAME == __FILE__
	45	+ require File.dirname(__FILE__) + '/../../test/test_helper'
	46	+
	47	+ class ConvertDatesTest < Test::Unit::TestCase
	48	+
	49	+ should 'convert with slash' do
	50	+ date = ConvertDates.convert('10/01/2009')
	51	+ assert_equal [10, 1, 2009], [date.day, date.month, date.year]
	52	+ end
	53	+
	54	+ should 'convert with hyphen' do
	55	+ date = ConvertDates.convert('10-01-2009')
	56	+ assert_equal [10, 1, 2009], [date.day, date.month, date.year]
	57	+ end
	58	+
	59	+ should 'convert with dot' do
	60	+ date = ConvertDates.convert('10.01.2009')
	61	+ assert_equal [10, 1, 2009], [date.day, date.month, date.year]
	62	+ end
	63	+
	64	+ should 'convert with slash and space' do
	65	+ date = ConvertDates.convert('10/ 01/ 2009')
	66	+ assert_equal [10, 1, 2009], [date.day, date.month, date.year]
	67	+ end
	68	+
	69	+ should 'convert with empty to nil' do
	70	+ date = ConvertDates.convert('')
	71	+ assert_nil date
	72	+ end
	73	+
	74	+ should 'convert with nil to nil' do
	75	+ date = ConvertDates.convert(nil)
	76	+ assert_nil date
	77	+ end
	78	+
	79	+ should 'convert with two digits 1900' do
	80	+ date = ConvertDates.convert('10/01/99')
	81	+ assert_equal [10, 1, 1999], [date.day, date.month, date.year]
	82	+ end
	83	+
	84	+ should 'convert with two digits 2000' do
	85	+ date = ConvertDates.convert('10/01/09')
	86	+ assert_equal [10, 1, 2009], [date.day, date.month, date.year]
	87	+ end
	88	+
	89	+ should 'convert with two numbers' do
	90	+ date = ConvertDates.convert('10/01')
	91	+ assert_equal [10, 1, (Date.today.year - 100)], [date.day, date.month, date.year]
	92	+ end
	93	+
	94	+ should 'convert to nil if non-numeric date' do
	95	+ date = ConvertDates.convert('10 de agosto de 2009')
	96	+ assert_nil date
	97	+ end
	98	+
	99	+ should 'do nothing if date' do
	100	+ date = ConvertDates.convert(Date.today)
	101	+ assert_equal Date.today, date
	102	+ end
	103	+
	104	+ should 'return nil when not string nor date' do
	105	+ date = ConvertDates.convert(1001)
	106	+ assert_nil date
	107	+ end
	108	+
	109	+ end
	110	+
	111	+end
	@@ -8,3 +8,7 @@		@@ -8,3 +8,7 @@
8	width: 108px;	8	width: 108px;
9	}	9	}
10		10
		11	+#profile-data .select-birth-date select {
		12	+ width: 70px;
		13	+}
		14	+
	@@ -279,7 +279,7 @@ class ProfileEditorControllerTest < Test::Unit::TestCase		@@ -279,7 +279,7 @@ class ProfileEditorControllerTest < Test::Unit::TestCase
279		279
280	should 'render person partial' do	280	should 'render person partial' do
281	person = create_user('test_profile', :environment => Environment.default).person	281	person = create_user('test_profile', :environment => Environment.default).person
282	- Person.any_instance.expects(:active_fields).returns(['contact_phone', 'birth_date', 'address']).at_least_once	282	+ Person.any_instance.expects(:active_fields).returns(['contact_phone', 'address']).at_least_once
283	get :edit, :profile => person.identifier	283	get :edit, :profile => person.identifier
284	person.active_fields.each do \|field\|	284	person.active_fields.each do \|field\|
285	assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }	285	assert_tag :tag => 'input', :attributes => { :name => "profile_data[#{field}]" }