Programs page UI - current-month/all-time filter

app/Models/Client.php

@@ -91,6 +91,12 @@ class Client extends Model
             ->orderBy('label', 'asc')
             ->orderBy('effective_date', 'desc');
     }
+    public function allMeasurements() {
+        return $this->hasMany(Measurement::class, 'client_id', 'id')
+            ->where('is_removed', false)
+            ->orderBy('label', 'asc')
+            ->orderBy('effective_date', 'desc');
+    }
 
     public function smses() {
         return $this->hasMany(ClientSMS::class, 'client_id', 'id')

resources/views/app/patient/programs.blade.php

@@ -343,9 +343,13 @@
                         </div>
                         <?php
                         $programMeasurements = [];
-                        foreach($patient->measurements as $measurement) {
+                        foreach($patient->allMeasurements as $measurement) {
+                            $measurementED = strtotime($measurement->effective_date);
                             if(in_array($measurement->label, $programCategories) !== FALSE) {
-                                $programMeasurements[] = $measurement;
+                                if($filter === 'all' ||
+                                    (date('Y') === date('Y', $measurementED) && date('m') === date('m', $measurementED))) {
+                                    $programMeasurements[] = $measurement;
+                                }
                             }
                         }
                         ?>