Dynamic menu loading

app/Http/Controllers/AllowancesController.php

@@ -2,15 +2,17 @@
 
 namespace App\Http\Controllers;
 
-use App\Ranges;
-use App\Allowance;
-use App\ListItems;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 
 class AllowancesController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         $allowances = DB::table('allowance_config')->get();
         $list_items = DB::table('list_items')->get();
@@ -28,7 +30,6 @@ class AllowancesController extends Controller
         return view('Allowances.create', compact(['ranges', 'list_items']));
     }
 
-
     public function store(Request $request)
     {
         $this->validate($request, [

app/Http/Controllers/Auth/LoginController.php

@@ -25,7 +25,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/employees';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/DashboardController.php

-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class DashboardController extends Controller
-{
-    public function index(){
-        return view('Dashboard.dashboard');
-    }
-}

app/Http/Controllers/DeductionsController.php

@@ -7,6 +7,12 @@ use Illuminate\Http\Request;
 
 class DeductionsController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/DependantController.php

@@ -7,6 +7,11 @@ use App\Dependants;
 
 class DependantController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/EmployeesController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Constants;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use App\Imports\Employee_detailsImport;
@@ -10,100 +11,205 @@ use Maatwebsite\Excel\Facades\Excel;
 use Maatwebsite\Excel\HeadingRowImport;
 use Illuminate\Support\Facades\Input;
 use App\EmployeeTest;
+use App\Dependants;
+use App\Imports;
 
 
 class EmployeesController extends Controller
 {
-    
-    public function index(){
-        Return View('Employees.index');
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $users = DB::table('main_users AS mu')
+                ->join('business_units AS bu', 'bu.id', '=', 'mu.business_unit')
+                ->join('departments AS dp', 'dp.id', '=', 'mu.department')
+                ->join('main_users AS mu_', 'mu_.id', '=', 'mu.reporting_manager')
+                ->select('mu.id', 'mu.employee_id', 'mu.first_name', 'mu.last_name', 'mu.email_address', 'bu.business_unit', 'dp.department_name', 'mu.is_active', 'mu.work_phone', 'mu.job_title', 'mu_.first_name AS reporting_manager', 'mu.personal_phone', 'mu.employee_type', 'mu.role')
+                ->paginate(Constants::RESULTS_PER_PAGE);
+        return View('Employees.index', compact(['users']));
     }
-    //exportation function
-    public function export() 
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $departments = DB::table('departments')->get();
+        $businessunits = DB::table('business_units')->get();
+        $emergency = DB::table('emergency_contacts')->get();
+        $dependants = DB::table('dependants')->get();
+        return view('Employees.Registration', compact(['departments','businessunits','emergency','dependants']));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+    public function export()
     {
         try {
             $export=Excel::download(new Employee_detailsExport, 'Employees.xls');
             return $export;
         } catch (\Exception $e) {
             return redirect('/employees')->with('error','Something wrong happened');
-            
+
         }
-        
+
     }
     //importation function
-    public function import(Request $request) 
+    public function import(Request $request)
     {
-        
-        $this->validate($request, array(
-            'file'      => 'required'
-        ));
-        try {
-            if ($request -> hasFile('file')) {
-                $extension = $request ->file ->getClientOriginalExtension();
-                if ($extension == "xlsx" || $extension == "xls" || $extension == "csv" || $extension == "xlsm") {
-                    $name = $request->file->getClientOriginalName();  
-                     
-                    $import = Excel::import(new Employee_detailsImport, request()->file('file'));
-                      dd($import);
-                     return redirect('/employees')->with('success','File has been successfully imported');
-                }
-                else {                 
-                    return redirect('/employees')->with('error','File is a '.$extension.' file.!! Please upload a valid xls/csv file..!!'); 
-                }
-            }
-            
-        }
-        catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
-
-            $failures = $e->failures();  
-            // dd($failures);       
-                            
-            foreach ($failures as $failure) {
-                $failure->row(); // row that went wrong
-                
-                $failure->attribute(); //  column index
-                
-                $failure->errors(); // Actual error messages from Laravel validator 
-                
-                 return redirect('/employees')->withErrors($failures);                                  
-            }                          
-        }           
-        catch(\Exception $e){
+        $import = Excel::import(new Imports, request()->file('file'));
+        dd($import);
+        return redirect('/employees')->with('success','File has been successfully imported');
+
+        /*   $this->validate($request, array(
+              'file'      => 'required'
+          ));
+          try {
+              if ($request -> hasFile('file')) {
+                  $extension = $request ->file ->getClientOriginalExtension();
+                  if ($extension == "xlsx" || $extension == "xls" || $extension == "csv" || $extension == "xlsm" || $extension == "xlsx") {
+                      $name = $request->file->getClientOriginalName();
+
+                      $import = Excel::import(new Employee_detailsImport, request()->file('file'));
+                        dd($import);
+                       return redirect('/employees')->with('success','File has been successfully imported');
+                  }
+                  else {
+                      return redirect('/employees')->with('error','File is a '.$extension.' file.!! Please upload a valid xls/csv file..!!');
+                  }
+              }
+
+          }
+          catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+
+              $failures = $e->failures();
+              // dd($failures);
+
+              foreach ($failures as $failure) {
+                  $failure->row(); // row that went wrong
+
+                  $failure->attribute(); //  column index
+
+                  $failure->errors(); // Actual error messages from Laravel validator
+
+                   return redirect('/employees')->withErrors($failures);
+              }
+          }            */
+        /* catch(\Exception $e){
             return redirect('/employees')->with('error','Something wrong happened');
-        }
-        
-    } 
-    //
-    public function form(){
-        $departments = DB::table('departments')->get();
-        $businessunits = DB::table('business_units')->get();
-        return view('Employees.Registration', compact(['departments','businessunits']));
-        // Return View('Employees.Registration');
-    } 
-    //storing form attributes
-    public function store()
+        } */
+
+    }
+    public function personalinfo(Request $request)
+    {
+        $request->validate([
+            'name'=>'required',
+            'dateofBirth' =>'required',
+            'relation'=>'required',
+
+        ]);
+        $dependant = new Dependants([
+            'name' => $request->get('name'),
+            'dateofBirth'=> $request->get('dateofBirth'),
+            'relation'=> $request->get('relation'),
+
+        ]);
+        $dependant->save();
+        return redirect('/employees/create')->with('success', 'Dependant has been added');
+
+    }
+    public function dependantedit($id){
+        $dependant = Dependants::find($id);
+        return redirect('/employees/create', compact('dependant'));
+    }
+    public function updateDependant(Request $request, $id)
     {
-        $this->validate(request(), [
-            'InputFirstname' => 'required',
-            'InputLastname' => 'required',
-            'InputEmail' => 'required|distinct',
-            'InputGender' => 'required',
-            'InputDate' => 'required',
-            'InputYearsofExperience' => 'required',
+        $request->validate([
+            'name'=>'required',
+            'dateofBirth'   => 'required',
+            'relation'=>'required',
         ]);
-        
-            $form = new EmployeeTest;
-            
-            //$form->employeid = request('employeid');
-            $form->FirstName = request('InputFirstname');
-            $form->LastName = request('InputLastname');
-            $form->Email = request('InputEmail');
-            $form->Gender = request('gender');
-            $form->DateofJoining = request('InputDate');
-            $form->YearsofExperience = request('InputYearsofExperience');
-            $form->save();
-          
-            return redirect('/registration')->with('success','Employee has successfully been added');
-    } 
-   
+
+        $dependant = Dependants::find($id);
+        $dependant->name = $request->get('name');
+        $dependant->dateofBirth = $request->get('dateofBirth');
+        $dependant->relation = $request->get('relation');
+        $dependant->save();
+
+        return redirect('/employees/create')->with('success', 'Dependant has been updated');
+    }
+    public function dependantdestroy($id)
+    {
+        $dependant = Dependants::find($id);
+        dd($dependant);
+        $dependant->delete();
+
+        return redirect('/employees/create')->with('success', 'Dependant has been deleted successfully');
+    }
+
 }

app/Http/Controllers/HomeController.php

@@ -23,15 +23,16 @@ class HomeController extends Controller
      */
     public function index()
     {
-       
-            return view('home');
-        }
-        public function admin()
-        {
-            return view('Employees.index');
-        }
-        public function manager()
-        {
-            return view('Payslip.index');
-        }
+        return view('Home.index');
+    }
+
+    public function admin()
+    {
+        return view('Employees.index');
+    }
+
+    public function manager()
+    {
+        return view('Payslip.index');
+    }
 }

app/Http/Controllers/PayfrequencyController.php

@@ -6,6 +6,12 @@ use Illuminate\Http\Request;
 
 class PayfrequencyController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/PayslipController.php

@@ -8,6 +8,11 @@ use Illuminate\Support\Facades\DB;
 class PayslipController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         Return view('Payslip.index');
     }

app/Http/Controllers/ProcessPayrollController.php

@@ -9,6 +9,11 @@ use Illuminate\Support\Arr;
 class ProcessPayrollController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index(){
         $business_units = DB::table('business_units')
             ->select('id', 'business_unit')
@@ -456,10 +461,14 @@ class ProcessPayrollController extends Controller
                 }
 
                 ############################################################################################
-                #4. Calculate net pay
+                #4. Calculate gross/taxable/pay after tax/net pay
                 ############################################################################################
                 #Get a list of all the users
                 $users = DB::table('payslips')
+                    ->where([
+                        ['payslips.month', $month],
+                        ['payslips.year', $year]
+                    ])
                     ->join('main_users', 'main_users.id', '=', 'payslips.user_id')
                     ->join('employee_salary_details', 'employee_salary_details.user_id', '=', 'payslips.user_id')
                     ->select(DB::raw('distinct payslips.user_id'), 'employee_salary_details.salary')
@@ -469,7 +478,11 @@ class ProcessPayrollController extends Controller
                 foreach($users as $user){
                     #Get all the details of employee
                     $user_details = DB::table('payslips')
-                        ->where('user_id', $user->user_id)
+                        ->where([
+                            ['user_id', $user->user_id],
+                            ['month', $month],
+                            ['year', $year]
+                        ])
                         ->get();
 
                     $basic_salary = $user->salary;
@@ -482,12 +495,9 @@ class ProcessPayrollController extends Controller
                         if ($user_detail->item == 1){
                             #Allowances
                             $allowances += $user_detail->item_amount;
-                        }else if ($user_detail->item == 2 && $user_detail->tax_option == 1){
+                        }else if ($user_detail->item == 2 && $user_detail->tax_option == 2){
                             #Non-taxable deductions
                             $non_taxable_deductions += $user_detail->item_amount;
-                        /*}else if($user_detail->item == 2 && $user_detail->paye == 1){
-                            #PAYE
-                            $paye += $user_detail->item_amount;*/
                         }else if($user_detail->item == 2 && $user_detail->tax_option == 1){
                             #Taxable deductions
                             $taxable_deductions += $user_detail->item_amount;
@@ -514,18 +524,18 @@ class ProcessPayrollController extends Controller
                     #Add all the allowances to the basic pay to get gross pay
                     $gross_pay = $basic_salary + $allowances;
 
-                    #Start calculating net pay
-                    $net_pay = $gross_pay;
+                    # Get taxable pay
+                    $taxable_pay = $gross_pay - $non_taxable_deductions;
 
-                    #Remove all the non-taxable deductions
-                    $net_pay -= $non_taxable_deductions;
+                    #Start calculating net pay
+                    $net_pay = $taxable_pay;
 
                     #Calculate PAYE here;
                     $paye = 0;
                     $count = 0;
                     foreach ($paye_details as $paye_detail){
-                        if ($paye_detail->lower_limit <= $basic_salary && $paye_detail->upper_limit >= $basic_salary){
-                            $paye_amount = round(($basic_salary - $paye_detail->lower_limit + 1) * round($paye_detail->rate/100, 2), 2);
+                        if ($paye_detail->lower_limit <= $taxable_pay && $paye_detail->upper_limit >= $taxable_pay){
+                            $paye_amount = round(($taxable_pay - $paye_detail->lower_limit + 1) * round($paye_detail->rate/100, 2), 2);
 
                             $paye = $paye + $paye_amount;
                             $count += 1;
@@ -545,15 +555,42 @@ class ProcessPayrollController extends Controller
                     #Remove PAYE
                     $net_pay = $net_pay - $paye;
 
-                    #Remove all taxable deductions
-                    $net_pay = $net_pay - $taxable_deductions;
+                    # Pay After Tax
+                    $pay_after_tax = $net_pay;
 
                     #Add all the reliefs
                     $net_pay = $net_pay + $relief;
 
-                    #Save the paye, gross pay and net pay
+                    #Remove all taxable deductions
+                    $net_pay = $net_pay - $taxable_deductions;
+
+                    #Save the paye, taxable_pay, gross pay and net pay
                     DB::table('payslips')
                         ->insert([
+                            ['user_id' => $user->user_id,
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Pay after tax',
+                                'item_amount' => round($pay_after_tax, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
+
+                            ['user_id' => $user->user_id,
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Taxable pay',
+                                'item_amount' => round($taxable_pay, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
+
                             ['user_id' => $user->user_id,
                                 'month' => $month,
                                 'year' => $year,
@@ -561,34 +598,34 @@ class ProcessPayrollController extends Controller
                                 'tax_option' => 1,
                                 'item_name' => 'PAYE',
                                 'item_amount' => round($paye, 2),
-                                'paye' => 0,
+                                'paye' => 1,
                                 'gross' => 0,
                                 'created_by' => 1,
                                 'created_at' => DB::raw('NOW()')],
 
                             ['user_id' => $user->user_id,
-                            'month' => $month,
-                            'year' => $year,
-                            'item' => 2,
-                            'tax_option' => 1,
-                            'item_name' => 'Net pay',
-                            'item_amount' => round($net_pay, 2),
-                            'paye' => 0,
-                            'gross' => 0,
-                            'created_by' => 1,
-                            'created_at' => DB::raw('NOW()')],
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 2,
+                                'tax_option' => 1,
+                                'item_name' => 'Net pay',
+                                'item_amount' => round($net_pay, 2),
+                                'paye' => 0,
+                                'gross' => 0,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')],
 
                             ['user_id' => $user->user_id,
-                            'month' => $month,
-                            'year' => $year,
-                            'item' => 1,
-                            'tax_option' => 1,
-                            'item_name' => 'Gross pay',
-                            'item_amount' => round($gross_pay, 2),
-                            'paye' => 0,
-                            'gross' => 1,
-                            'created_by' => 1,
-                            'created_at' => DB::raw('NOW()')]
+                                'month' => $month,
+                                'year' => $year,
+                                'item' => 1,
+                                'tax_option' => 1,
+                                'item_name' => 'Gross pay',
+                                'item_amount' => round($gross_pay, 2),
+                                'paye' => 0,
+                                'gross' => 1,
+                                'created_by' => 1,
+                                'created_at' => DB::raw('NOW()')]
                         ]);
                 }
 

app/Http/Controllers/RangesController.php

@@ -11,6 +11,11 @@ use phpDocumentor\Reflection\Types\Integer;
 class RangesController extends Controller
 {
 
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     public function index()
     {
         $ranges = DB::table('ranges')->get();

app/Http/Controllers/ReliefController.php

@@ -7,6 +7,12 @@ use Illuminate\Http\Request;
 
 class ReliefController extends Controller
 {
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
     /**
      * Display a listing of the resource.
      *

app/Http/Controllers/ReportController.php

@@ -2,83 +2,55 @@
 
 namespace App\Http\Controllers;
 
+use App\Constants;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class ReportController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
+    public function __construct()
     {
-        //
+        $this->middleware('auth');
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
+    public function payroll_report(){
+        $month = 1;
+        $year = 2019;
+        $departments_array = [1,2,3,4,5];
+        $business_units_array = [1];
+
+        $departments = implode(',', $departments_array);
+        $business_units = implode(',', $business_units_array);
+
+        # Check whether requested payroll is available
+        $payroll_status = DB::table('processed_payroll')
+            ->where([
+                ['month', $month],
+                ['year', $year],
+                ['departments', $departments],
+                ['business_units', $business_units]
+            ])
+            ->get();
+
+        # Get the titles required for this report
+        $columns = DB::table('payslips')
+            ->where([
+                ['month', $month],
+                ['year', $year]
+            ])
+            ->groupBy('item_name')
+            ->select('item_name', 'item', 'tax_option', 'gross', 'paye')
+            ->orderBy('item')
+            ->get();
+
+        $users = DB::table('main_users')
+            ->whereIn('main_users.department', $departments_array)
+            ->whereIn('main_users.business_unit', $business_units_array)
+            ->join('employee_salary_details', 'employee_salary_details.user_id', '=', 'main_users.id')
+            ->select('main_users.id', 'main_users.department', 'main_users.business_unit', 'main_users.employee_id', 'main_users.first_name', 'main_users.last_name', 'employee_salary_details.salary')
+            ->paginate(Constants::RESULTS_PER_PAGE);
+
+        return view('Report.payroll_report', compact(['payroll_status', 'users', 'columns', 'month', 'year', 'pages']));
     }
 }

app/Http/Middleware/Admin.php

@@ -15,15 +15,13 @@ class Admin
      */
     public function handle($request, Closure $next)
     {
-        if(auth()->user()->isAdmin ==1){
+        if(auth()->user()->isAdmin == 1) {
             return $next($request);
+        }elseif (auth()->user()->isAdmin == 2) {
+            return $next($request);
+        }else{
+            return redirect('home')->with('error','You have no admin access');
         }
-       elseif (auth()->user()->isAdmin==2) {
-        return $next($request);
-       }
-       else{
-        return redirect('home')->with('error','You have no admin access');
-       }     
         
     }
 }

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect('/');
         }
 
         return $next($request);

composer.json

@@ -21,6 +21,9 @@
         "phpunit/phpunit": "^7.0"
     },
     "autoload": {
+        "files": [
+            "app/helpers.php"
+        ],
         "classmap": [
             "database/seeds",
             "database/factories"

config/app.php

@@ -210,6 +210,7 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
         'Excel' => Maatwebsite\Excel\Facades\Excel::class,
+        'Constants' => App\Constants::class
 
     ],
 

config/database.php

@@ -43,14 +43,14 @@ return [
             'driver' => 'mysql',
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'database' => env('DB_DATABASE', 'kinetic'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 

resources/lang/en/validation.php

@@ -125,6 +125,9 @@ return [
         'range-rate[].required' => 'Provide a rate for the range',
         'range.required' => 'Select a range',
         'relief-name.required' => 'Provide a relief name',
+        'menu-name.required' => 'Provide a menu name',
+        'url.required' => 'Provide a URL',
+
     ],
 
     /*

resources/views/Dashboard/dashboard.blade.php

-<!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>Laravel</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 13px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-
-                        @if (Route::has('register'))
-                            <a href="{{ route('register') }}">Register</a>
-                        @endif
-                    @endauth
-                </div>
-            @endif
-
-            
-            </div>
-        </div>
-    </body>
-</html>

resources/views/Employees/JobtitleConfig.blade.php

@@ -2,23 +2,43 @@
 
 @section('title', 'Employees')
 <style>
-.choose_file {
-    position: relative;
-    display: inline-block;   
-    font: normal 14px Myriad Pro, Verdana, Geneva, sans-serif;
-    color: #7f7f7f;
-    margin-top: 2px;
-    background: white
+form {
+  border-radius: 5px; 
+  width:100%;   
+  background-color: #FFFFFF;
+  overflow: hidden;
+}
+
+p span {
+  color: #F00;
+}
+
+p {
+  margin: 0px;
+  font-weight: 500;
+  line-height: 2;
+  color:#333;
+}
+
+a {
+  text-decoration:inherit
 }
-#import_file{
-    -webkit-appearance:none; 
-    position:absolute;
-    top:0;
-    left:0;
-    opacity:0;
-    width: 100%;
-    height: 100%;
+
+
+.form-group {
+  overflow: hidden;
+  clear: both;
 }
+ .form-control {
+    
+    position:relative;
+    clear: both;    
+    margin-top: 2px;
+    display:inline-block;    
+    margin-right: 10px;
+ }
+
+
 </style>
 
 @section('content')
@@ -26,7 +46,7 @@
             <section class="scrollable padder">
                 <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
                     <li><a href="."><i class="fa fa-home"></i> Home</a></li>                    
-                    <li class="active">Pay Frequency</li>
+                    <li class="active">Job Title</li>
                 </ul>              
                
         @if ( session('success') )
@@ -61,9 +81,9 @@
 @endif
 <div class=container-fluid>
 <div class=row>
-    <legend style="padding:25px 5px 5px 10px">Pay Frequency</legend>
+    <legend style="padding:25px 5px 5px 10px">Job Title</legend>
     <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm"><i class="fa fa-plus"></i></a>
+                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createJobtitle"><i class="fa fa-plus"></i>Add Job Title</a>
     </div>
 </div>
     <div class=row style="padding:0px 5px 5px 10px">
@@ -98,6 +118,50 @@
     </div>
 </div>
 </section>
+</section>
+
+<!-- Modal -->
+<div class="modal fade" id="createJobtitle" role="dialog">
+    <div class="modal-dialog">
+    
+      <!-- Modal content-->
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+          <h4 class="modal-title">Pay Frequency</h4>
+        </div>
+        <div class="modal-body">
+            <form method="post" action="" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;"> 
+            <div class=form-group style="padding-left:20px">     
+            <p>Pay Frequency<span>*</span></p>	
+                <input name="payfrequency" type="text" class="form-control" id="payfrequency" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>
+            </div>
+            <div class=form-group style="padding-left:20px">     
+            <p>Short Code <span>*</span></p>	
+                <input name="shortcode" type="text" class="form-control" id="shortcode" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>
+            </div>
+            <div class=form-group style="padding-left:20px">     
+            <p>Description <span>*</span></p>	
+                <input name="description" type="text" class="form-control" id="description" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
+                          required>            </div>
+            </form> 
+        </div>
+        <div class="modal-footer">
+        <button type="button" onclick="form_submit()" class="btn btn-primary">Save changes</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+      
+    </div>
+  </div>
+  
+<script type="text/javascript">
+function form_submit() {
+  document.getElementById("my_form").submit();
+ }
+</script>
   
  @endsection
  @section('footer-include')

resources/views/Employees/PayfrequencyConfig.blade.php

-@extends('Layout.Employeesmaster')
-
-@section('title', 'Employees')
-<style>
-form {
-  border-radius: 5px; 
-  width:100%;   
-  background-color: #FFFFFF;
-  overflow: hidden;
-}
-
-p span {
-  color: #F00;
-}
-
-p {
-  margin: 0px;
-  font-weight: 500;
-  line-height: 2;
-  color:#333;
-}
-
-a {
-  text-decoration:inherit
-}
-
-
-.form-group {
-  overflow: hidden;
-  clear: both;
-}
- .form-control {
-    
-    position:relative;
-    clear: both;    
-    margin-top: 2px;
-    display:inline-block;    
-    margin-right: 10px;
- }
-
-
-</style>
-
-@section('content')
-    <section id="content">    
-            <section class="scrollable padder">
-                <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
-                    <li><a href="."><i class="fa fa-home"></i> Home</a></li>                    
-                    <li class="active">Pay Frequency</li>
-                </ul>              
-               
-        @if ( session('success') )
-        <div class="alert alert-success alert-dismissible" role="alert">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-            <span class="sr-only">Close</span>
-        </button>
-        <strong>{{ session('success') }}</strong>
-    </div>
-    @endif
- 
-    @if (session('error'))
-    <div class="alert alert-danger alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">×</span>
-            <span class="sr-only">Close</span>
-        </button>
-        <strong>{{ session('error') }}</strong>
-    </div>
-    @endif
- 
-    @if (count($errors) > 0)
-    <div class="alert alert-danger">
-      <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
-      <div>
-        @foreach ($errors->all() as $error)
-        <p>{{ $error }}</p>
-        @endforeach
-    </div>
-</div>
-@endif
-<div class=container-fluid>
-<div class=row>
-    <legend style="padding:25px 5px 5px 10px">Pay Frequency</legend>
-    <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createPayfrequency"><i class="fa fa-plus"></i></a>
-    </div>
-</div>
-    <div class=row style="padding:0px 5px 5px 10px">
-        <div class="table-responsive" style="padding:0px 5px 5px 10px">
-            <table class="table table-striped m-b-sm datagrid">
-                <thead>
-                   <tr>
-                    <th>Action</th>
-                    <th>Pay Frequency</th>
-                    <th>Short Code</th>
-                    <th>Description</th>
-                   </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span></a>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>   
-                        <a href=""><span class="btn btn-danger btn-sm"><i class="fa fa-trash no-margin"></i></span></a>                     
-                    </td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>                               
-                <tr>
-                   <td colspan="2" class="text-center">Nothing to display</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>                
-    </div>
-</div>
-</section>
-</section>
-
-<!-- Modal -->
-<div class="modal fade" id="createPayfrequency" role="dialog">
-    <div class="modal-dialog">
-    
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Pay Frequency</h4>
-        </div>
-        <div class="modal-body">
-            <form method="post" action="" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;"> 
-            <div class=form-group style="padding-left:20px">     
-            <p>Pay Frequency<span>*</span></p>	
-                <input name="payfrequency" type="text" class="form-control" id="payfrequency" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>
-            </div>
-            <div class=form-group style="padding-left:20px">     
-            <p>Short Code <span>*</span></p>	
-                <input name="shortcode" type="text" class="form-control" id="shortcode" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>
-            </div>
-            <div class=form-group style="padding-left:20px">     
-            <p>Description <span>*</span></p>	
-                <input name="description" type="text" class="form-control" id="description" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 10em;height: 30px;float: left;padding: 0px 15px;"
-                          required>            </div>
-            </form> 
-        </div>
-        <div class="modal-footer">
-        <button type="button" onclick="form_submit()" class="btn btn-primary">Save changes</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-  
-<script type="text/javascript">
-function form_submit() {
-  document.getElementById("my_form").submit();
- }
-</script>
-  
- @endsection
- @section('footer-include')
-    <!-- fuelux -->
-    <script src="/js/libs/underscore-min.js"></script>
-    <script src="/js/fuelux/fuelux.js"></script>
-    {{--<script src="js/fuelux/demo.datagrid.js"></script>--}}
-    <!-- select2 -->
-@endsection
-
-@section('j-script')
-    <!-- Jquery -->
-    <script>
-        $(document).on('ready', function(){
-
-        });
-       
-    </script>
-
-@endsection
\ No newline at end of file

resources/views/Employees/Registration.blade.php

@@ -2,16 +2,21 @@
 
 @section('title', 'Employees')
 @section('header-include')
-    <link rel="stylesheet" href="/newswag/bootstrap.min.css" type="text/css"/>
-    <link rel="stylesheet" href="/newswag/bootstrapselect.min.css" type="text/css"/>
+<link rel="stylesheet" href="css/bootstrap.css" type="text/css" />
+<link rel="stylesheet" href="css/animate.css" type="text/css" />
+<link rel="stylesheet" href="css/font-awesome.min.css" type="text/css" />
+<link rel="stylesheet" href="css/font.css" type="text/css" />
+<link rel="stylesheet" href="/js/select3/bootstrap.min.css" type="text/css"/>
+<link rel="stylesheet" href="/js/select3/bootstrapselect.min.css" type="text/css"/>
+
 @endsection
 
 
 @section('content')
 <style>
 form {
-  border-radius: 5px; 
-  width:100%;   
+  border-radius: 5px;
+  width:100%;
   background-color: #FFFFFF;
   overflow: hidden;
 }
@@ -37,11 +42,11 @@ a {
   clear: both;
 }
  .form-control {
-    
+
     position:relative;
-    clear: both;    
+    clear: both;
     margin-top: 2px;
-    display:inline-inline;    
+    display:inline-inline;
     margin-right: 10px;
 }
 .accordion {
@@ -64,13 +69,13 @@ a {
   transition: max-height 0.2s ease-out;
 }
 </style>
-<section id="content">    
+<section id="content">
   <section class="scrollable padder">
     <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
       <li><a href="."><i class="fa fa-home"></i> Home</a></li>
       <li><a href="/employees">Employees</a></li>
       <li class="active">Add</li>
-    </ul> 
+    </ul>
     @include('Layout.errors')
     @if ( session('success') )
       <div class="alert alert-success alert-dismissible" role="alert">
@@ -81,206 +86,227 @@ a {
           <strong>{{ session('success') }}</strong>
       </div>
     @endif
-   
-    <div class="container-fluid"  style="margin-bottom:0px;">  
+
+    <div class="container-fluid"  style="margin-bottom:0px;">
     <div class=col-md-3 id=tabLinks style="width:13.5%">
             <ul class="list-group">
-              <li class="list-group-item active" ><a href="#employeeinfo" class="tab" onclick="tabswitch(this)">Employee Info</a></li> 
-              <li class="list-group-item "><a href="#personal" class="tab" onclick="tabswitch(this)">Personal</a></li>               
-              <li class="list-group-item "><a href="#salary" class="tab" onclick="tabswitch(this)">Salary</a></li>  
-              <li class="list-group-item "><a href="#training" class="tab" onclick="tabswitch(this)">Training and Certification</a></li>                                       
+              <li class="list-group-item active" ><a href="#employeeinfo" class="tab" onclick="tabswitch(this)">Employee Info</a></li>
+              <li class="list-group-item "><a href="#personal" class="tab" onclick="tabswitch(this)">Personal</a></li>
+              <li class="list-group-item "><a href="#salary" class="tab" onclick="tabswitch(this)">Salary</a></li>
+              <li class="list-group-item "><a href="#training" class="tab" onclick="tabswitch(this)">Training and Certification</a></li>
            </ul>
-          </div> 
-          <div class=col-md-6  style="width:86.5%"> 
-          <form method="post" action="{{ route('/employees/add') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
-          {{ csrf_field() }}                
-            <div class="tabcontainer employeeinfo" id=employeeinfo>
+          </div>
+          <div class=col-md-6  style="width:86.5%;">
+          <form method="post" action="{{ route('employees.create') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
+          {{ csrf_field() }}
+            <div class="tabcontainer employeeinfo" id=employeeinfo style= >
             <fieldset>
             <legend>Employee Info</legend>
             <div class=row style="padding:0px 5px 5px 10px">
                 <div class=col-md-4 style="width:20%">
-                <p>Prefix<span>*</span></p>	
+                <p>Prefix<span>*</span></p>
                 <select name="prefix" id="prefix" class="form-control selectpicker" data-live-search="true" data-size="2"  title="Select prefix" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                     <option value="1">Mr.</option>
                     <option value="2">Ms.</option>
                     <option value="3">Eng.</option>
                     <option value="4">Dr.</option>
                     <option value="5">Prof.</option>
-                    </select>        
-                </div>                   
-               
+                    </select>
+                </div>
+
                 <div class=col-md-4 id="Firstname" style="width:20%; display: inline;">
-                <p>First Name <span>*</span></p>	
+                <p>First Name <span>*</span></p>
                 <input name="InputFirstname" type="text" class="form-control" id="first_name" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           required>
-                </div>   
+                </div>
                 <div class=col-md-4 id="Lastname" style="width:20%; display: inline;">
-                <p>Last Name <span>*</span></p>	
+                <p>Last Name <span>*</span></p>
                 <input name="InputLastname" type="text" class="form-control" id="last_name" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           required>
-                </div>      
+                </div>
                 <div class=col-md-4 id="Middlename" style="width:20%; display: inline;">
-                <p>Middle Name </p>	
+                <p>Middle Name </p>
                 <input name="InputMiddlename" type="text" class="form-control" id="middle_name" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           >
-                </div> 
+                </div>
                 <div class=col-md-4 style="width:20%">
                 <p>Gender <span>*</span></p>
                   <label class="radio-inline">
                     <input type="radio" id="smt-fld-1-2" value="male"  name="gender" required >Male</label>
                   <label class="radio-inline">
-                    <input type="radio" id="smt-fld-1-3" value="female" name="gender" required >Female</label> 
+                    <input type="radio" id="smt-fld-1-3" value="female" name="gender" required >Female</label>
                   <label class="radio-inline">
-                    <input type="radio" id="smt-fld-1-3" value="other" name="gender" required >Other</label> 
-                </div>                
-                 
+                    <input type="radio" id="smt-fld-1-3" value="other" name="gender" required >Other</label>
+                </div>
+
             </div><!-- End of first row -->
 
-            <div class=row style="padding:0px 5px 5px 10px">          
+            <div class=row style="padding:0px 5px 5px 10px">
               <div class=col-md-4 style="width:20%">
                 <p>Branch<span>*</span></p>
                 <select name="branch" id="branch" class="form-control selectpicker" data-live-search="true"  title="Select Branch" style="width:15em;" data-size="5" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="0">All Business Units</option>
                     @foreach($businessunits as $businessunit)
-                  <option value="{{ $department->id }}">{{ $businessunit->business_unit }}</option>
+                  <option value="{{ $businessunit->id }}">{{ $businessunit->business_unit }}</option>
                     @endforeach
-                </select>  
-              </div>                
+                </select>
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <span data-toggle="modal" data-target="#createCertificate">Add Branch</span>
+                </div>
+              </div>
               <div class=col-md-4 style="width:20%">
-                <p>Department <span>*</span></p>          
+                <p>Department <span>*</span></p>
                 <select name="department" id="department" class="form-control selectpicker" data-live-search="true" data-size="5"  title="Select Department" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="0">All departments</option>
                     @foreach($departments as $department)
                   <option value="{{ $department->id }}">{{ $department->department_name }}</option>
                     @endforeach
-                </select> 
-              </div>                      
+                </select>
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <span>Add Department</span>
+                </div>
+              </div>
               <div class=col-md-4 style="width:20%">
-                <p>Employee Code</p>			
+                <p>Employee Code</p>
                 <select name="employeecode" id="employeecode" class="form-control selectpicker" data-live-search="true"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                  <option value="1">Branch Code</option>  
+                  <option value="1">Branch Code</option>
                   <option value="2">Department Code</option>
-                  <option value="3">None</option>                                      
-                </select> 
-                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;"> 
-                <span>Add Employee Code</span>
-                </div>   
-              </div>               
+                  <option value="3">None</option>
+                </select>
+              </div>
               <div class=col-md-4 style="width:20%">
-                <p>Employee No <span>*</span></p>			
+                <p>Employee No <span>*</span></p>
                 <input name="InputEmployeeno" type="text" class="form-control" id="employee_no" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                   required>
-                </div> 
+                </div>
               <div class=col-md-4 style="width:20%">
-                <p>E-mail <span>*</span></p>	
+                <p>E-mail <span>*</span></p>
                 <input name="InputEmail" type="email" class="form-control" id="email" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                   required>
-                </div> 
+                </div>
 
             </div> <!-- End of second row -->
 
-            <div class=row style="padding:0px 5px 5px 10px">                             
+            <div class=row style="padding:0px 5px 5px 10px">
               <div class=col-md-4 style="width:20%">
-                <p>Personal PhoneNo. <span>*</span></p>			
+                <p>Personal PhoneNo. <span>*</span></p>
                 <input name="InputPhoneno" type="text" class="form-control" id="personal_phoneno" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                     required>
-              </div>   
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>Work PhoneNo. </p>
-                <input name="InputWorkphone" type="text" class="form-control" id="work_phoneno" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">   
-              </div>   
+                <input name="InputWorkphone" type="text" class="form-control" id="work_phoneno" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>Extension</p>
-                <input name="Inputextension" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">   
-              </div>      
+                <input name="Inputextension" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>KRA PIN <span>*</span></p>
                 <input name="InputKrapin" type="text" class="form-control" id="krapin" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                   required>
-              </div>  
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>NHIF No. <span>*</span></p>
                 <input name="InputNhifNo" type="text" class="form-control" id="nhif_no" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                   required>
-              </div> 
+              </div>
 
             </div><!-- End of third row -->
 
-            <div class=row style="padding:0px 5px 5px 10px">                  
+            <div class=row style="padding:0px 5px 5px 10px">
               <div class=col-md-4 style="width:20%">
                 <p>NSSF No. <span>*</span></p>
                 <input name="InputNssfNo" type="text" class="form-control" id="nssf_no" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                   required>
-              </div>   
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>IFMIS No</p>
                 <input name="InputIfmisno" type="text" class="form-control" id="ifmis_no" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                  >               
-              </div>            
+                  >
+              </div>
               <div class=col-md-4 style="width:20%">
                 <p>Reporting Manager <span>*</span></p>
                 <select name="reportingManager" id="reportingManager" class="form-control selectpicker" data-live-search="true" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="0">Select Reporting Manager</option>
-                </select>                     
-                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;"> 
+                </select>
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
                 <span>Add Reporting Manager</span>
-                </div>          
-              </div> 
+                </div>
+              </div>
               <div class=col-md-4 style="width:20%">
-                <p>Role <span>*</span></p>        
+                <p>Role <span>*</span></p>
                 <select name="role" id="role" title="Select Role" class="form-control selectpicker" data-live-search="true" data-size="5"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="1">Employee</option>
                   <option value="2">Team Lead</option>
                   <option value="3">System Admin</option>
                   <option value="4">HR Manager</option>
                   <option value="5">Manager</option>
-                  <option value="6">Management</option>               
+                  <option value="6">Management</option>
                 </select>
-              </div>  
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <span>Add Role</span>
+                </div>
+              </div>
               <div class=col-md-4 style="width:20%">
-                <p>Job Title <span>*</span></p>              
+                <p>Job Title <span>*</span></p>
                 <select name="jobtitle" id="jobtitle" class="form-control selectpicker" data-live-search="true" data-size="5"  title="Select Job Title" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="1">Bids and Partnership Officer</option>
                   <option value="2">Business Operations Executive</option>
                   <option value="3">Enterprise Applications Engineer</option>
                   <option value="4">Sales and Markerting Executive</option>
-                  <option value="5">System Delivery Engineer</option>                
-                </select>              
-                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;"> 
+                  <option value="5">System Delivery Engineer</option>
+                </select>
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
                 <span>Add Job Title</span>
-                </div>          
-              </div>                 
-                
-            </div><!-- End of fourth row --> 
+                </div>
+              </div>
 
-            <div class=row style="padding:0px 5px 5px 10px">                  
-              <div class=col-md-4 style="width:20%">
-              <p>Employment Status <span>*</span></p>                
-              <select name="employmentstatus" id="employmentstatus" class="form-control selectpicker" data-live-search="true" data-size="5"  title="Select employment status." style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                <option value="1">Full Time</option>
-                <option value="2">Part Time</option>
-                <option value="3">Contract</option>
-                <option value="4">Temporary</option>
-                <option value="5">Permanent</option>  
-                <option value="6">Casual</option>
-                <option value="7">Probation</option>                 
+            </div><!-- End of fourth row -->
+
+            <div class=row style="padding:0px 5px 5px 10px">
+            <div class=col-md-4 style="width:20%">
+              <p>Employment Status <span>*</span></p>
+            <select name="employmentstatus" id="employmentstatus" class="form-control selectpicker" data-live-search="true" data-size="5" onchange="durationfieldVisibility(this);" title="Select employment status." style="width:15em;">
+            <option value="full_time">Full Time</option>
+                <option value="part_time">Part Time</option>
+                <option value="contract">Contract</option>
+                <option value="temporary">Temporary</option>
+                <option value="permanent">Permanent</option>
+                <option value="casual">Casual</option>
+                <option value="probation">Probation</option>
               </select>
-              </div>     
-              <div class=col-md-4 style="width:20%">
+              <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <span>Add Employment Status</span>
+                </div>
+              </div>
+            <div class=col-md-4  id="duration" style="display: none;width:20%">
+              <p>Duration <span>*</span></p>
+              <select name="duration" id="duration" class="form-control selectpicker" data-live-search="true" data-size="5"  title="Select Duration" style="width:15em;" >
+                <option value="1">1 Month</option>
+                <option value="2">3 Months</option>
+                <option value="3">6 Months</option>
+                <option value="4">1 Year</option>
+              </select>
+              <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <span>Add Duration</span>
+                </div>
+            </div>
+            <div class=col-md-4 style="width:20%">
               <p>Years of Experience <span>*</span></p>
               <input name="Inputyearsofexperience" type="text" class="form-control" id="yearsofexperience" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                required>             
-              </div>
+                required>
+            </div>
               <div class=col-md-4 style="width:20%">
                 <p>Date of Joining <span>*</span></p>
                 <input name="InputDateofjoining" type="date" class="form-control" id="dateofjoining" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                  required>          
-              </div>  
+                  required>
+              </div>
             <div class=row style="padding:0px 5px 5px 10px">
               <div class=col-md-4 style="width:20%">
               <p>Date of Leaving </p>
               <input name="InputDateofleaving" type="date" class="form-control" id="dateofleaving" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;" >
-              </div>                    
+              </div>
             </div><!-- End of fifth row -->
             <div class=row style="padding:0px 5px 5px 10px">
               <div class=col-md-4 style="width:20%;  padding-top:15px">
@@ -289,63 +315,66 @@ a {
               <div class=col-md-4 style="width:20%; padding-top:15px">
               <button class=btn style="padding: 5px 25px 5px 25px">Cancel</button>
               </div>
-            </div> <!-- End of button row -->  
-          </form>                                        
-            <div class=row style="padding:0px 5px 5px 10px">
+            </div> <!-- End of button row -->
+          </form>
+          </fieldset>
+          <div class= container-row style="padding:0px 5px 5px 10px;">
+            <div class="row">
               <div class=col-md-4 style="width:20%;padding-top:25px;">
               <b> Is Employee Disabled?</b> <input type="checkbox" id="disabilitycheckbox" />
-            </div>   
-            </div>           
-            </fieldset>
-            <!-- Disability Info row -->
-            <fieldset>            
-            <div class=row id=disabilityformrow style="padding:0px 5px 5px 10px;display:none">
+              </div>
+            </div>
+            <div class="disability row" id=disabilityformrow style="padding:0px 5px 5px 10px;display:none;">
             <legend style="padding:30px 0px 0px 10px;">Disability</legend>
-            <form method="post" action="{{ route('/employees/add') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
-            {{ csrf_field() }}    
-                <div class=col-md-4 style="width:20%">
-                <p>Disability Type </p>
-                <select name="disabilityType" id="disabilityType" class="form-control selectpicker" data-size="2" data-live-search="true"  title="Select disability" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                    <option value="0">Select disability</option>
-                    <option value="1">Health Impairments</option>
-                    <option value="2">Blindness and Visual Impairment</option>
-                    <option value="3">Hearing Impairments</option>
-                    <option value="4">Mental illness or Emotional disturbances</option>
-                    <option value="5">Learning disabilities</option>
-                    <option value="6">Mobility or Orthopedic disability</option>
-                    <option value="7">Speech or language impairments</option>
-                    <option value="8">Other</option>
-                    </select>   
-                </div>               
-                <div class=col-md-4 style="width:20%">
-                <p>Description </p>
-                <input name="disabilitydescription" type="text" class="form-control" id="disabilitydescription" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 60px;float: left;padding: 0px 15px;"
-                  required>                  
-                </div>
-                <div class=col-md-4 style="width:20%">
-                <p>Exemption Certificate <span>*</span></p>
-                <input type="file" name="exemptionCert" class="form-control" style="width:15em;" >
-                </div>   
-                <div class=row style="padding:0px 5px 5px 10px">
-                  <div class=col-md-4 style="width:20%;  padding-top:15px">
-                  <button class="btn btn-info" style="padding: 5px 25px 5px 25px">Save</button>
-                  </div>
-                  <div class=col-md-4 style="width:20%; padding-top:15px">
-                  <button class=btn style="padding: 5px 25px 5px 25px">Cancel</button>
-                  </div>
-                </div> <!-- End of button row -->  
-              </form>                
+            <form method="post" action="{{ route('employees.create') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
+            {{ csrf_field() }}
+            <div class="disabilityinfo row" style="padding:0px 5px 5px 10px;height:125px">
+              <div class=col-md-4 style="width:20%;">
+              <p>Disability Type </p>
+              <select name="disabilityType" id="disabilityType" class="dropdown selectpicker"  data-dropup--auto="false" title="Select Disability" data-size="2" data-live-search="true" >
+                <option value="1">Blindness and Visual Impairment</option>
+                <option value="2">Hearing Impairments</option>
+                <option value="3">Mental illness or Emotional disturbances</option>
+                <option value="4">Learning disabilities</option>
+                <option value="5">Mobility or Orthopedic disability</option>
+                <option value="6">Speech or language impairments</option>
+                <option value="7">Health Impairments</option>
+                <option value="8">Other</option>
+              </select>
+              </div>
+              <div class=col-md-4 style="width:20%">
+              <p>Description </p>
+              <textarea id=disabilityDescription class="form-control inputstl" rows="3"></textarea>
+              </div>
+              <div class=col-md-4 style="width:20%">
+              <p>Exemption Certificate <span>*</span></p>
+              <input type="file" name="exemptionCert" class="form-control" style="width:15em;" >
+              </div>
 
-              </div><!-- End of Disability row -->               
-             
-            </fieldset>
+            </div><!-- End of DisabilityInfo row -->
 
-            </div> <!-- End of employeeinfo tabcontainer  -->            
+            <div class="button row" style="padding:0px 5px 5px 10px;">
+              <div class=col-md-4 style="width:20%;  padding-top:15px">
+              <button class="btn btn-info" style="padding: 5px 25px 5px 25px">Save</button>
+              </div>
+              <div class=col-md-4 style="width:20%; padding-top:15px">
+              <button class=btn style="padding: 5px 25px 5px 25px">Cancel</button>
+              </div>
+            </div> <!-- End of button row -->
+            </form>
+            </div><!-- End of Disability row -->
+
+          </div><!-- End of container-row               -->
+
+
+
+          </div> <!-- End of employeeinfo tabcontainer  -->
+
+          </div> <!--End of employeeinfo column -->
 
-          </div> <!--End of employeeinfo column -->           
 
           <!-- PersonalInfo Div -->
-          <div class="col-md-6 tabcontainer personal" id=personal style="display:none;width:86.5%">          
+          <div class="col-md-6 tabcontainer personal" id=personal style="display:none;width:86.5%">
           <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             <div class="panel panel-default">
               <div class="panel-heading" role="tab" id="headingOne">
@@ -357,38 +386,38 @@ a {
               </div>
               <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
               <div class="panel-body">
-              <form method="post" action="{{ route('/employees/add') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
+              <form method="post" action="{{ route('employees.create') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
               {{ csrf_field() }}
-              <div class=row style="padding:0px 5px 5px 10px">                
+              <div class=row style="padding:0px 5px 5px 10px">
                 <div class=col-md-4 style="width:20%">
-                <p>Marital Status<span>*</span></p>			    
+                <p>Marital Status<span>*</span></p>
                 <select class="selectpicker" id="maritalStatus" name="maritalStatus" data-live-search="true"  title="Select marital status" data-size="3" >
                     <option data-tokens="single" value="single">Single</option>
-                    <option data-tokens="married" value="married">Married</option> 
-                    <option data-tokens="separated" value="separated">Separated</option> 
-                    <option data-tokens="divorced" value="divorced">Divorced</option> 
-                    <option data-tokens="widow_widower" value="widow_widower">Widow/Widower</option>                   
-                    </select> 
+                    <option data-tokens="married" value="married">Married</option>
+                    <option data-tokens="separated" value="separated">Separated</option>
+                    <option data-tokens="divorced" value="divorced">Divorced</option>
+                    <option data-tokens="widow_widower" value="widow_widower">Widow/Widower</option>
+                    </select>
                 </div>
                 <div class=col-md-4 style="width:20%">
-                <p>Nationality <span>*</span></p>		                
+                <p>Nationality <span>*</span></p>
                 <select name="nationality" class="form-control selectpicker" data-live-search="true" data-size="3"  title="Select nationality" onchange="ethnicVisibility(this);" id="nationality" class="form-control" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                    <option value="kenyan">Kenyan</option>                   
-                    <option value="">Ugandan</option>
-                    <option value="">Tanzanian</option>          
-                    <option value="">Tanzanian</option>          
-                    <option value="">Tanzanian</option>          
-                    <option value="">Tanzanian</option>          
-                    <option value="">Tanzanian</option>          
-                    <option value="">Tanzanian</option>                   
-                    </select>   
-                </div> 
+                    <option value="kenyan">Kenyan</option>
+                    <option value="ugandan">Ugandan</option>
+                    <option value="">Tanzanian</option>
+                    <option value="">American</option>
+                    <option value="">German</option>
+                    <option value="">Dutch</option>
+                    <option value="">Tanzanian</option>
+                    <option value="">Tanzanian</option>
+                    </select>
+                </div>
                 <div class=col-md-4 id="ethnicfield" style="width:20%; display: none;">
-                <p>Ethnic Code <span>*</span></p>	
+                <p>Ethnic Code <span>*</span></p>
                 <select name="ethnicity" id="ethnicity" class="form-control selectpicker" data-live-search="true" data-size="3" multiple data-max-options="2"   title="Select ethnicity" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                    <option value="1">Abaluhya</option> 
-                    <option value="2">Abagusii</option> 
-                    <option value="3">Abakuria</option>                 
+                    <option value="1">Abaluhya</option>
+                    <option value="2">Abagusii</option>
+                    <option value="3">Abakuria</option>
                     <option value="4">Aembu</option>
                     <option value="5">Agikuyu</option>
                     <option value="6">Akamba</option>
@@ -408,78 +437,78 @@ a {
                     <option value="17">Abaluhya</option>
                     <option value="18">Abaluhya</option>
                     <option value="19">Abaluhya</option>
-                    <option value="20">Abaluhya</option> 
-                    <option value="21">Abaluhya</option> 
-                    <option value="22">Abaluhya</option> 
-                    <option value="23">Abaluhya</option> 
-                    <option value="24">Abaluhya</option> 
-                    <option value="25">Abaluhya</option> 
-                    <option value="26">Abaluhya</option> 
-                    <option value="27">Abaluhya</option> 
-                    <option value="28">Abaluhya</option> 
-                    <option value="29">Abaluhya</option> 
-                    <option value="30">Abaluhya</option> 
-                    <option value="31">Abaluhya</option> 
-                    <option value="30">Abaluhya</option> 
-                    <option value="31">Abaluhya</option> 
-                    <option value="32">Abaluhya</option> 
-                    <option value="33">Abaluhya</option> 
-                    <option value="34">Abaluhya</option> 
-                    <option value="35">Abaluhya</option> 
-                    <option value="36">Abaluhya</option> 
-                    <option value="37">Abaluhya</option> 
-                    <option value="38">Abaluhya</option> 
-                    <option value="39">Abaluhya</option> 
-                    <option value="40">Abaluhya</option> 
-                    <option value="41">Abaluhya</option> 
-                    <option value="42">Abaluhya</option>                   
-                    </select>  
-                </div>   
+                    <option value="20">Abaluhya</option>
+                    <option value="21">Abaluhya</option>
+                    <option value="22">Abaluhya</option>
+                    <option value="23">Abaluhya</option>
+                    <option value="24">Abaluhya</option>
+                    <option value="25">Abaluhya</option>
+                    <option value="26">Abaluhya</option>
+                    <option value="27">Abaluhya</option>
+                    <option value="28">Abaluhya</option>
+                    <option value="29">Abaluhya</option>
+                    <option value="30">Abaluhya</option>
+                    <option value="31">Abaluhya</option>
+                    <option value="30">Abaluhya</option>
+                    <option value="31">Abaluhya</option>
+                    <option value="32">Abaluhya</option>
+                    <option value="33">Abaluhya</option>
+                    <option value="34">Abaluhya</option>
+                    <option value="35">Abaluhya</option>
+                    <option value="36">Abaluhya</option>
+                    <option value="37">Abaluhya</option>
+                    <option value="38">Abaluhya</option>
+                    <option value="39">Abaluhya</option>
+                    <option value="40">Abaluhya</option>
+                    <option value="41">Abaluhya</option>
+                    <option value="42">Abaluhya</option>
+                    </select>
+                </div>
                 <div class=col-md-4 style="width:20%">
-                <p>Date of Birth <span>*</span></p>	
+                <p>Date of Birth <span>*</span></p>
                 <input name="Inputdob" type="date" class="form-control" id="dob" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           required>
-                </div>                 
+                </div>
                 <div class=col-md-4 style="width:20%">
                 <p>Identity Documents<span>*</span> </p>
-                <select class="form-control selectpicker"  data-live-search="true"  title="Select Identity Document" onchange="inputfieldVisibility(this);" id="identitydocument" style="background-color:white;">  
-                    <option value="national">National ID</option>                   
+                <select class="form-control selectpicker"  data-live-search="true"  title="Select Identity Document" onchange="inputfieldVisibility(this);" id="identitydocument" style="background-color:white;">
+                    <option value="national">National ID</option>
                     <option value="passport">Passport No</option>
-                    <option value="military">Military ID</option>                   
-                    </select>  
-                </div>  
-                
-              </div><!-- End of first row -->   
+                    <option value="military">Military ID</option>
+                    </select>
+                </div>
+
+              </div><!-- End of first row -->
 
-              <div class=row style="padding:0px 5px 5px 10px">           
+              <div class=row style="padding:0px 5px 5px 10px">
                 <div class=col-md-4 id="nationaldocument" style="width:20%; display: none;">
                 <p>National ID No.</p>
-                  <input name="nationalid" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">   
+                  <input name="nationalid" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
                 </div>
                 <div class=col-md-4 id="passportdocument" style="width:20%; display: none;">
                 <p>Passport No.</p>
-                  <input name="passportno" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">   
+                  <input name="passportno" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
                 </div>
                 <div class=col-md-4 id="militarydocument" style="width:20%; display: none;">
                 <p>Military ID No.</p>
-                  <input name="militaryid" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">   
+                  <input name="militaryid" type="text" class="form-control" id="extension" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
                 </div>
                 <div class=col-md-4 style="width:20%">
-                <p>Language</p>	
+                <p>Language</p>
                 <select class="dropup selectpicker" name="language" data-dropup--auto="false" multiple data-max-options="5" data-size="3" data-live-search="true" title="Select a language">
-                        <option>PHP</option>
-                        <option>CSS</option>
-                        <option>HTML</option>
-                        <option>CSS 3</option>
-                        <option>Bootstrap</option>
-                        <option>JavaScript</option>
-                        <option>Java</option>
-                        <option>C#</option>
-                        <option>Python</option>
+                        <option>English</option>
+                        <option>Swahili</option>
+                        <option>Deutch</option>
+                        <option>French</option>
+                        <option>Spanish</option>
+                        <option>Chinese</option>
+                        <option>Japanese</option>
+                        <option>Russian</option>
+
                 </select>
-                </div>                  
+                </div>
                 <div class=col-md-4 style="width:20%">
-                <p>Blood Group <span>*</span></p>			
+                <p>Blood Group <span>*</span></p>
                 <select class="dropup form-control selectpicker" name="bloodgroup" data-dropup--auto="false" title="Select blood group"  data-size="3" data-live-search="true">
                       <option>A +</option>
                       <option>A  -</option>
@@ -490,7 +519,7 @@ a {
                       <option>O +</option>
                       <option>O -</option>
                 </select>
-                </div> 
+                </div>
 
               </div> <!-- End of second row -->
 
@@ -503,7 +532,7 @@ a {
                 </div>
 
               </div> <!-- End of button row -->
-              </form> 
+              </form>
 
               </div>
               </div>
@@ -518,20 +547,20 @@ a {
               </div>
               <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
                 <div class="panel-body">
-                  <form method="post" action="{{ route('/employees/add') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
+                  <form method="post" action="{{ route('employees.create') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
                   {{ csrf_field() }}
                   <legend style="padding:5px 5px 5px 10px">Postal Address</legend>
-                  <div class=row style="padding:0px 5px 5px 10px">               
+                  <div class=row style="padding:0px 5px 5px 10px">
                     <div class=col-md-4 style="width:20%">
                     <p>Country <span>*</span></p>
                     <input name="country" type="text" class="form-control" id="country" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                       required>
-                    </div>   
+                    </div>
                     <div class=col-md-4 style="width:20%">
                     <p>State/County <span>*</span></p>
                     <input name="state" type="text" class="form-control" id="state" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                       required>
-                    </div>   
+                    </div>
                     <div class=col-md-4 style="width:20%">
                     <p>City <span>*</span></p>
                     <input name="city" type="text" class="form-control" id="city" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
@@ -541,30 +570,39 @@ a {
                     <p>Street Address <span>*</span></p>
                     <input name="streetaddress" type="text" class="form-control" id="streetaddress" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                       required>
-                    </div>            
+                    </div>
                     <div class=col-md-4 style="width:20%">
                     <p>Postal Code</p>
                     <input name="postalcode" type="text" class="form-control" id="postalcode" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;">
-                    </div> 
+                    </div>
 
                   </div><!-- End of Postal Address row -->
-                          
+
                   <div class=row style="padding:0px 5px 5px 10px">
                   <legend style="padding:25px 5px 5px 10px">Current Address</legend>
                     <div class=col-md-4 style="width:20%">
                     <p>Country <span>*</span></p>
-                    <input name="postalCountry" type="text" class="form-control" id="postalCountry" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                      required>
-                    </div>   
+                    <select name="CurrentaddressCountry" id="CurrentaddressCountry" class="dropup selectpicker" data-dropup--auto="false" data-live-search="true"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
+                    <option value="1">Kenya</option>
+                    <option value="2">Tanzania</option>
+                    <option value="3">Uganda</option>
+                    </select>
+                    </div>
                     <div class=col-md-4 style="width:20%">
                     <p>State/County <span>*</span></p>
-                    <input name="postalState" type="text" class="form-control" id="postalState" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                      required>
-                    </div>   
+                    <select name="CurrentaddressCounty" id="CurrentaddressCounty" class="dropup selectpicker" data-dropup--auto="false" data-live-search="true"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
+                    <option value="1">Nairobi</option>
+                    <option value="2">Nakuru</option>
+                    <option value="3">Mandera</option>
+                    </select>
+                    </div>
                     <div class=col-md-4 style="width:20%">
                     <p>Constituency <span>*</span></p>
-                    <input name="postalCity" type="text" class="form-control" id="postalCity" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
-                      required>
+                    <select name="CurrentaddressConstituency" id="CurrentaddressConstituency" class="dropup selectpicker" data-dropup--auto="false" data-live-search="true"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
+                    <option value="1">Langata</option>
+                    <option value="2">Kikuyu</option>
+                    <option value="3">Kisii</option>
+                    </select>
                     </div>
                     <div class=col-md-4 style="width:20%">
                     <p>Location  <span>*</span></p>
@@ -582,28 +620,29 @@ a {
                     <button class=btn style="padding: 5px 25px 5px 25px">Cancel</button>
                     </div>
 
-                  </div> <!-- End of button row --> 
+                  </div> <!-- End of button row -->
 
-                </form> 
+                </form>
                 </div>
               </div>
             </div>
             <div class="panel panel-default">
               <div class="panel-heading" role="tab" id="headingThree">
-              <h4 class="panel-title">
-              <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-              Emergency Contacts
-              </a>
-              </h4>
+                <h4 class="panel-title">
+                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+                Emergency Contacts
+                </a>
+                </h4>
               </div>
               <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
                 <div class="panel-body">
                 <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Add Emergency Contact</a>
+                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createEmergencyContact"><i class="fa fa-plus"></i>Add Emergency Contact</a>
                 </div>
                 <div class=row style="padding:0px 5px 5px 10px">
-                  <div class="table-responsive" style="padding:0px 5px 5px 10px">
+                <div class="table-responsive" style="padding:0px 5px 5px 10px">
                   <table class="table table-striped m-b-sm datagrid">
+                  @if(count($emergency) > 0)
                   <thead>
                     <tr>
                       <th>Name</th>
@@ -614,26 +653,33 @@ a {
                     </tr>
                   </thead>
                   <tbody>
-                    <tr id="">
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
+                  @foreach($emergency as $row)
+                  <tr id="emergency-row-{{ $row->id }}">
+                    <td>{{$row->name }}</td>
+                    <td>{{$row->phone_no}}</td>
+                    <td>{{$row->email}}</td>
+                    <td>{{$row->relation}}</td>
                     <td>
-                      <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>
-                      <a href=""><span class="btn btn-danger btn-sm" ><i class="fa fa-trash no-margin"></i></span></a>
+                    <form action="{{ route('emergency.destroy', $row->id)}}" method="post" style=position:relative;float:right>
+                     @csrf
+                     @method('DELETE')
+                     <a href="{{ route('emergency.edit',$row->id)}}" ><span class="btn btn-default"><i class="fa fa-edit no-margin"></i></span></a>
+                     <button data-toggle="tooltip" data-placement="top" title="Delete" type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this item?');"><i class="fa fa-trash no-margin"></i></button>
+                    </form>
                     </td>
-                    </tr>                               
+                  </tr>
+                    @endforeach
+                    @else
                     <tr>
                       <td colspan="2" class="text-center">Nothing to display</td>
                     </tr>
+                    @endif
                   </tbody>
                   </table>
-                  </div> 
-
-                </div><!-- End of Emergency Contact row -->  
+                  </div>
 
-                </div>                    
+                </div><!-- End of Emergency Contact row -->
+                </div>
 
               </div>
             </div>
@@ -648,11 +694,12 @@ a {
               <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
                 <div class="panel-body">
                 <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                  <a href="" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Add Dependant</a>
-                  </div>                  
+                  <a href="" class="btn btn-info btn-sm" id="dependant" data-toggle="modal" data-target="#createDependant"><i class="fa fa-plus"></i>Add Dependant</a>
+                  </div>
                         <div class=row style="padding:0px 5px 5px 10px">
                         <div class="table-responsive" style="padding:0px 5px 5px 10px">
                           <table class="table table-striped m-b-sm datagrid">
+                          @if(count($dependants)>0)
                           <thead>
                             <tr>
                                 <th>Name</th>
@@ -661,107 +708,124 @@ a {
                                 <th>Action</th>
                               </tr>
                           </thead>
-                          <tbody>                  
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                              <td>
-                                <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>
-                                <a href=""><span class="btn btn-danger btn-sm" ><i class="fa fa-trash no-margin"></i></span></a>
-                              </td>
-                            </tr>                               
+                          <tbody id="dependants-crud" class="Dependant">
+                          @foreach($dependants as $dependant)
+                          <tr id="dependant-row-{{ $dependant->id }}">
+                            <td>{{$dependant->name}}</td>
+                            <td>{{$dependant->relation}}</td>
+                            <td>{{$dependant->dateofBirth}}</td>
+                            <td >
+                            <form action="{{ route('dependants.destroy', $dependant->id)}}" method="post" style=position:relative;float:right>
+                              @csrf
+                              @method('DELETE')
+                              <a href="{{ route('dependants.edit',$row->id)}}" ><span class="btn btn-default"><i class="fa fa-edit no-margin"></i></span></a>
+                              <button data-toggle="tooltip" data-placement="top" title="Delete" type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this item?');"><i class="fa fa-trash no-margin"></i></button>
+                            </form>
+                            </td>
+                            </tr>
+                            @endforeach
+                            @else
                             <tr>
                               <td colspan="2" class="text-center">Nothing to display</td>
                             </tr>
+                            @endif
                           </tbody>
                           </table>
-                        </div>              
-                        </div><!-- End of fifth row -->    
+                        </div>
+                        </div><!-- End of fifth row -->
                       </div>
               </div>
             </div>
           </div>
-
+          </div>
           <!-- End of Accordion -->
-            
-                       
-          </div> <!--End of column --> 
+
 
           <div class="col-md-6 tabcontainer salary" id=salary style="display:none;width:86.5%">
-          <form method="post" action="{{ route('/employees/add') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
-          {{ csrf_field() }}                
-            <fieldset>
-            <legend>Salary Info</legend>
-            <div class=row style="padding:0px 5px 5px 10px">
-                <div class=col-md-4 style="width:20%">
-                <p>Pay Frequency<span>*</span></p>	
+            <div class="panel panel-default">
+              <div class="panel-heading" role="tab" id="headingOne">
+                <h4 class="panel-title">
+                  Salary Info
+                </h4>
+              </div>
+              <div class="panel-body">
+              <form method="post" action="{{ route('employees.create') }}" enctype="multipart/form-data" class="form-inline" style="padding-top:10px;">
+              {{ csrf_field() }}
+              <div class=row style="padding:0px 5px 5px 10px">
+              <div class=col-md-4 style="width:20%">
+                <p>Pay Frequency<span>*</span></p>
                 <select name="payfrequency" id="payfrequency" class="form-control selectpicker" data-live-search="true" data-size="2"  title="Select Pay Frequency" style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
                   <option value="1">Monthly</option>
                   <option value="2">Weekly</option>
-                  <option value="3">Daily</option>                    
-                </select>        
-                </div>                   
-               
+                  <option value="3">Daily</option>
+                </select>
+                <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
+                <a href=""  data-toggle="modal" data-target="#createPayfrequency"><span>Add Pay Frequency</span></a>
+                  </div>
+                </div>
+
                 <div class=col-md-4 style="width:20%">
-                  <p>Currency</p>			
+                  <p>Currency</p>
                   <select name="currency" id="currency" class="form-control selectpicker" data-live-search="true"  style="width:15em;" onfocus='this.size=5;' onblur='this.size=1;' onchange='this.size=1; this.blur();'>
-                    <option value="1">Ksh.</option>  
+                    <option value="1">Ksh.</option>
                     <option value="2">USD</option>
-                    <option value="3">Euro</option>                                      
-                  </select> 
-                  <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;"> 
+                    <option value="3">Euro</option>
+                  </select>
+                  <div style="float:left; margin-top: 2px;text-align: left;font-family: 'Roboto Regular',sans-serif;color: #208BBD;font-size: 12px;cursor: pointer;">
                   <span>Add Currency</span>
-                  </div>   
-                </div> 
-                <div class=col-md-4 id="Lastname" style="width:20%;">
-                <p>Accounts <span>*</span></p>	
-                <select class="selectpicker" name="language" data-dropup--auto="false" multiple data-max-options="2" data-size="3"  title="Select Accounts" onchange="accVisibility(this);">
-                        <option value="bank">Bank</option>
-                        <option value="sacco">Sacco</option>
-                       
-                </select>
-                </div>      
-                <div class=col-md-4 id="Middlename" style="width:20%; display: none;">
-                <p>Bank Branch Name </p>	
+                  </div>
+                </div>
+                <div class=col-md-4 id="Middlename" style="width:20%;">
+                <p>Salary Amount </p>
+                <input name="bankBranch" type="text" class="form-control" id="bankBranch" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
+                          >
+                </div>
+                <div class=col-md-4 id="Middlename" style="width:20%;">
+                <p>Bank Branch Name </p>
                 <input name="bankBranch" type="text" class="form-control" id="bankBranch" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           >
-                </div> 
-                <div class=col-md-4 id="Middlename" style="width:20%; display: none;">
-                <p>Acc No. </p>	
+                </div>
+                <div class=col-md-4 id="Middlename" style="width:20%;">
+                <p>Account No. </p>
                 <input name="bankAcc" type="text" class="form-control" id="bankAcc" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           >
-                </div>       
-                 
-            </div><!-- End of first row -->
+                </div>
+              </div><!-- End of first row -->
 
-            <div class=row style="padding:0px 5px 5px 10px">          
-            <div class=col-md-4 id="Middlename" style="width:20%; display: none;">
-                <p>Sacco Branch Name </p>	
-                <input name="saccoBranch" type="text" class="form-control" id="saccoBranch" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
+              <div class=row style="padding:0px 5px 5px 10px">
+                <div class=col-md-4 id="saccoName" style="width:20%;">
+                <p>Sacco Name </p>
+                <input name="saccoName" type="text" class="form-control" id="saccoName" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           >
-                </div> 
-                <div class=col-md-4 id="Middlename" style="width:20%; display: none;">
-                <p>Acc No. </p>	
-                <input name="saccoAcc" type="text" class="form-control" id="saccoAcc" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
+                </div>
+                <div class=col-md-4 id="saccoAccountno" style="width:20%;">
+                <p>Sacco Account No. </p>
+                <input name="saccoAccountno" type="text" class="form-control" id="saccoAccountno" style="border-radius: 0px 5px 5px 0px;border: 1px solid #eee;margin-bottom: 15px;width: 15em;height: 40px;float: left;padding: 0px 15px;"
                           >
-                </div>      
-            </div> <!-- End of second row -->
-            <div class=row style="padding:0px 5px 15px 10px">
-              <div class=col-md-4 style="width:20%;  padding-top:15px">
+                </div>
+
+              </div> <!-- End of second row -->
+
+              <div class=row style="padding:0px 5px 15px 10px">
+                <div class=col-md-4 style="width:20%;  padding-top:15px">
                 <button class="btn btn-info" style="padding: 5px 25px 5px 25px">Save</button>
-              </div>
-              <div class=col-md-4 style="width:20%; padding-top:15px">
+                </div>
+                <div class=col-md-4 style="width:20%; padding-top:15px">
                 <button class=btn style="padding: 5px 25px 5px 25px">Cancel</button>
                 </div>
-              </div> <!-- End of button row --> 
-          </div>
-        
-    
+
+              </div> <!-- End of button row -->
+              </form>
+
+            </div>
+            </div>
+          </div> <!---End of salary tabcontainer -->
+
           <div class="col-md-6 tabcontainer training" id=training style="display:none;width:86.5%">
           <div class=row style="padding:0px 5px 5px 10px">
               <legend style="padding:25px 5px 5px 10px">Training and Certification</legend>
               <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Add Certification</a>
+                <a href="" class="btn btn-info btn-sm" data-toggle="modal" data-target="#createCertificate"><i class="fa fa-plus"></i>Add Certification</a>
               </div>
               </div>
               <div class=row style="padding:0px 5px 5px 10px">
@@ -777,34 +841,88 @@ a {
                     </tr>
                 </thead>
                 <tbody>
+
                   <tr id="">
                   <td></td>
                   <td></td>
                   <td></td>
                   <td></td>
                     <td>
-                      <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>
-                      <a href=""><span class="btn btn-danger btn-sm" ><i class="fa fa-trash no-margin"></i></span></a>
+                    <form action="" method="post" style=position:relative;float:right>
+                     @csrf
+                     @method('DELETE')
+                     <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span></a>
+                     <a href="" ><span class="btn btn-default"><i class="fa fa-edit no-margin"></i></span></a>
+                      <button data-toggle="tooltip" data-placement="top" title="Delete" type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this item?');"><i class="fa fa-trash no-margin"></i></button>
+                    </form>
                     </td>
-                  </tr>                               
+                  </tr>
+
                   <tr>
                     <td colspan="2" class="text-center">Nothing to display</td>
                   </tr>
+
                 </tbody>
                 </table>
-                
-              </div>              
-              </div><!-- End of fifth row --> 
-              </div><!--- End of training and Certification -->
-              
-    </div> <!-- End of container -->  
- 
+
+              </div>
+              </div><!-- End of fifth row -->
+
+            </div><!--- End of training and Certification -->
+
+
+
+    </div> <!-- End of container -->
+
+
   </section>
 </section>
+<!---Modals used on the page-->
+
+<!-- Training and Certification Modal -->
+@include('Modals/trainingCertification')
+<!-- Emergency Contacts Modal -->
+@include('Modals/emergencyContacts')
+<!-- Dependants Modal -->
+@include('Modals/dependants')
+
+
+<script>
+function dependantUpdate() {
+  document.getElementById("dependantUpdated").submit();
+ }
+
+</script>
+<script>
+    /* populate the modal popup when it's launched, with the data provided by the launching button ....  */
+    $('#updateDependant').on('show.bs.modal', function (event) {
+      alert("working");
+        var button = $(event.relatedTarget); // Button that triggered the modal
+        var name       = button.data('name');    // Extract info from data-* attributes
+        var dateofBirth      = button.data('dateofBirth');
+        var relation     = button.data('relation');
+        // Update the modal's content
+        var modal = $(this);
+        modal.find('#name').text(name);
+        modal.find('#dateofBirth').date(dateofBirth);
+        modal.find('#relation').text(relation);
+    });
+</script>
+
+
+
+
+
+<!--PayFrequency Modal -->
+@include('Modals/payFrequency')
+
+<script src="/js/select2/select2.min.js"></script>
 <!-- Bootstrap -->
-<script src="/newswag/jquery.min.js"></script>
-<script src="/newswag/jquery.min.js"></script>
-<script src="/newswag/bootstrapselect.min.js"></script>
+<script src="/js/select3/jquery.min.js"></script>
+<script src="/js/select3/jquery.min.js"></script>
+<script src="/js/select3/bootstrapselect.min.js"></script>
+<script src="js/file-input/bootstrap-filestyle.min.js"></script>
+
 <script>
 $("input").click(function(){
         $(this).next().show();
@@ -822,7 +940,7 @@ $("input").click(function(){
     $('#disabilityformrow').fadeOut('slow');
 
     });
-    
+
 </script>
 
 <!--Javascript for rendering tablinks-->
@@ -856,72 +974,158 @@ $("input").click(function(){
 
 <script>
   function inputfieldVisibility(that) {
-    if(that.value == "national") {            
+    if(that.value == "national") {
       document.getElementById("nationaldocument").style.display = "inline";
       document.getElementById("passportdocument").style.display = "none";
       document.getElementById("militarydocument").style.display = "none";
-    }else if(that.value == "passport") {            
+    }else if(that.value == "passport") {
       document.getElementById("passportdocument").style.display = "inline";
       document.getElementById("militarydocument").style.display = "none";
       document.getElementById("nationaldocument").style.display = "none";
-    }else if(that.value == "military") {            
+    }else if(that.value == "military") {
       document.getElementById("militarydocument").style.display = "inline";
       document.getElementById("nationaldocument").style.display = "none";
       document.getElementById("passportdocument").style.display = "none";
     }else {
       document.getElementById("nationaldocument").style.display = "none";
       document.getElementById("passportdocument").style.display = "none";
-      document.getElementById("militarydocument").style.display = "none";  
-    }      
-  } 
+      document.getElementById("militarydocument").style.display = "none";
+    }
+  }
   function ethnicVisibility(that) {
-    if (that.value == "kenyan") {            
+    if (that.value == "kenyan") {
       document.getElementById("ethnicfield").style.display = "inline";
     }else{
       document.getElementById("ethnicfield").style.display = "none";
-    }       
-  }  
-  function accVisibility(that) {
-    if (that.value == "bank" && that.value == "sacco") {
-      document.getElementById("bankBranch").style.display = "inline";
-      document.getElementById("bankAcc").style.display = "inline";   
-      document.getElementById("saccoBranch").style.display = "inline";         
-      document.getElementById("saccoAcc").style.display = "inline";
-    }else if(that.value == "bank"){ 
-      document.getElementById("bankBranch").style.display = "inline";
-      document.getElementById("bankAcc").style.display = "inline";   
-      document.getElementById("saccoBranch").style.display = "none"; 
-      document.getElementById("saccoAcc").style.display = "none";
-    }else if(that.value == "sacco"){ 
-      document.getElementById("saccoBranch").style.display = "inline"; 
-      document.getElementById("saccoAcc").style.display = "inline";
-      document.getElementById("bankBranch").style.display = "none";
-      document.getElementById("bankAcc").style.display = "none";   
-    }else{ 
-      document.getElementById("saccoBranch").style.display = "none"; 
-      document.getElementById("saccoAcc").style.display = "none";
-      document.getElementById("bankBranch").style.display = "none";
-      document.getElementById("bankAcc").style.display = "none";   
-    } 
-  }               
-</script> 
-
+    }
+  }
+  function durationfieldVisibility(that) {
+        if (that.value == "casual"|| that.value == "probation" || that.value =="contract"|| that.value == "temporary") {
+            document.getElementById("duration").style.display = "block";
+        } else {
+            document.getElementById("duration").style.display = "none";
+        }
+    }
+    function relationfieldVisibility(that) {
+        if (that.value == "other") {
+            document.getElementById("other_relation").style.display = "block";
+        } else {
+            document.getElementById("other_relation").style.display = "none";
+        }
+    }
+</script>
 <script>
-var acc = document.getElementsByClassName("accordion");
-var i;
-
-for (i = 0; i < acc.length; i++) {
-  acc[i].addEventListener("click", function() {
-    this.classList.toggle("active");
-    var panel = this.nextElementSibling;
-    if (panel.style.maxHeight){
-      panel.style.maxHeight = null;
-    } else {
-      panel.style.maxHeight = panel.scrollHeight + "px";
-    } 
+$('.updateDependant').on("click", function(event) {
+    $("#updateDependant").modal('show');
+    var id = $(this).data('id');
+    $.ajax({
+        url: "/employees/create/dependants" + id,
+        type: 'GET',
+        dataType: 'json',
+    }).done(function(response) {
+        $("#name").val(response.name);
+        // Assign values to other fields
+    });
+});
+</script>
+
+
+
+
+<!-- <script>
+  $(document).ready(function () {
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+
+        }
+    });
+    /*  When user click add user button */
+    $('#dependant').click(function () {
+        $('#btn-save').val("create-dependant");
+        $('#dependants').trigger("reset");
+        $('#dependant-heading').html("Add Dependant");
+        $('#createDependant').modal('show');
+    });
+
+   /* When click edit user */
+   $('#linkrow').on('click', '#edit-user', function (e) {
+      clickEvent = true;
+      var id = $(this).data('id');
+      $.get('emergency.edit' + id +'/edit', function (data) {
+          $('#dependant-heading').html("Edit User");
+          $('#btn-save').val("edit-dependant");
+          $('#createDependant').modal('show');
+          $('#name').val(data.name);
+          $('#dateofBirth').val(data.dateofBirth);
+          $('#relation').val(data.relation);
+      })
+   });
+   //delete user login
+   $('#linkrow').on('click', '#delete-user', function (e) {
+      clickEvent = true;
+
+        var id = $(this).data("id");
+        confirm("Are You sure want to delete !");
+
+        $.ajax({
+            type: "DELETE",
+            url: "{{ url('/employees/create/dependants')}}"+'/'+id,
+            success: function (data) {
+                $("#id_" + id).remove();
+            },
+            error: function (data) {
+                console.log('Error:', data);
+            }
+        });
+    });
   });
+
+ if ($("#dependants").length > 0) {
+      $("#dependants").validate({
+
+     submitHandler: function(form) {
+
+      var actionType = $('#btn-save').val();
+      $('#btn-save').html('Sending..');
+      $.ajax({
+          data: $('#dependants').serialize(),
+          type: "POST",
+          dataType: 'json',
+          success: function (data) {
+              var user = '<tr id="id_' + data.id + '"><td>' + data.name + '</td><td>' + data.dateofBirth + '</td><td>' + data.relation + '</td>';
+              user += '<td><a href="javascript:void(0)" id="edit-user" data-id="' + data.id + '" class="btn btn-info">Edit</a></td>';
+              user += '<td><a href="javascript:void(0)" id="delete-user" data-id="' + data.id + '" class="btn btn-danger delete-user">Delete</a></td></tr>';
+
+
+              if (actionType == "create-dependant") {
+                  $('#dependants-crud').prepend(user);
+              } else {
+                  $("#id_" + data.id).replaceWith(user);
+              }
+
+              $('#dependants').trigger("reset");
+              $('#createDependant').modal('hide');
+              $('#btn-save').html('Save Changes');
+
+          },
+          error: function (data) {
+              console.log('Error:', data);
+              $('#btn-save').html('Save Changes');
+          }
+      });
+      return false;
+    }
+  })
 }
+
+
 </script>
+ -->
+
+
+
+
 @endsection
 @section('footer-include')
     <!-- fuelux -->
@@ -936,9 +1140,10 @@ for (i = 0; i < acc.length; i++) {
   <script>
   $(document).on('ready', function(){
   });
-       
+
   </script>
 
 @endsection
 
 
+

resources/views/Employees/index.blade.php

@@ -13,6 +13,26 @@
             width: 100%;
             height: 100%;
         }
+
+        .r-action i{
+            padding:5px 5px;
+            background:white;
+            border-radius:5px;
+            border:1px solid rgba(0,0,0,0.1);
+        }
+
+        .r-action i.fa-trash{
+            color:rgb(220,0,0);
+        }
+
+        table tbody tr:last-child td{
+            border-bottom:1px solid rgba(0,0,0,0.08);
+        }
+
+        .sortable,
+        table tbody td{
+            white-space:nowrap;
+        }
     </style>
 @endsection
 
@@ -22,208 +42,88 @@
         <section class="vbox">
             <section class="scrollable padder">
                 <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
-                    <li><a href="."><i class="fa fa-home"></i>Home</a></li>
-                    <li class="active">Employees</li>
+                    <li><a href="."><i class="fa fa-home"></i> Home</a></li>
+                    <li>Employees</li>
+                    <li class="active">All employees</li>
                 </ul>
-                @include('Layout.errors')
+                @include('Layout.messages')
                 <section class="panel panel-default">
-                    <header class="panel-heading font-bold clearfix">
+                    <header class="panel-heading font-bold">
                         Employees
                     </header>
-                    <div class="table-responsive">
-                        <table class="table table-striped m-b-sm datagrid">
-                            <thead>
-                            <tr>
-                                <th colspan="6">
-                                    <div class="row clearfix">
-                                        <div class="col-sm-4 m-t-xs m-b-xs">
-                                            <div class="input-group search datagrid-search">
-                                                <input type="text" class="input-sm form-control" placeholder="Search">
-                                                <div class="input-group-btn">
-                                                    <button class="btn btn-default btn-sm"><i class="fa fa-search"></i></button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="pull-right" style="margin:5px 10px 0 0;">
-                                            <a href="/employees/add" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Create</a>
-                                            <a href="/employees" class="btn btn-info btn-sm"><i class="fa fa-refresh"></i>Refresh</a>
-                                        </div>
-                                        <form action="{{ route('import') }}" method="POST" enctype="multipart/form-data" id="importForm" style="width:125px;display:inline-block;margin-right:10px;">
-                                            {{ csrf_field() }}
-                                            <input type="file" name="file" id="import_file"/>
-                                            <input type="submit" class="btn btn-success btn-sm" value="Import From Excel"/>
-                                        </form>
-                                    </div>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sortable">Action</th>
-                                <th class="sortable">First Name</th>
-                                <th class="sortable">Last Name</th>
-                                <th class="sortable">Email</th>
-                                <th class="sortable">Phone No.</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td colspan="6" class="text-center">
-                                        Create a new employee by clicking &apos;Create&apos;
-                                    </td>
-                                </tr>
-                            </tbody>
-                            <tfoot>
-                            <tr>
-                                <th class="row">
-                                    <div class="datagrid-footer-left col-sm-6 text-center-xs m-l-n" style="display:none;">
-                                        <div class="grid-controls m-t-sm">
-                                                <span>
-                                                    <span class="grid-start"></span> -
-                                                    <span class="grid-end"></span> of
-                                                    <span class="grid-count"></span>
-                                                </span>
-                                            <div class="select grid-pagesize dropup" data-resize="auto">
-                                                <button data-toggle="dropdown" class="btn btn-sm btn-default dropdown-toggle">
-                                                    <span class="dropdown-label"></span>
-                                                    <span class="caret"></span>
-                                                </button>
-                                                <ul class="dropdown-menu">
-                                                    <li data-value="5"><a href="#">5</a></li>
-                                                    <li data-value="10"><a href="#">10</a></li>
-                                                    <li data-value="20" data-selected="true"><a href="#">20</a></li>
-                                                    <li data-value="50"><a href="#">50</a></li>
-                                                    <li data-value="100"><a href="#">100</a></li>
-                                                </ul>
-                                            </div>
-                                            <span>Per Page</span>
-                                        </div>
-                                    </div>
-                                    <div class="datagrid-footer-right col-sm-6 text-right text-center-xs" style="display:none;">
-                                        <div class="grid-pager m-r-n">
-                                            <button type="button" class="btn btn-sm btn-default grid-prevpage"><i class="fa fa-chevron-left"></i></button>
-                                            <span>Page</span>
-                                            <div class="inline">
-                                                <div class="input-group dropdown combobox">
-                                                    <input class="input-sm form-control" type="text">
-                                                    <div class="input-group-btn dropup">
-                                                        <button class="btn btn-sm btn-default" data-toggle="dropdown"><i class="caret"></i></button>
-                                                        <ul class="dropdown-menu pull-right"></ul>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <span>of <span class="grid-pages"></span></span>
-                                            <button type="button" class="btn btn-sm btn-default grid-nextpage"><i class="fa fa-chevron-right"></i></button>
-                                        </div>
+                    <div class="panel-body">
+                        <div class="row clearfix" style="padding-bottom:5px;">
+                            <div class="col-sm-4 m-t-xs m-b-xs">
+                                <div class="input-group search datagrid-search">
+                                    <input type="text" class="input-sm form-control" placeholder="Search">
+                                    <div class="input-group-btn">
+                                        <button class="btn btn-default btn-sm"><i class="fa fa-search"></i></button>
                                     </div>
-                                </th>
-                            </tr>
-                            </tfoot>
-                        </table>
+                                </div>
+                            </div>
+                            <div class="pull-right" style="margin:5px 10px 0 0;">
+                                <a href="{{ route('employees.create') }}" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Create</a>
+                                <a href="{{ route('employees.index') }}" class="btn btn-info btn-sm"><i class="fa fa-refresh"></i>Refresh</a>
+                            </div>
+                        </div>
+                        <div class="row" style="overflow-x:auto;">
+                            <table class="table table-striped m-b-sm">
+                                <thead>
+                                    <tr>
+                                        <th class="sortable">Action</th>
+                                        <th class="sortable">Employee ID</th>
+                                        <th class="sortable">F. Name</th>
+                                        <th class="sortable">L. Name</th>
+                                        <th class="sortable">Email</th>
+                                        <th class="sortable">Business Unit</th>
+                                        <th class="sortable">Department</th>
+                                        <th class="sortable">User Status</th>
+                                        <th class="sortable">Work Phone</th>
+                                        <th class="sortable">Job Title</th>
+                                        <th class="sortable">Reporting Manager</th>
+                                        <th class="sortable">Contact Number</th>
+                                        <th class="sortable">Employment Status</th>
+                                        <th class="sortable">Role</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($users as $user)
+                                        <tr>
+                                            <td class="r-action">
+                                                <i class="fa fa-edit" data-user-id="{{ $user->id }}"></i>
+                                                <i class="fa fa-eye" data-user-id="{{ $user->id }}"></i>
+                                                <i class="fa fa-trash" data-user-id="{{ $user->id }}"></i>
+                                            </td>
+                                            <td>{{ $user->employee_id }}</td>
+                                            <td>{{ $user->first_name }}</td>
+                                            <td>{{ $user->last_name }}</td>
+                                            <td>{{ $user->email_address }}</td>
+                                            <td>{{ $user->business_unit }}</td>
+                                            <td>{{ $user->department_name }}</td>
+                                            <td>{{ ($user->is_active == 0)?'Inactive':'Active' }}</td>
+                                            <td>{{ $user->work_phone }}</td>
+                                            <td>{{ $user->job_title }}</td>
+                                            <td>{{ $user->reporting_manager }}</td>
+                                            <td>{{ $user->personal_phone }}</td>
+                                            <td>{{ $user->employee_type }}</td>
+                                            <td>{{ $user->role }}</td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="pull-right" style="padding-right:10px;">
+                        {{ $users->render() }}
                     </div>
                 </section>
             </section>
         </section>
         <a href="#" class="hide nav-off-screen-block" data-toggle="class:nav-off-screen, open" data-target="#nav,html"></a>
     </section>
-    <aside class="bg-light lter b-l aside-md hide" id="notes">
-        <div class="wrapper">Notification</div>
-    </aside>
 
 @endsection
 
-{{--@section('content')
-    <section id="content">    
-            <section class="scrollable padder">
-                <ul class="breadcrumb no-border no-radius b-b b-light pull-in">
-                    <li><a href="."><i class="fa fa-home"></i> Home</a></li>
-                    <li class="active">Employees</li>
-                </ul>              
-               
-                @if ( session('success') )
-                    <div class="alert alert-success alert-dismissible" role="alert">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">×</span>
-                            <span class="sr-only">Close</span>
-                        </button>
-                        <strong>{{ session('success') }}</strong>
-                    </div>
-                @endif
- 
-                @if (session('error'))
-                    <div class="alert alert-danger alert-dismissible" role="alert">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">×</span>
-                            <span class="sr-only">Close</span>
-                        </button>
-                        <strong>{{ session('error') }}</strong>
-                    </div>
-                @endif
- 
-    @if (count($errors) > 0)
-        <div class="alert alert-danger">
-        <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
-        <div>
-    @foreach ($errors->all() as $error)
-        <p>{{ $error }}</p>
-    @endforeach
-    </div>
-</div>
-@endif
-<div class=container-fluid>
-    <div class=row style="float:right;position:relative">
-    <div class=col-md-3 style=width:49.5%>
-        <a href="{{ route('export') }}"><button class="btn btn-success">Download Excel xls</button></a>
-    </div>
-    <div class=col-md-3 style=width:49.5%>
-        <form action="{{ route('import') }}" method="POST" enctype="multipart/form-data" id="importForm">
-            {{ csrf_field() }}            
-            <input type="file" name="file" class="form-control" id="import_file" >        
-            <input type="submit" class="btn btn-success" value="Import File" >
-        </form>
-    </div> 
-    </div> 
-    <div class=row>
-    <legend style="padding:25px 5px 5px 10px">Employees</legend>
-    <div class="pull-right" style="margin:5px 20px 5px 10px;">
-                <a href="/employees/add" class="btn btn-info btn-sm"><i class="fa fa-plus"></i>Add Employee</a>
-              </div>
-              </div>
-              <div class=row style="padding:0px 5px 5px 10px">
-              <div class="table-responsive" style="padding:0px 5px 5px 10px">
-                <table class="table table-striped m-b-sm datagrid">
-                <thead>
-                   <tr>
-                      <th>Action</th>
-                      <th>First Name</th>
-                      <th>Last Name</th>
-                      <th>Email</th>
-                      <th>Phone No.</th>
-                    </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span></a>
-                        <a href=""><span class="btn btn-default btn-sm"><i class="fa fa-edit no-margin"></i></span></a>
-                        
-                    </td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>                               
-                  <tr>
-                    <td colspan="5" class="text-center">Nothing to display</td>
-                  </tr>
-                </tbody>
-                </table>
-              </div>                
-    </div>
-</div>
-</section>
-@endsection--}}
-
-
-
 @section('footer-include')
     <!-- fuelux -->
     <script src="/js/libs/underscore-min.js"></script>
@@ -235,6 +135,7 @@
 @section('j-script')
     <!-- Jquery -->
     <script>
+
         $(document).on('ready', function(){
             var form = document.getElementById('importForm');
             var input = document.getElementById('import_file');
@@ -251,4 +152,5 @@
         });
        
     </script>
+
 @endsection
\ No newline at end of file

resources/views/Layout/master.blade.php

+<?php
+
+?>
 <!DOCTYPE html>
 <html lang="en" class="app">
 <head>
     <meta charset="utf-8" />
-    <title>@yield('title', 'Kinetic HRM')</title>
+    <title>@yield('title', \App\Constants::APP_NAME)</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
     <meta name="csrf-token" content="{{ csrf_token() }}">
@@ -97,7 +100,7 @@
             <span class="thumb-sm avatar pull-left">
               <img src="/images/avatar.jpg">
             </span>
-                    Michael Jackson
+                    {{ \Illuminate\Support\Facades\Auth::user()->name}}
                     <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu animated fadeInRight">
@@ -119,11 +122,14 @@
                     </li>
                     <li class="divider"></li>
                     <li>
-                        <a href="modal.lockme.html" data-toggle="ajaxModal" >Logout</a>
+                        <a href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit()">Logout</a>
                     </li>
                 </ul>
             </li>
         </ul>
+        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+            @csrf
+        </form>
     </header>
     <section>
         <section class="hbox stretch">
@@ -132,15 +138,14 @@
                 <section class="vbox">
                     <header class="header bg-warning lter text-center clearfix">
                         <div class="btn-group">
-                            <button type="button" class="btn btn-sm btn-dark btn-icon" title="New project"><i class="fa fa-plus"></i></button>
                             <div class="btn-group hidden-nav-xs">
                                 <button type="button" class="btn btn-sm btn-success dropdown-toggle" data-toggle="dropdown">
-                                    Switch Project
+                                    {{-- Display the current active module here --}}
+                                    Select another module here
                                     <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu text-left">
-                                    <li><a href="allowances">Payroll</a></li>
-                                    <li><a href="employees">Employees</a></li>
+                                    <?php echo h_get_main_modules() ?>
                                 </ul>
                             </div>
                         </div>
@@ -151,97 +156,9 @@
                             <!-- nav -->
                             <nav class="nav-primary hidden-xs">
                                 <ul class="nav">
-                                    <li>
-                                        <a href=".">
-                                            <i class="fa fa-dashboard icon">
-                                                <b class="bg-danger"></b>
-                                            </i>
-                                            <span>Dashboard</span>
-                                        </a>
-                                    </li>
                                     <li  class="active">
-                                        <a href="." class="active">
-                                            <i class="fa fa-folder icon">
-                                                <b class="bg-danger"></b>
-                                            </i>
-                                            <span class="pull-right">
-                                              <i class="fa fa-angle-down text"></i>
-                                              <i class="fa fa-angle-up text-active"></i>
-                                            </span>
-                                            <span>Payroll</span>
-                                        </a>
                                         <ul class="nav lt">
-                                            <li class="active">
-                                                <a href="#" class="active">
-                                                    <i class="fa fa-angle-down text"></i>
-                                                    <i class="fa fa-angle-up text-active"></i>
-                                                    <span>Payroll items</span>
-                                                </a>
-                                                <ul class="nav bg">
-                                                    <li>
-                                                        <a href="/allowances">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Allowances</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/deductions">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Deductions</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/relief">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Relief</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/ranges">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Range manager</span>
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Process payroll</span>
-                                                </a>
-                                                <ul class="nav bg">
-                                                    {{--<li>
-                                                        <a href="/processing_options">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Processing options</span>
-                                                        </a>
-                                                    </li>
-                                                    <li>
-                                                        <a href="/payslip_structure">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Payslip structure</span>
-                                                        </a>
-                                                    </li>--}}
-                                                    <li>
-                                                        <a href="/process_payroll/">
-                                                            <i class="fa fa-angle-right"></i>
-                                                            <span>Process payroll</span>
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Payslip</span>
-                                                </a>
-                                            </li>
-                                            <li>
-                                                <a href="#">
-                                                    <i class="fa fa-angle-right"></i>
-                                                    <span>Reports</span>
-                                                </a>
-                                            </li>
+                                            <?php echo h_load_main_menu(); ?>
                                         </ul>
                                     </li>
                                 </ul>
@@ -308,6 +225,26 @@
     });
 
     let errorMessage = "Something went wrong. Contact system administrator.";
+
+    $(document).on('click', '.module-shifter', function(){
+        let data = 'module_id=' + $(this).data('moduleId');
+
+        let changeModuleRequest = $.ajax({
+            type:'POST',
+            url:'menus/change_module',
+            data:data,
+            timeout:10000,
+            success:function(){
+                window.location = $(this).attr('href');
+            },
+            error(x,t,m){
+                if (t === "timeout"){
+                    changeModuleRequest.abort();
+                    console.log('Request time out');
+                }
+            }
+        })
+    });
 </script>
 @yield('j-script')
 </body>

resources/views/ProcessPayroll/index.blade.php

-@extends('Layout.Payslipmaster')
+@extends('Layout.master')
 
 @section('title', 'Process payroll')
 
@@ -99,7 +99,7 @@
                                                 <td>1/5</td>
                                                 <td>
                                                     <span class="btn btn-default btn-sm"><i class="fa fa-eye no-margin"></i></span>
-                                                    <span class="btn btn-info btn-sm">Re-Run</span>
+                                                    <span class="btn btn-info btn-sm" data-year="" data-month="">Re-Run</span>
                                                     <span class="btn btn-danger btn-sm"><i class="fa fa-trash no-margin"></i></span>
                                                 </td>
                                             </tr>

resources/views/auth/login.blade.php

-@extends('layouts.app')
+<!DOCTYPE html>
+<html lang="en" class="bg-dark">
+<head>
+    <meta charset="utf-8"/>
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <title>{{ \App\Constants::APP_NAME }}&emsp;&middot;&emsp;Login</title>
+    <meta name="description" content="app, web app, responsive, admin dashboard, admin, flat, flat ui, ui kit, off screen nav" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+    <link rel="stylesheet" href="/css/bootstrap.css" type="text/css" />
+    <link rel="stylesheet" href="/css/animate.css" type="text/css" />
+    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
+    <link rel="stylesheet" href="/css/font.css" type="text/css" />
+    <link rel="stylesheet" href="/css/app.css" type="text/css" />
+    <!--[if lt IE 9]>
+    <script src="/js/ie/html5shiv.js"></script>
+    <script src="/js/ie/respond.min.js"></script>
+    <script src="/js/ie/excanvas.js"></script>
+    <![endif]-->
+</head>
+<style>
+    .logo{
+        width:150px;
+    }
+</style>
+<body class="">
+<section id="content" class="m-t-lg wrapper-md animated fadeInUp">
+    <div class="container aside-xxl">
+        <img class="logo" src="/images/kinetic.png" alt="{{ \App\Constants::APP_NAME }} Logo">
+        <section class="panel panel-default bg-white m-t-lg">
+            <header class="panel-heading text-center">
+                <strong>Sign in</strong>
+            </header>
+            <form method="POST" action="{{ route('login') }}" class="panel-body wrapper-lg">
+                @csrf
 
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Login') }}</div>
+                <div class="form-group">
+                    <label class="control-label">{{ __('E-Mail Address') }}</label>
+                    <input id="email" type="email" placeholder="test@example.com" class="form-control {{ $errors->has('email') ? ' input-danger' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
 
-                <div class="card-body">
-                    <form method="POST" action="{{ route('login') }}">
-                        @csrf
-
-                        <div class="form-group row">
-                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <div class="col-md-6 offset-md-4">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
-
-                                    <label class="form-check-label" for="remember">
-                                        {{ __('Remember Me') }}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-8 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Login') }}
-                                </button>
+                    @if ($errors->has('email'))
+                        <span class="error text-danger" role="alert">
+                            <strong>{{ $errors->first('email') }}</strong>
+                        </span>
+                    @endif
+                </div>
+                <div class="form-group">
+                    <label class="control-label">{{ __('Password') }}</label>
+                    <input id="password" type="password" placeholder="Password" class="form-control {{ $errors->has('password') ? ' input-danger' : '' }}" name="password" required>
 
-                                @if (Route::has('password.request'))
-                                    <a class="btn btn-link" href="{{ route('password.request') }}">
-                                        {{ __('Forgot Your Password?') }}
-                                    </a>
-                                @endif
-                            </div>
-                        </div>
-                    </form>
+                    @if ($errors->has('password'))
+                        <span class="error text-danger" role="alert">
+                            <strong>{{ $errors->first('password') }}</strong>
+                        </span>
+                    @endif
+                </div>
+                <div class="form-group">
+                    <div class="checkbox">
+                        <label for="remember">
+                            <input type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
+                            {{ __('Remember Me') }}
+                        </label>
+                    </div>
                 </div>
-            </div>
-        </div>
+                @if (Route::has('password.request'))
+                    <a href="{{ route('password.request') }}" class="m-t-xs">
+                        <small>{{ __('Forgot Your Password?') }}</small>
+                    </a>
+                @endif
+                <button type="submit" class="btn btn-success pull-right">{{ __('Login') }}</button>
+            </form>
+        </section>
+    </div>
+</section>
+<!-- footer -->
+<footer id="footer">
+    <div class="text-center padder">
+        <p>
+            <small>{{ \App\Constants::APP_NAME }}<br>&copy; {{ @date('Y') }}</small>
+        </p>
     </div>
-</div>
-@endsection
+</footer>
+<!-- / footer -->
+<script src="/js/jquery.min.js"></script>
+<!-- Popper JS -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+<!-- Bootstrap -->
+<script src="/js/bootstrap.js"></script>
+<!-- App -->
+<script src="/js/app.js"></script>
+<script src="/js/slimscroll/jquery.slimscroll.min.js"></script>
+<script src="/js/app.plugin.js"></script>
+</body>
+</html>
\ No newline at end of file

resources/views/home.blade.php

-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Dashboard</div>
-                <?php if(auth()->user()->isAdmin == 1)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('admin/routes')}}">Admin</a>
-                </div>
-                <?php } 
-                elseif(auth()->user()->isAdmin == 2)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('manager/routes')}}">Manager</a>
-                </div>
-                <?php } 
-                elseif(auth()->user()->isAdmin == 3)
-                {?>
-                <div class="panel-body">
-                <a href="{{url('manager/routes')}}">Manager</a>
-                </div>
-                <?php } 
-                else echo '<div class="panel-heading">Normal User</div>';?>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection
-

resources/views/layouts/app.blade.php

@@ -58,8 +58,7 @@
 
                                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                                     <a class="dropdown-item" href="{{ route('logout') }}"
-                                       onclick="event.preventDefault();
-                                                     document.getElementById('logout-form').submit();">
+                                       onclick="event.preventDefault();document.getElementById('logout-form').submit();">
                                         {{ __('Logout') }}
                                     </a>
 

resources/views/welcome.blade.php

-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>Laravel</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 12px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-                        <a href="{{ route('register') }}">Register</a>
-                    @endauth
-                </div>
-            @endif
-
-            <div class="content">
-                <div class="title m-b-md">
-                    Laravel
-                </div>
-
-                <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://nova.laravel.com">Nova</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>

routes/web.php

@@ -11,10 +11,23 @@
 |
 */
 
-#Dashboard
-Route::get('/', 'DashboardController@index');
-Route::get('/dashboard', 'DashboardController@index');
+########################################################################################################################
+# Authentication #######################################################################################################
+########################################################################################################################
+Auth::routes();
+
+# Home (Dashboard)
+Route::get('/', 'HomeController@index');
+
+Route::get('admin/routes', 'HomeController@admin')->middleware('admin');
+Route::get('manager/routes', 'HomeController@manager')->middleware('admin');
+
 
+
+
+########################################################################################################################
+# Payroll ##############################################################################################################
+########################################################################################################################
 /**********************- To be shared by all 3 payroll items -********************/
 
 Route::post('/allowances/employees/save_selected_employees', 'AllowancesController@save_selected_employees');
@@ -24,60 +37,71 @@ Route::post('/allowances/employees/delete_group', 'AllowancesController@delete_g
 
 /**********************- To be shared by all 3 payroll items -********************/
 
-#Allowances
+# Allowances
 Route::get('/allowances/edit_group/{group_id}', 'AllowancesController@edit_group');
 Route::get('/allowances/employees/{allowance}', 'AllowancesController@add_employees');
 Route::resource('/allowances', 'AllowancesController');
 Route::post('/allowances/destroy', 'AllowancesController@destroy');
 
-#Range
+# Range
 Route::get('/ranges/edit/{range_id}', 'RangesController@edit');
 Route::resource('/ranges', 'RangesController');
 Route::post('/ranges/destroy', 'RangesController@destroy');
 
-#Relief
+# Relief
 Route::get('/relief/edit_group/{group_id}', 'ReliefController@edit_group');
 Route::get('/relief/employees/{relief}', 'ReliefController@add_employees');
 Route::resource('/relief', 'ReliefController');
 Route::post('/relief/destroy', 'ReliefController@destroy');
 
-#Deductions
+# Deductions
 Route::get('/deductions/edit_group/{group_id}', 'DeductionsController@edit_group');
 Route::get('/deductions/employees/{deduction}', 'DeductionsController@add_employees');
 Route::resource('/deductions', 'DeductionsController');
 Route::post('/deductions/destroy', 'DeductionsController@destroy');
 
-#Dashboard
-Route::get('/dashboard', 'DashboardController@index');
-
-#ProcessPayrollController
+# ProcessPayrollController
 Route::post('/process_payroll/process', 'ProcessPayrollController@process_payroll');
 Route::resource('/process_payroll', 'ProcessPayrollController');
 
-#PayslipController
+# PayslipController
 Route::get('/payslip', 'PayslipController@index');
 Route::get('/payslip/view_payslip', 'PayslipController@view_payslip');
 
-#EmployeesController
+
+
+
+########################################################################################################################
+# Employees ############################################################################################################
+########################################################################################################################
+# EmployeesController
 Route::resource('/employees','EmployeesController');
 Route::get('/employees/export', 'EmployeesController@export')->name('export');
 Route::post('/employees/import', 'EmployeesController@import')->name('import');
 
-/* Route::post('/employees/create/dependants', 'EmployeeController@dependantstore')->name('dependantstore');
-Route::post('/employees/dependantsupdate', 'EmployeeController@updateDependant')->name('updateDependant');
-Route::get('/employees/create/dependants{id}', 'EmployeeController@dependantdestroy')->name('dependantdelete'); */
-
-#PayfrequencyController
+# PayfrequencyController
 Route::resource('/payfrequency', 'PayfrequencyController');
 
-#EmergencyController
+# EmergencyController
 Route::resource('/employees/create/emergency','EmergencyController');
 Route::resource('/employees/create/dependants','DependantController');
 
-Auth::routes();
 
-Route::get('/home', 'HomeController@index')->name('home');
-Route::get('admin/routes', 'HomeController@admin')->middleware('admin');
-Route::get('manager/routes', 'HomeController@manager')->middleware('admin');
 
 
+########################################################################################################################
+# Reports ##############################################################################################################
+########################################################################################################################
+
+# Payroll report
+Route::get('/report/payroll_report', 'ReportController@payroll_report');
+
+
+
+
+########################################################################################################################
+# Menu manager #########################################################################################################
+########################################################################################################################
+# Resource link generator
+Route::resource('/menus', 'MenusController');
+Route::get('/menus/change_menu', 'MenusController@change_menu');
\ No newline at end of file

vendor/composer/ClassLoader.php

@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
@@ -377,7 +377,7 @@ class ClassLoader
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {

vendor/composer/autoload_classmap.php

@@ -8,8 +8,7 @@ $baseDir = dirname($vendorDir);
 return array(
     'App\\Allowance' => $baseDir . '/app/Allowance.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
-    'App\\Dependants' => $baseDir . '/app/Dependants.php',
-    'App\\EmergencyContact' => $baseDir . '/app/EmergencyContact.php',
+    'App\\Constants' => $baseDir . '/app/Constants.php',
     'App\\EmployeeTest' => $baseDir . '/app/EmployeeTest.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
     'App\\Exports\\Employee_detailsExport' => $baseDir . '/app/Exports/Employee_detailsExport.php',
@@ -22,14 +21,17 @@ return array(
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
     'App\\Http\\Controllers\\DashboardController' => $baseDir . '/app/Http/Controllers/DashboardController.php',
     'App\\Http\\Controllers\\DeductionsController' => $baseDir . '/app/Http/Controllers/DeductionsController.php',
+    'App\\Http\\Controllers\\DependantController' => $baseDir . '/app/Http/Controllers/DependantController.php',
     'App\\Http\\Controllers\\EmergencyController' => $baseDir . '/app/Http/Controllers/EmergencyController.php',
-    'App\\Http\\Controllers\\EmployeeController' => $baseDir . '/app/Http/Controllers/EmployeeController.php',
+    'App\\Http\\Controllers\\EmployeesController' => $baseDir . '/app/Http/Controllers/EmployeesController.php',
     'App\\Http\\Controllers\\HomeController' => $baseDir . '/app/Http/Controllers/HomeController.php',
+    'App\\Http\\Controllers\\MenusController' => $baseDir . '/app/Http/Controllers/MenusController.php',
     'App\\Http\\Controllers\\PayfrequencyController' => $baseDir . '/app/Http/Controllers/PayfrequencyController.php',
     'App\\Http\\Controllers\\PayslipController' => $baseDir . '/app/Http/Controllers/PayslipController.php',
     'App\\Http\\Controllers\\ProcessPayrollController' => $baseDir . '/app/Http/Controllers/ProcessPayrollController.php',
     'App\\Http\\Controllers\\RangesController' => $baseDir . '/app/Http/Controllers/RangesController.php',
     'App\\Http\\Controllers\\ReliefController' => $baseDir . '/app/Http/Controllers/ReliefController.php',
+    'App\\Http\\Controllers\\ReportController' => $baseDir . '/app/Http/Controllers/ReportController.php',
     'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php',
     'App\\Http\\Middleware\\Admin' => $baseDir . '/app/Http/Middleware/Admin.php',
     'App\\Http\\Middleware\\Authenticate' => $baseDir . '/app/Http/Middleware/Authenticate.php',
@@ -41,7 +43,6 @@ return array(
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
     'App\\Imports\\Employee_detailsImport' => $baseDir . '/app/Imports/Employee_detailsImport.php',
     'App\\ListItems' => $baseDir . '/app/ListItems.php',
-    'App\\PayFrequency' => $baseDir . '/app/PayFrequency.php',
     'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
     'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
@@ -2590,7 +2591,7 @@ return array(
     'PHPUnit\\Util\\Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php',
     'PHPUnit\\Util\\ConfigurationGenerator' => $vendorDir . '/phpunit/phpunit/src/Util/ConfigurationGenerator.php',
     'PHPUnit\\Util\\ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php',
-    'PHPUnit\\Util\\FileLoader' => $vendorDir . '/phpunit/phpunit/src/Util/FileLoader.php',
+    'PHPUnit\\Util\\FileLoader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php',
     'PHPUnit\\Util\\Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php',
     'PHPUnit\\Util\\Filter' => $vendorDir . '/phpunit/phpunit/src/Util/Filter.php',
     'PHPUnit\\Util\\Getopt' => $vendorDir . '/phpunit/phpunit/src/Util/Getopt.php',
@@ -2615,7 +2616,7 @@ return array(
     'PHPUnit\\Util\\TextTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/TextTestListRenderer.php',
     'PHPUnit\\Util\\Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
     'PHPUnit\\Util\\XdebugFilterScriptGenerator' => $vendorDir . '/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php',
-    'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
+    'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/XML.php',
     'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
     'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',

vendor/composer/autoload_files.php

@@ -87,4 +87,5 @@ return array(
     '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
     '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
     '0d8253363903f0ac7b0978dcde4e28a0' => $vendorDir . '/beyondcode/laravel-dump-server/helpers.php',
+    'b4e3f29b106af37a2bb239f73cdf68c7' => $baseDir . '/app/helpers.php',
 );

vendor/composer/autoload_static.php

@@ -88,6 +88,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
         '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
         '0d8253363903f0ac7b0978dcde4e28a0' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/helpers.php',
+        'b4e3f29b106af37a2bb239f73cdf68c7' => __DIR__ . '/../..' . '/app/helpers.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -531,8 +532,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
     public static $classMap = array (
         'App\\Allowance' => __DIR__ . '/../..' . '/app/Allowance.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
-        'App\\Dependants' => __DIR__ . '/../..' . '/app/Dependants.php',
-        'App\\EmergencyContact' => __DIR__ . '/../..' . '/app/EmergencyContact.php',
+        'App\\Constants' => __DIR__ . '/../..' . '/app/Constants.php',
         'App\\EmployeeTest' => __DIR__ . '/../..' . '/app/EmployeeTest.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
         'App\\Exports\\Employee_detailsExport' => __DIR__ . '/../..' . '/app/Exports/Employee_detailsExport.php',
@@ -545,14 +545,17 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
         'App\\Http\\Controllers\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/DashboardController.php',
         'App\\Http\\Controllers\\DeductionsController' => __DIR__ . '/../..' . '/app/Http/Controllers/DeductionsController.php',
+        'App\\Http\\Controllers\\DependantController' => __DIR__ . '/../..' . '/app/Http/Controllers/DependantController.php',
         'App\\Http\\Controllers\\EmergencyController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmergencyController.php',
-        'App\\Http\\Controllers\\EmployeeController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmployeeController.php',
+        'App\\Http\\Controllers\\EmployeesController' => __DIR__ . '/../..' . '/app/Http/Controllers/EmployeesController.php',
         'App\\Http\\Controllers\\HomeController' => __DIR__ . '/../..' . '/app/Http/Controllers/HomeController.php',
+        'App\\Http\\Controllers\\MenusController' => __DIR__ . '/../..' . '/app/Http/Controllers/MenusController.php',
         'App\\Http\\Controllers\\PayfrequencyController' => __DIR__ . '/../..' . '/app/Http/Controllers/PayfrequencyController.php',
         'App\\Http\\Controllers\\PayslipController' => __DIR__ . '/../..' . '/app/Http/Controllers/PayslipController.php',
         'App\\Http\\Controllers\\ProcessPayrollController' => __DIR__ . '/../..' . '/app/Http/Controllers/ProcessPayrollController.php',
         'App\\Http\\Controllers\\RangesController' => __DIR__ . '/../..' . '/app/Http/Controllers/RangesController.php',
         'App\\Http\\Controllers\\ReliefController' => __DIR__ . '/../..' . '/app/Http/Controllers/ReliefController.php',
+        'App\\Http\\Controllers\\ReportController' => __DIR__ . '/../..' . '/app/Http/Controllers/ReportController.php',
         'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
         'App\\Http\\Middleware\\Admin' => __DIR__ . '/../..' . '/app/Http/Middleware/Admin.php',
         'App\\Http\\Middleware\\Authenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/Authenticate.php',
@@ -564,7 +567,6 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
         'App\\Imports\\Employee_detailsImport' => __DIR__ . '/../..' . '/app/Imports/Employee_detailsImport.php',
         'App\\ListItems' => __DIR__ . '/../..' . '/app/ListItems.php',
-        'App\\PayFrequency' => __DIR__ . '/../..' . '/app/PayFrequency.php',
         'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
         'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',
@@ -3113,7 +3115,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'PHPUnit\\Util\\Configuration' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Configuration.php',
         'PHPUnit\\Util\\ConfigurationGenerator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/ConfigurationGenerator.php',
         'PHPUnit\\Util\\ErrorHandler' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/ErrorHandler.php',
-        'PHPUnit\\Util\\FileLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/FileLoader.php',
+        'PHPUnit\\Util\\FileLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Fileloader.php',
         'PHPUnit\\Util\\Filesystem' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Filesystem.php',
         'PHPUnit\\Util\\Filter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Filter.php',
         'PHPUnit\\Util\\Getopt' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Getopt.php',
@@ -3138,7 +3140,7 @@ class ComposerStaticInit403cc4551796c83fc344eeeb22d5c4e6
         'PHPUnit\\Util\\TextTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/TextTestListRenderer.php',
         'PHPUnit\\Util\\Type' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Type.php',
         'PHPUnit\\Util\\XdebugFilterScriptGenerator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php',
-        'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Xml.php',
+        'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XML.php',
         'PHPUnit\\Util\\XmlTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
         'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
         'PHP_Token' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',