From 1253e2c26e668fcde6f66a2fc3cf1b9999c2eae6 Mon Sep 17 00:00:00 2001 From: Vckynando12 Date: Mon, 24 Feb 2025 02:03:19 +0700 Subject: [PATCH] repair report sadata anda make it sampel with button detail selengkapnya --- .gitignore | 1 - public/storage/.gitignore | 2 + resources/views/reports.blade.php | 156 +++++++++++++++++++----------- 3 files changed, 102 insertions(+), 57 deletions(-) create mode 100644 public/storage/.gitignore diff --git a/.gitignore b/.gitignore index 508a04d..e313b19 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /node_modules /public/build /public/hot -/public/storage /vendor .env .env.backup diff --git a/public/storage/.gitignore b/public/storage/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/public/storage/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/resources/views/reports.blade.php b/resources/views/reports.blade.php index 6d16c7d..5cdf9e9 100644 --- a/resources/views/reports.blade.php +++ b/resources/views/reports.blade.php @@ -5,45 +5,91 @@ Report Data +

Laporan Keamanan dan Monitoring

- @if(count($reports) > 0) + @php + use Illuminate\Pagination\LengthAwarePaginator; + + // Konversi array ke koleksi + $reportsCollection = collect($reports); + + // Pagination manual + $currentPage = request()->get('page', 1); + $perPage = 10; // Jumlah item per halaman + $paginatedReports = new LengthAwarePaginator( + $reportsCollection->forPage($currentPage, $perPage), + $reportsCollection->count(), + $perPage, + $currentPage, + ['path' => request()->url()] + ); + @endphp + + @if($paginatedReports->count() > 0) - - - - - - - - + + + - @foreach($reports as $key => $report) + @foreach($paginatedReports as $key => $report) - - - - - - - - - - + + + + + @endforeach
# TanggalWaktuGerakanStatus KeamananAkses TerakhirStatus ServoStatus PerangkatKelembabanSuhuPerangkatStatusInfo Selengkapnya
{{ $key + 1 }}{{ $report['tanggal'] }} {{ $report['waktu'] }} {{ ucfirst($report['security']['motion']) }}{{ ucfirst($report['security']['status']) }}{{ $report['smartcab']['last_access'] }}{{ ucfirst($report['smartcab']['servo_status']) }}{{ ucfirst($report['smartcab']['status_device']) }}{{ $report['dht11']['humidity'] }}%{{ $report['dht11']['temperature'] }}°C{{ $paginatedReports->firstItem() + $key }}{{ \Carbon\Carbon::parse($report['timestamp'])->format('d-m-Y H:i:s') }} + @if($loop->first) + Gerakan + @elseif($report['security']['motion'] !== $reports[$key - 1]['security']['motion']) + Gerakan + @elseif($report['security']['status'] !== $reports[$key - 1]['security']['status']) + Status Keamanan + @elseif($report['smartcab']['last_access'] !== $reports[$key - 1]['smartcab']['last_access']) + Akses Terakhir + @elseif($report['smartcab']['servo_status'] !== $reports[$key - 1]['smartcab']['servo_status']) + Status Servo + @else + - + @endif + + @if($loop->first) + {{ ucfirst($report['security']['motion']) }} + @elseif($report['security']['motion'] !== $reports[$key - 1]['security']['motion']) + {{ ucfirst($report['security']['motion']) }} + @elseif($report['security']['status'] !== $reports[$key - 1]['security']['status']) + {{ ucfirst($report['security']['status']) }} + @elseif($report['smartcab']['last_access'] !== $reports[$key - 1]['smartcab']['last_access']) + {{ ucfirst($report['smartcab']['last_access']) }} + @elseif($report['smartcab']['servo_status'] !== $reports[$key - 1]['smartcab']['servo_status']) + {{ ucfirst($report['smartcab']['servo_status']) }} + @else + Tidak ada perubahan + @endif + + +
+ + +
+ {{ $paginatedReports->links('pagination::bootstrap-4') }} +
@else
Tidak ada data laporan. @@ -51,42 +97,40 @@ @endif
+ + + + + - - - \ No newline at end of file