Quellcode durchsuchen

presences - tolti utenti archiviati o eliminati

ferrari vor 3 Wochen
Ursprung
Commit
1c454a20fe
2 geänderte Dateien mit 10 neuen und 2 gelöschten Zeilen
  1. 0 1
      app/Http/Livewire/Presence.php
  2. 10 1
      app/Http/Livewire/PresenceReport.php

+ 0 - 1
app/Http/Livewire/Presence.php

@@ -238,7 +238,6 @@ class Presence extends Component
 
 
     public function render()
     public function render()
     {
     {
-
         $this->records = [];
         $this->records = [];
 
 
         setlocale(LC_ALL, 'it_IT');
         setlocale(LC_ALL, 'it_IT');

+ 10 - 1
app/Http/Livewire/PresenceReport.php

@@ -151,10 +151,19 @@ class PresenceReport extends Component
             }
             }
 
 
             $membersQuery = \App\Models\MemberCourse::query()
             $membersQuery = \App\Models\MemberCourse::query()
+                ->with(['member', 'course.level'])
                 ->whereIn('course_id', $slotCourseIds)
                 ->whereIn('course_id', $slotCourseIds)
                 ->whereDate('date_from', '<=', $calendar->from)
                 ->whereDate('date_from', '<=', $calendar->from)
                 ->whereDate('date_to', '>=', $calendar->from)
                 ->whereDate('date_to', '>=', $calendar->from)
-                ->with(['member', 'course.level']);
+                ->whereHas('member', function ($query) {
+                    $query->where(function ($q) {
+                        $q->where('is_archived', false)
+                            ->orWhereNull('is_archived');
+                    })->where(function ($q) {
+                        $q->where('is_deleted', false)
+                            ->orWhereNull('is_deleted');
+                    });
+                });
 
 
             if (!empty($this->search)) {
             if (!empty($this->search)) {
                 $s = trim(mb_strtolower($this->search));
                 $s = trim(mb_strtolower($this->search));