Review changes

raisinbread/RB_files/RB_flag.sql

@@ -2767,7 +2767,7 @@ INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (11519,2154,'medical_history','475906DCC4222154431524506506',NULL,'N',NULL,NULL,NULL,'admin','2018-04-23 18:01:46',NULL);
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (11521,2154,'mri_parameter_form','475906DCC4222154441524506506','In Progress','N',NULL,NULL,NULL,'admin','2018-04-23 18:01:51',NULL);
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (7261,1053,'radiology_review','587630DCC0901053111524238782','Complete','Y','All',NULL,NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2017-01-01\",\"Examiner\":\"8\",\"Scan_done\":\"yes\",\"MRI_date_status\":\"not_answered\",\"Review_date_status\":\"not_answered\",\"Review_results\":\"normal\",\"abnormal_atypical_exclusionary\":\"not_answered\",\"Incidental_findings_status\":\"not_answered\",\"Candidate_Age\":8,\"Window_Difference\":0,\"MRI_date\":null,\"Review_date\":null,\"Incidental_findings\":null}');
-INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (7257,1053,'bmi','587630DCC0901053121524238782','In Progress','Y','All','Questionable',NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2017-01-01\",\"Examiner\":\"8\",\"unit_classification\":\"standard\",\"height_feet_status\":null,\"height_inches_status\":null,\"weight_lbs_status\":null,\"height_cms_status\":null,\"weight_kgs_status\":null,\"Candidate_Age\":8,\"Window_Difference\":0,\"height_feet\":\"5\",\"height_inches\":\"60\",\"weight_lbs\":\"110\",\"height_cms\":null,\"weight_kgs\":null}');
+INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (7257,1053,'bmi','587630DCC0901053121524238782','In Progress','Y','All','Questionable',NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2017-01-01\",\"Examiner\":\"8\",\"unit_classification\":\"imperial\",\"height_feet_status\":null,\"height_inches_status\":null,\"weight_lbs_status\":null,\"height_cms_status\":null,\"weight_kgs_status\":null,\"Candidate_Age\":8,\"Window_Difference\":0,\"height_feet\":\"5\",\"height_inches\":\"60\",\"weight_lbs\":\"110\",\"height_cms\":null,\"weight_kgs\":null}');
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (8909,1053,'medical_history','587630DCC0901053131524315869','In Progress','Y',NULL,NULL,NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2018-04-03\",\"Examiner\":\"7\",\"Candidate_Age\":23.1,\"Window_Difference\":0,\"arthritis\":\"yes\",\"arthritis_age\":\"55\",\"arthritis_age_status\":null,\"pulmonary_issues\":\"yes\",\"pulmonary_issues_specific\":\"dgfdg\",\"hypertension\":\"yes\",\"hypertension_while_pregnant\":\"yes\",\"hypertension_while_pregnant_age\":\"22\",\"hypertension_while_pregnant_age_status\":null,\"concussion_or_head_trauma\":\"yes\",\"concussion_1_description\":\"dgf\",\"concussion_1_hospitalized\":\"yes\",\"concussion_1_age\":\"44\",\"concussion_2_description\":null,\"concussion_2_hospitalized\":null,\"concussion_2_age\":null,\"concussion_3_description\":null,\"concussion_3_hospitalized\":null,\"concussion_3_age\":null,\"current_concussion_symptoms\":\"dizziness\"}');
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (7259,1053,'mri_parameter_form','587630DCC0901053141524238782','Complete','Y','All',NULL,NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2017-01-01\",\"Examiner\":\"8\",\"Candidate_Age\":8,\"Window_Difference\":0,\"mri_dataset_name\":\"test\",\"type_of_data\":\"participant\",\"site\":\"1\",\"total_duration_hours_status\":\"not_answered\",\"total_duration_minutes_status\":\"not_answered\",\"mri_operator_name\":\"DCC Test\",\"scan_date\":\"2017-05-05\",\"3d_t1w_Scan_Done\":\"yes\",\"3d_t1w_number_attempts\":\"2\",\"3d_t1w_comments\":\"woke up\",\"2d_flair_Scan_Done\":\"yes\",\"2d_flair_number_attempts\":\"3\",\"2d_flair_comments\":\"test\",\"total_duration_hours\":null,\"total_duration_minutes\":null}');
 INSERT INTO `flag` (`ID`, `SessionID`, `Test_name`, `CommentID`, `Data_entry`, `Required_elements_completed`, `Administration`, `Validity`, `Exclusion`, `UserID`, `Testdate`, `Data`) VALUES (7255,1053,'aosi','587630DCC0901053161524238782','In Progress','Y','Partial','Valid',NULL,'admin','2020-12-17 14:11:33','{\"Date_taken\":\"2019-02-01\",\"Examiner\":\"18\",\"examiner_location\":\"examiner\",\"other_comments_status\":\"not_answered\",\"Candidate_Age\":33,\"Window_Difference\":0,\"other_comments\":null,\"q1_visual_tracking_press_1\":\"2\",\"q1_visual_tracking_press_2\":\"2\",\"q1_visual_tracking_press_3\":\"0\",\"q1_visual_tracking_score_override\":\"0\",\"q1_visual_tracking_notes_status\":\"not_answered\",\"q2_disengagement_of_attention_press_1\":\"1\",\"q2_disengagement_of_attention_press_2\":\"0\",\"q2_disengagement_of_attention_press_3\":\"0\",\"q2_disengagement_of_attention_score_override\":\"0\",\"q2_disengagement_of_attention_notes_status\":\"not_answered\",\"free_play_period_1_notes_status\":\"not_answered\",\"q3_orients_to_name_press_1_trial_1\":\"orients_with_eye_contact\",\"q3_orients_to_name_press_1_trial_2\":\"orients_without_eye_contact\",\"q3_orients_to_name_press_2_trial_1\":\"orients_with_eye_contact\",\"q3_orients_to_name_press_2_trial_2\":\"orients_without_eye_contact\",\"q3_orients_to_name_press_3_trial_1\":\"orients_with_eye_contact\",\"q3_orients_to_name_press_3_trial_2\":\"orients_with_eye_contact\",\"q3_orients_to_name_score_override\":\"0\",\"q3_orients_to_name_notes_status\":\"not_answered\",\"q4_differential_response_to_facial_emotion\":\"1\",\"q4_differential_response_to_facial_emotion_notes_status\":\"not_answered\",\"q5_anticipatory_response\":\"0\",\"q5_anticipatory_response_notes_status\":\"not_answered\",\"q6_imitation_of_actions_activity_1\":\"ha\",\"q6_imitation_of_actions_act_1_att_1\":\"0\",\"q6_imitation_of_actions_act_1_att_2\":\"0\",\"q6_imitation_of_actions_act_1_att_3\":\"0\",\"q6_imitation_of_actions_activity_2\":\"bla\",\"q6_imitation_of_actions_act_2_att_1\":\"0\",\"q6_imitation_of_actions_act_2_att_2\":\"0\",\"q6_imitation_of_actions_act_2_att_3\":\"0\",\"q6_imitation_of_actions_activity_3\":\"bla\",\"q6_imitation_of_actions_act_3_att_1\":\"0\",\"q6_imitation_of_actions_act_3_att_2\":\"0\",\"q6_imitation_of_actions_act_3_att_3\":\"0\",\"q6_imitation_of_actions_score_override\":\"0\",\"q6_imitation_of_actions_notes_status\":\"not_answered\",\"free_play_period_2_notes_status\":\"not_answered\",\"q1_visual_tracking_notes\":null,\"q2_disengagement_of_attention_notes\":null,\"free_play_period_1_notes\":null,\"q3_orients_to_name_notes\":null,\"q4_differential_response_to_facial_emotion_notes\":null,\"q5_anticipatory_response_notes\":null,\"q6_imitation_of_actions_notes\":null,\"free_play_period_2_notes\":null,\"q7_social_babbling\":\"2\",\"q7_social_babbling_notes_status\":\"not_answered\",\"q8_eye_contact\":\"not_answered\",\"q8_eye_contact_notes_status\":\"not_answered\",\"q9_reciprocal_social_smile\":\"1\",\"q9_reciprocal_social_smile_notes_status\":\"not_answered\",\"q10_coordination_of_eye_gaze_and_action\":\"3\",\"q10_coordination_of_eye_gaze_and_action_notes_status\":\"not_answered\",\"q11_reactivity\":\"1\",\"q11_reactivity_notes_status\":\"not_answered\",\"q14_social_interest\":\"0\",\"q14_social_interest_notes_status\":\"not_answered\",\"q15_transitions\":\"0\",\"q15_transitions_notes_status\":\"not_answered\",\"q16_motor_control_and_behaviour\":\"not_answered\",\"q16_motor_control_and_behaviour_notes_status\":\"not_answered\",\"q17_atypical_motor\":\"0\",\"q17_atypical_motor_notes_status\":\"not_answered\",\"q18_atypical_sensory\":\"2\",\"q18_atypical_sensory_notes_status\":\"not_answered\",\"q19_engagement_of_attention\":\"1\",\"q19_engagement_of_attention_notes_status\":\"not_answered\",\"q20_insistence_on_particular_objects\":\"0\",\"q20_insistence_on_particular_objects_notes_status\":\"not_answered\",\"q21_social_referencing\":\"8\",\"q21_social_referencing_notes\":\"fhgfh\",\"q21_social_referencing_notes_status\":null,\"q7_social_babbling_notes\":null,\"q8_eye_contact_notes\":null,\"q9_reciprocal_social_smile_notes\":null,\"q10_coordination_of_eye_gaze_and_action_notes\":null,\"q11_reactivity_notes\":null,\"q14_social_interest_notes\":null,\"q15_transitions_notes\":null,\"q16_motor_control_and_behaviour_notes\":null,\"q17_atypical_motor_notes\":null,\"q18_atypical_sensory_notes\":null,\"q19_engagement_of_attention_notes\":null,\"q20_insistence_on_particular_objects_notes\":null,\"total_score_1_18\":12,\"total_score_1_18_override\":10,\"number_of_markers\":7,\"number_of_markers_override\":6,\"q1_visual_tracking_score\":2,\"q2_disengagement_of_attention_score\":0,\"q3_orients_to_name_score\":0,\"q4_differential_response_to_facial_emotion_score\":\"1\",\"q5_anticipatory_response_score\":\"0\",\"q6_imitation_of_actions_score\":\"0\"}');

raisinbread/RB_files/RB_parameter_type.sql

@@ -589,7 +589,7 @@ INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Descr
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1107,'bmi_Candidate_Age',NULL,'varchar(255)','Candidate Age (Months)',NULL,NULL,'Candidate_Age','bmi',NULL,1,0);
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1108,'bmi_Window_Difference',NULL,'varchar(255)','Window Difference (+/- Days)',NULL,NULL,'Window_Difference','bmi',NULL,1,0);
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1109,'bmi_Examiner',NULL,'varchar(255)','Examiner',NULL,NULL,'Examiner','bmi',NULL,1,0);
-INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1110,'bmi_unit_classification',NULL,'enum(\'metric\',\'standard\')','Choose unit of measurement',NULL,NULL,'unit_classification','bmi',NULL,1,0);
+INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1110,'bmi_unit_classification',NULL,'enum(\'metric\',\'imperial\')','Choose unit of measurement',NULL,NULL,'unit_classification','bmi',NULL,1,0);
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1111,'bmi_height_feet',NULL,'numeric','Your height (feet) :',NULL,NULL,'height_feet','bmi',NULL,1,0);
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1112,'bmi_height_feet_status',NULL,'enum(\'not_answered\')','',NULL,NULL,'height_feet_status','bmi',NULL,1,0);
 INSERT INTO `parameter_type` (`ParameterTypeID`, `Name`, `Alias`, `Type`, `Description`, `RangeMin`, `RangeMax`, `SourceField`, `SourceFrom`, `SourceCondition`, `Queryable`, `IsFile`) VALUES (1113,'bmi_height_inches',NULL,'numeric','Your height (inches) :',NULL,NULL,'height_inches','bmi',NULL,1,0);

