Merge pull request #586 from liberu-genealogy/sweep/reports

Sweep: reports
liberu-genealogy · May 12, 2024 · 3e09314 · 3e09314
2 parents edbd2b4 + 2b58b51
commit 3e09314
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/app/Filament/Widgets/ReportWidget.php b/app/Filament/Widgets/ReportWidget.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Filament\Widgets;
+
+use App\Http\Livewire\DabovilleReport;
+use App\Http\Livewire\HenryReport;
+use App\Http\Livewire\AhnentafelReport;
+use Filament\Widgets\Widget;
+
+class ReportWidget extends Widget
+{
+    protected static string $view = 'filament.widgets.report-widget';
+
+    protected function getHeading(): string
+    {
+        return 'Reports';
+    }
+
+    public function mount(): void
+    {
+        $this->livewire = [
+            'daboville-report' => DabovilleReport::class,
+            'henry-report' => HenryReport::class,
+            'ahnentafel-report' => AhnentafelReport::class,
+        ];
+    }
+
+    protected function getViewData(): array
+    {
+        return [
+            'livewire' => $this->livewire,
+        ];
+    }
+}
diff --git a/app/Http/Livewire/AhnentafelReport.php b/app/Http/Livewire/AhnentafelReport.php
@@ -18,7 +18,7 @@ public function render()
     public function generateReport($personId)
     {
         $this->selectedPersonId = $personId;
-        $person = Person::find($personId);
+        $person = Person::with('child_in_family.birth', 'child_in_family.death')->find($personId);
         if ($person) {
             $this->reportData = [];
             $this->traverseFamilyTree($person, '1');

diff --git a/app/Http/Livewire/DabovilleReport.php b/app/Http/Livewire/DabovilleReport.php
@@ -39,7 +39,7 @@ public function render()
     public function generateReport($personId)
     {
         $this->selectedPersonId = $personId;
-        $person = Person::find($personId);
+        $person = Person::with('child_in_family.birth', 'child_in_family.death')->find($personId);
         if ($person) {
             $this->reportData = [];
             $this->traverseFamilyTree($person, '1');

diff --git a/app/Http/Livewire/HenryReport.php b/app/Http/Livewire/HenryReport.php
@@ -18,7 +18,7 @@ public function render()
     public function generateReport($personId)
     {
         $this->selectedPersonId = $personId;
-        $person = Person::find($personId);
+        $person = Person::with('child_in_family.birth', 'child_in_family.death')->find($personId);
         if ($person) {
             $this->reportData = [];
             $this->processHenryReportData($person);

diff --git a/resources/views/livewire/daboville-report.blade.php b/resources/views/livewire/daboville-report.blade.php
@@ -31,8 +31,8 @@
                     <tr>
                         <td>{{ $data['number'] }}</td>
                         <td>{{ $data['name'] }}</td>
-                        <td>{{ $data['birth'] }}</td>
-                        <td>{{ $data['death'] }}</td>
+                        <td>{{ $data['birth'] ?? 'N/A' }}</td>
+                        <td>{{ $data['death'] ?? 'N/A' }}</td>
                     </tr>
                 @endforeach
             </tbody>

diff --git a/resources/views/livewire/henry-report.blade.php b/resources/views/livewire/henry-report.blade.php
@@ -29,8 +29,8 @@
                 @foreach($reportData as $data)
                     <tr>
                         <td>{{ $data['name'] }}</td>
-                        <td>{{ $data['birth'] }}</td>
-                        <td>{{ $data['death'] }}</td>
+                        <td>{{ $data['birth'] ?? 'N/A' }}</td>
+                        <td>{{ $data['death'] ?? 'N/A' }}</td>
                     </tr>
                 @endforeach
             </tbody>