using php DateTime diff

days instead of %a
aces · Jan 22, 2020 · 73106f0 · 73106f0
1 parent 0b76f9c
commit 73106f0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/modules/timepoint_list/php/timepoint_list.class.inc b/modules/timepoint_list/php/timepoint_list.class.inc
@@ -104,7 +104,10 @@ class Timepoint_List extends \NDB_Menu
         $this->tpl_data['candID'] = $this->candID;
         $this->tpl_data['PSCID']  = $candidate->getPSCID();
         $listOfTimePoints         = $candidate->getListOfTimePoints();
-        $this->tpl_data['candidate'] = $candidate->getData();
+        $this->tpl_data['candidate'] = array_merge(
+            $candidate->getData(),
+            array('Age' => $candidate->getAgeInMonths())
+        );
 
         if (!empty($listOfTimePoints)) {
             $user     =& \User::singleton();

diff --git a/modules/timepoint_list/templates/menu_timepoint_list.tpl b/modules/timepoint_list/templates/menu_timepoint_list.tpl
@@ -6,6 +6,9 @@
     <th>
       DOB
     </th>
+    <th>
+      Age
+    </th>
     {if $candidate.EDC!=""}
       <th>
         EDC
@@ -30,6 +33,9 @@
     <td>
       {$candidate.DoB}
     </td>
+    <td>
+      {$candidate.Age}
+    </td>
     {if $candidate.EDC!=""}
       <td>
         {$candidate.EDC}

diff --git a/php/libraries/Candidate.class.inc b/php/libraries/Candidate.class.inc
@@ -664,9 +664,12 @@ class Candidate
      */
     public function getAge(): array
     {
-        return \Utility::calculateAge(
-            $this->candidateInfo["DoB"],
-            (new DateTime())->format('Y-m-d')
+        $dob = new DateTime($this->candidateInfo["DoB"]);
+        $age = $dob->diff(new DateTime('now'))->format('%y,%m,%d');
+
+        return array_combine(
+          array('year', 'mon', 'day'),
+          explode(",", $age)
         );
     }
 
@@ -677,7 +680,9 @@ class Candidate
      */
     public function getAgeYears(): int
     {
-        return $this->getAge()['year'];
+        $dob = new DateTime($this->candidateInfo["DoB"]);
+
+        return (int)$dob->diff(new DateTime('now'))->format('%y');
     }
 
     /**
@@ -687,10 +692,9 @@ class Candidate
      */
     public function getAgeInMonths(): int
     {
-        $age    = $this->getAge();
-        $months = $age['year']*12 + $age['mon'] + ($age['day']/30);
+        $dob = new DateTime($this->candidateInfo["DoB"]);
 
-        return (round($months*10) / 10.0);
+        return (int)$dob->diff(new DateTime('now'))->format('%m') + 12 * $this->getAgeYears();
     }
 
     /**
@@ -700,9 +704,9 @@ class Candidate
      */
     public function getAgeInDays(): int
     {
-        $age    = $this->getAge();
+        $dob = new DateTime($this->candidateInfo["DoB"]);
 
-        return $age['year']*365 + $age['mon']*30 + $age['day'];
+        return (int)$dob->diff(new DateTime('now'))->days;
     }
 
     /**