raisinbread/instruments/bmi.linst

@@ -1,24 +1,23 @@
-table{@}bmi
 title{@}BMI Calculator
 date{@}Date_taken{@}Date of Administration{@}2006{@}2012
 static{@}Candidate_Age{@}Candidate Age (Months)
 static{@}Window_Difference{@}Window Difference (+/- Days)
 select{@}Examiner{@}Examiner{@}NULL=>''
 static{@}{@}Note: Please enter measurements in Imperial OR Metric units
-select{@}unit_classification{@}Choose unit of measurement{@}NULL=>''{-}'metric'=>'Metric'{-}'imperial'=>'Imperial'{-}'standard'=>'Standard'{-}'not_answered'=>'Not Answered'
+select{@}unit_classification{@}Choose unit of measurement{@}NULL=>''{-}'metric'=>'Metric'{-}'imperial'=>'Imperial'
 page{@}{@}Imperial units
 static{@}{@}Imperial units
-numeric{@}height_feet{@}Your height (feet) :{@}undefined{@}undefined
+numeric{@}height_feet{@}Your height (feet) :
 select{@}height_feet_status{@}{@}NULL=>''{-}'not_answered'=>'Not Answered'
-numeric{@}height_inches{@}Your height (inches) :{@}undefined{@}undefined
+numeric{@}height_inches{@}Your height (inches) :
 select{@}height_inches_status{@}{@}NULL=>''{-}'not_answered'=>'Not Answered'
 numeric{@}weight_lbs{@}Your weight (lbs) :{@}50{@}500
 select{@}weight_lbs_status{@}{@}NULL=>''{-}'not_answered'=>'Not Answered'
 page{@}{@}Metric Units
 static{@}{@}Metric units
-numeric{@}height_cms{@}Your height (cms) :{@}undefined{@}undefined
+numeric{@}height_cms{@}Your height (cms) :
 select{@}height_cms_status{@}{@}NULL=>''{-}'not_answered'=>'Not Answered'
-numeric{@}weight_kgs{@}Your weight (kgs) :{@}undefined{@}undefined
+numeric{@}weight_kgs{@}Your weight (kgs) :
 select{@}weight_kgs_status{@}{@}NULL=>''{-}'not_answered'=>'Not Answered'
 page{@}{@}Results
 static{@}bmi{@}Your BMI

raisinbread/instruments/instrument_sql/bmi.sql

@@ -6,7 +6,7 @@ CREATE TABLE `bmi` (
 `Date_taken` date default NULL,
 `Candidate_Age` varchar(255) default NULL,
 `Window_Difference` varchar(255) default NULL,
-`unit_classification` enum('metric','imperial','standard','not_answered') default NULL,
+`unit_classification` enum('metric','imperial') default NULL,
 `height_feet` numeric default NULL,
 `height_feet_status` enum('not_answered') default NULL,
 `height_inches` numeric default NULL,