Skip to content
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

Terapkan nominal pemasangan Aplikasi dan terpengaruh pada filter #395

Merged
merged 3 commits into from
Aug 10, 2024
Merged

Terapkan nominal pemasangan Aplikasi dan terpengaruh pada filter #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
153c529
Terapkan nominal pemasangan Aplikasi dan terpengaruh pada filter
pandigresik Aug 8, 2024
9169246
Merge branch 'rilis-dev' into dev-309
vickyrolanda Aug 10, 2024
99722ff
[ci skip] memutahirkan catatan rilis
vickyrolanda Aug 10, 2024
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
32 changes: 31 additions & 1 deletion app/Http/Controllers/WebsiteDashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ public function summary(Request $request)
$opendk = Opendk::aktif($tanggalAkhir)->select(['nama_kecamatan'])->limit(7)->get();
$layanan = TrackMobile::aktif($tanggalAkhir)->with(['desa' => static fn ($q) => $q->select(['kode_desa', 'nama_desa'])])->distinct()->select(['kode_desa'])->limit(7)->get();
$kelolaDesa = TrackKeloladesa::aktif($tanggalAkhir)->with(['desa' => static fn ($q) => $q->select(['kode_desa', 'nama_desa'])])->distinct()->select(['kode_desa'])->limit(7)->get();


$openkabWilayah = Openkab::where('created_at', '<=', $tanggalAkhir);
$opensidWilayah = Desa::where('created_at', '<=', $tanggalAkhir);
$opendkWilayah = Opendk::where('created_at', '<=', $tanggalAkhir);
$layananWilayah = TrackMobile::where('created_at', '<=', $tanggalAkhir);
$kelolaDesaWilayah = TrackKeloladesa::where('created_at', '<=', $tanggalAkhir);
$versiTerakhirOpensid = collect();
if($versiOpensid){
$versiTerakhirOpensid = Desa::where(function($query) use ($versiOpensid){
return $query->where('versi_hosting', 'like', "{$versiOpensid}-premium%")
Expand All @@ -71,16 +77,33 @@ public function summary(Request $request)
$summary->where('kode_provinsi', $provinsi);
$summarySebelumnya->where('kode_provinsi', $provinsi);
$versiTerakhirOpensid->where('kode_provinsi', $provinsi);

$openkabWilayah->where('kode_prov', $provinsi);
$opensidWilayah->where('kode_provinsi', $provinsi);
$opendkWilayah->where('kode_provinsi', $provinsi);
$layananWilayah->provinsi($provinsi);
$kelolaDesaWilayah->provinsi($provinsi);
}
if ($kabupaten) {
$summary->where('kode_kabupaten', $kabupaten);
$summarySebelumnya->where('kode_kabupaten', $kabupaten);
$versiTerakhirOpensid->where('kode_kabupaten', $kabupaten);

$openkabWilayah->where('kode_kab', $kabupaten);
$opensidWilayah->where('kode_kabupaten', $kabupaten);
$opendkWilayah->where('kode_kabupaten', $kabupaten);
$layananWilayah->kabupaten($kabupaten);
$kelolaDesaWilayah->kabupaten($kabupaten);
}
if ($kecamatan) {
$summary->where('kode_kecamatan', $kecamatan);
$summarySebelumnya->where('kode_kecamatan', $kecamatan);
$versiTerakhirOpensid->where('kode_kecamatan', $kecamatan);

$opensidWilayah->where('kode_kecamatan', $kabupaten);
$opendkWilayah->where('kode_kecamatan', $kabupaten);
$layananWilayah->kecamatan($kecamatan);
$kelolaDesaWilayah->kecamatan($kecamatan);
}
$summareResult = $summary->first();
$summarySebelumnyaResult = $summarySebelumnya->first();
Expand All @@ -106,6 +129,13 @@ public function summary(Request $request)
],
'additional' => [
'opensid' => ['install_versi_terakhir' => $totalVersiTerakhirOpensid]
],
'summary' => [
'openkab' => $openkabWilayah->count(),
'opensid' => $opensidWilayah->count(),
'opendk' => $opendkWilayah->count(),
'layanandesa' => $layananWilayah->count(),
'keloladesa' => $kelolaDesaWilayah->count()
]
]
);
Expand Down
15 changes: 15 additions & 0 deletions app/Models/TrackKeloladesa.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,19 @@ public function scopeAktif($query, $batasTgl)

return $query->where('tgl_akses', '>=', $maksimalTanggal);
}

