Other race

.gitignore

@@ -1,102 +1,106 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config (but not my example config)
-/.bundle/config
-
-# Ignore editor-added directory (on Magee's system)
-/.idea
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log
-/tmp
-
-
-#.gitignore
-.DS_Store
-
-#	old subversion directories, probably irrelevant here
-.svn/
-
-#	Jake's versions directories
-versions/
-/misc/
-
-#	where I store all my database dumps
-/dumps/
-
-#	old copies of my Gemfile.lock file
-/Gemfile.lock.*
-
-#	Files potentitally with passwords and such
-/config/api.yml
-/config/database.yml
-#config/*database.yml
-/config/fed_ex.yml
-/config/initializers/mail.rb
-#/config/initializers/session_store.rb
-/config/initializers/secret_token.rb
-/config/s3.yml
-
-#	code coverate data
-/coverage.data
-/coverage*/
-
-
-/db/*.yml
-/doc/
-
-#	jruby warble files (not used here)
-#/*.war
-
-#/packages_updated.*
-
-/public/bottom.html
-/public/columns.html
-/public/doc/
-/public/images/BufflerBanner1.jpg
-/public/labels.html
-/public/layout1.html
-/public/system/
-#/script/server_secure
-#/script/webrick
-/surveys/fixtures/
-
-#*/documents
-
-/public/javascripts/jquery-1.3.2.js
-/public/javascripts/jquery-1.4.2.min.js
-/public/javascripts/jquery-ui-1.7.2.js
-/public/javascripts/jquery-ui-1.8.4.custom.min.js
-
-
-db/test_*_schema.rb
-
-#	vi/vim tmp files
-*.swp
-
-#	not in gem, so don't have to ignore
-#test-livebirthdata_011912.csv
-live_birth_errors.csv
-test/birth_datum_update/
-development/birth_datum_update/
-
-#	not in gem, so don't have to ignore
-#icf_master_tracker_011712.csv
-test/icf_master_tracker_update/
-development/icf_master_tracker_update/
-
-*_errors.txt
-#odms_development.*.sql
-
-
-/solr/pids
-/solr/data
-
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config (but not my example config)
+/.bundle/config
+
+# Ignore editor-added directory (on Magee's system)
+/.idea
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log
+/tmp
+
+#  Magee's sqlite databases
+odms_production
+odms_test
+odms_development
+
+#.gitignore
+.DS_Store
+
+#	old subversion directories, probably irrelevant here
+.svn/
+
+#	Jake's versions directories
+versions/
+/misc/
+
+#	where I store all my database dumps
+/dumps/
+
+#	old copies of my Gemfile.lock file
+/Gemfile.lock.*
+
+#	Files potentitally with passwords and such
+/config/api.yml
+/config/database.yml
+#config/*database.yml
+/config/fed_ex.yml
+/config/initializers/mail.rb
+#/config/initializers/session_store.rb
+/config/initializers/secret_token.rb
+/config/s3.yml
+
+#	code coverate data
+/coverage.data
+/coverage*/
+
+
+/db/*.yml
+/doc/
+
+#	jruby warble files (not used here)
+#/*.war
+
+#/packages_updated.*
+
+/public/bottom.html
+/public/columns.html
+/public/doc/
+/public/images/BufflerBanner1.jpg
+/public/labels.html
+/public/layout1.html
+/public/system/
+#/script/server_secure
+#/script/webrick
+/surveys/fixtures/
+
+#*/documents
+
+/public/javascripts/jquery-1.3.2.js
+/public/javascripts/jquery-1.4.2.min.js
+/public/javascripts/jquery-ui-1.7.2.js
+/public/javascripts/jquery-ui-1.8.4.custom.min.js
+
+
+db/test_*_schema.rb
+
+#	vi/vim tmp files
+*.swp
+
+#	not in gem, so don't have to ignore
+#test-livebirthdata_011912.csv
+live_birth_errors.csv
+test/birth_datum_update/
+development/birth_datum_update/
+
+#	not in gem, so don't have to ignore
+#icf_master_tracker_011712.csv
+test/icf_master_tracker_update/
+development/icf_master_tracker_update/
+
+*_errors.txt
+#odms_development.*.sql
+
+
+/solr/pids
+/solr/data
+

