Skip to content

Tambahkan tema Lestari pada laporan Pengguna Tema bawaan #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 18, 2025
Merged

Tambahkan tema Lestari pada laporan Pengguna Tema bawaan #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a561386
Tambahkan tema Lestari pada laporan Pengguna Tema bawaan
pandigresik Sep 11, 2025
90d66db
ganti dengan looping
pandigresik Sep 11, 2025
2c7b540
update icon
pandigresik Sep 11, 2025
daf1225
Merge branch 'rilis-dev' into dev-540
vickyrolanda Sep 18, 2025
2416991
[ci skip] memutahirkan catatan rilis
vickyrolanda Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions app/Http/Controllers/LaporanTemaController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class LaporanTemaController extends Controller
{
private $temaBawaan = ['esensi', 'natra', 'palanta', 'lestari'];
public function index(Request $request)
{
$fillters = [
Expand All @@ -27,7 +28,7 @@ public function index(Request $request)
if ($tema) {
$data = DataTables::of(Desa::fillter($fillters)->where('tema', $tema));
} else {
$data = DataTables::of(Desa::fillter($fillters)->whereIn('tema', ['esensi', 'natra', 'palanta']));
$data = DataTables::of(Desa::fillter($fillters)->whereIn('tema', $this->temaBawaan));
}

return $data->addIndexColumn()
Expand All @@ -38,12 +39,24 @@ public function index(Request $request)
->rawColumns(['url_hosting']) // Mengizinkan HTML di kolom url_hosting
->make(true);
}

$palanta = Desa::TemaPalanta();
$natra = Desa::TemaNatra();
$esensi = Desa::TemaEsensi();
$listTemaCard = [];
// Hitung jumlah pengguna untuk setiap tema
foreach( $this->temaBawaan as $tema) {
$countVarName = strtolower($tema);
$listTemaCard[$countVarName] = [
'name' => ucfirst($tema),
'count' => Desa::whereTema(ucfirst($tema))->count(),
'color' => match(strtolower($tema)) {
'esensi' => 'bg-success',
'natra' => 'bg-warning',
'palanta' => 'bg-info',
'lestari' => 'bg-primary',
default => 'bg-secondary',
},
];
}
$tema = Desa::Tema();

return view('laporan.tema', compact('fillters', 'palanta', 'natra', 'esensi', 'tema'));
return view('laporan.tema', compact('fillters', 'listTemaCard', 'tema'));
}
}
1 change: 1 addition & 0 deletions catatan_rilis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Di rilis v2509.0.0 berisi perbaikan yang diminta Komunitas Open Desa.
4. [#538](https://github.com/OpenSID/pantau/issues/538) Penambahan role group "Wilayah".
5. [#539](https://github.com/OpenSID/pantau/issues/539) Penambahan halaman laporan khusus Kecamatan OpenSID.
6. [#537](https://github.com/OpenSID/pantau/issues/537) Penambahan halaman khusus kabupaten untuk melihat kondisi aplikasi terpasang dan update.
7. [#540](https://github.com/OpenSID/pantau/issues/540) Penambahan tema Lestari pada laporan Pengguna Tema bawaan.

#### Perbaikan Bug

Expand Down
67 changes: 19 additions & 48 deletions resources/views/laporan/tema.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,60 +9,35 @@
</small></h1>
@stop

@section('content')
@section('content')
@include('layouts.components.notification')
<div class="row">
@if(empty(request()->query('tema')))
<div class="col-lg-12">
<div class="card card-outline card-primary">
<div class="card-body">
<div class="row">
<div class="col-lg-4">
<!-- small card -->
<div class="small-box bg-info">
<div class="inner">
<h3>{{$natra}}</h3>
<p>Tema Natra</p>
@foreach ($listTemaCard as $temaCard)
<div class="col-lg-{{ ceil(12/count($listTemaCard)) }}">
<!-- small card -->
<div class="small-box {{ $temaCard['color'] }}">
<div class="inner">
<h3>{{ $temaCard['count'] }}</h3>
<p>Tema {{ $temaCard['name'] }}</p>
</div>
<div class="icon">
<i class="fas fa-palette"></i>
</div>
<a href="{{ url('laporan/tema') }}?tema={{ $temaCard['name'] }}&total={{ $temaCard['count'] }}" class="small-box-footer">Lihat detail <i class="fas fa-arrow-circle-right"></i></a>
</div>
<div class="icon">
<i class="fas fa-shopping-cart"></i>
</div>
<a href="{{ url('laporan/tema') }}?tema=Natra" class="small-box-footer">Lihat detail <i class="fas fa-arrow-circle-right"></i></a>
</div>
</div>
<!-- ./col -->
<div class="col-lg-4">
<!-- small card -->
<div class="small-box bg-success">
<div class="inner">
<h3>{{$esensi}}</h3>
<p>Tema Esensi</p>
</div>
<div class="icon">
<i class="ion ion-stats-bars"></i>
</div>
<a href="{{ url('laporan/tema') }}?tema=Esensi" class="small-box-footer">Lihat detail <i class="fas fa-arrow-circle-right"></i></a>
</div>
</div>
<!-- ./col -->
<div class="col-lg-4">
<!-- small card -->
<div class="small-box bg-warning">
<div class="inner">
<h3>{{$palanta}}</h3>
<p>Tema Palanta</p>
</div>
<div class="icon">
<i class="fas fa-user-plus"></i>
</div>
<a href="{{ url('laporan/tema') }}?tema=Palanta" class="small-box-footer">Lihat detail <i class="fas fa-arrow-circle-right"></i></a>
</div>
@endforeach
</div>
</div>
</div>
</div>
</div>

@endif
<div class="col-lg-12">
<div class="card">
Expand All @@ -71,12 +46,8 @@
<div class="card-tools">
<span data-toggle="tooltip" title=""
class="badge badge-primary">
@if(request()->query('tema') == 'Esensi')
{{$esensi}}
@elseif(request()->query('tema') == 'Natra')
{{$natra}}
@elseif(request()->query('tema') == 'Palanta')
{{$palanta}}
@if(request()->query('total'))
{{request()->query('total')}}
@else
{{$tema}}
@endif
Expand All @@ -93,7 +64,7 @@ class="badge badge-primary">
<table class="table" id="table-desa">
<thead>
<tr>
<th>No</th>
<th>No</th>
<th>Tanggal Terpantau</th>
<th>Desa</th>
<th>Kecamatan</th>
Expand Down Expand Up @@ -195,7 +166,7 @@ class="badge badge-primary">
},
{
data: 'url_hosting'
},
},
{
data: 'tema'
}, ],
Expand Down