penilai kedua

app/Http/Controllers/Auth/LoginController.php

@@ -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

@@ -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

@@ -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

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

resources/views/khazanah/kakitangan.blade.php

@@ -1,5 +1,10 @@
 @extends('layouts.app')
-
+<style>
+    .form-group.required .control-label:after {
+        content:"*";
+        color:red;
+    }
+</style>
 @section('content')
 <div class="container">
     <div class="row justify-content-center mt-3">
@@ -15,16 +20,12 @@
 
 
                 <div class="card-body">
-                    
+                    <form action="{{ route('kakitangan.harian') }}" onsubmit="validatekakitangan()" method="post">
-                    <div class="row mb-4">
-                       
-                    </div>
-                    <form action="{{ route('kakitangan.harian') }}" method="post">
                         @csrf
-                        <div class="col-12 text-center">
+                        <div class="row">
-                            <div class="row">
+                            <div class="col-6 text-center">
-                                <div class="row col-6">
+                                <div class="row col-12">
-                                    <label class="col-6">Pengurus Cawangan:</label>
+                                    <label class="col-6">Pengurus Cawangan :</label>
                                     @if($pc != null)
                                         <input type="text" class="form-control col-6" readonly 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'] }}"/>
@@ -33,21 +34,8 @@
                                     @endif
                                 </div>
 
-                                <div class="row col-6">
+                                <div class="row col-12">   
-                                    <label class="col-6">Khazanah Cawangan:</label>
+                                    <label class="col-6">Pen. Peng. Cawangan :</label>
-                                    <select name="khazanah" id="khazanah" class="form-control col-6">
-                                        @foreach ($khazanah as $index=>$k)
-                                            <option value="{{ $k['id'] }}" {{ $k['role_harian'] == 'khazanah' ? 'selected' : ''}}>{{ $k['name'] }}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-12 mt-4 text-center">
-                            <div class="row">
-                                <div class="row col-6">   
-                                    <label class="col-6">Pen. Peng. Cawangan:</label>
                                     @if($ppc != null)
                                         <input type="text" class="form-control col-6" readonly 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'] }}"/>
@@ -55,20 +43,43 @@
                                         <input type="text" class="form-control col-6" readonly name="pc" id="pc" value="Tiada Penolong Pengurus Cawangan"/>
                                     @endif
                                 </div>
+                            </div>
 
-                                <div class="row col-6">
+                            <div class="col-6 text-center">
-                                    <label class="col-6">Penilai Cawangan:</label>
+                                <div class="row col-12">
+                                    <label class="col-6">Khazanah <span class="text-danger">*</span> :</label>
+                                    <select name="khazanah" id="khazanah" class="form-control col-6">
+                                        <option value="" selected disabled>Sila Pilih Khazanah</option>
+                                        @foreach ($khazanah as $index=>$k)
+                                            <option value="{{ $k['id'] }}" {{ $k['role_harian'] == 'khazanah' ? 'selected' : ''}}>{{ $k['name'] }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                
+                                <div class="row col-12">
+                                    <label class="col-6">Penilai 1 <span class="text-danger">*</span> :</label>
                                     <select name="penilai" id="penilai" class="form-control col-6">
+                                        <option value="" selected disabled>Sila Pilih Penilai 1</option>
                                         @foreach ($teller as $index=>$t)
                                             <option value="{{ $t['id'] }}" {{ $t['role_harian'] == 'penilai' ? 'selected' : ''}}>{{ $t['name'] }}</option>
                                         @endforeach
                                     </select>
                                 </div>
+
+                                <div class="row col-12">
+                                    <label class="col-6">Penilai 2 :</label>
+                                    <select name="penilai2" id="penilai2" class="form-control col-6">
+                                        <option value="" selected>Tiada Penilai 2</option>
+                                        @foreach ($teller as $index=>$t)
+                                            <option value="{{ $t['id'] }}" {{ $t['role_harian'] == 'penilai2' ? 'selected' : ''}}>{{ $t['name'] }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
                             </div>
                         </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 mr-4" value="Sahkan">
                         </div>
                     </form>
@@ -103,6 +114,34 @@
 </div>
 <script>
 
+    function validatekakitangan(){
+        var khazanah = $('#khazanah').val();
+        var penilai = $('#penilai').val();
+        var penilai2 = $('#penilai2').val();
+
+        console.log(penilai);
+        if(khazanah == null || penilai == null){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Pilih Khazanah dan Penilai Bertugas Hari Ini.'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(penilai == penilai2 && penilai != null){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Penilai Sama'
+            });
+            event.preventDefault();
+            return false;
+        }
+
+        return true;
+    }
+
     var tablekakitangan = $('#table-kakitangan').DataTable({
           "scrollX": true
         });