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: 0 additions & 1 deletion app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ public static function kuitansi($id)
];
}


/**
* Format nilai SPJ.
*
Expand Down
10 changes: 6 additions & 4 deletions app/Models/DaftarPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class DaftarPemeliharaan extends Model
protected $casts = [
'tanggal' => 'date',
];

public function masterBarangPemeliharaan(): BelongsTo
{
return $this->belongsTo(MasterBarangPemeliharaan::class);
Expand All @@ -28,10 +29,11 @@ protected static function booted(): void
]);
});
static::deleted(function (DaftarPemeliharaan $daftar) {
if ($daftar->count() === 0)
$daftar->pemeliharaan->update([
'status' => 'outdated',
]);
if ($daftar->count() === 0) {
$daftar->pemeliharaan->update([
'status' => 'outdated',
]);
}
});
}
}
1 change: 0 additions & 1 deletion app/Models/Dipa.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Models;

use App\Nova\Metrics\SerapanAnggaran;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Mostafaznv\LaraCache\CacheEntity;
Expand Down
3 changes: 0 additions & 3 deletions app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
namespace App\Models;

use App\Helpers\Helper;
use App\Models\PembelianPersediaan;
use App\Models\Pemeliharaan;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
Expand Down Expand Up @@ -86,7 +84,6 @@ protected static function booted(): void
$pemeliharaan->rincian = $kak->rincian;
$pemeliharaan->save();


$perjalanan = PerjalananDinas::where('kerangka_acuan_id', $kak->id)->first();
$perjalanan->tanggal_berangkat = $kak->awal;
$perjalanan->tanggal_kembali = $kak->akhir;
Expand Down
5 changes: 2 additions & 3 deletions app/Models/MasterBarangPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,15 @@ public function user(): BelongsTo
return $this->belongsTo(User::class);
}

public function daftarPemeliharaan():HasMany
public function daftarPemeliharaan(): HasMany
{
return $this->hasMany(DaftarPemeliharaan::class);
}


protected static function booted(): void
{
static::deleting(function (MasterBarangPemeliharaan $barang) {
$barang->daftarPemeliharaan->each->delete();
$barang->daftarPemeliharaan->each->delete();
});
}
}
3 changes: 1 addition & 2 deletions app/Models/Pemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ protected static function booted(): void
{
static::creating(function (Pemeliharaan $pemeliharaan) {
$pemeliharaan->status = 'dibuat';

});
static::created(function (Pemeliharaan $pemeliharaan) {
User::find(Auth::user()->id)->notify(
Expand All @@ -44,7 +43,7 @@ protected static function booted(): void
);
});
static::deleting(function (Pemeliharaan $pemeliharaan) {
$pemeliharaan->daftarPemeliharaan->each->delete();
$pemeliharaan->daftarPemeliharaan->each->delete();
});
}
}
2 changes: 1 addition & 1 deletion app/Models/PersediaanKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function daftarBarangPersediaans(): MorphMany
return $this->morphMany(BarangPersediaan::class, 'barang_persediaanable');
}

public function naskahKeluar():BelongsTo
public function naskahKeluar(): BelongsTo
{
return $this->belongsTo(NaskahKeluar::class);
}
Expand Down
36 changes: 16 additions & 20 deletions app/Nova/Actions/ImportMasterBarangPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

namespace App\Nova\Actions;

use App\Helpers\Helper;
use App\Models\MasterBarangPemeliharaan;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage;
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Fields\ActionFields;
use Laravel\Nova\Fields\File;
Expand All @@ -32,27 +30,25 @@ public function handle(ActionFields $fields, Collection $models)
MasterBarangPemeliharaan::query()->update(['updated_at' => null]);
(new FastExcel)->import($fields->file, function ($row) {
if (
!empty($row['Kode Barang']) &&
!empty($row['No PSP']) &&
! empty($row['Kode Barang']) &&
! empty($row['No PSP']) &&
($row['Kondisi'] == 'Baik' || $row['Kondisi'] == 'Rusak Ringan') &&
substr($row['Kode Barang'], 0, 7) != '6010102'
)
{
) {
$MasterBarangPemeliharaan = MasterBarangPemeliharaan::firstOrNew(
[
'kode_barang' => $row['Kode Barang'],
'nup' => $row['NUP'],
]
);
$MasterBarangPemeliharaan->nama_barang = $row['Nama Barang'];
$MasterBarangPemeliharaan->merk = $row['Nama'];
$MasterBarangPemeliharaan->nopol = $row['No Polisi'];
$MasterBarangPemeliharaan->kondisi = $row['Kondisi'];
$MasterBarangPemeliharaan->lokasi = $row['Lokasi Ruang'];
$MasterBarangPemeliharaan->updated_at = now();

$MasterBarangPemeliharaan = MasterBarangPemeliharaan::firstOrNew(
[
'kode_barang' => $row['Kode Barang'],
'nup' => $row['NUP'],
]
);
$MasterBarangPemeliharaan->nama_barang = $row['Nama Barang'];
$MasterBarangPemeliharaan->merk = $row['Nama'];
$MasterBarangPemeliharaan->nopol = $row['No Polisi'];
$MasterBarangPemeliharaan->kondisi = $row['Kondisi'];
$MasterBarangPemeliharaan->lokasi = $row['Lokasi Ruang'];
$MasterBarangPemeliharaan->updated_at = now();

$MasterBarangPemeliharaan->save();
$MasterBarangPemeliharaan->save();
}
});
$ids = MasterBarangPemeliharaan::where('updated_at', null)->get()->pluck('id');
Expand Down
6 changes: 3 additions & 3 deletions app/Nova/Actions/ImportMataAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function handle(ActionFields $fields, Collection $models)
MataAnggaran::where('dipa_id', $model->id)->update(['updated_at' => null]);
$collections = (new FastExcel)->import($newFilePath);
$index = 0;
foreach($collections as $row) {
foreach ($collections as $row) {
$mataAnggaran = MataAnggaran::firstOrNew(
[
'coa_id' => $row['CONS_ITEM'],
Expand Down Expand Up @@ -71,8 +71,8 @@ public function handle(ActionFields $fields, Collection $models)
$mataAnggaran->rpd_12 = $row['POK_NILAI_12'];
}

$mataAnggaran->updated_at = now();
$index++;
$mataAnggaran->updated_at = now();
$index++;
$mataAnggaran->ordered = $index;
$mataAnggaran->save();
}
Expand Down
3 changes: 2 additions & 1 deletion app/Nova/DaftarPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function actions(NovaRequest $request)
{
return [];
}

public static function redirectAfterUpdate(NovaRequest $request, $resource)
{
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId;
Expand All @@ -126,6 +126,7 @@ public static function redirectAfterCreate(NovaRequest $request, $resource)
{
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId;
}

public static function indexQuery(NovaRequest $request, $query)
{
return $query->whereYear('tanggal', session('year'));
Expand Down
2 changes: 0 additions & 2 deletions app/Nova/DaftarPesertaPerjalanan.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ public function fields(NovaRequest $request)
$field
->rules('required')
->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)));

}),
Select::make('Bendahara', 'bendahara_user_id')
->searchable()
Expand All @@ -111,7 +110,6 @@ public function fields(NovaRequest $request)
$field
->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi)))
->rules('required');

}),
]),
];
Expand Down
7 changes: 3 additions & 4 deletions app/Nova/Filters/BulanFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public function apply(Request $request, $query, $value)
return $query;
}

return $this->isdate
? $query->whereMonth($this->column, $value)
return $this->isdate
? $query->whereMonth($this->column, $value)
: $query->where($this->column, $value);
}

/**
* Get the filter's available options.
*
Expand All @@ -49,7 +49,6 @@ public function apply(Request $request, $query, $value)
public function options(Request $request)
{
return array_flip(Helper::$bulan);

}

public function default()
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/KodeNaskah.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function actions(NovaRequest $request)
}

return $actions;
}
}

/**
* Return the location to redirect the user after update.
Expand Down
3 changes: 1 addition & 2 deletions app/Nova/Lenses/RealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class RealisasiAnggaran extends Lens

public function name()
{

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

Expand Down Expand Up @@ -76,7 +75,7 @@ public static function query(LensRequest $request, $query)
->orderBy('mak')
->orderBy('ordered'),
'realisasi_anggarans')
));
));
}

/**
Expand Down
13 changes: 6 additions & 7 deletions app/Nova/Lenses/RekapBarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ public function name()
public static function query(LensRequest $request, $query)
{
$displayed = DB::table('barang_persediaans')
->select('master_persediaan_id')
->distinct()
->whereYear('tanggal_transaksi', session('year'));
->select('master_persediaan_id')
->distinct()
->whereYear('tanggal_transaksi', session('year'));

return $request->withOrdering($request->withFilters(
$query->fromSub(fn ($query) =>
$query->from('master_persediaans')->select(self::columns())
$query->fromSub(fn ($query) => $query->from('master_persediaans')->select(self::columns())
->join('barang_persediaans', function ($join) {
$join->on('master_persediaans.id',
'=',
Expand All @@ -53,8 +53,7 @@ public static function query(LensRequest $request, $query)
->groupBy('master_persediaans.id')
->joinSub($displayed, 'displayed', function (JoinClause $join) {
$join->on('displayed.master_persediaan_id', '=', 'master_persediaans.id');
})
,'master_persediaans')
}), 'master_persediaans')
));
}

Expand Down
3 changes: 2 additions & 1 deletion app/Nova/Lenses/RekapHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public function name()
public static function query(LensRequest $request, $query)
{
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'mitras_filter', 'App\\Nova\\Filters\\BulanFilter', date('m'));

return $request->withoutTableOrderPrefix()->withOrdering(
$query->select('bulan', 'jenis_kontrak_id', 'nama', 'mitra_id')
->addSelect([
Expand All @@ -52,7 +53,7 @@ public static function query(LensRequest $request, $query)
$request->withFilters($query->select('id')->from('honor_kegiatans')
->where('tahun', session('year'))
->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) {
return $query->where('bulan', $filtered_bulan);
return $query->where('bulan', $filtered_bulan);
})
->where('jenis_honor', 'Kontrak Mitra Bulanan')
);
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Lenses/RencanaPenarikanDana.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class RencanaPenarikanDana extends Lens

public function name()
{

return 'Monitoring RPD';
}

Expand Down
12 changes: 6 additions & 6 deletions app/Nova/MasterBarangPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function title()

public function subtitle()
{
return 'Kode: '.$this->kode_barang. ' NUP: '.$this->nup.' Merk:'.$this->merk.' Nopol:'.$this->nopol.' Kondisi:'.$this->kondisi.' Lokasi:'.$this->lokasi;
return 'Kode: '.$this->kode_barang.' NUP: '.$this->nup.' Merk:'.$this->merk.' Nopol:'.$this->nopol.' Kondisi:'.$this->kondisi.' Lokasi:'.$this->lokasi;
}

/**
Expand All @@ -48,7 +48,7 @@ public function subtitle()
* @var array
*/
public static $search = [
'kode_barang', 'nup', 'nama_barang', 'merk', 'nopol', 'kondisi', 'lokasi', 'user.name'
'kode_barang', 'nup', 'nama_barang', 'merk', 'nopol', 'kondisi', 'lokasi', 'user.name',
];

