Skip to content

Perbaikan tampilan logo identitas dan perbaikan opsi undefined pada dropdown kabupaten #1287

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

Open
habibie11 wants to merge 1 commit into
base: rilis-dev
Choose a base branch
from
Open

Perbaikan tampilan logo identitas dan perbaikan opsi undefined pada dropdown kabupaten #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions app/Http/Controllers/IdentitasController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,18 @@ public function edit()
public function logo()
{
$path = Identitas::first();
if (is_null($path) || is_null($path->logo)) {
$path->logo = 'opensid_logo.png';
if ($path && $path->logo) {
$storagePath = storage_path('app/public/img/'.$path->logo);
if (file_exists($storagePath)) {
return ambilBerkas($storagePath);
}

$publicPath = public_path('storage/img/'.$path->logo);
if (file_exists($publicPath)) {
return ambilBerkas($publicPath);
}
}
ambilBerkas(public_path('storage/img/').$path->logo);

return ambilBerkas(public_path('assets/img/opensid_logo.png'));
}
}
83 changes: 58 additions & 25 deletions resources/views/identitas/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<div class="widget-user-header text-center p-4">
<img :src="dataIdentitas.logo ? '{{ asset('storage/img') }}/' + dataIdentitas.logo :
'{{ asset('assets/img/opensid_logo.png') }}'"
x-on:error="$event.target.src = '{{ asset('assets/img/opensid_logo.png') }}'"
alt="Logo" width="150px">
<h5 class="mt-3" x-text="'Logo ' + dataIdentitas.nama_aplikasi">Logo {{ config('app.namaAplikasi') }}
</h5>
Expand Down Expand Up @@ -153,16 +154,18 @@ function identitas() {
};
},
processResults: function(data) {
let results = data.results;
let results = data.results || [];
return {
results: results.map(value => {
return {
'id': value.kode_prov,
'text': value.nama_prov,
'kode_prov': value.kode_prov,
'nama_prov': value.nama_prov
}
}),
results: results
.filter(value => value.kode_prov && value.nama_prov)
.map(value => {
return {
'id': value.kode_prov,
'text': value.nama_prov,
'kode_prov': value.kode_prov,
'nama_prov': value.nama_prov
}
}),
pagination: data.pagination,
}
},
Expand All @@ -177,13 +180,30 @@ function identitas() {
},
});

if (this.dataIdentitas.kode_provinsi && this.dataIdentitas.nama_provinsi) {
let optionProv = new Option(this.dataIdentitas.nama_provinsi, this.dataIdentitas.kode_provinsi, true, true);
$(this.$refs.selectProv).append(optionProv).trigger('change');
}

this.select2Prov.on("select2:select", (event) => {
this.dataIdentitas.kode_provinsi = event.params.data.kode_prov;
this.dataIdentitas.nama_provinsi = event.params.data.nama_prov;
this.dataIdentitas.kode_kabupaten = null;
this.dataIdentitas.nama_kabupaten = null;
$(this.$refs.select).val(null).trigger('change');
});

this.select2Prov.on("select2:clear", () => {
this.dataIdentitas.kode_provinsi = null;
this.dataIdentitas.nama_provinsi = null;
this.dataIdentitas.kode_kabupaten = null;
this.dataIdentitas.nama_kabupaten = null;
$(this.$refs.select).val(null).trigger('change');
});
},

selectKab() {
const _this = this;
this.select2 = $(this.$refs.select).select2({
ajax: {
url: function() {
Expand All @@ -195,23 +215,25 @@ function identitas() {
data: function(params) {
return {
cari: params.term || '',
kode: $('select[name=prov]').val(),
kode: $('select[name=prov]').val() || _this.dataIdentitas.kode_provinsi,
page: params.page || 1,
};
},
processResults: function(data) {
let results = data.results;
let results = data.results || [];
return {
results: results.map(value => {
return {
'id': value.kode_kab,
'text': value.nama_prov + ' - ' + value.nama_kab,
'kode_kab': value.kode_kab,
'kode_prov': value.kode_prov,
'nama_kab': value.nama_kab,
'nama_prov': value.nama_prov
}
}),
results: results
.filter(value => value.kode_kab && value.nama_kab)
.map(value => {
return {
'id': value.kode_kab,
'text': (value.nama_prov ? value.nama_prov + ' - ' : '') + value.nama_kab,
'kode_kab': value.kode_kab,
'kode_prov': value.kode_prov,
'nama_kab': value.nama_kab,
'nama_prov': value.nama_prov
}
}),
pagination: data.pagination,
}
},
Expand All @@ -226,12 +248,23 @@ function identitas() {
},
});

if (this.dataIdentitas.kode_kabupaten && this.dataIdentitas.nama_kabupaten) {
let kabText = (this.dataIdentitas.nama_provinsi ? this.dataIdentitas.nama_provinsi + ' - ' : '') + this.dataIdentitas.nama_kabupaten;
let optionKab = new Option(kabText, this.dataIdentitas.kode_kabupaten, true, true);
$(this.$refs.select).append(optionKab).trigger('change');
}

this.select2.on("select2:select", (event) => {
this.dataIdentitas.kode_kabupaten = event.params.data.kode_kab;
this.dataIdentitas.kode_provinsi = event.params.data.kode_prov;
this.dataIdentitas.nama_kabupaten = event.params.data.nama_kab;
this.dataIdentitas.nama_provinsi = event.params.data.nama_prov;
});

this.select2.on("select2:clear", () => {
this.dataIdentitas.kode_kabupaten = null;
this.dataIdentitas.nama_kabupaten = null;
});
},

uploadGambar() {
Expand Down Expand Up @@ -267,15 +300,15 @@ function identitas() {
contentType: false, // tell jQuery not to set contentType
success: function(response) {
if (response.success == true) {
this.data.logo = response.data
Swal.fire({
title: 'Simpan!',
text: 'Data berhasil tersimpan',
icon: 'success',
showConfirmButton: false,
showConfirmButton: true,
timer: 1500,
})
location.reload();
}).then(function() {
window.location.reload();
});

} else {
Swal.fire({
Expand Down
23 changes: 23 additions & 0 deletions tests/Feature/IdentitasControllerApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,27 @@ public function test_post_upload_favicon()
$this->assertTrue(File::exists('public/favicons/favicon-96x96.png'));
$this->assertDatabaseHas('identitas', $dataLogo);
}

public function test_get_logo()
{
ob_start();
$response = $this->get('/pengaturan/logo');
ob_end_clean();

$response->assertStatus(Response::HTTP_OK);
}

public function test_get_logo_fallback_when_null()
{
$identitas = \App\Models\Identitas::first();
if ($identitas) {
$identitas->update(['logo' => null]);
}

ob_start();
$response = $this->get('/pengaturan/logo');
ob_end_clean();

$response->assertStatus(Response::HTTP_OK);
}
}
Loading