From 00842e0a675bebcaa732430cf394d84645fb0df5 Mon Sep 17 00:00:00 2001 From: Afiq Date: Mon, 11 Jan 2021 08:31:00 +0800 Subject: [PATCH] kakitangan harian --- app/Http/Controllers/Auth/LoginController.php | 20 ++--- app/Http/Controllers/HomeController.php | 20 ++--- app/Http/Controllers/KakitanganController.php | 33 +++++++++ app/Http/Controllers/KhazanahController.php | 9 ++- app/Http/Middleware/Khazanah.php | 2 +- app/Http/Middleware/Penilai.php | 2 +- app/Http/Middleware/Teller.php | 2 +- app/User.php | 2 +- resources/views/khazanah/kakitangan.blade.php | 74 ++++++++++--------- routes/web.php | 4 +- 10 files changed, 108 insertions(+), 60 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 5ab28d6..e7b684a 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -61,17 +61,19 @@ class LoginController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); if($auth_user['roles'] == 'teller'){ - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url')); - }elseif($auth_user['roles'] == 'penilai'){ - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); - $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url')); + if($auth_user['role_harian'] == 'teller'){ + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url')); + }elseif($auth_user['role_harian'] == 'penilai'){ + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); + $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url')); + } } - elseif($auth_user['roles'] == 'khazanah'){ + elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url')); + return view('homepage.khazanah.home',compact('cawangan_info','api_url')); } elseif($auth_user['roles'] == 'operasi'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9897ac3..6fd996c 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -30,17 +30,19 @@ class HomeController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); if($auth_user['roles'] == 'teller'){ - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url')); - }elseif($auth_user['roles'] == 'penilai'){ - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); - $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url')); + if($auth_user['role_harian'] == 'teller'){ + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url')); + }elseif($auth_user['role_harian'] == 'penilai'){ + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); + $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url')); + } } - elseif($auth_user['roles'] == 'khazanah'){ + elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url')); + return view('homepage.khazanah.home',compact('cawangan_info','api_url')); } elseif($auth_user['roles'] == 'operasi'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php index 563dbd5..8817299 100644 --- a/app/Http/Controllers/KakitanganController.php +++ b/app/Http/Controllers/KakitanganController.php @@ -47,4 +47,37 @@ class KakitanganController extends Controller return redirect()->route('daftar.kakitangan'); } + + public function kakitanganHarian(Request $request){ + $auth_user = Auth::user(); + $user_cawangan = User::where('cawangan','=',$auth_user['cawangan'])->get(); + + foreach($user_cawangan as $index=>$user){ + if($user['roles'] == 'teller'){ + if($user['id'] == $request->penilai){ + $role_harian = 'penilai'; + }else{ + $role_harian = 'teller'; + } + }elseif($user['roles'] == 'ppc'){ + if($user['id'] == $request->khazanah){ + $role_harian = 'khazanah'; + }else{ + $role_harian = 'ppc'; + } + }elseif($user['roles'] == 'pc'){ + if($user['id'] == $request->khazanah){ + $role_harian = 'khazanah'; + }else{ + $role_harian = 'pc'; + } + } + + User::where('id','=',$user['id'])->update(array( + 'role_harian' => $role_harian + )); + } + + return redirect()->route('home'); + } } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index fbcd99d..299ac46 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1155,10 +1155,13 @@ class KhazanahController extends Controller $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $teller = User::where('roles','=',"teller")->get(); - $khazanah = User::where('roles','=',"khazanah")->get(); + $teller = User::where([['roles','=','teller'],['cawangan','=',$auth_user['cawangan']]])->get(); + $khazanah = User::whereIn('roles',['pc','ppc'])->where('cawangan','=',$auth_user['cawangan'])->get(); - return view('khazanah.kakitangan',compact('cawangan_info','api_url','teller','khazanah')); + $ppc = User::where([['roles','=','ppc'],['cawangan','=',$auth_user['cawangan']]])->first(); + $pc = User::where([['roles','=','pc'],['cawangan','=',$auth_user['cawangan']]])->first(); + + return view('khazanah.kakitangan',compact('cawangan_info','api_url','teller','khazanah','pc','ppc')); } public function capaian() diff --git a/app/Http/Middleware/Khazanah.php b/app/Http/Middleware/Khazanah.php index 5e8e0d1..e9cd4b4 100644 --- a/app/Http/Middleware/Khazanah.php +++ b/app/Http/Middleware/Khazanah.php @@ -15,7 +15,7 @@ class Khazanah */ public function handle($request, Closure $next) { - if(Auth::check() && Auth::user()->roles == 'khazanah'){ + if(Auth::check() && (Auth::user()->roles == 'pc' || Auth::user()->roles == 'ppc')){ return $next($request); } diff --git a/app/Http/Middleware/Penilai.php b/app/Http/Middleware/Penilai.php index f432ebb..a815e6e 100644 --- a/app/Http/Middleware/Penilai.php +++ b/app/Http/Middleware/Penilai.php @@ -15,7 +15,7 @@ class Penilai */ public function handle($request, Closure $next) { - if(Auth::check() && Auth::user()->roles == 'penilai'){ + if(Auth::check() && Auth::user()->role_harian == 'penilai'){ return $next($request); } diff --git a/app/Http/Middleware/Teller.php b/app/Http/Middleware/Teller.php index 710785d..7b393d0 100644 --- a/app/Http/Middleware/Teller.php +++ b/app/Http/Middleware/Teller.php @@ -15,7 +15,7 @@ class Teller */ public function handle($request, Closure $next) { - if(Auth::check() && Auth::user()->roles == 'teller'){ + if(Auth::check() && Auth::user()->role_harian == 'teller'){ return $next($request); } diff --git a/app/User.php b/app/User.php index 7864618..dcb0041 100644 --- a/app/User.php +++ b/app/User.php @@ -16,7 +16,7 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'name', 'email', 'password','roles','no_kp','no_telefon','cawangan', + 'name', 'email', 'password','roles','no_kp','no_telefon','cawangan','role_harian','perubatan', ]; /** diff --git a/resources/views/khazanah/kakitangan.blade.php b/resources/views/khazanah/kakitangan.blade.php index 9cb4519..8708e7f 100644 --- a/resources/views/khazanah/kakitangan.blade.php +++ b/resources/views/khazanah/kakitangan.blade.php @@ -19,46 +19,52 @@
- -
-
-
- - -
- -
- - +
+ @csrf +
+
+
+ + + +
+ +
+ + +
-
-
-
-
- - -
- -
- - +
+
+
+ + + +
+ +
+ + +
-
-
- -
+
+ + +
+ + diff --git a/routes/web.php b/routes/web.php index cc8042a..6d13ab8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -103,6 +103,8 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); +Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian']); + //Added Yang Baru Route::post('/barcodescannedtebus',['as'=>'barcodetebus.scanned','uses'=>'KhazanahController@barcodescannedtebus'])->middleware('auth','khazanah'); Route::get('/pendahuluanserah/{id}',['as'=>'pendahuluan.serah','uses'=>'KhazanahController@pendahuluanserah'])->middleware('auth','khazanah'); @@ -158,4 +160,4 @@ Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=> Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller'); Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi'); Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi'); -Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff']); +Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','operasi');