/**
Expand All @@ -74,10 +74,10 @@ public function fields(NovaRequest $request)
->showWhenPeeking()
->readonly(),
Text::make('Merk')
->showWhenPeeking()
->showWhenPeeking()
->readonly(),
Text::make('Nopol')
->showWhenPeeking()
->showWhenPeeking()
->readonly(),
Select::make('Kondisi')
->options([
Expand All @@ -99,7 +99,7 @@ public function fields(NovaRequest $request)
->searchable()
->withSubtitles(),
HasMany::make('Daftar Pemeliharaan', 'daftarPemeliharaan', 'App\Nova\DaftarPemeliharaan'),

];
}

Expand Down Expand Up @@ -147,7 +147,7 @@ public function lenses(NovaRequest $request)
public function actions(NovaRequest $request)
{
$actions = [];
if (Policy::make()->allowedFor('admin,kasubbag,bmn')){
if (Policy::make()->allowedFor('admin,kasubbag,bmn')) {
$actions [] = ImportMasterBarangPemeliharaan::make()
->standalone()
->onlyOnIndex();
Expand Down
3 changes: 1 addition & 2 deletions app/Nova/Metrics/RealisasiPerJenisBelanja.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function __construct()
{
$header = collect(['Jenis Belanja', 'Target', 'Realisasi', 'Selisih']);
$this->viewAll([
'label' => "Target Serapan Anggaran yang tercantum adalah target pada akhir triwulan berjalan",
'label' => 'Target Serapan Anggaran yang tercantum adalah target pada akhir triwulan berjalan',
'link' => Nova::path().'/resources/realisasi-anggarans/lens/realisasi-anggaran', //URL to navigate when the link is clicked
'position' => 'top', //(Possible values `top` - `bottom`)
'style' => 'button', //(Possible values `link` - `button`)
Expand Down Expand Up @@ -79,6 +79,5 @@ public function __construct()
Cell::make(Helper::formatUang($data->selisih))->class('text-right'),
);
})->toArray());

}
}
Loading