Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ docs
specs/
.opencode/
.specify/
storage/sso
6 changes: 3 additions & 3 deletions app/Helpers/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use Intervention\Image\Laravel\Facades\Image;
use Intervention\Image\ImageManager;

define('SASARAN', serialize([
'1' => 'Penduduk',
Expand Down Expand Up @@ -39,7 +39,7 @@ function csp_nonce()
*/
function openkab_versi()
{
return 'v2608.0.1';
return 'v2608.0.2';
}
}

Expand Down Expand Up @@ -194,7 +194,7 @@ function default_favicon($favicon)
$pathFavicon = public_path('favicons/'.$favicon);
if (! file_exists($pathFavicon)) {
$filePath = public_path('assets/img/opensid_logo.png');
Image::read($filePath)->resize(96, 96)->save($pathFavicon, quality: 100);
ImageManager::gd()->read($filePath)->resize(96, 96)->save($pathFavicon, quality: 100);
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions app/Http/Controllers/Api/IdentitasController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use App\Http\Transformers\IdentitasTransformer;
use App\Models\Identitas;
use Illuminate\Support\Facades\Storage;
use Intervention\Image\Laravel\Facades\Image;
use Intervention\Image\ImageManager;
use Symfony\Component\HttpFoundation\Response;

class IdentitasController extends Controller
Expand Down Expand Up @@ -67,7 +67,7 @@ public function upload(UploadImageRequest $request, $id)
$filename = uniqid('img_');
$file = $request->file('file');

Image::read($file->path())->scale(width: 150, height: 150)->save($path.'/'.$filename.'.png'); //create logo
ImageManager::gd()->read($file->path())->scale(width: 150, height: 150)->save($path.'/'.$filename.'.png'); //create logo

Identitas::where('id', $id)->update([
'logo' => $filename.'.png',
Expand Down Expand Up @@ -120,13 +120,13 @@ private function generateFaviconsFromImagePath($filePath, $distPath)
// create an image manager instance with imagick driver
// Image::configure(['driver' => 'imagick']);

Image::read($filePath)->resize(192, 192)->save($distPath.'/android-chrome-192x192.png', quality: 100);
Image::read($filePath)->resize(512, 512)->save($distPath.'/android-chrome-512x512.png', quality: 100);
Image::read($filePath)->resize(180, 180)->save($distPath.'/apple-touch-icon.png', quality: 100);
Image::read($filePath)->resize(16, 16)->save($distPath.'/favicon-16x16.png', quality: 100);
Image::read($filePath)->resize(32, 32)->save($distPath.'/favicon-32x32.png', quality: 100);
Image::read($filePath)->resize(96, 96)->save($distPath.'/favicon-96x96.png', quality: 100);
Image::read($filePath)->resize(150, 150)->save($distPath.'/mstile-150x150.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(192, 192)->save($distPath.'/android-chrome-192x192.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(512, 512)->save($distPath.'/android-chrome-512x512.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(180, 180)->save($distPath.'/apple-touch-icon.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(16, 16)->save($distPath.'/favicon-16x16.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(32, 32)->save($distPath.'/favicon-32x32.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(96, 96)->save($distPath.'/favicon-96x96.png', quality: 100);
ImageManager::gd()->read($filePath)->resize(150, 150)->save($distPath.'/mstile-150x150.png', quality: 100);
copy($distPath.'/favicon-16x16.png', $distPath.'/favicon.ico');

$dataManifest = [
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/DataPokokController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function cetak_agama(Request $request)

public function kesehatan()
{
$title = 'Data Kependudukan dan Statistik';
$title = 'Data Kesehatan dan Statistik';

return view('data_pokok.kesehatan.index', ['title' => $title]);
}
Expand Down
4 changes: 4 additions & 0 deletions app/Http/Controllers/DesaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ public function index()
'kode_kecamatan' => null,
]);

$filters = collect($filters)->map(function ($value) {
return in_array($value, ['null', 'undefined'], true) ? null : $value;
})->all();

return view('desa.index', compact('filters'));
}

Expand Down
2 changes: 2 additions & 0 deletions app/Services/ApiProxyService.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ protected function callApi(string $method, string $endpoint, array $params = [],
} catch (\Exception $e) {
Log::error('API Proxy: Exception', [
'endpoint' => $endpoint,
'url' => $url,
'method' => $method,
'file' => __FILE__,
'error' => $e->getMessage(),
]);
Expand Down
9 changes: 6 additions & 3 deletions catatan_rilis.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
Di rilis ini, versi 2608.0.1 berisi penambahan dan perbaikan yang diminta pengguna.
Di rilis ini, versi 2608.0.2 berisi penambahan dan perbaikan yang diminta pengguna.

#### Penambahan Fitur

#### Perbaikan BUG

1. [#1105](https://github.com/OpenSID/OpenKab/issues/1105) Perbaikan filter kecamatan tampil tanpa memilih kabupaten terlebih dahulu.
2. [#1108](https://github.com/OpenSID/OpenKab/issues/1108) Perbaiki filter tahun dan desa masih ada yang kurang di data sandang.

2. [#1108](https://github.com/OpenSID/OpenKab/issues/1108) Perbaikan filter tahun dan desa masih ada yang kurang di data sandang.
3. [#1111](https://github.com/OpenSID/OpenKab/issues/1111) Perbaikan style pada halaman slide tertutupi card icon penduduk.
4. [#1262](https://github.com/OpenSID/OpenKab/issues/1262) Perbaikan grafik tidak tampil pada Profile Kependudukan - Kesehatan.
5. [#1260](https://github.com/OpenSID/OpenKab/issues/1260) Perbaikan Error 500 gagal ambil data statistik partisipasi sekolah dan ijazah tertinggi.
6. [#1265](https://github.com/OpenSID/OpenKab/issues/1265) perbaikan data desa tidak tampil di OpenKab.

#### Perubahan Teknis

Expand Down
99 changes: 13 additions & 86 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/web/css/openkab.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ button.btn-dark {
position: relative;
z-index: 2;
margin: 0 auto;
margin-top: -143px;
/*margin-top: -143px;*/
margin-bottom: 20px;
}

Expand Down
23 changes: 21 additions & 2 deletions resources/views/components/wilayah_filter_js.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
};
const identitasOpenkab = $(`meta[name="${AJAX_PARAMS_CONFIG.metaTagName}"]`).attr('content') || '';
let isAutoLoad = false;
let urlFilterRestoring = false;
const queryKodeKabupaten = new URLSearchParams(window.location.search).get('filter[kode_kabupaten]');
const queryKodeKecamatan = new URLSearchParams(window.location.search).get('filter[kode_kecamatan]');
const queryKodeDesa = new URLSearchParams(window.location.search).get('filter[kode_desa]');

let urlKabupaten =
"{{ config('app.databaseGabunganUrl') . '/api/v1/statistik-web/get-list-kabupaten' }}?" +
Expand All @@ -20,7 +24,6 @@
var optionEmpty = new Option("", "");
$("#filter_kabupaten").append(optionEmpty);

const queryKodeKabupaten = new URLSearchParams(window.location.search).get('filter[kode_kabupaten]');
const filterValue = queryKodeKabupaten || identitasOpenkab;

for (var i = 0; i < data.length; i++) {
Expand All @@ -30,6 +33,7 @@

if (data[i].kode_kabupaten === filterValue) {
isAutoLoad = true;
urlFilterRestoring = true;
$("#filter_kabupaten").val(filterValue).trigger('change');
}
}
Expand Down Expand Up @@ -75,8 +79,18 @@
$("#filter_kecamatan").append(newOption);
}
$('#filter_kecamatan').prop('disabled', false);
if (urlFilterRestoring && queryKodeKecamatan) {
$('#filter_kecamatan').val(queryKodeKecamatan);
if ($('#filter_kecamatan').val() === queryKodeKecamatan) {
$('#filter_kecamatan').trigger('change');
} else {
urlFilterRestoring = false;
}
} else {
urlFilterRestoring = false;
}
if (isAutoLoad) {
$('#bt_filter').trigger('click');
$('#bt_filter, #filter').trigger('click');
isAutoLoad = false;
}
})
Expand Down Expand Up @@ -104,6 +118,11 @@
$("#filter_desa").append(newOption);
}
$('#filter_desa').prop('disabled', false);
if (urlFilterRestoring && queryKodeDesa) {
$('#filter_desa').val(queryKodeDesa);
$('#filter_desa').trigger('change');
}
urlFilterRestoring = false;
})
}
})
Expand Down
Loading
Loading