Skip to content

Apply fixes from StyleCI #79

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

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Apply fixes from StyleCI #79

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
9 changes: 4 additions & 5 deletions app/Helpers/Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,9 @@ public static function createDateFromString($tanggal)
/**
* Mem-parsing filter dari URL yang diberikan.
*
* @param string $url URL yang akan di-parsing.
* @param string $filterUri URI filter yang akan dicari dalam query URL.
* @param string $filterKey Kunci filter yang akan diambil nilainya.
*
* @param string $url URL yang akan di-parsing.
* @param string $filterUri URI filter yang akan dicari dalam query URL.
* @param string $filterKey Kunci filter yang akan diambil nilainya.
* @return string Nilai filter yang ditemukan berdasarkan kunci filter yang diberikan.
*/
public static function parseFilterFromUrl($url, $filterUri, $filterKey, $defaultValue = null)
Expand All @@ -393,7 +392,7 @@ public static function parseFilterFromUrl($url, $filterUri, $filterKey, $default
)
);

$filterValue= $filters[$filterKey];
$filterValue = $filters[$filterKey];
}

return $filterValue;
Expand Down
1 change: 1 addition & 0 deletions app/Nova/BastMitra.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public static function label()
public static function indexQuery(NovaRequest $request, $query)
{
$kontrakMitraIds = KontrakMitra::where('tahun', session('year'))->get()->pluck('id');

return $query->whereIn('kontrak_mitra_id', $kontrakMitraIds);
}

Expand Down
2 changes: 0 additions & 2 deletions app/Nova/IzinKeluar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Nova;

use App\Helpers\Helper;
use App\Helpers\Policy;
use App\Models\User;
use Carbon\Carbon;
use Ctessier\NovaAdvancedImageField\AdvancedImage;
Expand All @@ -27,7 +26,6 @@ public static function label()
{
return 'Izin Keluar';
}


/**
* The model the resource corresponds to.
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/KerangkaAcuan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static function indexQuery(NovaRequest $request, $query)
{
$query->whereYear('tanggal', session('year'));
if (Policy::make()->allowedFor('koordinator,anggota')->get()) {
return $query->where('unit_kerja_id',Helper::getDataPegawaiByUserId($request->user()->id, now())->unit_kerja_id );
return $query->where('unit_kerja_id', Helper::getDataPegawaiByUserId($request->user()->id, now())->unit_kerja_id);
}

return $query;
Expand Down
14 changes: 7 additions & 7 deletions app/Nova/Metrics/JumlahKegiatan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ public function name()
*/
public function calculate(NovaRequest $request)
{
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
$filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
$filtered_jenis = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
$bulan_ini = DB::table('daftar_honor_mitras')
->select('honor_kegiatans.id')
->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) {
return $query->where('bulan', $filtered_bulan);
})
->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) {
return $query->where('jenis_kontrak_id', $filtered_jenis);
})
->distinct('honor_kegiatans.id')
Expand All @@ -46,10 +46,10 @@ public function calculate(NovaRequest $request)
->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
return $query->where('bulan', $filtered_bulan-1);
->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) {
return $query->where('bulan', $filtered_bulan - 1);
})
->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) {
return $query->where('jenis_kontrak_id', $filtered_jenis);
})
->distinct('honor_kegiatans.id')
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/Metrics/JumlahMitra.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function name()
*/
public function calculate(NovaRequest $request)
{
$filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
$filtered_jenis = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
$arr = [];
foreach (Helper::$bulan as $key => $value) {
$arr[$value] = DB::table('daftar_honor_mitras')
Expand All @@ -41,7 +41,7 @@ public function calculate(NovaRequest $request)
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->where('bulan', $key)
->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) {
return $query->where('jenis_kontrak_id', $filtered_jenis);
})
->distinct('mitra_id')
Expand Down
4 changes: 2 additions & 2 deletions app/Nova/Metrics/JumlahMitraPerJenisKontrak.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function name()
*/
public function calculate(NovaRequest $request)
{
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
$filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
$arr = DB::table('daftar_honor_mitras')
->selectRaw('jenis, count(distinct(mitra_id)) as jumlah_mitra')
->join(
Expand All @@ -44,7 +44,7 @@ public function calculate(NovaRequest $request)
->join('mitras', 'mitras.id', '=', 'daftar_honor_mitras.mitra_id')
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) {
return $query->where('bulan', $filtered_bulan);
})
->groupBy('jenis_kontrak_id')
Expand Down
4 changes: 2 additions & 2 deletions app/Policies/NaskahMasukPolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function create(): bool
public function update(User $user, NaskahMasuk $naskahMasuk): bool
{
return Policy::make()
->allowedFor('anggota,koordinator,kepala,arsiparis')
->allowedFor('anggota,koordinator,kepala,arsiparis')
->withYear(Helper::getYearFromDate($naskahMasuk->tanggal))
->get();
}
Expand All @@ -57,7 +57,7 @@ public function update(User $user, NaskahMasuk $naskahMasuk): bool
public function delete(User $user, NaskahMasuk $naskahMasuk): bool
{
return Policy::make()
->allowedFor('anggota,koordinator,kepala,arsiparis')
->allowedFor('anggota,koordinator,kepala,arsiparis')
->withYear(Helper::getYearFromDate($naskahMasuk->tanggal))
->get();
}
Expand Down