Merge pull request sebastianbergmann#114 from sheby460/dino

Dino

app/Http/Controllers/AuthController.php

@@ -2,17 +2,19 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\User;
+use App\Models\Policy;
 use App\Models\Departments;
+use Illuminate\Http\Request;
 use App\Models\EmploymentTypes;
-use App\Models\User;
-use App\Models\UserAdditionalInfo;
 use App\Models\UserFamilyDetails;
-use Illuminate\Http\Request;
+use App\Models\UserAdditionalInfo;
+use Spatie\Permission\Models\Role;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Storage;
 use RealRashid\SweetAlert\Facades\Alert;
-use Spatie\Permission\Models\Role;
+use Illuminate\Support\Facades\Validator;
 
 
 class AuthController extends Controller
@@ -24,12 +26,61 @@ public function login(){
     //get All user
     public function getAllUser(){
         $users = User::all();
+
         return view('role-permission/user.index', compact('users'));
     }
 
+    public function employee($id)
+    {
+        $user = User::findOrFail($id);
+        $policies = Policy::all();
+        return view('employees_details.show', compact('user','policies'));
+    }
+
+    public function changedept($id)
+{
+    // Fetch the user by ID
+    $user = User::findOrFail($id);
+    $policies = Policy::all();
+    // Pass the user to the view
+    return view('employees_details.show', compact('user','policies'));
+}
+
+
+public function update(Request $request, $id)
+{
+    // Validate the incoming data
+    $request->validate([
+        'department' => 'required|string|max:255',
+        'job_title' => 'required|string|max:255',
+        'ccb_code' => 'required|string|max:255',
+        'professional_reg_number' => 'required|string|max:255',
+        'nssf_no' => 'required|string|max:255',
+    ]);
+
+    // Find the user by ID
+    $user = User::findOrFail($id);
+
+    // Update the user details
+    $user->update([
+        'department' => $request->input('department'),
+        'job_title' => $request->input('job_title'),
+        'ccb_code' => $request->input('ccb_code'),
+        'professional_reg_number' => $request->input('professional_reg_number'),
+        'nssf_no' => $request->input('nssf_no'),
+    ]);
+
+    // Redirect with a success message
+    return redirect()->route('employees_details.show', $id)->with('success', 'User details updated successfully.');
+}
 
     public function userDetail(){
-        $users = User::all();
+
+            $users = User::select('users.*', 'language_knowledge.language')
+            ->leftJoin('language_knowledge', 'users.id', '=', 'language_knowledge.userId')
+            ->get();
+
+            // dd($users);
         return view('employees_details.index', compact('users'));
     }
 
@@ -87,6 +138,7 @@ public function handleRegistration(Request $request){
           'DOB' => 'required',
           'employment_typeId' => 'required',
           'password' => 'required|min:6',
+        //   'signature' => 'required|string',
         ]);
 
         if($validator->fails()) {
@@ -96,14 +148,14 @@ public function handleRegistration(Request $request){
             ]);
 
         }
