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
3 changes: 2 additions & 1 deletion app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ public static function formatTelepon($telepon)
$wa = str_replace('+62 08', '628', $telepon);
$wa = str_replace('+62 ', '62', $wa);
$wa = str_replace('-', '', $wa);

return "https://wa.me/{$wa}";
}

Expand Down Expand Up @@ -293,7 +294,7 @@ public static function formatUang($angka)

public static function asterikNik($nik)
{
return substr($nik, 0, 4) . str_repeat('*', 10) . substr($nik, 14);
return substr($nik, 0, 4).str_repeat('*', 10).substr($nik, 14);
}

/**
Expand Down
1 change: 0 additions & 1 deletion app/Models/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ protected static function booted(): void
->type('error')
);
}

}
if ($honor->volume_realisasi != $honor->volume_target) {
$honor->status_realisasi = $honor->volume_realisasi < $honor->volume_target
Expand Down
4 changes: 0 additions & 4 deletions app/Models/IzinKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@

namespace App\Models;

use App\Helpers\Helper;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Facades\Auth;
use Laravel\Nova\Notifications\NovaNotification;
use Laravel\Nova\Nova;
use Laravel\Nova\URL;

class IzinKeluar extends Model
{
Expand Down
1 change: 0 additions & 1 deletion app/Models/PerjalananDinas.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public function kepala(): BelongsTo
return $this->belongsTo(User::class, 'kepala_user_id');
}


public function daftarPesertaPerjalanan(): HasMany
{
return $this->hasMany(DaftarPesertaPerjalanan::class, 'perjalanan_dinas_id');
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ public function fieldsforIndex(NovaRequest $request)
return [
Text::make('Nama Barang', 'barang'),
Text::make('Kode Barang Detail', 'masterPersediaan.kode')
->hideFromIndex(!Policy::make()
->hideFromIndex(! Policy::make()
->allowedFor('bmn')
->get())
->copyable(),
Text::make('Kode Barang Sakti', 'masterPersediaan.kode')
->displayUsing(fn ($value) => substr($value, 0, 10))
->hideFromIndex(!Policy::make()
->hideFromIndex(! Policy::make()
->allowedFor('ppk,bmn')
->get())
->copyable(),
Expand Down
6 changes: 3 additions & 3 deletions app/Nova/BastMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ public function fields(NovaRequest $request)
return Helper::terbilangTanggal($tanggal);
})
->sortable()
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->filterable()
->rules('required', 'before_or_equal:today', 'after_or_equal:'.$akhir),
Select::make('Klasifikasi Arsip', 'kode_arsip_id')
->searchable()
->hideFromIndex()
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(KodeArsip::cache()->get('all')->where('id', $kode)->first(), 'kode'))
->dependsOn(['tanggal_bast'], function (Select $field, NovaRequest $request, FormData $formData) {
$default_naskah = NaskahDefault::cache()
Expand All @@ -106,7 +106,7 @@ public function fields(NovaRequest $request)
Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
->rules('required')
->searchable()
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->onlyOnForms()
->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Filters/GenerateNaskah.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Nova\Filters;

use App\Models\KodeArsip;
use Laravel\Nova\Filters\Filter;
use Laravel\Nova\Http\Requests\NovaRequest;

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Filters/RoFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ public function apply(NovaRequest $request, $query, $value)
*/
public function options(NovaRequest $request)
{
return array_flip(Helper::setOptionsRo(Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(),'id')));
return array_flip(Helper::setOptionsRo(Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id')));
}
}
4 changes: 2 additions & 2 deletions app/Nova/IzinKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function fields(NovaRequest $request)
Time::make('Jam Kembali', 'kembali')
->sortable()
->hideWhenCreating()
->updateRules('nullable', 'bail','after_or_equal:keluar'),
->updateRules('nullable', 'bail', 'after_or_equal:keluar'),
AdvancedImage::make('Bukti Dukung', 'bukti')
->disk('izin_keluar')
->croppable()
Expand All @@ -104,7 +104,7 @@ public function fields(NovaRequest $request)
->hideFromIndex()
->hideWhenCreating()
->sortable(),
Text::make('Bukti Dukung', fn() => $this->bukti ? 'Ada' : 'Tidak Ada')
Text::make('Bukti Dukung', fn () => $this->bukti ? 'Ada' : 'Tidak Ada')
->onlyOnIndex(),
]),