Gemfile.lock

@@ -6,6 +6,7 @@ GEM
   specs:
     Ascii85 (1.0.1)
     RedCloth (4.2.9)
+    RedCloth (4.2.9-x86-mingw32)
     ZenTest (4.8.2)
     actionmailer (3.2.8)
       actionpack (= 3.2.8)
@@ -95,9 +96,12 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     mysql (2.8.1)
+    mysql (2.8.1-x86-mingw32)
     mysql2 (0.3.11)
+    mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
     nokogiri (1.5.5)
+    nokogiri (1.5.5-x86-mingw32)
     paperclip (3.1.4)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
@@ -166,6 +170,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
+    sqlite3 (1.3.6-x86-mingw32)
     sunspot (1.3.3)
       pr_geohash (~> 1.0)
       rsolr (~> 1.0.7)
@@ -194,6 +199,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   RedCloth

app/models/screening_datum.rb

@@ -1,3 +1,3 @@
 class ScreeningDatum < ActiveRecord::Base
-#  attr_accessible :birth_city, :birth_country, :birth_state, :dad_is_biodad, :date, :dob, :dob_day, :dob_month, :dob_year, :father_first_name, :father_hispanicity, :father_hispanicity_mex, :father_last_name, :father_race, :first_name, :icf_master_id, :last_name, :middle_name, :mom_is_biomom, :mother_first_name, :mother_hispanicity, :mother_hispanicity_mex, :mother_last_name, :mother_maiden_name, :mother_race, :new_dob, :new_dob_day, :new_dob_month, :new_dob_year, :new_father_first_name, :new_father_last_name, :new_first_name, :new_last_name, :new_middle_name, :new_mother_first_name, :new_mother_last_name, :new_mother_maiden_name, :new_sex, :other_father_race, :other_mother_race, :screening_datum_update_id, :sex, :study_subject_id
+#  attr_accessible :birth_city, :birth_country, :birth_state, :dad_is_biodad, :date, :dob, :dob_day, :dob_month, :dob_year, :father_first_name, :father_hispanicity, :father_hispanicity_mex, :father_last_name, :father_race, :first_name, :icf_master_id, :last_name, :middle_name, :mom_is_biomom, :mother_first_name, :mother_hispanicity, :mother_hispanicity_mex, :mother_last_name, :mother_maiden_name, :mother_race, :new_dob, :new_dob_day, :new_dob_month, :new_dob_year, :new_father_first_name, :new_father_last_name, :new_first_name, :new_last_name, :new_middle_name, :new_mother_first_name, :new_mother_last_name, :new_mother_maiden_name, :new_sex, :father_race_other, :mother_race_other, :other_father_race, :other_mother_race, :screening_datum_update_id, :sex, :study_subject_id
 end

app/views/bc_requests/index.csv.erb

@@ -22,7 +22,7 @@ birthplace_city
 mother_hispanicity
 mother_hispanicity_mex
 mother_race
-other_mother_race
+mother_race_other
 father_hispanicity
 father_hispanicity_mex
 father_race
