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
2 changes: 1 addition & 1 deletion app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public static function kertas_kerja_reward($id)
'tanggal' => Helper::terbilangTanggal($data->tanggal_penetapan),
'kepala' => Helper::getPropertyFromCollection($kepala, 'name'),
'nipkepala' => Helper::getPropertyFromCollection($kepala, 'nip'),
'daftar_penilaian' => DaftarPenilaianReward::where('reward_pegawai_id', $id)->where('user_id','!=', $data->kepala_user_id)->get(),
'daftar_penilaian' => DaftarPenilaianReward::where('reward_pegawai_id', $id)->where('user_id', '!=', $data->kepala_user_id)->get(),

];
}
Expand Down
4 changes: 2 additions & 2 deletions app/Helpers/Policy.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static function make()

private static function hasAccess($roles): bool
{
return !empty(array_intersect($roles, session('role')));
return ! empty(array_intersect($roles, session('role')));
}

public function get(): bool
Expand All @@ -35,7 +35,7 @@ public function allowedFor(string $roles = 'all'): self

public function notAllowedFor(string $roles = 'all'): self
{
$this->allowed = $roles !== 'all' && self::hasAccess(array_diff(array_keys(Helper::$role),explode(',', $roles)), session('role'));
$this->allowed = $roles !== 'all' && self::hasAccess(array_diff(array_keys(Helper::$role), explode(',', $roles)), session('role'));

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/AnggaranKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected static function booted(): void
if ($pemeliharaan = Pemeliharaan::where('anggaran_kerangka_acuan_id', $anggaranKak->id)->first()) {
$pemeliharaan->rincian = $kak->rincian;
$pemeliharaan->save();
} else {
} else {
$pemeliharaan = new Pemeliharaan;
$pemeliharaan->kerangka_acuan_id = $kak->id;
$pemeliharaan->tanggal_kak = $kak->tanggal;
Expand Down
13 changes: 6 additions & 7 deletions app/Models/DaftarPenilaianReward.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,29 @@ class DaftarPenilaianReward extends Model
'reward_pegawai_id',
'user_id',
];
public function user() : BelongsTo

public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}

public function rewardPegawai() : BelongsTo
public function rewardPegawai(): BelongsTo
{
return $this->belongsTo(RewardPegawai::class);
}

protected static function booted(): void
{
{
static::saving(function (DaftarPenilaianReward $penilaian) {
$nilai_kinerja = 0.6 * $penilaian->nilai_skp;
$nilai_disiplin = 0.2 * (100 - (100*$penilaian->tk + 50*($penilaian->tl4 + $penilaian->psw4) + 30*($penilaian->tl3 + $penilaian->psw3) + 20*($penilaian->tl2 + $penilaian->psw2) + 10*($penilaian->tl1 + $penilaian->psw1)));
$nilai_disiplin = 0.2 * (100 - (100 * $penilaian->tk + 50 * ($penilaian->tl4 + $penilaian->psw4) + 30 * ($penilaian->tl3 + $penilaian->psw3) + 20 * ($penilaian->tl2 + $penilaian->psw2) + 10 * ($penilaian->tl1 + $penilaian->psw1)));
$nilai_disiplin_abs = $nilai_disiplin > 0 ? $nilai_disiplin : 0;
$nilai_beban = 0.2 * 4 * $penilaian->jumlah_butir;
$nilai_beban_abs = $nilai_beban <= 100 ? $nilai_beban : 100;
$penilaian->nilai_kinerja = $nilai_kinerja;
$penilaian->nilai_disiplin = $nilai_disiplin_abs;
$penilaian->nilai_beban = $nilai_beban_abs;
$penilaian->nilai_total = $nilai_kinerja + $nilai_disiplin_abs + $nilai_beban_abs;

});
});
}
}
2 changes: 1 addition & 1 deletion app/Models/DaftarSp2d.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DaftarSp2d extends Model
];
protected $fillable = ['dipa_id', 'nomor_sp2d'];

public function kerangkaAcuan():HasMany
public function kerangkaAcuan(): HasMany
{
return $this->hasMany(KerangkaAcuan::class);
}
Expand Down
1 change: 0 additions & 1 deletion app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function daftarSp2d(): BelongsTo
return $this->belongsTo(DaftarSp2d::class);
}