public function scopeProvinsi($query, $provinsi)
{
return $query->whereRaw('left(kode_desa, 2) = \''.$provinsi.'\'');
}

public function scopeKabupaten($query, $kabupaten)
{
return $query->whereRaw('left(kode_desa, 5) = \''.$kabupaten.'\'');
}

public function scopeKecamatan($query, $kecamatan)
{
return $query->whereRaw('left(kode_desa, 8) = \''.$kecamatan.'\'');
}
}
15 changes: 15 additions & 0 deletions app/Models/TrackMobile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,19 @@ public function scopeAktif($query, $batasTgl)

return $query->where('tgl_akses', '>=', $maksimalTanggal);
}

public function scopeProvinsi($query, $provinsi)
{
return $query->whereRaw('left(kode_desa, 2) = \''.$provinsi.'\'');
}

public function scopeKabupaten($query, $kabupaten)
{
return $query->whereRaw('left(kode_desa, 5) = \''.$kabupaten.'\'');
}

public function scopeKecamatan($query, $kecamatan)
{
return $query->whereRaw('left(kode_desa, 8) = \''.$kecamatan.'\'');
}
}
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 @@ -35,6 +35,7 @@ Di rilis v2408.0.0 berisi perbaikan yang diminta Komunitas Open Desa.
31. [#327](https://github.com/OpenSID/pantau/issues/327) Penambahan halaman khusus untuk KelolaDesa.
32. [#386](https://github.com/OpenSID/pantau/issues/386) Penambahan data no hp pada pengguna OpenSID yang diambil dari identitas desa.
33. [#389](https://github.com/OpenSID/pantau/issues/389) Penambahan fungsi collapse pada bagian pengguna OpenSID berdasarkan wilayah.
34. [#309](https://github.com/OpenSID/pantau/issues/309) Penambahan fungsi filter di halaman dasbor.

#### Perbaikan Bug

Expand Down
4 changes: 2 additions & 2 deletions public/vendor/weblte/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ button.navbar-toggler {
}

.apps-number {
padding: 10px;
padding: 10px 4px;
width: 25%;
text-align: center;
flex: 0 0 auto;
flex: 0 0 auto;
}

@media (max-width: 576px) {
Expand Down
4 changes: 4 additions & 0 deletions resources/views/website/dashboard.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ function updateData(){
success: function(data) {
const total = data.total
const detail = data.detail
const summary = data.summary
$('#box-provinsi>.total').text(total.provinsi.total)
$('#box-provinsi span.pertumbuhan').html(`<a href="#" class="${total.provinsi.pertumbuhan < 0 ? 'text-red' : 'text-green'}"><i
class="fa ${total.provinsi.pertumbuhan < 0 ? 'fa-arrow-down' : 'fa-arrow-up'}"></i>
Expand Down Expand Up @@ -126,6 +127,9 @@ class="fa ${total.desa.pertumbuhan < 0 ? 'fa-arrow-down' : 'fa-arrow-up'}"></i>
}
}

for(let i in summary){
$(`#app-${i}-count`).text(summary[i])
}

$.ajax({
url: 'api/web/chart-usage',
Expand Down
20 changes: 10 additions & 10 deletions resources/views/website/partial/peta.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<div class="apps-name">
OpenKab
</div>
<div class="apps-number bg-pink">
21
<div class="apps-number bg-pink" id="app-openkab-count">
0
</div>
</div>
<div class="d-flex align-items-center pb-2">
Expand All @@ -33,8 +33,8 @@
<div class="apps-name">
OpenDK
</div>
<div class="apps-number bg-green">
2981
<div class="apps-number bg-green" id="app-opendk-count">
0
</div>
</div>
<div class="d-flex align-items-center pb-2">
Expand All @@ -44,8 +44,8 @@
<div class="apps-name">
OpenSID
</div>
<div class="apps-number bg-orange">
31981
<div class="apps-number bg-orange" id="app-opensid-count">
0
</div>
</div>
<div class="d-flex align-items-center pb-2">
Expand All @@ -55,8 +55,8 @@
<div class="apps-name">
LayananDesa
</div>
<div class="apps-number bg-red">
4321
<div class="apps-number bg-red" id="app-layanandesa-count">
0
</div>
</div>
<div class="d-flex align-items-center pb-2">
Expand All @@ -66,8 +66,8 @@
<div class="apps-name">
KelolaDesa
</div>
<div class="apps-number bg-blue">
121
<div class="apps-number bg-blue" id="app-keloladesa-count">
0
</div>
</div>
</div>
Expand Down