Update

2025-09-04 04:10:52 +07:00
parent caf54a9dd7
commit f0b5e64d16
3 changed files with 74 additions and 27 deletions
@@ -175,7 +175,19 @@ class Controller extends BaseController
    protected function getDefaultData($jenis, $master, $mulai, $akhir, $valcari) {
        $query = Periksa::whereNotNull('nofoto');
        if ($jenis == 'ThisDay') {
-            return $query->whereDate('daftar', Carbon::today());
+            $url        = url()->current();
+            $baseurl    = url('/');
+            $ceklaman   = str_replace($baseurl.'/', '', $url);
+            if ($ceklaman == 'pendaftaran'){
+                return $query->whereDate('daftar', Carbon::today());
+            } else {
+                return $query->where(function($q) {
+                        $q->where('status', 'Selesai')
+                        ->orWhereNull('status')
+                        ->orWhere('status', 'not like', 'Dibatalkan%');
+                    });
+            }
+           
        } else if ($jenis == 'mundur2') {
            return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2));
        } else if ($jenis == 'mundur3') {