public function arsipDokumen(): HasMany
{
return $this->hasMany(ArsipDokumen::class);
Expand Down
2 changes: 1 addition & 1 deletion app/Models/PerjalananDinas.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function daftarPesertaPerjalanan(): HasMany

protected static function booted(): void
{
static::updating(function (PerjalananDinas $perjalanan) {
static::updating(function (PerjalananDinas $perjalanan) {
if ($perjalanan->st_naskah_keluar_id === null) {
$default_naskah = NaskahDefault::cache()->get('all')
->where('jenis', 'st')
Expand Down
15 changes: 6 additions & 9 deletions app/Models/RewardPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ protected static function booted(): void
{
static::creating(function (RewardPegawai $reward) {
$reward->status = 'dibuat';
});
});

static::deleting(function (RewardPegawai $reward) {
$reward->daftarPenilaianReward->each->delete();
NaskahKeluar::destroy([$reward->sk_naskah_keluar_id, $reward->sertifikat_naskah_keluar_id]);
});
static::saving(function (RewardPegawai $reward) {
$reward->tahun = session('year');
if ($reward->status === 'ditetapkan') {
if ($reward->sk_naskah_keluar_id === null) {
if ($reward->sk_naskah_keluar_id === null) {
$default_naskah = NaskahDefault::cache()->get('all')
->where('jenis', 'sk_reward')
->first();
Expand All @@ -57,7 +57,7 @@ protected static function booted(): void
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
$naskahkeluar->tujuan = 'Employee of the month';
$naskahkeluar->perihal = 'SK Employee of The Month Bulan ' . Helper::$bulan[$reward->bulan];
$naskahkeluar->perihal = 'SK Employee of The Month Bulan '.Helper::$bulan[$reward->bulan];
$naskahkeluar->generate = 'A';
$naskahkeluar->save();
$reward->sk_naskah_keluar_id = $naskahkeluar->id;
Expand All @@ -68,7 +68,7 @@ protected static function booted(): void
$naskahkeluar->save();
}
}
if ($reward->sertifikat_naskah_keluar_id === null) {
if ($reward->sertifikat_naskah_keluar_id === null) {
$default_naskah = NaskahDefault::cache()->get('all')
->where('jenis', 'sertifikat_reward')
->first();
Expand All @@ -78,7 +78,7 @@ protected static function booted(): void
$naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0];
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
$naskahkeluar->tujuan = 'Employee of the month';
$naskahkeluar->perihal = 'Sertifikat Employee of The Month Bulan ' . Helper::$bulan[$reward->bulan];
$naskahkeluar->perihal = 'Sertifikat Employee of The Month Bulan '.Helper::$bulan[$reward->bulan];
$naskahkeluar->generate = 'A';
$naskahkeluar->save();
$reward->sertifikat_naskah_keluar_id = $naskahkeluar->id;
Expand All @@ -90,9 +90,6 @@ protected static function booted(): void
}
}
}


});
}

}
17 changes: 8 additions & 9 deletions app/Nova/Actions/Download.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ public function handle(ActionFields $fields, Collection $models)
*/
public function fields(NovaRequest $request)
{
$fields = [
Text::make('Nama File', 'filename')
->rules('required', 'alpha_dash:ascii')
->help('tanpa extensi file')
->default(fn () => uniqid()),
Select::make('Template')
->rules('required')
->options(Helper::setOptionTemplate($this->jenis)),
$fields = [
Text::make('Nama File', 'filename')
->rules('required', 'alpha_dash:ascii')
->help('tanpa extensi file')
->default(fn () => uniqid()),
Select::make('Template')
->rules('required')
->options(Helper::setOptionTemplate($this->jenis)),
];

if ($this->withTanggal) {
Expand All @@ -102,6 +102,5 @@ public function fields(NovaRequest $request)
}

return $fields;

}
}
37 changes: 17 additions & 20 deletions app/Nova/Actions/ImportRekapPresensi.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

use App\Helpers\Helper;
use App\Models\DaftarPenilaianReward;
use App\Models\Mitra;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Fields\ActionFields;
Expand All @@ -34,25 +32,24 @@ public function handle(ActionFields $fields, Collection $models)
$model = $models->first();
DaftarPenilaianReward::where('reward_pegawai_id', $model->id)->update(['updated_at' => null]);
(new FastExcel)->startRow(5)->import($fields->file, function ($row) use ($model) {
$daftar = DaftarPenilaianReward::firstOrNew(
[
'user_id' => Helper::getPropertyFromCollection(User::cache()->get('all')->where('nip_lama', $row['NIP'])->first(), 'id'),
'reward_pegawai_id' => $model->id,
]
);
$daftar->tk = $row['TK'];
$daftar->tl1 = $row['TL1'];
$daftar->tl2 = $row['TL2'];
$daftar->tl3 = $row['TL3'];
$daftar->tl4 = $row['TL4'];
$daftar->psw1 = $row['PSW1'];
$daftar->psw2 = $row['PSW2'];
$daftar->psw3 = $row['PSW3'];
$daftar->psw4 = $row['PSW4'];
$daftar->updated_at = now();

$daftar->save();
$daftar = DaftarPenilaianReward::firstOrNew(
[
'user_id' => Helper::getPropertyFromCollection(User::cache()->get('all')->where('nip_lama', $row['NIP'])->first(), 'id'),
'reward_pegawai_id' => $model->id,
]
);
$daftar->tk = $row['TK'];
$daftar->tl1 = $row['TL1'];
$daftar->tl2 = $row['TL2'];
$daftar->tl3 = $row['TL3'];
$daftar->tl4 = $row['TL4'];
$daftar->psw1 = $row['PSW1'];
$daftar->psw2 = $row['PSW2'];
$daftar->psw3 = $row['PSW3'];
$daftar->psw4 = $row['PSW4'];
$daftar->updated_at = now();

$daftar->save();
});
$ids = DaftarPenilaianReward::where('updated_at', null)->get()->pluck('id');
DaftarPenilaianReward::destroy($ids);
Expand Down
25 changes: 11 additions & 14 deletions app/Nova/Actions/SetStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,18 @@ public function setStatus($status, $statusField = 'status')
public function handle(ActionFields $fields, Collection $models)
{
$model = $models->first();

if ($this->withTanggal) {
$model->{$this->column} = $fields->tanggal;
$model->kepala_user_id = $fields->kepala;

}
if ($this->withUser) {
$model->{$this->userColumn} = $fields->user;

}
if ($this->withUser || $this->withTanggal) {
$model->save();
}
$model->update([$this->statusField => $this->status]);

}

/**
Expand All @@ -92,20 +89,20 @@ public function fields(NovaRequest $request)
$fields = [];
if ($this->withUser) {
$fields[] = Select::make('Employee of the Month', 'user')
->options(Helper::setOptionsPemenang($this->parent_id))
->searchable()
->rules('required');
->options(Helper::setOptionsPemenang($this->parent_id))
->searchable()
->rules('required');
}
if ($this->withTanggal) {
$fields[] = Date::make('Tanggal')
->default(now())
->rules('required', 'before_or_equal:today');
->default(now())
->rules('required', 'before_or_equal:today');
$fields[] = Select::make('Kepala')
->searchable()
->rules('required')
->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) {
$field->options(Helper::setOptionPengelola('kepala', $form->tanggal));
});
->searchable()
->rules('required')
->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) {
$field->options(Helper::setOptionPengelola('kepala', $form->tanggal));
});
}

return $fields;
Expand Down
1 change: 0 additions & 1 deletion app/Nova/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use App\Nova\PersediaanMasuk as NovaPersediaanMasuk;
use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\Currency;
use Laravel\Nova\Fields\Field;
use Laravel\Nova\Fields\FormData;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Select;
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/DaftarPenilaianReward.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function fields(NovaRequest $request)
->exceptOnForms(),
Number::make('Total Nilai', 'nilai_total')
->exceptOnForms(),

];
}

Expand Down
24 changes: 12 additions & 12 deletions app/Nova/DaftarSp2d.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,18 @@ public function fields(NovaRequest $request)
->sortable()
->readonly(),
Panel::make('Arsip', [
File::make('Arsip', 'arsip_spm')
->disk('arsip')
->rules('mimes:pdf')
->acceptedTypes('.pdf')
->creationRules('required')
->prunable(),
File::make('Arsip SP2D', 'arsip_sp2d')
->disk('arsip')
->rules('mimes:pdf')
->acceptedTypes('.pdf')
->creationRules('required')
->prunable(),
File::make('Arsip', 'arsip_spm')
->disk('arsip')
->rules('mimes:pdf')
->acceptedTypes('.pdf')
->creationRules('required')
->prunable(),
File::make('Arsip SP2D', 'arsip_sp2d')
->disk('arsip')
->rules('mimes:pdf')
->acceptedTypes('.pdf')
->creationRules('required')
->prunable(),
]),
HasMany::make('Kerangka Acuan Kerja', 'kerangkaAcuan', 'App\Nova\KerangkaAcuan'),
];
Expand Down
1 change: 0 additions & 1 deletion app/Nova/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public function actions(NovaRequest $request)
->exceptOnIndex();
}


return $actions;
}

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/MasterBarangPemeliharaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Nova;

use App\Helpers\Policy;
use App\Nova\Actions\Download;
use App\Nova\Actions\ImportMasterBarangPemeliharaan;
use App\Nova\Lenses\PemeliharaanBarang;
use Laravel\Nova\Fields\BelongsTo;
Expand Down Expand Up @@ -154,6 +153,7 @@ public function actions(NovaRequest $request)
->standalone()
->onlyOnIndex();
}

return $actions;
}
}
5 changes: 3 additions & 2 deletions app/Policies/DaftarPenilaianRewardPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public function viewAny(): bool
public function view(): bool
{
return Policy::make()
->allowedFor('all')
->get();
->allowedFor('all')
->get();
}

/**
Expand All @@ -51,6 +51,7 @@ public function create(): bool
public function update(User $user, DaftarPenilaianReward $daftar): bool
{
$status = RewardPegawai::find($daftar->reward_pegawai_id)->status;

return Policy::make()
->allowedFor('kasubbag')
->andNotEqual($status, 'ditetapkan')
Expand Down
4 changes: 2 additions & 2 deletions app/Policies/KerangkaAcuanPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public function create(User $user): bool
}

return Policy::make()
->allowedFor('koordinator,anggota')
->get();
->allowedFor('koordinator,anggota')
->get();
});
}

Expand Down
Loading