KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

penilai kedua

Browse Source
This commit is contained in:
afiq
2022-01-11 06:49:04 +08:00
parent e144bcdadc
commit 45867c2f6f
5 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+1 -1
View File
@@ -67,7 +67,7 @@ class LoginController extends Controller
$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'));
return redirect()->route('home');
}elseif($auth_user['role_harian'] == 'penilai'){
}elseif($auth_user['role_harian'] == 'penilai' || $auth_user['role_harian'] == 'penilai2'){
$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();
app/Http/Controllers/HomeController.php
+2 -2
View File
@@ -33,11 +33,11 @@ class HomeController extends Controller
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'){
}elseif($auth_user['role_harian'] == 'penilai' || $auth_user['role_harian'] == 'penilai2'){
$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'));
return view('homepage.penilai.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
}
else{
return view('not_assign');
app/Http/Controllers/KakitanganController.php
+3 -1
View File
@@ -66,12 +66,14 @@ class KakitanganController extends Controller
public function kakitanganHarian(Request $request){
$auth_user = Auth::user();
$user_cawangan = User::where('cawangan','=',$auth_user['cawangan'])->get();
$user_cawangan = User::whereIn('roles',['pc','ppc','teller'])->where('cawangan','=',$auth_user['cawangan'])->get();
foreach($user_cawangan as $index=>$user){
if($user['roles'] == 'teller'){
if($user['id'] == $request->penilai){
$role_harian = 'penilai';
}elseif($user['id'] == $request->penilai2){
$role_harian = 'penilai2';
}else{
$role_harian = 'teller';
}
app/Http/Middleware/Penilai.php
+1 -1
View File
@@ -15,7 +15,7 @@ class Penilai
*/
public function handle($request, Closure $next)
{
if(Auth::check() && Auth::user()->role_harian == 'penilai'){
if(Auth::check() && (Auth::user()->role_harian == 'penilai' || Auth::user()->role_harian == 'penilai2')){
return $next($request);
}