Merge pull request #11 from zaliqarosli/2020-02-05-DisplayInstCandAge…

…InYears [Instrument] Change Candidate Age display to 'Years'
HenriRabalais · Feb 5, 2020 · 3a25a24 · 3a25a24
2 parents f953497 + 88af636
commit 3a25a24
Show file tree

Hide file tree

Showing 3 changed files with 931 additions and 2 deletions.
diff --git a/instruments/NeuropsychologyEvaluation.linst b/instruments/NeuropsychologyEvaluation.linst
@@ -1,7 +1,7 @@
 table{@}NeuropsychologyEvaluation
 title{@}Neuropsychology Evaluation
 date{@}Date_taken{@}Date of Administration{@}2014{@}2030
-static{@}Candidate_Age{@}Candidate Age (Months)
+static{@}Candidate_Age{@}Candidate Age (Years)
 static{@}Window_Difference{@}Window Difference (+/- Days)
 select{@}Examiner{@}Examiner{@}NULL=>''
 header{@}{@}Memory

diff --git a/libraries/NDB_BVL_Instrument.class.inc b/libraries/NDB_BVL_Instrument.class.inc
@@ -505,6 +505,11 @@ abstract class NDB_BVL_Instrument extends NDB_Page
             $this->dateTimeFields = array("Date_taken");
         }
 
+        // Convert Candidate_Age from months to years for display
+        if (!empty($defaults['Candidate_Age'])) {
+            $defaults['Candidate_Age'] = $this->getCandidateAge()['year'];
+        }
+
         if (isset($defaults['Window_Difference'])
             && $defaults['Window_Difference'] != 0
         ) {
@@ -846,7 +851,7 @@ abstract class NDB_BVL_Instrument extends NDB_Page
         if (strrpos($this->testName, '_proband') === false) {
             $this->addScoreColumn(
                 'Candidate_Age',
-                'Candidate Age (Months)'
+                'Candidate Age (Years)'
             );
             $this->addScoreColumn(
                 'Window_Difference',