@@ -49,7 +49,7 @@ other_father_race ).to_csv(
 	study_subject.mother_hispanicity_id,
 	study_subject.mother_hispanicity_mex,
 	study_subject.mother_race_id,
-	study_subject.other_mother_race,
+	study_subject.mother_race_other,
 	study_subject.father_hispanicity_id,
 	study_subject.father_hispanicity_mex,
 	study_subject.father_race_id,

app/views/screening_data/_form.html.erb

@@ -88,8 +88,8 @@
     <%= f.number_field :mother_hispanicity_mex %>
   </div>
   <div class="field">
-    <%= f.label :other_mother_race %><br />
-    <%= f.text_field :other_mother_race %>
+    <%= f.label :mother_race_other %><br />
+    <%= f.text_field :mother_race_other %>
   </div>
   <div class="field">
     <%= f.label :father_hispanicity_mex %><br />

app/views/screening_data/index.html.erb

@@ -71,7 +71,7 @@
     <td><%= screening_datum.birth_state %></td>
     <td><%= screening_datum.birth_city %></td>
     <td><%= screening_datum.mother_hispanicity_mex %></td>
-    <td><%= screening_datum.other_mother_race %></td>
+    <td><%= screening_datum.mother_race_other %></td>
     <td><%= screening_datum.father_hispanicity_mex %></td>
     <td><%= screening_datum.other_father_race %></td>
     <td><%= screening_datum.new_mother_first_name %></td>

app/views/screening_data/show.html.erb

@@ -97,7 +97,7 @@
 
 <p>
   <b>Other mother race:</b>
-  <%= @screening_datum.other_mother_race %>
+  <%= @screening_datum.mother_race_other %>
 </p>
 
 <p>

config/validations/study_subject.yml

@@ -84,6 +84,8 @@
   :attributes:
   - :other_mother_race
   - :other_father_race
+  - :mother_race_other
+  - :father_race_other
   - :state_id_no
   - :state_registrar_no
   - :local_registrar_no

database_tables

@@ -1502,9 +1502,11 @@ Table: screening_data
 | birth_state               | varchar(255) | YES  |     | NULL    |                |
 | birth_city                | varchar(255) | YES  |     | NULL    |                |
 | mother_hispanicity_mex    | int(11)      | YES  |     | NULL    |                |
+| mother_race_other         | varchar(255) | YES  |     | NULL    |                |
 | other_mother_race         | varchar(255) | YES  |     | NULL    |                |
 | father_hispanicity_mex    | int(11)      | YES  |     | NULL    |                |
 | other_father_race         | varchar(255) | YES  |     | NULL    |                |
+| father_race_other         | varchar(255) | YES  |     | NULL    |                |
 | new_mother_first_name     | varchar(255) | YES  |     | NULL    |                |
 | new_mother_last_name      | varchar(255) | YES  |     | NULL    |                |
 | new_mother_maiden_name    | varchar(255) | YES  |     | NULL    |                |
@@ -1626,6 +1628,8 @@ Table: study_subjects
 | birth_country               | varchar(255) | YES  |     | NULL    |                |
 | other_mother_race           | varchar(255) | YES  |     | NULL    |                |
 | other_father_race           | varchar(255) | YES  |     | NULL    |                |
+| mother_race_other           | varchar(255) | YES  |     | NULL    |                |
+| father_race_other           | varchar(255) | YES  |     | NULL    |                |
 | childid                     | int(11)      | YES  | UNI | NULL    |                |
 | patid                       | varchar(4)   | YES  | MUL | NULL    |                |
 | case_control_type           | varchar(1)   | YES  |     | NULL    |                |

db/migrate/20120816152122_add_mother_race_other_to_screening_data.rb

@@ -0,0 +1,5 @@
+class AddMotherRaceOtherToScreeningData < ActiveRecord::Migration
+  def change
+    add_column :screening_data, :mother_race_other, :string
+  end
+end

db/migrate/20120816152203_add_father_race_other_to_screening_data.rb

@@ -0,0 +1,5 @@
+class AddFatherRaceOtherToScreeningData < ActiveRecord::Migration
+  def change
+    add_column :screening_data, :father_race_other, :string
+  end
+end

db/migrate/20120816152349_add_father_race_other_to_study_subject.rb

@@ -0,0 +1,5 @@
+class AddFatherRaceOtherToStudySubject < ActiveRecord::Migration
+  def change
+    add_column :study_subjects, :father_race_other, :string
+  end
+end

db/migrate/20120816152428_add_mother_race_other_to_study_subject.rb

@@ -0,0 +1,5 @@
+class AddMotherRaceOtherToStudySubject < ActiveRecord::Migration
+  def change
+    add_column :study_subjects, :mother_race_other, :string
+  end
+end