diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index c0d75981..d8aaa60a 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -557,18 +557,18 @@ public static function setSegmen($num): string * @param json anggaran $spek * @return int */ - public static function isAkunHonor(String $mak): bool + public static function isAkunHonor(string $mak): bool { return in_array(substr($mak, -6), self::$akun_honor); } /** - // * Memeriksa apakah terjadi perubahan dari anggaran honor menjadi tidak ada. - // * - // * @param json anggaran $spek_old - // * @param json anggaran $spek_new - // * @return bool - // */ + * // * Memeriksa apakah terjadi perubahan dari anggaran honor menjadi tidak ada. + * // * + * // * @param json anggaran $spek_old + * // * @param json anggaran $spek_new + * // * @return bool + * // */ // public static function isAkunHonorChanged($spek_old, $spek_new) // { // return self::sumJenisAkunHonor($spek_old) - self::sumJenisAkunHonor($spek_new) == 1; diff --git a/app/Models/AnggaranKerangkaAcuan.php b/app/Models/AnggaranKerangkaAcuan.php index ec1ca388..ec2573df 100644 --- a/app/Models/AnggaranKerangkaAcuan.php +++ b/app/Models/AnggaranKerangkaAcuan.php @@ -34,7 +34,7 @@ protected static function booted(): void $honor->judul_spj = 'Daftar Honor Petugas '.strtr($kak->kegiatan, ['Pemeriksaan' => 'Pemeriksa', 'Pencacahan' => 'Pencacah', 'Pengawasan' => 'Pengawas']); $honor->awal = $kak->awal; $honor->akhir = $kak->akhir; - $honor->mak =$anggaranKak->mak; + $honor->mak = $anggaranKak->mak; $honor->kegiatan = $kak->kegiatan; $honor->uraian_tugas = 'Melakukan '.$kak->kegiatan; $honor->objek_sk = 'Petugas '.strtr($kak->kegiatan, ['Pemeriksaan' => 'Pemeriksa', 'Pencacahan' => 'Pencacah', 'Pengawasan' => 'Pengawas']); diff --git a/app/Models/HonorSurvei.php b/app/Models/HonorSurvei.php index 2724d2bc..403e9bd9 100644 --- a/app/Models/HonorSurvei.php +++ b/app/Models/HonorSurvei.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Helpers\Helper; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index 144fa66e..07448d60 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -123,6 +123,5 @@ protected static function booted(): void $dataKetua = Helper::getDataPegawaiByUserId($kak->koordinator_user_id, $kak->tanggal); $kak->unit_kerja_id = $dataKetua->unit_kerja_id; }); - } } diff --git a/app/Nova/AnggaranKerangkaAcuan.php b/app/Nova/AnggaranKerangkaAcuan.php index 86fbca34..93c1897e 100644 --- a/app/Nova/AnggaranKerangkaAcuan.php +++ b/app/Nova/AnggaranKerangkaAcuan.php @@ -54,8 +54,8 @@ public function fields(NovaRequest $request) return [ Hidden::make('ID KAK', 'kerangka_acuan_id')->default($request->viaResourceId)->doNotSaveOnActionRelation(), Select::make('MAK', 'mak') - ->updateRules('required', Rule::unique('anggaran_kerangka_acuans', 'mak')->where('kerangka_acuan_id', $request->viaResourceId)->ignore($this->id)) - ->creationRules('required', Rule::unique('anggaran_kerangka_acuans', 'mak')->where('kerangka_acuan_id', $request->viaResourceId)) + ->updateRules('required', Rule::unique('anggaran_kerangka_acuans', 'mak')->where('kerangka_acuan_id', $request->viaResourceId)->ignore($this->id)) + ->creationRules('required', Rule::unique('anggaran_kerangka_acuans', 'mak')->where('kerangka_acuan_id', $request->viaResourceId)) ->searchable() ->filterable() ->dependsOn('kerangka_acuan_id', function (Select $field, NovaRequest $request, FormData $formData) {