Other mother race: - <%= @screening_datum.other_mother_race %> + <%= @screening_datum.mother_race_other %>
diff --git a/config/validations/study_subject.yml b/config/validations/study_subject.yml index 1d578cec..d5a4c6d1 100644 --- a/config/validations/study_subject.yml +++ b/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 diff --git a/database_tables b/database_tables index af029b3c..582c1b54 100644 --- a/database_tables +++ b/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 | | diff --git a/db/migrate/20120816152122_add_mother_race_other_to_screening_data.rb b/db/migrate/20120816152122_add_mother_race_other_to_screening_data.rb new file mode 100644 index 00000000..668c9e61 --- /dev/null +++ b/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 diff --git a/db/migrate/20120816152203_add_father_race_other_to_screening_data.rb b/db/migrate/20120816152203_add_father_race_other_to_screening_data.rb new file mode 100644 index 00000000..8c580103 --- /dev/null +++ b/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 diff --git a/db/migrate/20120816152349_add_father_race_other_to_study_subject.rb b/db/migrate/20120816152349_add_father_race_other_to_study_subject.rb new file mode 100644 index 00000000..197c9c10 --- /dev/null +++ b/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 diff --git a/db/migrate/20120816152428_add_mother_race_other_to_study_subject.rb b/db/migrate/20120816152428_add_mother_race_other_to_study_subject.rb new file mode 100644 index 00000000..308c1cc6 --- /dev/null +++ b/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 diff --git a/db/schema.rb b/db/schema.rb index dbb2bd87..992a0ece 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120814234500) do +ActiveRecord::Schema.define(:version => 20120816152428) do create_table "abstracts", :force => true do |t| t.integer "study_subject_id" @@ -59,10 +59,10 @@ t.integer "response_marrow_lambda_day_7" t.integer "cbc_report_found" t.date "cbc_report_on" - t.decimal "cbc_white_blood_count", :precision => 10, :scale => 0 + t.decimal "cbc_white_blood_count" t.integer "cbc_percent_blasts" t.integer "cbc_number_blasts" - t.decimal "cbc_hemoglobin_level", :precision => 10, :scale => 0 + t.decimal "cbc_hemoglobin_level" t.integer "cbc_platelet_count" t.integer "cerebrospinal_fluid_report_found" t.date "csf_report_on" @@ -346,7 +346,7 @@ t.float "height_at_diagnosis" t.float "weight_at_diagnosis" t.string "hyperdiploidy_by" - t.boolean "cbc_percent_blasts_unknown", :default => false + t.boolean "cbc_percent_blasts_unknown", :default => false t.integer "response_day_7_days_since_treatment_began" t.integer "response_day_7_days_since_diagnosis" t.integer "response_day_14_days_since_treatment_began" @@ -357,8 +357,8 @@ t.string "entry_2_by_uid" t.string "merged_by_uid" t.date "discharge_summary_found_on" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "abstracts", ["study_subject_id"], :name => "index_abstracts_on_study_subject_id" @@ -488,7 +488,7 @@ t.integer "apgar_10min" t.integer "birth_order" t.string "birth_type" - t.decimal "birth_weight_gms", :precision => 10, :scale => 0 + t.decimal "birth_weight_gms" t.string "complications_labor_delivery" t.string "complications_pregnancy" t.string "county_of_delivery" @@ -547,8 +547,8 @@ t.integer "term_count_20_plus_weeks" t.integer "term_count_pre_20_weeks" t.boolean "vacuum_attempt_unsuccessful" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "control_number" t.string "father_ssn" t.string "mother_ssn" @@ -1142,9 +1142,9 @@ t.datetime "updated_at", :null => false end - add_index "operational_events", ["operational_event_type_id"], :name => "index_operational_events_on_operational_event_type_id" - add_index "operational_events", ["project_id"], :name => "index_operational_events_on_project_id" - add_index "operational_events", ["study_subject_id"], :name => "index_operational_events_on_study_subject_id" + add_index "operational_events", ["operational_event_type_id"], :name => "oe_oeti" + add_index "operational_events", ["project_id"], :name => "oe_pi" + add_index "operational_events", ["study_subject_id"], :name => "oe_ssi" create_table "organizations", :force => true do |t| t.integer "position" @@ -1402,7 +1402,7 @@ t.integer "sample_temperature_id" t.integer "sample_collector_id" t.integer "order_no" - t.decimal "quantity_in_sample", :precision => 10, :scale => 0 + t.decimal "quantity_in_sample" t.string "aliquot_or_sample_on_receipt" t.datetime "sent_to_subject_at" t.datetime "collected_from_subject_at" @@ -1415,10 +1415,10 @@ t.string "external_id_source" t.datetime "receipt_confirmed_at" t.string "receipt_confirmed_by" - t.boolean "future_use_prohibited", :default => false, :null => false + t.boolean "future_use_prohibited", :default => false, :null => false t.string "state" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "screening_data", :force => true do |t| @@ -1467,6 +1467,8 @@ t.string "father_race" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.string "mother_race_other" + t.string "father_race_other" end create_table "screening_datum_updates", :force => true do |t| @@ -1588,6 +1590,8 @@ t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.integer "phase" + t.string "father_race_other" + t.string "mother_race_other" end add_index "study_subjects", ["accession_no"], :name => "index_study_subjects_on_accession_no", :unique => true @@ -1661,13 +1665,13 @@ create_table "transfers", :force => true do |t| t.integer "position" t.integer "aliquot_id" - t.integer "from_organization_id", :null => false - t.integer "to_organization_id", :null => false - t.decimal "amount", :precision => 10, :scale => 0 + t.integer "from_organization_id", :null => false + t.integer "to_organization_id", :null => false + t.decimal "amount" t.string "reason" t.boolean "is_permanent" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "transfers", ["aliquot_id"], :name => "index_transfers_on_aliquot_id" diff --git a/test/assets/one_record_screening_datum_update_test_file.csv b/test/assets/one_record_screening_datum_update_test_file.csv index 11faf86d..7fa8287d 100644 --- a/test/assets/one_record_screening_datum_update_test_file.csv +++ b/test/assets/one_record_screening_datum_update_test_file.csv @@ -1,2 +1,2 @@ -icf_master_id,mom_is_biomom,dad_is_biodad,mother_first_name,mother_last_name,mother_maiden_name,father_first_name,father_last_name,first_name,middle_name,last_name,dob,sex,birth_country,birth_state,birth_city,mother_hispanicity_mex,other_mother_race,father_hispanicity_mex,other_father_race,new_mother_first_name,new_mother_last_name,new_mother_maiden_name,new_father_first_name,new_father_last_name,new_first_name,new_middle_name,new_last_name,new_dob,new_sex,date,dob_month,new_dob_month,dob_day,new_dob_day,dob_year,new_dob_year,mother_hispanicity,mother_race,father_hispanicity,father_race -12345FAKE,,,,,,,,,,,,,,, +icf_master_id,mom_is_biomom,dad_is_biodad,mother_first_name,mother_last_name,mother_maiden_name,father_first_name,father_last_name,first_name,middle_name,last_name,dob,sex,birth_country,birth_state,birth_city,mother_hispanicity_mex,mother_race_other,other_mother_race,father_hispanicity_mex,fatber_race_other,other_father_race,new_mother_first_name,new_mother_last_name,new_mother_maiden_name,new_father_first_name,new_father_last_name,new_first_name,new_middle_name,new_last_name,new_dob,new_sex,date,dob_month,new_dob_month,dob_day,new_dob_day,dob_year,new_dob_year,mother_hispanicity,mother_race,father_hispanicity,father_race +12345FAKE,,,,,,,,,,,,,,, diff --git a/test/functional/bc_requests_controller_test.rb b/test/functional/bc_requests_controller_test.rb index 760208d3..5c4b1df7 100644 --- a/test/functional/bc_requests_controller_test.rb +++ b/test/functional/bc_requests_controller_test.rb @@ -298,7 +298,7 @@ def factory_attributes(options={}) require 'csv' f = CSV.parse(@response.body) assert_equal 2, f.length # 2 rows, 1 header and 1 data - assert_equal f[0], ["masterid", "biomom", "biodad", "date", "mother_full_name", "mother_maiden_name", "father_full_name", "child_full_name", "child_dobm", "child_dobd", "child_doby", "child_gender", "birthplace_country", "birthplace_state", "birthplace_city", "mother_hispanicity", "mother_hispanicity_mex", "mother_race", "other_mother_race", "father_hispanicity", "father_hispanicity_mex", "father_race", "other_father_race"] + assert_equal f[0], ["masterid", "biomom", "biodad", "date", "mother_full_name", "mother_maiden_name", "father_full_name", "child_full_name", "child_dobm", "child_dobd", "child_doby", "child_gender", "birthplace_country", "birthplace_state", "birthplace_city", "mother_hispanicity", "mother_hispanicity_mex", "mother_race", "mother_race_other", "father_hispanicity", "father_hispanicity_mex", "father_race", "other_father_race"] assert_equal 23, f[0].length #["46", nil, nil, nil, "[name not available]", nil, "[name not available]", "[name not available]", "3", "23", "2006", "F", nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil] assert_equal f[1][0], case_study_subject.icf_master_id diff --git a/test/functional/sample_transfers_controller_test.rb b/test/functional/sample_transfers_controller_test.rb index f81467a4..a27d42ba 100644 --- a/test/functional/sample_transfers_controller_test.rb +++ b/test/functional/sample_transfers_controller_test.rb @@ -253,7 +253,7 @@ class SampleTransfersControllerTest < ActionController::TestCase require 'csv' f = CSV.parse(@response.body) assert_equal 2, f.length # 2 rows, 1 header and 1 data -# assert_equal f[0], ["masterid", "biomom", "biodad", "date", "mother_full_name", "mother_maiden_name", "father_full_name", "child_full_name", "child_dobm", "child_dobd", "child_doby", "child_gender", "birthplace_country", "birthplace_state", "birthplace_city", "mother_hispanicity", "mother_hispanicity_mex", "mother_race", "other_mother_race", "father_hispanicity", "father_hispanicity_mex", "father_race", "other_father_race"] +# assert_equal f[0], ["masterid", "biomom", "biodad", "date", "mother_full_name", "mother_maiden_name", "father_full_name", "child_full_name", "child_dobm", "child_dobd", "child_doby", "child_gender", "birthplace_country", "birthplace_state", "birthplace_city", "mother_hispanicity", "mother_hispanicity_mex", "mother_race", "mother_race_other", "father_hispanicity", "father_hispanicity_mex", "father_race", "other_father_race"] # assert_equal 23, f[0].length ##["46", nil, nil, nil, "[name not available]", nil, "[name not available]", "[name not available]", "3", "23", "2006", "F", nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil] # assert_equal f[1][0], case_study_subject.icf_master_id diff --git a/test/unit/icf_master_tracker_update_test.rb b/test/unit/icf_master_tracker_update_test.rb index c6c09d14..49c91cdc 100644 --- a/test/unit/icf_master_tracker_update_test.rb +++ b/test/unit/icf_master_tracker_update_test.rb @@ -207,7 +207,7 @@ class IcfMasterTrackerUpdateTest < ActiveSupport::TestCase # assert_equal candidate_control.mother_hispanicity_id, control[:mother_hispanicity] ##control[:mother_hispanicity_mex]},#{ # assert_equal candidate_control.mother_race_id, control[:mother_race] -##control[:other_mother_race]},#{ +##control[:mother_race_other]},#{ # assert_equal candidate_control.father_hispanicity_id, control[:father_hispanicity] ##control[:father_hispanicity_mex]},#{ # assert_equal candidate_control.father_race_id, control[:father_race] diff --git a/test/unit/study_subject_test.rb b/test/unit/study_subject_test.rb index e95dd1b2..b6b99411 100644 --- a/test/unit/study_subject_test.rb +++ b/test/unit/study_subject_test.rb @@ -28,12 +28,12 @@ class StudySubjectTest < ActiveSupport::TestCase birth_type birth_year case_control_type dad_is_biodad died_on familyid father_hispanicity_id father_hispanicity_mex other_father_race - father_yrs_educ gbid + father_yrs_educ gbid father_race_other other_guardian_relationship hispanicity_id idno_wiemels is_duplicate_of is_matched lab_no lab_no_wiemels local_registrar_no matchingid mom_is_biomom mother_hispanicity_id mother_hispanicity_mex - other_mother_race mother_yrs_educ phase + mother_race_other other_mother_race mother_yrs_educ phase reference_date related_case_childid related_childid ssn state_id_no state_registrar_no subjectid vital_status_id ) @@ -63,7 +63,7 @@ class StudySubjectTest < ActiveSupport::TestCase assert_should_require_attribute_length( :other_guardian_relationship, - :other_mother_race, :other_father_race, + :mother_race_other, :other_father_race, :state_id_no, :state_registrar_no, :local_registrar_no,