Expand Down
10 changes: 5 additions & 5 deletions app/Nova/KontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ public function fields(NovaRequest $request)
->rules('required', 'before_or_equal:today')->displayUsing(function ($tanggal) {
return Helper::terbilangTanggal($tanggal);
})
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->filterable()
->sortable(),
Select::make('Klasifikasi Arsip', 'kode_arsip_id')
->searchable()
->hideFromIndex()
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(KodeArsip::cache()->get('all')->where('id', $kode)->first(), 'kode'))
->dependsOn(['tanggal_spk'], function (Select $field, NovaRequest $request, FormData $formData) {
$default_naskah = NaskahDefault::cache()
Expand All @@ -118,21 +118,21 @@ public function fields(NovaRequest $request)
->rules('required', 'after_or_equal:tanggal_spk')->displayUsing(function ($tanggal) {
return Helper::terbilangTanggal($tanggal);
})
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->hideFromIndex(),
Date::make('Tanggal Selesai Kontrak', 'akhir_kontrak')
->rules('required', 'after_or_equal:awal')->displayUsing(function ($tanggal) {
return Helper::terbilangTanggal($tanggal);
})
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->hideFromIndex(),
BelongsTo::make('Pejabat Pembuat Komitmen', 'ppk', 'App\Nova\User')
->exceptOnForms()
->sortable(),
Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
->rules('required')
->searchable()
->readonly(!Policy::make()->allowedFor('ppk')->get())
->readonly(! Policy::make()->allowedFor('ppk')->get())
->onlyOnForms()
->displayUsing(fn ($id) => Helper::getPropertyFromCollection(Helper::getPegawaiByUserId($id), 'name'))
->dependsOn('tanggal_spk', function (Select $field, NovaRequest $request, FormData $formData) {
Expand Down
3 changes: 2 additions & 1 deletion app/Nova/Lenses/RealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class RealisasiAnggaran extends Lens
public function name()
{
$tanggal = Helper::terbilangTanggal(Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'tanggal_realisasi'));

return $tanggal ? 'Realisasi SP2D per '.Helper::terbilangTanggal(Dipa::cache()->get('all')->where('tahun', session('year'))->first()->tanggal_realisasi) : 'Realisasi SP2D';
}

Expand All @@ -43,7 +44,7 @@ public function name()
*/
public static function query(LensRequest $request, $query)
{
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(),'id');
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'realisasi-anggarans_filter', 'App\\Nova\\Filters\\BulanFilter', date('m'));

return $request->withOrdering($request->withFilters(
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RekapBarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static function query(LensRequest $request, $query)
'barang_persediaans.master_persediaan_id')
->whereNotNull('tanggal_transaksi');
})
->groupBy('master_persediaans.id','master_persediaans.kode', 'master_persediaans.satuan', 'master_persediaans.barang')
->groupBy('master_persediaans.id', 'master_persediaans.kode', 'master_persediaans.satuan', 'master_persediaans.barang')
->joinSub($displayed, 'displayed', function (JoinClause $join) {
$join->on('displayed.master_persediaan_id', '=', 'master_persediaans.id');
}), 'master_persediaans')
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RekapHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static function query(LensRequest $request, $query)
->join('daftar_honor_mitras', 'mitras.id', '=', 'daftar_honor_mitras.mitra_id')
->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
->join('jenis_kontraks', 'jenis_kontraks.id', '=', 'honor_kegiatans.jenis_kontrak_id')
->groupBy('bulan', 'mitra_id', 'nama', 'nik', 'sbml', 'jenis_kontrak_id','honor_kegiatan_id', 'volume_realisasi', 'harga_satuan')
->groupBy('bulan', 'mitra_id', 'nama', 'nik', 'sbml', 'jenis_kontrak_id', 'honor_kegiatan_id', 'volume_realisasi', 'harga_satuan')
->orderBy('jenis_kontrak_id', 'asc')
->orderBy('bulan', 'desc')
->orderBy('nilai_kontrak', 'desc'));
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RencanaPenarikanDana.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function name()
*/
public static function query(LensRequest $request, $query)
{
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(),'id');
$dipa_id = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'realisasi-anggarans_filter', 'App\\Nova\\Filters\\BulanFilter', date('m'));
$filtered_bulan = $filtered_bulan ?: date('m');

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/MataAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function subtitle()
return $this->mak;
}

/**
/**
* Get the searchable columns for the resource.
*
* @return array
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/RealisasiPerJenisBelanja.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct()
]);

$this->title('Target Serapan Anggaran Per Jenis Belanja Periode ini');
$dipaId = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(),'id');
$dipaId = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$bulan = date('m');

$datas = DB::table('mata_anggarans')
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/RencanaPenarikanPerJenisBelanja.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct()
]);

$this->title('Monitoring Rencana Penarikan Dana');
$dipaId = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(),'id');
$dipaId = Helper::getPropertyFromCollection(Dipa::cache()->get('all')->where('tahun', session('year'))->first(), 'id');
$bulan = date('m');

$datas = DB::table('mata_anggarans')
Expand Down
1 change: 0 additions & 1 deletion app/Nova/PembelianPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ public function actions(NovaRequest $request)
);
}
});

}
if (Policy::make()->allowedFor('bmn')->get()) {
$actions[] =
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/PermintaanPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public function actions(NovaRequest $request)
public static function indexQuery(NovaRequest $request, $query)
{
$query->whereYear('tanggal_permintaan', session('year'));
if (!Policy::make()->allowedFor('bmn')->get()) {
if (! Policy::make()->allowedFor('bmn')->get()) {
$query->where('user_id', $request->user()->id);
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function fields(NovaRequest $request)
->rules('required', 'regex:/^[0-9A-Za-z.\-_]+$/u', 'max:254')
->creationRules('unique:users,email')
->updateRules('unique:users,email,{{resourceId}}')
->readonly(!Policy::make()->allowedFor('admin')->get()),
->readonly(! Policy::make()->allowedFor('admin')->get()),
Password::make('Password')
->onlyOnForms()
->creationRules('required', Rules\Password::defaults(), 'confirmed')
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/BastMitraPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BastMitraPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down
4 changes: 2 additions & 2 deletions app/Policies/DaftarSp2dPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class DaftarSp2dPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand All @@ -21,7 +21,7 @@ public function viewAny(): bool
*/
public function view(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down
4 changes: 2 additions & 2 deletions app/Policies/HonorKegiatanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class HonorKegiatanPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand All @@ -32,7 +32,7 @@ public function view(User $user, HonorKegiatan $honor): bool
->get();
}

return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->withYear($honor->tahun)
->get();
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/KontrakMitraPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class KontrakMitraPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/NaskahKeluarPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NaskahKeluarPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/NaskahMasukPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NaskahMasukPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/RewardPegawaiPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class RewardPegawaiPolicy
*/
public function viewAny(): bool
{
return !Policy::make()
return ! Policy::make()
->allowedFor('admin')
->get();
}
Expand Down