fix: nonexistent values

djsall · Jun 22, 2024 · 4c4a443 · 4c4a443
1 parent 29c6314
commit 4c4a443
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/Filament/Resources/ReadingResource/Widgets/AverageConsumption.php b/app/Filament/Resources/ReadingResource/Widgets/AverageConsumption.php
@@ -18,7 +18,7 @@ protected function getStats(): array
 
         $value = '-';
 
-        if (filled($first) && filled($last) && $last->date->notEqualTo($first->date)) {
+        if ($first && $last && $last->date->notEqualTo($first->date)) {
             $value = ($last->value - $first->value) / ($first->date->startOfMonth()->diffInMonths($last->date->endOfMonth()) + 1);
             $value = number_format($value, thousands_separator: ' ');
         }

diff --git a/app/Models/Reading.php b/app/Models/Reading.php
@@ -36,7 +36,7 @@ public function scopeTenant(Builder $query): void
         $query->whereBelongsTo(Filament::getTenant(), 'meter');
     }
 
-    public static function firstOfYear(): self
+    public static function firstOfYear(): ?self
     {
         return self::query()
             ->tenant()
@@ -48,7 +48,7 @@ public static function firstOfYear(): self
             ->first();
     }
 
-    public static function lastOfYear(): self
+    public static function lastOfYear(): ?self
     {
         return self::query()
             ->tenant()