kakitangan harian

2021-01-11 08:31:00 +08:00
parent 6cbeee9f86
commit 00842e0a67
10 changed files with 108 additions and 60 deletions
@@ -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();
@@ -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();
@@ -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');
+    }
 }
@@ -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()
@@ -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);
        }

@@ -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);
        }

@@ -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);
        }

@@ -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',
    ];

    /**
@@ -19,46 +19,52 @@
                        <div class="col-2">
                        </div>
                    </div>
-
-                    <div class="col-12">
-                        <div class="row">
-                            <div class="row col-6">   
-                                <label class="col-6">Pengurus Cawangan:</label>
-                                <input type="text" class="form-control col-6"/>
-                            </div>
-                            
-                            <div class="row col-6">
-                                <label class="col-6">Khazanah Cawangan:</label>
-                                <select name="khazanah" id="khazanah" class="form-control col-6">
-                                    @foreach ($khazanah as $index=>$k)
-                                    <option value="{{ $k['name'] }}">{{ $k['name'] }}</option>
-                                    @endforeach
-                                  </select>
+                    <form action="{{ route('kakitangan.harian') }}" method="post">
+                        @csrf
+                        <div class="col-12">
+                            <div class="row">
+                                <div class="row col-6">   
+                                    <label class="col-6">Pengurus Cawangan:</label>
+                                    <input type="text" class="form-control col-6" name="pc" id="pc" value="{{ $pc['name'] }}"/>
+                                    <input type="text" class="form-control col-6" hidden name="pc_id" id="pc_id" value="{{ $pc['id'] }}"/>
+                                </div>
+                                
+                                <div class="row col-6">
+                                    <label class="col-6">Khazanah Cawangan:</label>
+                                    <select name="khazanah" id="khazanah" class="form-control col-6">
+                                        @foreach ($khazanah as $index=>$k)
+                                        <option value="{{ $k['id'] }}">{{ $k['name'] }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
                            </div>
                        </div>
-                    </div>

-                    <div class="col-12 mt-4">
-                        <div class="row">
-                            <div class="row col-6">   
-                                <label class="col-6">Pen. Peng. Cawangan:</label>
-                                <input type="text" class="form-control col-6"/>
-                            </div>
-                            
-                            <div class="row col-6">
-                                <label class="col-6">Penilai Cawangan:</label>
-                                <select name="penilai" id="penilai" class="form-control col-6">
-                                    @foreach ($teller as $index=>$t)
-                                    <option value="{{ $t['name'] }}">{{ $t['name'] }}</option>
-                                    @endforeach
-                                  </select>
+                        <div class="col-12 mt-4">
+                            <div class="row">
+                                <div class="row col-6">   
+                                    <label class="col-6">Pen. Peng. Cawangan:</label>
+                                    <input type="text" class="form-control col-6" name="ppc" id="ppc" value="{{ $ppc['name'] }}"/>
+                                    <input type="text" class="form-control col-6" hidden name="ppc_id" id="ppc_id" value="{{ $ppc['id'] }}"/>
+                                </div>
+                                
+                                <div class="row col-6">
+                                    <label class="col-6">Penilai Cawangan:</label>
+                                    <select name="penilai" id="penilai" class="form-control col-6">
+                                        @foreach ($teller as $index=>$t)
+                                        <option value="{{ $t['id'] }}">{{ $t['name'] }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
                            </div>
                        </div>
-                    </div>

-                    <div class="col-12 row justify-content-end mt-4 mb-4">
-                        <button class="btn btn-info">Sahkan</button>
-                    </div>
+                        <div class="col-12 row justify-content-end mt-4 mb-4">
+                            <!-- <button class="btn btn-info">Sahkan</button> -->
+                            <input type="submit" class="btn btn-primary" value="Sahkan">
+                        </div>
+                    </form>
+                    


                    <table class='table mt-4' id='table-kakitangan' style="width:100%;">
@@ -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');