-        $dob = \DateTime::createFromFormat('d-m-Y', $request->input('DOB'))->format('Y-m-d');
+        // $dob = \DateTime::createFromFormat('d-m-Y', $request->input('DOB'))->format('Y-m-d');
 
         $user = User::create([
             'fname' => $request->input('fname'),
             'mname' => $request->input('mname'),
             'lname' => $request->input('lname'),
             'username' => $request->input('username'),
-            // 'DOB' => $request->input('DOB'),
+            'DOB' => $request->input('DOB'),
             // 'DOB' => $request->input('DOB'),
             'gender' => $request->input('gender'),
             'marital_status' => $request->input('marital_status'),
@@ -133,9 +185,7 @@ public function handleRegistration(Request $request){
             Alert::success('User Registered Successful','Please login');
          return redirect()->route('dashboard')->with(
             'success', 'User registered successfully. Please login.');
-
-
-    }
+}
 
     public function editUserRole(Request $request, $userId)
     {
@@ -147,23 +197,7 @@ public function editUserRole(Request $request, $userId)
         return redirect('role')->with('status', 'Role assigned successfully');
     }
 
-//     public function editUserRole(Request $request, $id)
-// {
-//     $user = User::findOrFail($id);
-
-//     $validated = $request->validate([
-//         'username' => 'required|string|max:255',
-//         'roles' => 'required|string|exists:roles,name',
-//     ]);
-
-//     $user->username = $request->input('username');
-//     $user->save();
-
-//     // Assuming user roles are stored in a many-to-many relationship
-//     $user->roles()->sync([$request->input('roles')]);
 
-//     return redirect()->route('users.index')->with('success', 'User role updated successfully.');
-// }
 
     // Remove Role from User
     public function removeRole(Request $request, $userId)

app/Http/Controllers/ClearanceFormController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Models\ClearanceForm;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
+class ClearanceFormController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {   $user = Auth::user();
+        $forms = ClearanceForm::with('user')->get();
+        return view('clearance.index', compact('forms','user'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('clearance.create');
+    }
+
+    public function store(Request $request)
+    {
+        $request->validate([
+            'id_card' => 'nullable|boolean',
+            'name_tag' => 'nullable|boolean',
+            'nhif_cards' => 'nullable|boolean',
+            'bonding_agreement' => 'nullable|boolean',
+            'work_permit' => 'nullable|boolean',
+            'residence_permit' => 'nullable|boolean',
+            'changing_room_keys' => 'nullable|boolean',
+            'office_keys' => 'nullable|boolean',
+            'mobile_phone' => 'nullable|boolean',
+            'camera' => 'nullable|boolean',
+            'uniforms' => 'nullable|boolean',
+            'car_keys' => 'nullable|boolean',
+            'other_items' => 'nullable|string',
+            'repaid_advance' => 'nullable|boolean',
+            'informed_finance' => 'nullable|boolean',
+            'repaid_imprest' => 'nullable|boolean',
+            'laptop_returned' => 'nullable|boolean',
+            'access_card_returned' => 'nullable|boolean',
+            'domain_account_disabled' => 'nullable|boolean',
+            'email_account_disabled' => 'nullable|boolean',
+            'telephone_pin_disabled' => 'nullable|boolean',
+            'openclinic_account_disabled' => 'nullable|boolean',
+            'sap_account_disabled' => 'nullable|boolean',
+            'aruti_account_disabled' => 'nullable|boolean',
+        ]);
+
+        $clearanceForm = new ClearanceForm([
+            'userId' => Auth::id(),
+            'id_card' => $request->input('id_card', false),
+            'name_tag' => $request->input('name_tag', false),
+            'nhif_cards' => $request->input('nhif_cards', false),
+            'bonding_agreement' => $request->input('bonding_agreement', false),
+            'work_permit' => $request->input('work_permit', false),
+            'residence_permit' => $request->input('residence_permit', false),
+            'changing_room_keys' => $request->input('changing_room_keys', false),
+            'office_keys' => $request->input('office_keys', false),
+            'mobile_phone' => $request->input('mobile_phone', false),
+            'camera' => $request->input('camera', false),
+            'uniforms' => $request->input('uniforms', false),
+            'car_keys' => $request->input('car_keys', false),
+            'other_items' => $request->input('other_items', ''),
+            'repaid_advance' => $request->input('repaid_advance', false),
+            'informed_finance' => $request->input('informed_finance', false),
+            'repaid_imprest' => $request->input('repaid_imprest', false),
+            'laptop_returned' => $request->input('laptop_returned', false),
+            'access_card_returned' => $request->input('access_card_returned', false),
+            'domain_account_disabled' => $request->input('domain_account_disabled', false),
+            'email_account_disabled' => $request->input('email_account_disabled', false),
+            'telephone_pin_disabled' => $request->input('telephone_pin_disabled', false),
+            'openclinic_account_disabled' => $request->input('openclinic_account_disabled', false),
+            'sap_account_disabled' => $request->input('sap_account_disabled', false),
+            'aruti_account_disabled' => $request->input('aruti_account_disabled', false),
+        ]);
+
+        $clearanceForm->save();
+
+        return redirect()->route('clearance.index')->with('success', 'Clearance form submitted successfully.');
+    }
+    /**
+     * Display the specified resource.
+     */
+    public function show(ClearanceForm $clearanceForm)
+    {
+        return view('clearance.show', compact('clearanceForm'));
+    }
+
+    public function edit(ClearanceForm $clearanceForm)
+    {
+        $users = User::all();
+        return view('clearance.edit', compact('clearanceForm', 'users'));
+    }
+
+    public function update(Request $request, ClearanceForm $clearanceForm)
+    {
+        $request->validate([
+            'user_id' => 'required|exists:users,id',
+            'staff_signature' => 'required|string|max:255',
+            'staff_signature_date' => 'required|date',
+            // Add validation for other fields as needed
+        ]);
+
+        $clearanceForm->update($request->all());
+
+        return redirect()->route('clearance.index')->with('success', 'Form updated successfully.');
+    }
+
+    public function destroy(ClearanceForm $clearanceForm)
+    {
+        $clearanceForm->delete();
+
+        return redirect()->route('clearance.index')->with('success', 'Form deleted successfully.');
+    }
+}

app/Http/Controllers/DashboardController.php

@@ -42,7 +42,7 @@ public function index()
             $data['admin_content'] = 'Content for super admin';
         }
 
-        return view('dashboard', compact('data','policies'));
+        return view('dashboard', compact('data','policies','user'));
     }
     public function dashboard()
     {

app/Http/Controllers/FormController.php

@@ -19,6 +19,7 @@ class FormController extends Controller
 {
     public function getform(Request $request)
     {
+        $user = Auth::user();
         $ictForm = IctAccessResource::join('users', 'users.id', '=', 'ict_access_resources.userId')
             ->join('workflows', 'workflows.ict_request_resource_id', '=', 'ict_access_resources.id')
             ->join('work_flow_histories', 'work_flow_histories.work_flow_id', '=', 'workflows.id')
@@ -41,7 +42,7 @@ public function getform(Request $request)
                 'h_m_i_s_access_levels.names'
             ]);
 
-        return view('ict_resource_form', compact('ictForm'));
+        return view('ict_resource_form', compact('ictForm','user'));
     }