AI Review Center

Removed / Before Commit

- class StaffController extends Controller
- {
- // List all staff
-     public function index()
-     {
-         $staffs = Staff::latest()->paginate(10);
-         return view('admin.staff.index', compact('staffs'));
- }
- 
- // Show create form
- public function create()
- {

Added / After Commit

+ class StaffController extends Controller
+ {
+ // List all staff
+     // public function index()
+     // {
+     //     $staffs = Staff::latest()->paginate(10);
+     //     return view('admin.staff.index', compact('staffs'));
+     // }
+ 
+     public function index(Request $request)
+ {
+     $query = Staff::query();
+ 
+     // Apply filters
+     if ($request->filled('employee_category_id')) {
+         $query->where('employee_category_id', $request->employee_category_id);
+     }
+

Removed / Before Commit

- /**
- * Upload and import attendance Excel
- */
-     public function upload(Request $request)
- {
- $request->validate([
- 'attendance_file' => 'required|mimes:xlsx,xls'
- continue; // skip if employee not found
- }
- 
- Attendance::updateOrCreate(
- [
- 'employee_id' => $employee->id,
-                 'date' => Carbon::parse($row[2])->format('Y-m-d'),
- ],
- [
-                 'check_in'       => isset($row[3]) ? trim($row[3]) : null,
-                 'check_out'      => isset($row[4]) ? trim($row[4]) : null,

Added / After Commit

+ /**
+ * Upload and import attendance Excel
+ */
+    public function upload(Request $request)
+ {
+ $request->validate([
+ 'attendance_file' => 'required|mimes:xlsx,xls'
+ continue; // skip if employee not found
+ }
+ 
+         $date     = Carbon::parse($row[2])->format('Y-m-d');
+         $checkIn  = isset($row[3]) ? Carbon::parse($row[3]) : null;
+         $checkOut = isset($row[4]) ? Carbon::parse($row[4]) : null;
+ 
+         $remark = null;
+         $lateMinutes = 0;
+ 
+         // ===== Shift & Grace Logic =====

Removed / Before Commit

- User::create([
- 'name'        => $request->name,
- 'telephone'   => $request->telephone,
-             'role'        => $role->id,
- 'tno'         => $request->tno,
- 'innol'       => $request->innol,
- 'username'    => $request->username,
- 'vertical_id' => $request->verticals,

Added / After Commit

+ User::create([
+ 'name'        => $request->name,
+ 'telephone'   => $request->telephone,
+             'role'        => $role ? $role->id : 0,
+ 'tno'         => $request->tno,
+             'employee_number' => $request->employee_no,
+ 'innol'       => $request->innol,
+ 'username'    => $request->username,
+ 'vertical_id' => $request->verticals,

Removed / Before Commit

- 
- class BdeController extends Controller
- {
-     public function index()
- {
-         $bdes = Bde::paginate(10);
-         return view('bdes.index', compact('bdes'));
- }
- 
- public function store(Request $request)
- {
- $request->validate(['name' => 'required|string|max:255']);
- return response()->json(['message' => 'BDE deleted successfully.']);
- }
- }
-

Added / After Commit

+ 
+ class BdeController extends Controller
+ {
+ 
+     public function index(Request $request)
+ {
+         $query = Bde::query();
+ 
+         // collect filters
+         $filters = $request->only(['name']);
+ 
+         // apply filter
+         if (!empty($filters['name'])) {
+             $query->where('name', $filters['name']);
+         }
+ 
+         // distinct names for the filter dropdown
+         $bdeNames = Bde::select('name')->distinct()->orderBy('name')->pluck('name');

Removed / Before Commit

- 
- class CoController extends Controller
- {
-     public function index()
-     {
-         $cos = Co::all();
-         return view('cos.index', compact('cos'));
- }
- 
- public function store(Request $request)
- {
- Co::create($request->only('name'));

Added / After Commit

+ 
+ class CoController extends Controller
+ {
+     // public function index()
+     // {
+     //     $cos = Co::all();
+     //     return view('cos.index', compact('cos'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+     $query = Co::query();
+ 
+     // collect filters
+     $filters = $request->only(['name']);
+ 
+     // apply filter if selected

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\DB;
+ 
+ class CommonController extends Controller
+ {
+     public function toggleStatus(Request $request)
+     {
+         $request->validate([
+             'table' => 'required|string',
+             'id' => 'required|integer',
+             'is_active' => 'required|boolean',
+         ]);
+ 
+         try {

Removed / Before Commit

- 
- class CorpController extends Controller
- {
-     public function index()
- {
-         $corps = Corp::paginate(10);
-         return view('corps.index', compact('corps'));
- }
- 
- public function store(Request $request)
- {
- $request->validate(['name' => 'required|string|max:255']);

Added / After Commit

+ 
+ class CorpController extends Controller
+ {
+ 
+     public function index(Request $request)
+ {
+         $query = Corp::query();
+ 
+         // Search by name
+         if ($request->filled('search')) {
+             $query->where('name', 'like', '%' . $request->search . '%');
+         }
+ 
+         // Status filter (if you have a status column)
+         
+ 
+         $corps = $query->latest()->paginate(10)->appends($request->all());
+

Removed / Before Commit

- class CrcRepairController extends Controller
- {
- // List CRC Repairs with filters
- public function index(Request $request)
- {
- $repairs = CrcRepair::with(['job', 'crcEntry.unit'])
-             ->when($request->job_no, fn($q) => $q->whereHas('job', fn($j) => $j->where('job_no', $request->job_no)))
-             ->when($request->unit_id, fn($q) => $q->whereHas('crcEntry.unit', fn($u) => $u->where('id', $request->unit_id)))
-             ->when($request->part_no, fn($q) => $q->where('part_no', $request->part_no))
- ->where('initiated_to_wcn', false)
- ->orderByDesc('id')
-             ->get();
- 
- $jobNos = CrcJob::pluck('job_no');
- $units = Unit::select('id', 'name')->get();
- 
- return view('crc.repairs.index', compact('repairs', 'jobNos', 'units'));
- }

Added / After Commit

+ class CrcRepairController extends Controller
+ {
+ // List CRC Repairs with filters
+     // public function index(Request $request)
+     // {
+     //     $repairs = CrcRepair::with(['job', 'crcEntry.unit'])
+     //         ->when($request->job_no, fn($q) => $q->whereHas('job', fn($j) => $j->where('job_no', $request->job_no)))
+     //         ->when($request->unit_id, fn($q) => $q->whereHas('crcEntry.unit', fn($u) => $u->where('id', $request->unit_id)))
+     //         ->when($request->part_no, fn($q) => $q->where('part_no', $request->part_no))
+     //         ->where('initiated_to_wcn', false)
+     //         ->orderByDesc('id')
+     //         ->get();
+ 
+     //     $jobNos = CrcJob::pluck('job_no');
+     //     $units = Unit::select('id', 'name')->get();
+ 
+     //     return view('crc.repairs.index', compact('repairs', 'jobNos', 'units'));
+     // }

Removed / Before Commit

- 
- class DepartmentController extends Controller
- {
-     public function index()
-     {
-         $departments = Department::latest()->paginate(10);
-         return view('departments.index', compact('departments'));
- }
- 
- public function create()
- {
- return view('departments.create');

Added / After Commit

+ 
+ class DepartmentController extends Controller
+ {
+     // public function index()
+     // {
+     //     $departments = Department::latest()->paginate(10);
+     //     return view('departments.index', compact('departments'));
+     // }
+ 
+ public function index(Request $request)
+ {
+     $query = Department::query();
+ 
+     // Filter by status
+     if ($request->filled('status')) {
+         $query->where('is_active', $request->status);
+ }
+

Removed / Before Commit

- 
- class DesignationController extends Controller
- {
-     public function index()
-     {
-         $designations = Designation::latest()->paginate(10);
-         return view('designations.index', compact('designations'));
- }
- 
- public function create()
- {
- $leaveTypes = LeaveType::all();

Added / After Commit

+ 
+ class DesignationController extends Controller
+ {
+     // public function index()
+     // {
+     //     $designations = Designation::latest()->paginate(10);
+     //     return view('designations.index', compact('designations'));
+     // }
+ 
+     public function index(Request $request)
+ {
+     $query = Designation::query();
+ 
+     // Filter by status
+     if ($request->filled('status')) {
+         $query->where('is_active', $request->status);
+     }
+

Removed / Before Commit

- 
- class DivController extends Controller
- {
-     public function index()
- {
-         $divs = Div::paginate(10);
-         return view('divs.index', compact('divs'));
- }
- 
- public function store(Request $request)
- {
- $request->validate(['name' => 'required|string|max:255']);

Added / After Commit

+ 
+ class DivController extends Controller
+ {
+     // public function index()
+     // {
+     //     $divs = Div::paginate(10);
+     //     return view('divs.index', compact('divs'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+         // only the filters you actually have
+         $filters = $request->only(['name']);
+ 
+         $query = Div::query();
+ 
+         if (!empty($filters['name'])) {

Removed / Before Commit

- 
- class EmployeeCategoryController extends Controller
- {
-     public function index()
-     {
-         $categories = EmployeeCategory::paginate(10);
-         return view('employee_categories.index', compact('categories'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class EmployeeCategoryController extends Controller
+ {
+ 
+ 
+     public function index(Request $request)
+ {
+     // Dropdown list (all categories)
+     $allCategories = EmployeeCategory::orderBy('name')->get();
+ 
+     // Table data (with filters)
+     $query = EmployeeCategory::query();
+ 
+     if ($request->filled('category_id')) {
+         $query->where('id', $request->category_id);
+     }
+ 
+     if ($request->filled('status')) {

Removed / Before Commit

- ->when($request->group, fn($q) => $q->where('group', $request->group))
- ->when($request->main_eqpt, fn($q) => $q->where('main_eqpt', $request->main_eqpt))
- ->when($request->year, fn($q) => $q->where('production_year', $request->year))
-             ->paginate(10);
- 
- $groups = \App\Models\Group::with('equipments')->get(); // Assuming Group model exists

Added / After Commit

+ ->when($request->group, fn($q) => $q->where('group', $request->group))
+ ->when($request->main_eqpt, fn($q) => $q->where('main_eqpt', $request->main_eqpt))
+ ->when($request->year, fn($q) => $q->where('production_year', $request->year))
+             ->orderBy('id', 'desc') // optional: latest first
+             ->paginate(10)          // pagination
+             ->appends($request->query()); // keep filters in pagination links
+ 
+ $groups = \App\Models\Group::with('equipments')->get(); // Assuming Group model exists

Removed / Before Commit

- 
- class EquipmentController extends Controller
- {
-     public function index()
-     {
-         $equipments = Equipment::with('subgroup.group')->paginate(10);
-         $groups = Group::with('subgroups')->get();
- 
-         return view('equipment.index', compact('equipments', 'groups'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class EquipmentController extends Controller
+ {
+     // public function index()
+     // {
+     //     $equipments = Equipment::with('subgroup.group')->paginate(10);
+     //     $groups = Group::with('subgroups')->get();
+ 
+     //     return view('equipment.index', compact('equipments', 'groups'));
+     // }
+ 
+ 
+ 
+ 
+ // public function index(Request $request)
+ // {
+ //     $query = Equipment::with('subgroup.group');
+

Removed / Before Commit

- $sub->where('regd_no', 'like', '%' . $request->regd_no . '%');
- });
- })
-         ->get();
- 
- // 🎯 Filtered Job Number Options — only for entries NOT initiated to QA
- $jobNumbers = QCCheck::whereNotExists(function ($query) {

Added / After Commit

+ $sub->where('regd_no', 'like', '%' . $request->regd_no . '%');
+ });
+ })
+         ->paginate(10)   // paginate instead of get()
+         ->appends($request->query()); 
+ 
+ // 🎯 Filtered Job Number Options — only for entries NOT initiated to QA
+ $jobNumbers = QCCheck::whereNotExists(function ($query) {

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use App\Models\FinancialPower;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Validator;
+ 
+ class FinancialPowerController extends Controller
+ {
+     public function index(Request $request)
+     {
+         $query = FinancialPower::query();
+ 
+         if ($request->filled('search')) {
+             $s = $request->search;
+             $query->where(function ($q) use ($s) {
+                 $q->where('cfa', 'like', "%{$s}%")

Removed / Before Commit

- 
- class GroupController extends Controller
- {
-     public function index()
- {
-         $groups = Group::all();
- $verticals = Vertical::where('status', 1)->get();
- 
-         return view('groups.index', compact('groups', 'verticals'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class GroupController extends Controller
+ {
+     // public function index()
+     // {
+     //     $groups = Group::all();
+     //     $verticals = Vertical::where('status', 1)->get();
+ 
+     //     return view('groups.index', compact('groups', 'verticals'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+         $query = Group::with('vertical'); // load vertical relation if needed
+ 
+         if ($request->filled('name')) {
+             $query->where('name', 'like', '%' . $request->name . '%');

Removed / Before Commit

- 
- class HolidayController extends Controller
- {
-     public function index()
-     {
-         $holidays = Holiday::latest()->paginate(10);
-         return view('holidays.index', compact('holidays'));
- }
- 
- public function create()
- {
- return view('holidays.create');

Added / After Commit

+ 
+ class HolidayController extends Controller
+ {
+     // public function index()
+     // {
+     //     $holidays = Holiday::latest()->paginate(10);
+     //     return view('holidays.index', compact('holidays'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+     $query = Holiday::query();
+ 
+     // Apply filters
+     if ($request->filled('type')) {
+         $query->where('type', $request->type);
+     }

Removed / Before Commit

- 
- class LeaveApprovalController extends Controller
- {
-     public function index()
- {
-         $leaves = Leave::with(['employee.department', 'employee.designation', 'leaveType'])
-             ->orderBy('created_at','desc')
-             ->paginate(20);
- 
-         return view('leave.approval', compact('leaves'));
- }
- 
- public function approve($id)

Added / After Commit

+ 
+ class LeaveApprovalController extends Controller
+ {
+     // public function index()
+     // {
+     //     $leaves = Leave::with(['employee.department', 'employee.designation', 'leaveType'])
+     //         ->orderBy('created_at','desc')
+     //         ->paginate(20);
+ 
+     //     return view('leave.approval', compact('leaves'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+         $query = Leave::with(['employee.department', 'employee.designation', 'leaveType'])
+             ->orderBy('created_at', 'desc');
+

Removed / Before Commit

- use App\Models\Staff;
- use Illuminate\Http\Request;
- use Carbon\Carbon;
- 
- class LeaveController extends Controller
- {
- foreach($assignedLeaveTypes as $type) {
- $taken = Leave::where('employee_id', $employee->id)
- ->where('leave_type_id', $type->id)
-                         ->where('status', 'approved')
- ->sum('total_days');
-             $balance = ($type->annual_limit ?? 0) - $taken;
- $leaveBalance[$type->id] = [
-                 'name' => $type->name,
-                 'total' => $type->annual_limit ?? 0,
- 'taken' => $taken,
- 'balance' => $balance
- ];

Added / After Commit

+ use App\Models\Staff;
+ use Illuminate\Http\Request;
+ use Carbon\Carbon;
+ use Carbon\CarbonPeriod;
+ 
+ class LeaveController extends Controller
+ {
+ foreach($assignedLeaveTypes as $type) {
+ $taken = Leave::where('employee_id', $employee->id)
+ ->where('leave_type_id', $type->id)
+                         ->whereIn('status', ['approved', 'pending'])
+ ->sum('total_days');
+             $balance = ($type->leave_count ?? 0) - $taken;
+ $leaveBalance[$type->id] = [
+                 'name' => $type->leave_name,
+                 'total' => $type->leave_count ?? 0,
+ 'taken' => $taken,
+ 'balance' => $balance

Removed / Before Commit

- 
- class LeaveTypeController extends Controller
- {
-     public function index()
-     {
-         $leaveTypes = LeaveType::latest()->paginate(10);
-         return view('leave_types.index', compact('leaveTypes'));
- }
- 
- public function create()
- {
- return view('leave_types.create');

Added / After Commit

+ 
+ class LeaveTypeController extends Controller
+ {
+     // public function index()
+     // {
+     //     $leaveTypes = LeaveType::latest()->paginate(10);
+     //     return view('leave_types.index', compact('leaveTypes'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+     $query = LeaveType::query();
+ 
+     // Apply filters
+     if ($request->filled('leave_category')) {
+         $query->where('leave_category', $request->leave_category);
+     }

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use App\Models\LpoFund;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Validator;
+ use Carbon\Carbon;
+ 
+ class LpoFundController extends Controller
+ {
+     public function index(Request $request)
+     {
+         $query = LpoFund::query();
+ 
+         // Filtering: search by name/code_head/authority or financial_year
+         if ($request->filled('search')) {
+             $s = $request->search;

Removed / Before Commit

- 
- class MasterCommandController extends Controller
- {
-     public function index()
- {
-     $commands = MasterCommand::latest()->paginate(10);
-     return view('master_command.index', compact('commands'));
- }
- 
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class MasterCommandController extends Controller
+ {
+ 
+ 
+ public function index(Request $request)
+ {
+     $query = MasterCommand::query();
+ 
+     // Search by name
+     if ($request->filled('search')) {
+         $query->where('name', 'like', '%' . $request->search . '%');
+     }
+ 
+     // Filter by status
+     if ($request->filled('status')) {
+         $query->where('status', $request->status);
+     }

Removed / Before Commit

- 
- class McoScaleController extends Controller
- {
-     public function index()
-     {
-         $scales = McoScale::with(['group', 'repairClass', 'designColumns'])->latest()->get();
-         return view('mco.scales.index', compact('scales'));
- }
- 
- public function create()
- {
- $groups = Group::all();
- 
- $groupName        = Group::findOrFail($request->group_id)->name;
- $equipmentName    = Equipment::findOrFail($request->equipment_id)->name;
-         if($request->repair_class_id == 'other')
-         {
-              $repairClassName  = 'other';

Added / After Commit

+ 
+ class McoScaleController extends Controller
+ {
+     // public function index()
+     // {
+     //     $scales = McoScale::with(['group', 'repairClass', 'designColumns'])->latest()->get();
+     //     return view('mco.scales.index', compact('scales'));
+     // }
+ 
+     public function index(Request $request)
+ {
+     $query = McoScale::with(['group', 'repairClass', 'equipment', 'designColumns'])->latest();
+ 
+     // Group filter
+     if ($request->group_id) {
+         $query->where('group_id', $request->group_id);
+     }
+

Removed / Before Commit

- 
- class MenuController extends Controller
- {
-    public function index()
- {
-     $menusdata = Menu::with('parent', 'roles', 'children')->get();
-     return view('menus.index', compact('menusdata'));
- }
- 
- public function create()
- {
- $roles = Role::all();

Added / After Commit

+ 
+ class MenuController extends Controller
+ {
+ 
+     public function index(Request $request)
+ {
+     $query = Menu::with('parent', 'roles', 'children');
+ 
+     if ($request->filled('name')) {
+         $query->where('name', 'like', '%' . $request->name . '%');
+     }
+ 
+     if ($request->filled('route')) {
+         $query->where('route', 'like', '%' . $request->route . '%');
+     }
+ 
+     if ($request->filled('parent_id')) {
+         if ($request->parent_id === 'none') {

Removed / Before Commit

- 'qty_demanded'      => $demand->qty_demanded,
- 'status'            => 'approved',
- 'prod_year'         => $demand->prod_year,
-                     'registation_no'    => $demand->req_no,
- 'created_at'        => now(),
- 'updated_at'        => now(),
- ];
- return view('previous_demands.index', compact('data'));
- }
- 
- 
- 
- 
-     public function previousdetailsdata($req_no)
-     {
-         // Fetch all spares from demands table for given req_no
-         $spares = Demand::where('req_no',decrypt($req_no))->get();
-

Added / After Commit

+ 'qty_demanded'      => $demand->qty_demanded,
+ 'status'            => 'approved',
+ 'prod_year'         => $demand->prod_year,
+                     'req_no'            => $demand->req_no,
+ 'created_at'        => now(),
+ 'updated_at'        => now(),
+ ];
+ return view('previous_demands.index', compact('data'));
+ }
+ 
+ public function previousdetailsdata($req_no)
+ {
+     $spares = Demand::where('req_no', decrypt($req_no))
+         ->get();
+ 
+     return view('previous_demands.details', compact('spares', 'req_no'));
+ }
+

Removed / Before Commit

- 'is_active' => $request->is_active ?? 0
- ]);
- 
-         return response()->json(['message' => 'Saved']);
- }
- 
- public function update(Request $request, $id)
- 'is_active' => $request->is_active ?? 0
- ]);
- 
-         return response()->json(['message' => 'Updated']);
- }
- 
- public function destroy(Request $request, $id)
- }
- }
- 
-         return response()->json(['message' => 'Deleted']);

Added / After Commit

+ 'is_active' => $request->is_active ?? 0
+ ]);
+ 
+         return response()->json(['message' => 'Production Year Added successfully']);
+ }
+ 
+ public function update(Request $request, $id)
+ 'is_active' => $request->is_active ?? 0
+ ]);
+ 
+         return response()->json(['message' => 'Production Year updated successfully']);
+ 
+         
+ }
+ 
+ public function destroy(Request $request, $id)
+ }
+ }

Removed / Before Commit

- $query->where('regd_no', 'like', '%' . $request->regd_no . '%');
- }
- 
-     $equipments = $query->get();
- 
- // ✅ Dropdown filters based on QA-pending entries only
- $filterBase = WorkEquipment::with(['workOrder', 'vir', 'qaDecision'])

Added / After Commit

+ $query->where('regd_no', 'like', '%' . $request->regd_no . '%');
+ }
+ 
+     // ✅ Paginate instead of get()
+     $equipments = $query->paginate(10)->appends($request->query());
+ 
+ 
+     // $equipments = $query->get();
+ 
+ // ✅ Dropdown filters based on QA-pending entries only
+ $filterBase = WorkEquipment::with(['workOrder', 'vir', 'qaDecision'])

Removed / Before Commit

- 
- class QAInspectionController extends Controller
- {
-     // ✅ 1. Show all inspections with basic filters
- public function index(Request $request)
- {
- $initiations = QaInspectionInitate::with(['workOrder', 'workEquipment', 'vir', 'mr','latestRepair'])
- $sub->where('regd_no', 'like', '%' . $request->regd_no . '%');
- });
- })
-         ->get();
- 
- // 🔽 All for dropdowns
- $allInitiations = QaInspectionInitate::with(['workOrder', 'workEquipment'])

Added / After Commit

+ 
+ class QAInspectionController extends Controller
+ {
+     // 1. Show all inspections with basic filters
+ public function index(Request $request)
+ {
+ $initiations = QaInspectionInitate::with(['workOrder', 'workEquipment', 'vir', 'mr','latestRepair'])
+ $sub->where('regd_no', 'like', '%' . $request->regd_no . '%');
+ });
+ })
+         // ->get();
+         ->paginate(10)   // show 10 per page
+         ->appends($request->query()); // keep filters in pagination
+ 
+ 
+ // 🔽 All for dropdowns
+ $allInitiations = QaInspectionInitate::with(['workOrder', 'workEquipment'])

Removed / Before Commit

- 
- class QCCheckController extends Controller
- {
- public function index(Request $request)
- {
-     // 🎯 Main equipment fetch
-     $equipments = WorkEquipment::with(['workOrder.workUnit.units', 'workOrder.workUnit.wksps', 'workOrder.workUnit.commands', 'vir', 'workOrder.qcCheck'])
- ->whereHas('vir', fn ($q) => $q->whereNotNull('status'))
- ->whereHas('workOrder', fn ($q) => $q->whereNotNull('job_no'))
- ->whereDoesntHave('workOrder.qcCheck')
-         ->when($request->filled('job_no'), fn ($q) => $q->whereHas('workOrder', fn ($query) => $query->where('job_no', 'like', '%' . $request->job_no . '%')))
-         ->when($request->filled('regd_no'), fn ($q) => $q->where('regd_no', 'like', '%' . $request->regd_no . '%'))
-         ->get()
-         ->groupBy('work_order_id');
- 
-     // 🔽 Dropdown values: all possible unprocessed jobs/regd_no
- $jobNumbers = WorkEquipment::whereHas('workOrder', fn ($q) => $q->whereNotNull('job_no'))
- ->whereHas('vir', fn ($q) => $q->whereNotNull('status'))

Added / After Commit

+ 
+ class QCCheckController extends Controller
+ {
+ // public function index(Request $request)
+ // {
+ //     // 🎯 Main equipment fetch
+ //     $equipments = WorkEquipment::with(['workOrder.workUnit.units', 'workOrder.workUnit.wksps', 'workOrder.workUnit.commands', 'vir', 'workOrder.qcCheck'])
+ //         ->whereHas('vir', fn ($q) => $q->whereNotNull('status'))
+ //         ->whereHas('workOrder', fn ($q) => $q->whereNotNull('job_no'))
+ //         ->whereDoesntHave('workOrder.qcCheck')
+ //         ->when($request->filled('job_no'), fn ($q) => $q->whereHas('workOrder', fn ($query) => $query->where('job_no', 'like', '%' . $request->job_no . '%')))
+ //         ->when($request->filled('regd_no'), fn ($q) => $q->where('regd_no', 'like', '%' . $request->regd_no . '%'))
+ //         ->get()
+ //         ->groupBy('work_order_id');
+ 
+ //     // 🔽 Dropdown values: all possible unprocessed jobs/regd_no
+ //     $jobNumbers = WorkEquipment::whereHas('workOrder', fn ($q) => $q->whereNotNull('job_no'))
+ //         ->whereHas('vir', fn ($q) => $q->whereNotNull('status'))

Removed / Before Commit

- );
- });
- 
-     $records = $query->latest()->get();
- 
- // Step 2: For dropdown filters
- $allPassed = QAInspection::with(['workOrder', 'workEquipment'])

Added / After Commit

+ );
+ });
+ 
+         $records = $query->latest()
+     ->paginate(10)
+     ->appends($request->query());
+ 
+     // $records = $query->latest()->get();
+ 
+ // Step 2: For dropdown filters
+ $allPassed = QAInspection::with(['workOrder', 'workEquipment'])

Removed / Before Commit

- 
- class RepairClassController extends Controller
- {
-     public function index()
- {
-         $repairClasses = RepairClass::paginate(10);
-         return view('repair_class.index', compact('repairClasses'));
- }
- 
- public function store(Request $request)
- {
- RepairClass::create($request->validate([

Added / After Commit

+ 
+ class RepairClassController extends Controller
+ {
+     // public function index()
+     // {
+     //     $repairClasses = RepairClass::paginate(10);
+     //     return view('repair_class.index', compact('repairClasses'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+         $query = RepairClass::query();
+ 
+         // collect filters (future-proof, even if only name now)
+         $filters = $request->only(['name']);
+ 
+         if (!empty($filters['name'])) {

Removed / Before Commit

- class RoleController extends Controller
- {
- // Show all roles
-     public function index()
-     {
-         $roles = Role::with('children')->get();
-         return view('roles.index', compact('roles'));
- }
- 
- // Show form to create a new role
- public function create()
- {

Added / After Commit

+ class RoleController extends Controller
+ {
+ // Show all roles
+     // public function index()
+     // {
+     //     $roles = Role::with('children')->get();
+     //     return view('roles.index', compact('roles'));
+     // }
+ 
+     
+     public function index(Request $request)
+ {
+     $rolesQuery = Role::with(['children', 'parents', 'group']);
+ 
+     // Filter by Role Name
+     if ($request->filled('role')) {
+         $rolesQuery->where('name', 'like', '%' . $request->role . '%');
+     }

Removed / Before Commit

- 
- class SalaryComponentController extends Controller
- {
-     public function index() {
-         $components = SalaryComponent::all();
-         return view('salary.components.index', compact('components'));
- }
- 
- public function create() {
- return view('salary.components.create');
- }

Added / After Commit

+ 
+ class SalaryComponentController extends Controller
+ {
+     // public function index() {
+     //     $components = SalaryComponent::all();
+     //     return view('salary.components.index', compact('components'));
+     // }
+ 
+     public function index(Request $request) {
+     $query = SalaryComponent::query()->orderBy('created_at', 'desc');
+ 
+     // Apply filters
+     if ($request->filled('type')) {
+         $query->where('type', $request->type);
+     }
+ 
+     if ($request->filled('calculation_type')) {
+         $query->where('calculation_type', $request->calculation_type);

Removed / Before Commit

- 
- class SalaryGroupController extends Controller
- {
-     public function index() {
-         $groups = SalaryGroup::all();
-         return view('salary.groups.index', compact('groups'));
- }
- 
- public function create() {
- $components = SalaryComponent::where('is_active',true)->get();
- return view('salary.groups.create', compact('components'));
- foreach ($request->components as $compId) {
- SalaryGroupComponent::create([
- 'salary_group_id'      => $group->id,
-                 'salary_component_id'  => $compId, // ✅ अब सही ID जाएगी
- 'value'                => $request->component_values[$compId] ?? 0
- ]);
- }

Added / After Commit

+ 
+ class SalaryGroupController extends Controller
+ {
+     // public function index() {
+     //     $groups = SalaryGroup::all();
+     //     return view('salary.groups.index', compact('groups'));
+     // }
+ 
+ public function index(Request $request)
+ {
+     $query = SalaryGroup::with('components.component');
+ 
+     // Group Name filter
+     if ($request->filled('name')) {
+         $query->where('id', $request->name);
+ }
+ 
+     // Component filter

Removed / Before Commit

- 
- class ShiftController extends Controller
- {
-     public function index()
-     {
-         $shifts = Shift::latest()->paginate(10);
-         return view('shifts.index', compact('shifts'));
- }
- 
- public function create()
- {
- return view('shifts.create');

Added / After Commit

+ 
+ class ShiftController extends Controller
+ {
+ 
+     public function index(Request $request)
+ {
+     $query = Shift::query();
+ 
+     // Filter by status
+     if ($request->filled('status')) {
+         $query->where('is_active', $request->status);
+     }
+ 
+     // Filter by specific shift
+     if ($request->filled('shift_id')) {
+         $query->where('id', $request->shift_id);
+ }
+

Removed / Before Commit

- 
- class SubAssyEquipmentController extends Controller
- {
- public function index(Request $request)
- {
-     $query = SubAssyEquipment::with(['equipment.subgroup.group']);
- 
- if ($request->filled('equipment_id')) {
- $query->where('equipment_id', $request->equipment_id);
- }
- 
-     if ($request->filled('group_id')) {
-         $query->whereHas('equipment.subgroup.group', function ($q) use ($request) {
-             $q->where('id', $request->group_id);
-         });
- }
- 
-     $subAssys = $query->paginate(10);

Added / After Commit

+ 
+ class SubAssyEquipmentController extends Controller
+ {
+ 
+ public function index(Request $request)
+ {
+     $query = SubAssyEquipment::with('equipment.subgroup.group');
+ 
+     if ($request->filled('group_id')) {
+         $query->whereHas('equipment.subgroup', function ($q) use ($request) {
+             $q->where('group_id', $request->group_id);
+         });
+     }
+ 
+ if ($request->filled('equipment_id')) {
+ $query->where('equipment_id', $request->equipment_id);
+ }
+

Removed / Before Commit

- 
- class SubGroupController extends Controller
- {
-     public function index()
-     {
-         $subGroups = SubGroup::with('group')->get();
-         $groups = Group::where('status', 1)->get();
- 
-         return view('sub-groups.index', compact('subGroups', 'groups'));
- }
- 
- public function store(Request $request)
- {
- SubGroup::create([

Added / After Commit

+ 
+ class SubGroupController extends Controller
+ {
+     // public function index()
+     // {
+     //     $subGroups = SubGroup::with('group')->get();
+     //     $groups = Group::where('status', 1)->get();
+ 
+     //     return view('sub-groups.index', compact('subGroups', 'groups'));
+     // }
+ 
+     
+ //     public function index(Request $request)
+ // {
+ //     $query = SubGroup::with('group');
+ 
+ //     // Filter by subgroup name (auto search)
+ //     if ($request->filled('search')) {

Removed / Before Commit

- 
- class UnitController extends Controller
- {
-     public function index()
- {
-         $units = Unit::orderBy('id', 'desc')->paginate(10);
-         return view('units.index', compact('units'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class UnitController extends Controller
+ {
+     // public function index()
+     // {
+     //     $units = Unit::orderBy('id', 'desc')->paginate(10);
+     //     return view('units.index', compact('units'));
+     // }
+ 
+ 
+     public function index(Request $request)
+ {
+         $query = Unit::query();
+ 
+         // collect filters
+         $filters = $request->only(['name']);
+ 
+         // apply filter if name selected

Removed / Before Commit

Added / After Commit

+ <?php
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ 
+ use Illuminate\Support\Facades\DB;
+ use Illuminate\Support\Str;
+ use Illuminate\Support\Facades\Schema;
+ 
+ use App\Models\McoDemand;
+ use App\Models\UrgencyMaster;
+ use App\Models\Urgency;
+ use App\Models\FinancialPower;
+ 
+ class UrgencyController extends Controller
+ {
+ 
+     public function preview(Request $request, $req_no)

Removed / Before Commit

- 
- class UserController extends Controller
- {
-     public function index()
-     {
-         $user = Auth::user();
- 
-         if (!$user->role) {
-             // Super Admin: see all users
-            $users = User::with(['vertical', 'group', 'roles'])->get();
-         } else {
-             $childRoleIds = $user->roles->children()->pluck('id');
-             $users = User::with(['vertical', 'group', 'roles'])->whereIn('role', $childRoleIds)->get();
-         }
-         return view('users.index', compact('users'));
- }
- 
- public function dashboard()

Added / After Commit

+ 
+ class UserController extends Controller
+ {
+     // public function index()
+     // {
+     //     $user = Auth::user();
+ 
+     //     if (!$user->role) {
+     //         // Super Admin: see all users
+     //        $users = User::with(['vertical', 'group', 'roles'])->get();
+     //     } else {
+     //         $childRoleIds = $user->roles->children()->pluck('id');
+     //         $users = User::with(['vertical', 'group', 'roles'])->whereIn('role', $childRoleIds)->get();
+     //     }
+     //     return view('users.index', compact('users'));
+     // }
+ 
+

Removed / Before Commit

- 
- class VerticalController extends Controller
- {
-     public function index()
-     {
-         $verticals = Vertical::orderBy('created_at', 'desc')->get();
-         return view('verticals.index', compact('verticals'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([

Added / After Commit

+ 
+ class VerticalController extends Controller
+ {
+     // public function index()
+     // {
+     //     $verticals = Vertical::orderBy('created_at', 'desc')->get();
+     //     return view('verticals.index', compact('verticals'));
+     // }
+ 
+ 
+     // public function index(Request $request)
+     // {
+     //     $query = Vertical::query();
+ 
+     //     // Search by name
+     //     if ($request->filled('name')) {
+     //         $query->where('name', 'like', '%' . $request->name . '%');
+     //     }

Removed / Before Commit

- $query->where('regd_no', 'like', '%' . $request->regd_no . '%');
- }
- 
-     $equipments = $query->get();
- 
-     // 🟡 Now build filter options from same base condition
- $baseFilterQuery = WorkEquipment::with('workOrder', 'vir')
- ->where(function ($q) {
- $q->whereDoesntHave('vir')

Added / After Commit

+ $query->where('regd_no', 'like', '%' . $request->regd_no . '%');
+ }
+ 
+     // Use paginate with query persistence
+     $equipments = $query->paginate(10)->appends($request->query());
+ 
+     // $equipments = $query->get();
+ 
+     //  Now build filter options from same base condition
+ $baseFilterQuery = WorkEquipment::with('workOrder', 'vir')
+ ->where(function ($q) {
+ $q->whereDoesntHave('vir')

Removed / Before Commit

- 
- class WkspController extends Controller
- {
-     public function index()
- {
-         $wksps = Wksp::paginate(10);
-         return view('wksps.index', compact('wksps'));
- }
- 
- public function store(Request $request)
- {
- $request->validate(['name' => 'required|string|max:255']);

Added / After Commit

+ 
+ class WkspController extends Controller
+ {
+     // public function index()
+     // {
+     //     $wksps = Wksp::paginate(10);
+     //     return view('wksps.index', compact('wksps'));
+     // }
+ 
+     public function index(Request $request)
+ {
+         $query = Wksp::query();
+ 
+         // collect filters
+         $filters = $request->only(['name']);
+ 
+         // apply filter if name is chosen
+         if (!empty($filters['name'])) {

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Model;
+ use Illuminate\Database\Eloquent\SoftDeletes;
+ 
+ class FinancialPower extends Model
+ {
+     use SoftDeletes;
+ 
+     protected $table = 'financial_powers';
+ 
+     protected $fillable = [
+         'cfa',
+         'inherit_power',
+         'power_in_consultation_with_isa',
+         'next_higher_cfa',

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Model;
+ use Illuminate\Database\Eloquent\SoftDeletes;
+ 
+ class LpoFund extends Model
+ {
+     use SoftDeletes;
+ 
+     protected $table = 'lpo_funds';
+ 
+     protected $fillable = [
+         'name_of_fund',
+         'code_head',
+         'amount_allotted',
+         'financial_year',

Removed / Before Commit

- ->first();
- }
- 
- 
- }

Added / After Commit

+ ->first();
+ }
+ 
+  // ✅ Relation with Urgencies
+     public function urgencies()
+     {
+         return $this->hasMany(Urgency::class, 'mco_demand_id');
+     }
+     
+ 
+     
+ 
+ }

Removed / Before Commit

- 
- public function leaves() {
- return $this->hasMany(Leave::class, 'employee_id');
- }
- public function salaryGroup() {
-     return $this->belongsTo(SalaryGroup::class);
- }
- 
- 
- public function employeeCategory()
- {
-     return $this->belongsTo(EmployeeCategory::class, 'employee_category_id');
- }

Added / After Commit

+ 
+ public function leaves() {
+ return $this->hasMany(Leave::class, 'employee_id');
+     }
+     public function salaryGroup() {
+         return $this->belongsTo(SalaryGroup::class);
+     }
+ 
+ 
+ public function employeeCategory()
+     {
+         return $this->belongsTo(EmployeeCategory::class, 'employee_category_id');
+     }
+     public function leaveBalances()
+         {
+             return $this->hasMany(LeaveBalance::class, 'staff_id');
+         }

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Factories\HasFactory;
+ use Illuminate\Database\Eloquent\Model;
+ 
+ class Urgency extends Model
+ {
+     use HasFactory;
+ 
+     protected $fillable = [
+         'urgency_master_id',
+         'scale_id',
+         'item_id',
+         'qty_urgency',
+         'reason',
+         'req_no',

Removed / Before Commit

Added / After Commit

+ <?php
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Factories\HasFactory;
+ use Illuminate\Database\Eloquent\Model;
+ 
+ class UrgencyMaster extends Model
+ {
+     use HasFactory;
+ 
+     protected $fillable = [
+         'req_no',
+         'status',
+         'nac_date',
+         'nac_no',
+         'validity_date',
+         'lpr_no',
+         'draft_bid_validity_date',

Removed / Before Commit

- 'role',
- 'tno',
- 'innol',
- 'username',
- 'vertical_id',
- 'group_id',

Added / After Commit

+ 'role',
+ 'tno',
+ 'innol',
+     'employee_number',
+ 'username',
+ 'vertical_id',
+ 'group_id',

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Run the migrations.
+      */
+     public function up()
+     {
+         Schema::create('lpo_funds', function (Blueprint $table) {
+             $table->id();
+             $table->string('name_of_fund');
+             $table->string('code_head');
+             $table->decimal('amount_allotted', 15, 2)->default(0);

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Run the migrations.
+      */
+    public function up()
+     {
+         Schema::create('financial_powers', function (Blueprint $table) {
+             $table->id();
+             $table->string('cfa'); // Competent financial authority
+             $table->text('inherit_power')->nullable();
+             $table->text('power_in_consultation_with_isa')->nullable();

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Run the migrations.
+      */
+     public function up(): void
+     {
+         Schema::create('urgencies', function (Blueprint $table) {
+             $table->id();
+             $table->unsignedBigInteger('mco_demand_id'); // FK to mco_demands (item urgency is created from here)
+             $table->integer('urgency_qty')->default(0); // Qty Approved - Qty Received
+             $table->text('reason')->nullable(); // Why urgent

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Run the migrations.
+      */
+     public function up(): void
+     {
+         Schema::create('urgency_histories', function (Blueprint $table) {
+             $table->id();
+             $table->unsignedBigInteger('urgency_id');
+             $table->integer('old_qty')->nullable();
+             $table->integer('new_qty')->nullable();

Removed / Before Commit

Added / After Commit

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Run the migrations.
+      */
+     public function up(): void
+     {
+         Schema::table('urgency_histories', function (Blueprint $table) {
+             $table->string('field')->nullable()->after('urgency_id'); // which field changed
+             $table->text('old_value')->nullable()->after('field');
+             $table->text('new_value')->nullable()->after('old_value');
+         });

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-5">
- <h4><b>Staff Management</b></h4>
- </div>
- </div>
- </div>
- </div>
- <hr>
- 
- <div class="card-body">
- <th>Phone</th>
- <th>Designation</th>
- <th>Department</th>
-                             <th>Status</th>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-5">
+ <h4><b>Staff Management</b></h4>
+ </div>
+ </div>
+ </div>
+     </div> -->
+ 
+     <div class="card-header py-3">
+         <div class="row align-items-end">
+             <!-- Left Heading -->
+             <div class="col-md-4">
+                 <h4><b>Staff Management</b></h4>
+             </div>

Removed / Before Commit

- @endif
- 
- <div class="card">
- <div class="card-header py-3">
- <div class="row align-items-center">
-             <div class="col-md-4">
- <h4><b>AP Demands Master</b></h4>
- </div>
-             <div class="col-md-8">
-                 <!-- 🔍 Auto Filter Form -->
-                 <form method="GET" action="{{ route('apdemands.index') }}" id="filterForm">
-                     <div class="row">
-                         <div class="col-md-8">
-                             <select name="equipment_id" class="form-select" onchange="document.getElementById('filterForm').submit();">
-                                 <option value="">-- All Equipments --</option>
-                                 @foreach($equipments as $eqpt)
-                                     <option value="{{ $eqpt->id }}" 
-                                         {{ request('equipment_id') == $eqpt->id ? 'selected' : '' }}>

Added / After Commit

+ @endif
+ 
+ <div class="card">
+     <div class="card-header py-3 d-flex justify-content-between align-items-center flex-wrap">
+         
+         {{-- Left side heading --}}
+         <h4 class="mb-0"><b>AP Demands Master</b></h4>
+ 
+         {{-- Right side filter + button --}}
+         <div class="d-flex align-items-center gap-2">
+         <div>    
+         <form method="GET" action="{{ route('apdemands.index') }}" id="filterForm" class="d-flex align-items-center">
+                 <div><label class="form-label me-2 mb-0">Equipments</label></div>
+                 <select name="equipment_id" class="form-select select2" 
+                         onchange="document.getElementById('filterForm').submit();">
+                     <option value="">-- All Equipments --</option>
+                     @foreach($equipments as $eqpt)
+                         <option value="{{ $eqpt->id }}"

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container-fluid">
- 
- <!-- Page Header -->
-     
- 
- <!-- Filter Section -->
-     <div class="card mb-3 p-3 shadow-sm">
- 
-     <div class="d-flex justify-content-between align-items-center mb-5">
-         <h4 class="mb-0"><b>Employee Attendance</b></h4>
-         <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadModal">
-             <i class="fa fa-upload"></i> Upload Attendance
-         </button>
-     </div>
-

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <div class="card">
+ 
+ <!-- Page Header -->
+ 
+ 
+ <!-- Filter Section -->
+     <div class="card-header mb-3 p-2 ">
+ 
+         <div class="d-flex justify-content-between align-items-center mb-4">
+             <h4 class="mb-0"><b>Employee Attendance</b></h4>
+             <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadModal">
+                 <i class="fa fa-upload me-1" ></i> Upload Attendance
+             </button>
+         </div>
+

Removed / Before Commit

- 									<label for="tno" class="form-label">T NO.</label>
- 									<input type="text" class="form-control" id="tno" name="tno" placeholder="T No" required value="{{ old('tno') }}">
- 								</div>
- 
- 								<div class="col-6 mb-2">
- 									<label for="name" class="form-label">Full Name</label>

Added / After Commit

+ 									<label for="tno" class="form-label">T NO.</label>
+ 									<input type="text" class="form-control" id="tno" name="tno" placeholder="T No" required value="{{ old('tno') }}">
+ 								</div>
+ 								<div class="col-6 mb-2">
+ 									<label for="tno" class="form-label">Employee No.</label>
+ 									<input type="text" class="form-control" id="employee" name="employee_no" placeholder="Employee No" required value="{{ old('employee_no') }}">
+ 								</div>
+ 
+ 								<div class="col-6 mb-2">
+ 									<label for="name" class="form-label">Full Name</label>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>BDE</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#bdeModal">Add BDE</button>
- </div>
- </div>
-                             </div>
- <hr>
- 
- <!-- <div class="card-header text-end">
- <div class="mb-3">
- <label class="form-label">BDE Name</label>
- <input type="text" class="form-control" id="bdeName">
- </div>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+                             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>BDE</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#bdeModal">Add BDE</button>
+ </div>
+ </div>
+                             </div> -->
+ 
+ 
+                             <div class="card-header py-3">
+     <div class="row align-items-center">
+         <div class="col-md-3">
+             <h4 class="mb-0"><b>BDE</b></h4>
+         </div>

Removed / Before Commit

- 
- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Corps</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#corpModal">Add Corps</button>
- </div>
- </div>
-                             </div>
- <hr>
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#corpModal">Add Corps</button>
- <input type="hidden" id="corpId">
- <div class="mb-3">
- <label class="form-label">Corps Name</label>

Added / After Commit

+ 
+ <div class="row">
+ <div class="col">
+         
+ <div class="card">
+ 
+         <div class="card-header py-3">
+     <div class="row align-items-center">
+         <!-- Title -->
+         <div class="col-md-3">
+             <h4><b>Corps</b></h4>
+         </div>
+ 
+         <!-- Filters + Add button -->
+         <div class="col-md-9 d-flex justify-content-end align-items-end">
+             <form method="GET" action="{{ url('corps') }}" id="filterForm" class=" me-3">
+                 <div class="">
+                     <!-- Search -->

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>C/O</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#coModal">Add CO</button>
- </div>
- </div>
- </div>
-                             <hr>
- 
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#coModal">Add CO</button>
- <div class="mb-3">
- <label class="form-label">CO Name</label>
- <input type="text" class="form-control" id="coName">

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>C/O</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#coModal">Add CO</button>
+ </div>
+ </div>
+                             </div> -->
+ 
+ 
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>C/O</b></h4>
+                     </div>

Removed / Before Commit

- @csrf
- 
- <div class="card">
- <div class="card-header">
- <h4 class="mb-0"><b>Create CRC Entry</b></h4>
- </div>
- 
- <div class="card-body">
- 
-             <div class="row">
-                 <div class="col-md-4">
-                     {{-- 🔹 General Info --}}
-         
-                         <h5 class="mb-3"><b>General Info</b></h5>
-                         
-                             <div class="mb-4">
- <label for="unit_id">Unit Name:</label>
- <select name="unit_id" class="form-control select2-single" id="unit_id" required>

Added / After Commit

+ @csrf
+ 
+ <div class="card">
+         
+ <div class="card-header">
+ <h4 class="mb-0"><b>Create CRC Entry</b></h4>
+ </div>
+ 
+ <div class="card-body">
+ 
+             <div class="row align-items-end">
+                 
+                     
+                             <div class="col-md-6">
+                                 <h5 class="mb-3"><b>General Info</b></h5>
+                             </div>
+                             <div class="col-md-3">
+ <label for="unit_id">Unit Name:</label>

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header py-3 d-flex justify-content-between align-items-center">
-     <h4><b>CRC Entries</b></h4>
-     <a href="{{ route('crc.entries.create') }}" class="btn btn-primary">
-         <i data-feather="plus"></i> Create New Entry
-     </a>
- </div>
- 
- <hr>
- 
- 
-     <div class="card-body">
-         {{-- 🔍 Filter Form --}}
-         <form method="GET" action="{{ route('crc.entries.index') }}" class="row g-3 mb-4 align-items-end">
- <div class="col-md-2">
- <label><b>CRC No</b></label>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+ 
+     <div class="card-header py-3 d-flex justify-content-between align-items-center flex-wrap">
+         {{-- Left side heading --}}
+         <h4 class="mb-0"><b>CRC Entries</b></h4>
+ 
+         {{-- Right side filter form + add button --}}
+         <div class="d-flex align-items-end gap-1 flex-wrap">
+             <form method="GET" action="{{ route('crc.entries.index') }}" id="filterForm"
+                 class="d-flex align-items-end gap-3 mb-0 flex-wrap">
+ 
+                 <div class="d-flex flex-column">
+                     <label class="form-label mb-1"><b>CRC No</b></label>
+                     <select name="crc_no" class="form-select form-select-sm select2" style="min-width: 140px">
+                         <option value="">-- All CRC --</option>
+                         @foreach ($crcNos as $crc)

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header">
-         <h4><b>CRC Repairs</b></h4>
-     </div>
- 
-     <div class="card-body">
-         <form method="GET" class="row g-3 mb-4">
-             <div class="col-md-3">
-                 <label>Job Number</label>
-                 <select name="job_no" class="form-select select2">
-                     <option value="">-- Select Job No --</option>
-                     @foreach($jobNos as $job)
-                         <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>{{ $job }}</option>
-                     @endforeach
-                 </select>
-             </div>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-end justify-content-between ">
+             <div class="col-md-5  ">
+                 <h4><b>CRC Repairs</b></h4>
+ </div>
+ 
+ 
+             <div class="col-md-6 d-flex  justify-content-end ">
+                
+ 
+                 <form method="GET" class="row g-3" id="filterForm">
+                     <div class="col-md-4">
+                         <label class="form-label">Job Number</label>
+                         <select name="job_no" class="form-select select2 auto-submit">
+                             <option value="">-- Select Job No --</option>

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header"><h4>Pending IV Entries</h4></div>
- 
-      <div class="card-body">
-         <!-- 🔍 Filters -->
-         <form method="GET" class="row g-3 mb-4">
- <div class="col-md-3">
- <label>Unit</label>
- <select name="unit_id" class="form-select select2">
- <div class="col-md-3 align-self-end">
- <button type="submit" class="btn btn-search">Search</button>
- </div>
-         </form>
-        
- 
- @if($repairs->count())

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-end justify-content-between ">
+             <div class="col-md-4  ">
+                 <h4><b>Pending IV Entries</b></h4>
+             </div>
+ 
+             <div class="col-md-7 d-flex align-items-end  justify-content-end ">
+ 
+                 <form method="GET" class="row g-3">
+                     <div class="col-md-3">
+                         <label>Unit</label>
+                         <select name="unit_id" class="form-select select2">
+                             <option value="">-- Select Unit --</option>
+                             @foreach($units as $unit)
+                             <option value="{{ $unit->id }}" {{ request('unit_id') == $unit->id ? 'selected' : '' }}>

Removed / Before Commit

- <div class="col-md-4"></div>
- <div class="col-md-4">
- <label for="control_number" class="form-label">Job Number</label>
-                             <select name="job_no" class="form-control auto-submit">
- <option value="">-- Select Job No --</option>
- @foreach($allJobNos as $id => $job)
- <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>
- </div>
- <div class="col-md-4">
- <label for="equips" class="form-label">Equipment</label>
-                             <select name="equipment_id" class="form-control auto-submit">
- <option value="">-- Select Equipment --</option>
- @foreach($allEquipments as $id => $name)
- <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>

Added / After Commit

+ <div class="col-md-4"></div>
+ <div class="col-md-4">
+ <label for="control_number" class="form-label">Job Number</label>
+                             <select name="job_no" class="form-select select2 auto-submit">
+ <option value="">-- Select Job No --</option>
+ @foreach($allJobNos as $id => $job)
+ <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>
+ </div>
+ <div class="col-md-4">
+ <label for="equips" class="form-label">Equipment</label>
+                             <select name="equipment_id" class="form-select select2 auto-submit">
+ <option value="">-- Select Equipment --</option>
+ @foreach($allEquipments as $id => $name)
+ <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container">
- <div class="d-flex align-items-center justify-content-between mb-3">
-     <h4 class="mb-0">Requisition Approval Details</h4>
-     
-     @if($demands[0]->status == 'submitted')
-         <form method="POST" action="{{ route('demand.approve.submit') }}" class="d-inline">
-             @csrf
-             <input type="hidden" name="equipment_id" value="{{ $demands[0]->work_equipment_id }}">
-             <input type="hidden" name="job_no" value="{{ $demands[0]->job_no }}">
-             <input type="hidden" name="req_no" value="{{ $demands[0]->req_no }}">
-             <button type="submit" class="btn btn-success">
-                 Approve Demand
-             </button>
-         </form>
-     @else

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+  <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-center">
+             <div class="col-md-5">
+                 <h4><b>Requisition Approval Details</b></h4>
+             </div>
+             <div class="col-md-7 d-flex justify-content-end">
+                 @if($demands[0]->status == 'submitted')
+                     <form method="POST" action="{{ route('demand.approve.submit') }}" class="d-inline">
+                         @csrf
+                         <input type="hidden" name="equipment_id" value="{{ $demands[0]->work_equipment_id }}">
+                         <input type="hidden" name="job_no" value="{{ $demands[0]->job_no }}">
+                         <input type="hidden" name="req_no" value="{{ $demands[0]->req_no }}">
+                         <button type="submit" class="btn btn-success">

Removed / Before Commit

- <!-- 📊 Table -->
- <div class="table-responsive">
- <form method="GET" action="{{ route('demand.index') }}" class="mb-1">
-                     <div class="col-md-4">
-                         <label for="control_number" class="form-label">Choose Class</label>
-                         <select name="class" class="form-select select2" onchange="this.form.submit()">
-                             <option value="">-- Show All --</option>
-                             @foreach($classes as $id => $class)
-                                 @if($class->name == 'CL A')
-                                     <option value="{{ $class->id }}" {{ request('class') == $class->id ? 'selected' : '' }}>
-                                         {{ $class->name }}
-                                     </option>
-                                 @endif
-                             @endforeach
-                             <option value="other" {{ request('class') == 'other' ? 'selected' : '' }}>Other</option>
-                         </select>
- </div>
- </form>

Added / After Commit

+ <!-- 📊 Table -->
+ <div class="table-responsive">
+ <form method="GET" action="{{ route('demand.index') }}" class="mb-1">
+                     <div class="row mb-3">
+                         <div class="col-md-4">
+                             <label for="control_number" class="form-label">Choose Class</label>
+                             <select name="class" class="form-select select2" onchange="this.form.submit()">
+                                 <option value="">-- Show All --</option>
+                                 @foreach($classes as $id => $class)
+                                     @if($class->name == 'CL A')
+                                         <option value="{{ $class->id }}" {{ request('class') == $class->id ? 'selected' : '' }}>
+                                             {{ $class->name }}
+                                         </option>
+                                     @endif
+                                 @endforeach
+                                 <option value="other" {{ request('class') == 'other' ? 'selected' : '' }}>Other</option>
+                             </select>
+                         </div>

Removed / Before Commit

- </div>
- <div class="col-md-4">
- <label for="job_number" class="form-label">Job Number</label>
-                             <select name="job_id" class="form-select select2" style="width:150px;" onchange="this.form.submit()">
- <option value="">-- Select Job --</option>
- @foreach($job_nos as $id => $job)
- <option value="{{ $id }}" {{ $selectedJob == $id ? 'selected' : '' }}>{{ $job }}</option>
- </div>
- </div>
- 
- <div class="card-body">
- {{-- Initial Equipment dropdown --}}
- @if(!$selectedEquipment)
- <form method="GET" action="{{ route('demand.otherindex') }}">
- <div class="row mb-3">
-                 <div class="col-md-6">
-                     <label class="form-label">Select Equipment</label>
- <select name="equipment_id" class="form-select select2" onchange="this.form.submit()">

Added / After Commit

+ </div>
+ <div class="col-md-4">
+ <label for="job_number" class="form-label">Job Number</label>
+                             <select name="job_id" class="form-select select2" onchange="this.form.submit()">
+ <option value="">-- Select Job --</option>
+ @foreach($job_nos as $id => $job)
+ <option value="{{ $id }}" {{ $selectedJob == $id ? 'selected' : '' }}>{{ $job }}</option>
+ </div>
+ </div>
+ 
+     <hr>
+ 
+ <div class="card-body">
+         <div class="container-fluid">
+ {{-- Initial Equipment dropdown --}}
+ @if(!$selectedEquipment)
+ <form method="GET" action="{{ route('demand.otherindex') }}">
+ <div class="row mb-3">

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container">
-     <h4>Preview Requisition</h4>
- 
- @if($drafts->count())
- <form method="POST" action="{{ route('demand.submit', encrypt(json_encode($equipmentIds))) }}">
- @endif
- </div>
- 
- @endsection
- @section('scripts')
- <script>

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-center">
+             <div class="col-md-12">
+                 <h4><b>Preview Requisition</b></h4>
+             </div>
+         </div>
+     </div>
+     <hr>
+ 
+ 
+ <div class="card-body">  
+ <div class="container-fluid">
+

Removed / Before Commit

- </div>
- @endif
- <div class="card">
-     <div class="card-header py-3">
- <div class="row mb-1">
- <!-- <h4><b>Group Requisition</b></h4> -->
-     </div>
- 
-     <div class="row mb-1">
- <h4 class="mb-0">
-             Main Equipment Name: {{ $equipment->equipments->name }}
- &nbsp;&nbsp;
- </h4>
- </div>
- 
-     <div class="row" style="margin-top:20px">
- <form method="GET" action="{{ route('demand.createFromSelected') }}" class="mb-1" id="filterForm">
-             <div class="row">

Added / After Commit

+ </div>
+ @endif
+ <div class="card">
+     <div class="card-header py-2">
+ <div class="row mb-1">
+ <!-- <h4><b>Group Requisition</b></h4> -->
+     
+ 
+     <div class="row mb-1 col-md-7 align-items-end">
+ <h4 class="mb-0">
+             <b>Main Equipment Name: {{ $equipment->equipments->name }}</b>
+ &nbsp;&nbsp;
+ </h4>
+ </div>
+      
+ 
+     <div class="row col-md-5 justify-content-end " >
+ <form method="GET" action="{{ route('demand.createFromSelected') }}" class="mb-1" id="filterForm">

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container">
-     <h4>Preview Requisition</h4>
- 
- @if($drafts->count())
- <form method="POST" action="{{ route('demand.submit', $equipmentId) }}">
- @csrf
- 
- <!-- <a href="{{ route('demand.spares', $equipmentId) }}" class="btn btn-secondary mt-3">Back to Spares</a> -->
- </div>
- @endsection

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+ 
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-center">
+             <div class="col-md-12">
+                 <h4><b>Preview Requisition</b></h4>
+             </div>
+         </div>
+     </div>
+     <hr>
+ 
+ <div class="card-body">
+ 
+ <div class="container-fluid">

Removed / Before Commit

- <div class="card">
- <div class="card-header py-3">
- <div class="row align-items-center">
-             <div class="col-md-5">
- <h4><b>Departments</b></h4>
- </div>
-             <div class="col-md-7">
- <div class="d-flex justify-content-end">
- <a href="{{ route('departments.create') }}" class="btn btn-primary btn-sm">Add Department</a>
- </div>
- </div>
- </div>
- </div>
- <hr>
- 
- 
- <td>
- <a href="{{ route('departments.edit', $dept->id) }}" title="Edit">

Added / After Commit

+ <div class="card">
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+             <div class="col-md-2">
+ <h4><b>Departments</b></h4>
+ </div>
+             <div class="row col-md-10 align-items-end justify-content-end mb-3">
+             <div class="col-md-4">
+                 <label class="form-label">Status</label>
+                 <select id="statusFilter" class="form-control select2">
+                     <option value="">-- Filter by Status --</option>
+                     <option value="1" {{ request('status') == '1' ? 'selected' : '' }}>Active</option>
+                     <option value="0" {{ request('status') == '0' ? 'selected' : '' }}>Inactive</option>
+                 </select>
+             </div>
+ 
+             <div class="col-md-4">
+                 <label class="form-label">Department</label>

Removed / Before Commit

- <select name="leave_types[]" class="form-select select2 select2-hidden-accessible" multiple>
- @foreach($leaveTypes as $lt)
- <option value="{{ $lt->id }}" {{ isset($selectedLeaves) && in_array($lt->id, $selectedLeaves) ? 'selected' : '' }}>
-                 {{ $lt->name }}
- </option>
- @endforeach
- </select>

Added / After Commit

+ <select name="leave_types[]" class="form-select select2 select2-hidden-accessible" multiple>
+ @foreach($leaveTypes as $lt)
+ <option value="{{ $lt->id }}" {{ isset($selectedLeaves) && in_array($lt->id, $selectedLeaves) ? 'selected' : '' }}>
+                 {{ $lt->leave_name }}
+ </option>
+ @endforeach
+ </select>

Removed / Before Commit

- @extends('layouts.app')
- @section('content')
- <div class="card">
- <div class="card-header py-3">
- <div class="row align-items-center">
-             <div class="col-md-5">
- 
-                 <h4><b>Designations</b></h4>
- 
-             </div>
-             <div class="col-md-7">
-                 <div class="d-flex justify-content-end">
-                     <a href="{{ route('designations.create') }}" class="btn btn-primary btn-sm">Add Designation</a>
- </div>
- </div>
- </div>
- </div>
- <hr>

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ <div class="card">
+ 
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+             <!-- Left side: Heading -->
+             <div class="col-md-3 d-flex align-items-center">
+                 <h4 class="mb-0"><b>Designations</b></h4>
+             </div>
+ 
+             <!-- Right side: Filters + Button -->
+             <div class="col-md-9">
+                 <div class="d-flex justify-content-end gap-2">
+                     <!-- Designation filter -->
+                     <div class="me-2">
+                         <label class="form-label mb-1">Designation</label>
+                         <select id="designationFilter" class="form-control select2">

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Divisions</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#divModal">Add Division</button>
- </div>
- </div>
-                             </div>
-                             <hr>
-                             
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#divModal">Add Division</button>
- </div> -->
- <div class="mb-3">
- <label class="form-label">Division Name</label>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+ 
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>Divisions</b></h4>
+                     </div>
+ 
+                     <div class="col-md-9">
+                         <form method="GET" action="{{ url('divs') }}" id="filterForm"
+                             class="d-flex flex-wrap align-items-end gap-2 justify-content-end">
+                             <div>
+                                 <label class="form-label">Division</label>
+                                 <select name="name" class="form-select select2"
+                                     onchange="document.getElementById('filterForm').submit();">
+                                     <option value="">All Divisions</option>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-             <div class="card-header py-3">
- <div class="row align-items-center">
-                     <div class="col-md-3">
- <h4><b>Employee Categories</b></h4>
- </div>
-                     <div class="col-md-9 text-end">
-                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#categoryModal">Add Category</button>
- </div>
- </div>
-             </div>
- <hr>
- <div class="card-body">
- 
- </div>
- <div class="modal-body">

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+                     <div class="col-md-4">
+ <h4><b>Employee Categories</b></h4>
+ </div>
+ 
+                     <div class="col-md-6 row">
+                         
+                         <form method="GET" action="{{ route('employee-categories.index') }}" id="filterForm" class=" g-3 mb-3 align-items-end">
+                             <div class="col-md-5">
+                                 <label for="category_id" class="form-label"><b>Category</b></label>
+                                 <select name="category_id" id="category_id" class="form-control select2" onchange="document.getElementById('filterForm').submit();">
+                                     <option value="">-- Select Category --</option>
+ 
+                                     @foreach($allCategories as $category)

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
- <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Eqpt Targets</b></h4>
- </div>
-                     <div class="col-md-9 text-end">
-                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#equipmentModal">Add Target</button>
- </div>
- </div>
-             </div>
- <hr>
- <div class="card-body">
- 
- </div>
- <div class="modal-body">

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+ 
+ 
+ <div class="card-header py-3">
+                 <div class="row align-items-end">
+                     {{-- Left side: Heading --}}
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>Eqpt Targets</b></h4>
+                     </div>
+ 
+                     {{-- Right side: Filters + Add Button --}}
+                     <div class="col-md-9 " >
+                         <div class="row align-items-end justify-content-end">
+                             {{-- Group --}}
+                             <div class="col-md-3">
+                                 <label class="form-label">Groups</label>

Removed / Before Commit

- <div class="col">
- <div class="card">
- <div class="card-header py-3">
-                 <div class="row align-items-center">
-                     <div class="col-md-3">
- <h4><b>Equipments</b></h4>
- </div>
-                     <div class="col-md-9 text-end">
-                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#equipmentModal">Add Equipment</button>
- </div>
- </div>
- </div>
- <div class="modal-body">
- <input type="hidden" id="equipmentId">
- 
- <div class="mb-3">
- <label class="form-label">Group</label>
- <select class="form-select" id="groupSelect">

Added / After Commit

+ <div class="col">
+ <div class="card">
+ <div class="card-header py-3">
+                 <div class="row align-items-end">
+                     <div class="col-md-2">
+ <h4><b>Equipments</b></h4>
+ </div>
+ 
+                     <!-- <div class="mb-3"> -->
+                         <div class="col-md-2">
+                             <label class="form-label">Group</label>
+                             <select id="filterGroup" class="form-select select2">
+                                 <option value="">-- All Groups --</option>
+                                 @foreach($groups as $group)
+                                 <option value="{{ $group->id }}" {{ request('group_id') == $group->id ? 'selected' : '' }}>
+                                     {{ $group->name }}
+                                 </option>
+                                 @endforeach

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ 
+ <div class="row">
+     <div class="col">
+         <div class="card">
+             <div class="card-header py-3">
+                 <div class="row align-items-center align-items-end">
+                     <div class="col-md-3 align-items-end">
+                         <h4 class="mb-0"><b>Financial Power</b></h4>
+                     </div>
+ 
+                     <div class="col-md-9 ">
+                         <div class="d-flex justify-content-end gap-4 align-items-end">
+                             <form id="filterForm" method="GET" action="{{ url('financial-powers') }}" class="d-flex gap-2">
+                                 <div>
+                                     <label class="form-label">Search</label>
+                                     <input type="text" name="search" class="form-control" value="{{ request('search') }}" placeholder="Search CFA or next higher CFA">

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header py-3">
-         <h4><b>Generate Gate Pass</b></h4>
- </div>
- 
- <div class="card-body">
-         <!-- 🔍 Filter Form -->
-          @if(!isset($recentGatePass))
-         <form method="GET" action="{{ route('gatepass.index') }}" class="row g-3 mb-4">
-             <div class="col-md-3">
-                 <label>WCN Number</label>
-                <select name="wcn_number" class="form-select select2" data-placeholder="Select WCN Number">
-                     <option value="">-- Select WCN Number --</option>
-                     @foreach($wcnNumbers as $wcn)
-                         <option value="{{ $wcn }}" {{ request('wcn_number') == $wcn ? 'selected' : '' }}>
-                             {{ $wcn }}

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <div class="card-header">
+         
+ </div>
+ 
+ <div class="card-body">
+         <!-- Filter Form -->
+         <div class="row py-3 align-items-center">
+             <div class="col-md-5 ">
+                 <h4><b>Generate Gate Pass</b></h4>
+ </div>
+             <div class="col-md-7">
+                 @if(!isset($recentGatePass))
+                 <form method="GET" action="{{ route('gatepass.index') }}" class="row g-3 justify-content-end ">
+                     <div class="col-md-4">
+                         <label>WCN Number</label>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Groups</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#groupModal">Add Group</button>
- </div>
- </div>
- </div>
- <hr>
- 
- <div class="card-body">
- <select class="form-select" id="groupVertical">
- <option value="">-- Select Vertical --</option>
- @foreach($verticals as $vertical)
-                                             <option value="{{ $vertical->id }}">{{ $vertical->name }}</option>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>Groups</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#groupModal">Add Group</button>
+ </div>
+ </div>
+             </div> -->
+ 
+             <div class="card-header py-3">
+                 <div class="row align-items-end">
+                     <!-- Left: Heading -->
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>Groups</b></h4>
+                     </div>

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-5">
- <h4><b>Holidays</b></h4>
- </div>
- </div>
- </div>
- </div>
- <hr>
- <div class="card-body">
- <div class="table-responsive">
- <input class="form-check-input status-toggle" type="checkbox" id="holidaySwitch{{ $holiday->id }}" data-id="{{ $holiday->id }}" {{ $holiday->is_active ? 'checked' : '' }}>
- </div>
- <td>
-                                 <a href="{{ route('holidays.edit', $holiday->id) }}" title="Edit"><i class="fas fa-pencil "></i></a>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-5">
+ <h4><b>Holidays</b></h4>
+ </div>
+ </div>
+ </div>
+     </div> -->
+ 
+     <div class="card-header py-3">
+         <div class="row align-items-end">
+             <!-- Left: Heading -->
+             <div class="col-md-4">
+                 <h4 class="mb-0"><b>Holidays</b></h4>
+             </div>

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container">
- 
- @if($cartItems->isEmpty())
- <p>No items in cart.</p>
- </form>
- @endif
- </div>
- @endsection
- @section('scripts')
- <script>

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+ <div class="card">
+ <div class="card-body">
+ <div class="container-fluid">
+ 
+ @if($cartItems->isEmpty())
+ <p>No items in cart.</p>
+ </form>
+ @endif
+ </div>
+ </div>
+ </div>
+ @endsection
+ @section('scripts')
+ <script>

Removed / Before Commit

- <div class="container-fluid">
- <!-- 📊 Table -->
- <div class="table-responsive">
-                 <select id="demandSelect" class="form-control mb-3">
- <option value="">Select Demand No</option>
- @foreach($demands as $de)
- <option value="{{ encrypt($de) }}">{{ $de }}</option>
- @endforeach
- </select>
-                 <div id="demandDetails"></div>
- </div>
- </div>
- </div>

Added / After Commit

+ <div class="container-fluid">
+ <!-- 📊 Table -->
+ <div class="table-responsive">
+                 <div class="row">
+                     <div class="col-md-4">
+                         <select id="demandSelect" class="form-select mb-3">
+ <option value="">Select Demand No</option>
+ @foreach($demands as $de)
+ <option value="{{ encrypt($de) }}">{{ $de }}</option>
+ @endforeach
+ </select>
+                         
+                     </div>
+                 </div>
+ 
+                 <div class="row">
+                     <div class="col-md-12">
+                         <div id="demandDetails"></div>

Removed / Before Commit

- {{-- Control Number --}}
- <div class="col-md-4">
- <label for="control_number" class="form-label">Job Number</label>
-                             <select name="job_no" class="form-control" onchange="$('#filterForm').submit()">
- <option value="">All Job Nos</option>
- @foreach($jobNos as $jobNo)
- <option value="{{ $jobNo }}" {{ request('job_no') == $jobNo ? 'selected' : '' }}>
- </div>
- <div class="col-md-4">
- <label for="equips" class="form-label">Equipment</label>
-                             <select name="equipment_id" class="form-control auto-submit">
- <option value="">-- Select Equipment --</option>
- @foreach($equipmentNames as $id => $name)
- <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>
- </div>
- <div class="col-md-4">
- <label for="equips" class="form-label">All Voucher Nos</label>
-                            <select name="voucher_no" class="form-select auto-submit">

Added / After Commit

+ {{-- Control Number --}}
+ <div class="col-md-4">
+ <label for="control_number" class="form-label">Job Number</label>
+                             <select name="job_no" class="form-select select2" onchange="$('#filterForm').submit()">
+ <option value="">All Job Nos</option>
+ @foreach($jobNos as $jobNo)
+ <option value="{{ $jobNo }}" {{ request('job_no') == $jobNo ? 'selected' : '' }}>
+ </div>
+ <div class="col-md-4">
+ <label for="equips" class="form-label">Equipment</label>
+                             <select name="equipment_id" class="form-select select2 auto-submit">
+ <option value="">-- Select Equipment --</option>
+ @foreach($equipmentNames as $id => $name)
+ <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>
+ </div>
+ <div class="col-md-4">
+ <label for="equips" class="form-label">All Voucher Nos</label>
+                            <select name="voucher_no" class="form-select select2 auto-submit">

Removed / Before Commit

- </div>
- @endif
- @endforeach
- <div class="page-content container-xxl">
- @yield('content')
- </div>
- </div>
- @include('layouts.footer')
- </div>
- @include('layouts.js')
- @yield('scripts')
- </body>
- <script>
- ['success', 'error', 'warning', 'info'].forEach(function(type) {
- const el = document.getElementById('flash-message-' + type);
- if (el) {
- }, 3000); // Hide after 3 seconds
- }

Added / After Commit

+ </div>
+ @endif
+ @endforeach
+ 
+ 
+ 
+ 
+ <div class="page-content container-xxl">
+             <!-- Global AJAX alert -->
+             <div id="ajax-alert" class="m-2"></div>
+ 
+ @yield('content')
+ </div>
+ </div>
+ @include('layouts.footer')
+ </div>
+ 
+     <!-- Delete Confirmation Modal -->

Removed / Before Commit

- -->
- @section('content')
- <div class="card">
-     <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-5">
- <h4><b>Leave Types</b></h4>
- </div>
- </div>
- </div>
- </div>
- <hr>
- <div class="card-body">
- <div class="table-responsive">
- <th>Name</th>
- <th>Category</th>
- <th>Eligible For</th>
-                         <th>Annual Limit</th>

Added / After Commit

+ -->
+ @section('content')
+ <div class="card">
+     <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-5">
+ <h4><b>Leave Types</b></h4>
+ </div>
+ </div>
+ </div>
+     </div> -->
+ 
+     <div class="card-header py-3">
+         <div class="row align-items-end justify-content-end">
+             <div class="col-md-5">
+                 <h4><b>Leave Types</b></h4>
+             </div>
+             <div class="col-md-7 justify-content-end">

Removed / Before Commit

- @extends('layouts.app')
- @section('content')
- <div class="card">
- <div class="card-header py-3">
-         <div class="row align-items-center">
-             <div class="col-md-5">
-     <h4><b>Leave Approval</b></h4>
- </div>
-              </div>
-              </div>
- <hr>
- 
-         <div class="card-body">
-            <div class="container-fluid">
- <div aria-checked="table-responsive">
- <table class="table table-bordered table-hover table-striped">
-                 <thead>
-                     <tr>

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ 
+ <div class="card">
+ <div class="card-header py-3">
+         <div class="row align-items-end">
+             <div class="col-md-3">
+                 <h4><b>Leave Approval</b></h4>
+             </div>
+ 
+             <div class="col-md-9 d-flex justify-content-end">
+                 {{-- Filter Section --}}
+                 <form method="GET" action="{{ url('leave-approve') }}" class="row g-2" id="filterForm">
+ 
+                     <div class="col-md-3">
+                         <label class="form-label">Department</label>
+                         <select name="department" class="form-select select2" onchange="this.form.submit()">
+                             <option value="">All Departments</option>

Removed / Before Commit

- <div class="card">
- <div class="card-body">
- @if ($errors->any())
-                 <div class="alert alert-danger">
- <ul class="mb-0">
- @foreach ($errors->all() as $error)
- <li>{{ $error }}</li>
- @endforeach
- </ul>
- </div>
- @endif
- 
-             <form action="{{ route('leave.store') }}" method="POST">
- @csrf
- <div class="mb-3">
- <label for="subject" class="form-label">Subject</label>
- <select name="leave_type_id" id="leave_type_id" class="form-select" required>
- <option value="">Select Leave Type</option>

Added / After Commit

+ <div class="card">
+ <div class="card-body">
+ @if ($errors->any())
+                 <div class="alert alert-danger alert-dismissible fade show" role="alert">
+ <ul class="mb-0">
+ @foreach ($errors->all() as $error)
+ <li>{{ $error }}</li>
+ @endforeach
+ </ul>
+                     <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+ </div>
+ @endif
+ 
+             <form id="leaveForm" action="{{ route('leave.store') }}" method="POST">
+ @csrf
+ <div class="mb-3">
+ <label for="subject" class="form-label">Subject</label>
+ <select name="leave_type_id" id="leave_type_id" class="form-select" required>

Removed / Before Commit

- 
- <div class="card">
- <div class="card-body">
-             <form action="{{ route('leave.update', $leave->id) }}" method="POST">
- @csrf
- @method('PUT')
- 
- <div class="mb-3">
- <label for="subject" class="form-label">Subject</label>
-                     <input type="text" name="subject" id="subject" class="form-control" value="{{ old('subject', $leave->subject) }}" required>
- </div>
- 
- <div class="mb-3">
- <label for="leave_type_id" class="form-label">Leave Type</label>
- <select name="leave_type_id" id="leave_type_id" class="form-select" required>
- <option value="">Select Leave Type</option>
- @foreach($leaveTypes as $type)
-                             <option value="{{ $type->id }}" {{ $leave->leave_type_id == $type->id ? 'selected' : '' }}>

Added / After Commit

+ 
+ <div class="card">
+ <div class="card-body">
+             <form id="leaveEditForm" action="{{ route('leave.update', $leave->id) }}" method="POST">
+ @csrf
+ @method('PUT')
+ 
+ <div class="mb-3">
+ <label for="subject" class="form-label">Subject</label>
+                     <input type="text" name="subject" id="subject" class="form-control" 
+                            value="{{ old('subject', $leave->subject) }}" required>
+ </div>
+ 
+ <div class="mb-3">
+ <label for="leave_type_id" class="form-label">Leave Type</label>
+ <select name="leave_type_id" id="leave_type_id" class="form-select" required>
+ <option value="">Select Leave Type</option>
+ @foreach($leaveTypes as $type)

Removed / Before Commit

- </div>
- <div class="col-md-7">
- <div class="d-flex justify-content-end">
-                     <a href="{{ route('leave.create') }}" class="btn btn-success"><i class="fa fa-plus"></i> Apply Leave</a>                    
- </div>
- </div>
- </div>
- @forelse($leaves as $leave)
- <tr>
- <td>{{ $leave->subject }}</td>
-                         <td>{{ $leave->leaveType->name }}</td>
- <td>{{ \Carbon\Carbon::parse($leave->from_date)->format('d-m-Y') }}</td>
- <td>{{ \Carbon\Carbon::parse($leave->to_date)->format('d-m-Y') }}</td>
- <td>{{ $leave->total_days }}</td>
-                         <td class="text-capitalize">
- @if($leave->status == 'pending')
- <span class="badge bg-warning text-dark">Pending</span>
- @elseif($leave->status == 'approved')

Added / After Commit

+ </div>
+ <div class="col-md-7">
+ <div class="d-flex justify-content-end">
+                     <a href="{{ route('leave.create') }}" class="btn btn-primary"><i class="fa fa-plus"></i> Apply Leave</a>                    
+ </div>
+ </div>
+ </div>
+ @forelse($leaves as $leave)
+ <tr>
+ <td>{{ $leave->subject }}</td>
+                         <td>{{ $leave->leaveType->leave_name ?? 'N/A' }}</td>
+ <td>{{ \Carbon\Carbon::parse($leave->from_date)->format('d-m-Y') }}</td>
+ <td>{{ \Carbon\Carbon::parse($leave->to_date)->format('d-m-Y') }}</td>
+ <td>{{ $leave->total_days }}</td>
+                         <td class="text-capitalize text-center">
+ @if($leave->status == 'pending')
+ <span class="badge bg-warning text-dark">Pending</span>
+ @elseif($leave->status == 'approved')

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ 
+ <div class="row">
+     <div class="col">
+         <div class="card">
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>LPO Fund</b></h4>
+                     </div>
+ 
+                     <div class="col-md-9">
+                         <div class="d-flex justify-content-end align-items-end gap-4">
+                             {{-- Filter Form --}}
+                             <form id="filterForm" method="GET" action="{{ url('lpofunds') }}" class="d-flex gap-2">
+                                 <div>
+                                     <label class="form-label">Search</label>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-6">
- <h4><b>Commands</b></h4>
- <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#commandModal">Add Command</button>
- </div>
- </div>
- </div>
- <hr>
- 
- <div class="card-body">
- <div class="mb-3">
- <label class="mb-2">Command Name</label>
- <input type="text" class="form-control" id="commandName" placeholder="Enter command">
- </div>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-6">
+ <h4><b>Commands</b></h4>
+ <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#commandModal">Add Command</button>
+ </div>
+ </div>
+             </div> -->
+             
+             <div class="card-header py-3">
+     <div class="row align-items-center">
+         <div class="col-md-3">
+             <h4><b>Commands</b></h4>
+         </div>
+         <div class="col-md-9 d-flex justify-content-end align-items-end">

Removed / Before Commit

- @extends('layouts.app')
- @section('content')
- <div class="container">
-     <h4>Requisition Details</h4>
- @php
- $equipment = \App\Models\WorkEquipment::with(['Equipments', 'group', 'RepairClass'])
- ->find($demands[0]->work_equipment_id);
- </div>
- </div>
- </div>
- @endsection

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ 
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-center">
+             <div class="col-md-5">
+                 <h4><b>Requisition Details</b></h4>
+             </div>
+             <div class="col-md-7">
+             </div>
+         </div>
+     </div>
+     <hr>
+ 
+     <div class="card-body">
+     
+     <div class="container-fluid">

Removed / Before Commit

- @extends('layouts.app')
- 
- @section('content')
- <div class="container">
- @php
- $equipment = \App\Models\WorkEquipment::with(['Equipments', 'group', 'RepairClass'])
- ->find($demands[0]->work_equipment_id);
- ->exists();
- @endphp
- 
- <h4 class="mb-3">Requisition Details</h4>
- 
- <div class="d-flex flex-wrap align-items-center mb-3">
- <div class="me-3"><strong>Equipment Name:</strong> {{ $equipment->Equipments?->name ?? 'N/A' }}</div>
- <div class="me-3"><strong>Job No:</strong> {{ $demands[0]->job_no }}</div>
- </tbody>
- </table>
- </div>

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+ 
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-center">
+             <div class="col-md-12">
+                 <h4><b>Requisition Details</b></h4>
+             </div>
+         </div>
+     </div>
+     <hr>
+ 
+ <div class="card-body">
+ <div class="container-fluid">
+ @php

Removed / Before Commit

- {{-- Control Number --}}
- <div class="col-md-4">
- <label for="control_number" class="form-label">Job Number</label>
-                             <select name="job_no" class="form-control auto-submit">
- <option value="">-- Select Job No --</option>
- @foreach($allJobNos as $id => $job)
- <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>
- </div>
- <div class="col-md-4">
- <label for="equips" class="form-label">Equipment</label>
-                             <select name="equipment_id" class="form-control auto-submit">
- <option value="">-- Select Equipment --</option>
- @foreach($allEquipments as $id => $name)
- <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>
- </div>
- <div class="col-md-4">
- <label for="equips" class="form-label">Group</label>
-                            <select name="group_id" class="form-select auto-submit">

Added / After Commit

+ {{-- Control Number --}}
+ <div class="col-md-4">
+ <label for="control_number" class="form-label">Job Number</label>
+                             <select name="job_no" class="form-select select2 auto-submit">
+ <option value="">-- Select Job No --</option>
+ @foreach($allJobNos as $id => $job)
+ <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>
+ </div>
+ <div class="col-md-4">
+ <label for="equips" class="form-label">Equipment</label>
+                             <select name="equipment_id" class="form-select select2 auto-submit">
+ <option value="">-- Select Equipment --</option>
+ @foreach($allEquipments as $id => $name)
+ <option value="{{ $id }}" {{ request('equipment_id') == $id ? 'selected' : '' }}>
+ </div>
+ <div class="col-md-4">
+ <label for="equips" class="form-label">Group</label>
+                            <select name="group_id" class="form-select select2 auto-submit">

Removed / Before Commit

- @endif
- @endforeach
- <td>
-                                 <button type="submit">
-                                     <i class="fa fa-save"></i>
- </button>
- 
- </td>

Added / After Commit

+ @endif
+ @endforeach
+ <td>
+                                 <button class="border border-0 bg-white" type="submit">
+                                     <i class="fa fa-save fs-3 text"></i>
+ </button>
+ 
+ </td>

Removed / Before Commit

- 
- 
- @if($errors->any())
-     <div class="alert alert-danger">
-         <ul class="mb-0">
-             @foreach($errors->all() as $error)
-                 <li>{{ $error }}</li>
-             @endforeach
-         </ul>
-     </div>
- @endif
- <div class="row">
- <div class="col">
- <div class="card">
- <div class="card-header py-3">
- <div class="row align-items-center">
-                     <div class="col-md-6">
- <h4><b>MCO Scale Management</b></h4>

Added / After Commit

+ 
+ 
+ @if($errors->any())
+ <div class="alert alert-danger">
+     <ul class="mb-0">
+         @foreach($errors->all() as $error)
+         <li>{{ $error }}</li>
+         @endforeach
+     </ul>
+ </div>
+ @endif
+ <div class="row">
+ <div class="col">
+ <div class="card">
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+                     <div class="col-md-4">
+ <h4><b>MCO Scale Management</b></h4>

Removed / Before Commit

- 
- @section('content')
- 
- 				<!-- <div class="page-breadcrumb d-none d-sm-flex align-items-center mb-3">
- 					<a href="{{ route('menus.create') }}"><div class="breadcrumb-title pe-3">Create Menu</div></a>
- 					<div class="ps-3">
- 						<nav aria-label="breadcrumb">
- 					</div>
- 					
- 				</div> -->
- 				
- 				
- 				<div class="card">
- 					<div class="card-header py-3">
- 								<div class="row align-items-center">
- 									<div class="col-md-3">
- 										<h4><b>List of Created Menu</b></h4>
- 									</div>

Added / After Commit

+ 
+ @section('content')
+ 
+ <!-- <div class="page-breadcrumb d-none d-sm-flex align-items-center mb-3">
+ 					<a href="{{ route('menus.create') }}"><div class="breadcrumb-title pe-3">Create Menu</div></a>
+ 					<div class="ps-3">
+ 						<nav aria-label="breadcrumb">
+ 					</div>
+ 					
+ 				</div> -->
+ 
+ 
+ <div class="card">
+ 	<div class="card">
+ 		<div class="card-header py-3">
+ 			<div class="row align-items-center">
+ 				<div class="col-md-3">
+ 					<h4><b>List of Created Menu</b></h4>

Removed / Before Commit

- <h4><b>M&R Manufacturing</b></h4>
- </div>
- <div class="col-md-3">
-                 <form method="GET" class="row d-flex">
-                     
-                         <label>Filter by Job Number</label>
-                         <select name="job_no" class="form-control" onchange="this.form.submit()">
- <option value="">-- Select --</option>
- @foreach($jobNumbers as $job)
- <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>{{ $job }}</option>
- @endforeach
- </select>
-                    
- </form>
- </div>
- </div>
- <td>{{ $remaining }}</td>
- <td>{{ $latestDate }}</td>

Added / After Commit

+ <h4><b>M&R Manufacturing</b></h4>
+ </div>
+ <div class="col-md-3">
+                 <form method="GET" class="row d-flex align-items-end gap-2">
+                     <div class="w-100">
+                         <label for="job_no" class="form-label">Filter by Job Number</label>
+                         <select name="job_no" class="form-select select2" onchange="this.form.submit()">
+ <option value="">-- Select --</option>
+ @foreach($jobNumbers as $job)
+ <option value="{{ $job }}" {{ request('job_no') == $job ? 'selected' : '' }}>{{ $job }}</option>
+ @endforeach
+ </select>
+                    </div>
+ </form>
+ </div>
+ </div>
+ <td>{{ $remaining }}</td>
+ <td>{{ $latestDate }}</td>

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header py-3 d-flex justify-content-between align-items-center">
- <h4 class="mb-0"><b>Requisition Data Detail</b></h4>
-     <a href="{{ route('demand.previous.details', encrypt($req_no)) }}" class="btn btn-secondary btn-sm">
-         <i class="fa fa-arrow-left"></i> Back
-     </a>
- </div>
- 
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-bordered table-striped">
- <th>Qty Demaned</th>
- <th>Qty Approved</th>
- <th>Qty Received</th>
- </tr>
- </thead>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+ <div class="card-header py-3 d-flex justify-content-between align-items-center">
+ <h4 class="mb-0"><b>Requisition Data Detail</b></h4>
+     @php
+     $approvedurgency = \App\Models\McoDemand::where('scale_id', $spares[0]?->scale_id)
+                                         ->where('item_id', $spares[0]?->item_id)
+                                         ->where('req_no', $spares[0]?->req_no)
+                                         ->first();
+     @endphp
+     <div class="d-flex justify-content-end">
+     @if(!empty($approvedurgency))   
+         <a href="{{ route('urgency.preview', ['req_no' => $req_no]) }}" 
+             class="btn btn-secondary btn-sm" 
+             style="background:red; color:white;">
+             <i class="fa fa-exclamation-triangle"></i> Urgency
+         </a>

Removed / Before Commit

- <hr>
- <div class="card-body">
- <div class="container-fluid">
-             <!-- 📊 Table -->
- <div class="table-responsive">
- <table class="table table-bordered table-striped" id="example">
- <thead class="table-primary">

Added / After Commit

+ <hr>
+ <div class="card-body">
+ <div class="container-fluid">
+             <!--  Table -->
+ <div class="table-responsive">
+ <table class="table table-bordered table-striped" id="example">
+ <thead class="table-primary">

Removed / Before Commit

- @extends('layouts.app')
- @section('content')
- 
- <div class="row">
- <div class="col">
- <div class="card">
- <label class="col-sm-3 col-form-label">Production Year</label>
- <div class="col-sm-9">
- <input type="text" class="form-control" id="financialYearSelect" placeholder="e.g. 2024-2025">
- <div class="form-check form-switch mt-2">
- <input class="form-check-input" type="checkbox" id="isActiveToggle">
- <label class="form-check-label" for="isActiveToggle">Status</label>
- <input type="checkbox" class="form-check-input toggle-status" data-id="{{ $item->id }}" {{ $item->is_active ? 'checked' : '' }}>
- </div>
- </td>
-                                <td>
-     <a href="javascript:void(0);" class="btn-edit me-2"
-        data-id="{{ $item->id }}"

Added / After Commit

+ @extends('layouts.app')
+ @section('content')
+ 
+ <div id="ajax-alert"></div>
+ 
+ <div class="row">
+ <div class="col">
+ <div class="card">
+ <label class="col-sm-3 col-form-label">Production Year</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="financialYearSelect" placeholder="e.g. 2024-2025">
+                                         <small id="financialYearEmptyError" class="text-danger d-none">Please enter vertical name.</small>
+ <div class="form-check form-switch mt-2">
+ <input class="form-check-input" type="checkbox" id="isActiveToggle">
+ <label class="form-check-label" for="isActiveToggle">Status</label>
+ <input type="checkbox" class="form-check-input toggle-status" data-id="{{ $item->id }}" {{ $item->is_active ? 'checked' : '' }}>
+ </div>
+ </td>

Removed / Before Commit

- 
- 
- @if ($errors->any())
-     <div class="alert alert-danger">
-         <strong>Whoops!</strong> Please fix the following:
-         <ul>
-             @foreach ($errors->all() as $error)
-                 <li>{{ $error }}</li>
-             @endforeach
-         </ul>
-     </div>
- @endif
- 
- 
-     <div class="card">
-         <div class="card-header py-3">
-             <div class="row align-items-center">
-                 <div class="col-md-5">

Added / After Commit

+ 
+ 
+ @if ($errors->any())
+ <div class="alert alert-danger">
+     <strong>Whoops!</strong> Please fix the following:
+     <ul>
+         @foreach ($errors->all() as $error)
+         <li>{{ $error }}</li>
+         @endforeach
+     </ul>
+ </div>
+ @endif
+ 
+ 
+ <div class="card">
+     <div class="card-header py-3">
+         <div class="row align-items-end">
+             <div class="col-md-6">

Removed / Before Commit

- @section('content')
- 
- @if ($errors->any())
-     <div class="alert alert-danger">
-         <strong>Whoops!</strong> Please fix the following:
-         <ul>
-             @foreach ($errors->all() as $error)
-                 <li>{{ $error }}</li>
-             @endforeach
-         </ul>
-     </div>
- @endif
- 
- 
-  <div class="card">
- <div class="card-header py-3">
-         <div class="row align-items-center">
- <div class="col-md-5">

Added / After Commit

+ @section('content')
+ 
+ @if ($errors->any())
+ <div class="alert alert-danger">
+     <strong>Whoops!</strong> Please fix the following:
+     <ul>
+         @foreach ($errors->all() as $error)
+         <li>{{ $error }}</li>
+         @endforeach
+     </ul>
+ </div>
+ @endif
+ 
+ 
+ <div class="card">
+ 
+ <div class="card-header py-3">
+     <div class="row align-items-end justify-content-between">

Removed / Before Commit

- 
- 
- @if ($errors->any())
-     <div class="alert alert-danger">
-         <strong>Whoops!</strong> Please fix the following:
-         <ul>
-             @foreach ($errors->all() as $error)
-                 <li>{{ $error }}</li>
-             @endforeach
-         </ul>
-     </div>
- @endif
- <div class="card">
- <div class="card-header py-3">
-         <div class="row align-items-center">
-             <div class="col-md-5">
- <h4><b>QC Inspection</b></h4>
- </div>

Added / After Commit

+ 
+ 
+ @if ($errors->any())
+ <div class="alert alert-danger">
+     <strong>Whoops!</strong> Please fix the following:
+     <ul>
+         @foreach ($errors->all() as $error)
+         <li>{{ $error }}</li>
+         @endforeach
+     </ul>
+ </div>
+ @endif
+ <div class="card">
+ <div class="card-header py-3">
+         <div class="row align-items-end">
+             <div class="col-md-6">
+ <h4><b>QC Inspection</b></h4>
+ </div>

Removed / Before Commit

- @endif
- <div class="card">
- <div class="card-header py-3">
-         <div class="row align-items-center">
-             <div class="col-md-5">
- <h4><b>Quality Control Number</b></h4>
- </div>
-                 <div class="col-md-7">
-                 <form method="GET" action="{{ route('qc.index') }}" class="mb-1">
- <div class="row align-items-end">
- <div class="col-md-5">
- <label for="job_no" class="form-label">Job Number</label>
- <a href="{{ route('qc.index') }}" class="btn btn-info">Reset</a>
- </div>
- </div>
-                 </form>
- </div>
- </div>

Added / After Commit

+ @endif
+ <div class="card">
+ <div class="card-header py-3">
+         <div class="row align-items-end">
+             <div class="col-md-6">
+ <h4><b>Quality Control Number</b></h4>
+ </div>
+                 <div class="col-md-6">
+ 
+                 <form method="GET" action="{{ route('qc.index') }}" id="filterForm">
+     <div class="row align-items-end">
+         <div class="col-md-6">
+             <label for="job_no" class="form-label">Job Number</label>
+             <select name="job_no" class="form-select select2 filter-auto" data-placeholder="Select or search Job Number">
+                 <option value="">-- Select Job No --</option>
+                 @foreach($jobNumbers as $jobNo)
+                     <option value="{{ $jobNo }}" {{ request('job_no') == $jobNo ? 'selected' : '' }}>
+                         {{ $jobNo }}

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Repair Class</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#repairClassModal">Add Repair Class</button>
- </div>
- </div>
-                             </div>
- <hr>
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#repairClassModal">Add Repair Class</button>
- <div class="mb-3">
- <label class="form-label">Name</label>
- <input type="text" class="form-control" id="repairClassName">
- </div>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>Repair Class</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#repairClassModal">Add Repair Class</button>
+ </div>
+ </div>
+                             </div> -->
+                             
+                             <div class="card-header py-3">
+     <div class="row align-items-center">
+         <div class="col-md-3">
+             <h4 class="mb-0"><b>Repair Class</b></h4>
+         </div>
+

Removed / Before Commit

- 
- <div class="card">
- <div class="card-header py-3">
-         <div class="row align-items-center">
-             <div class="col-md-5">
- <h4><b>Equipment Repair Progress</b></h4>
- </div>
-             <div class="col-md-7">
-                 <form method="GET" action="{{ route('repairs.index') }}" class="mb-1">
- <div class="row align-items-end">
- <div class="col-md-5">
- <label for="Job_number" class="form-label">Job Number</label>
- <a href="{{ route('repairs.index') }}" class="btn btn-info">Reset</a>
- </div>
- </div>
-                 </form>
- </div>
- </div>

Added / After Commit

+ 
+ <div class="card">
+ <div class="card-header py-3">
+         <div class="row align-items-end">
+             <div class="col-md-6">
+ <h4><b>Equipment Repair Progress</b></h4>
+ </div>
+             <div class="col-md-6">
+                 <form method="GET" action="{{ route('repairs.index') }}" id="filterForm" class="mb-1">
+     <div class="row align-items-end">
+         <div class="col-md-6">
+             <label for="Job_number" class="form-label">Job Number</label>
+             <select name="job_number" class="form-control  filter-auto">
+                 <option value="">-- Select Job Number --</option>
+                 @foreach ($jobNumbers as $job)
+                     <option value="{{ $job }}" {{ request('job_number') == $job ? 'selected' : '' }}>
+                         {{ $job }}
+                     </option>

Removed / Before Commit

- 
- @section('content')
- 
- 				<div class="row">
- 					<div class="col">
- 						<div class="card">
- 							<div class="card-header py-3">
- 								<div class="row align-items-center">
- 									<div class="col-md-3">
- 										<h4><b>List of Created Role</b></h4>
- 									</div>
- 									<div class="col-md-9">
- 										<form class="float-md-end">
- 											<div class="row row-cols-md-auto g-lg-3">
- 												<a href="{{ route('roles.create') }}"><button type="button" class="btn btn-primary">Add Role</button></a>
- 											</div>
- 										</form>
- 									</div>

Added / After Commit

+ 
+ @section('content')
+ 
+ <div class="row">
+ 	<div class="col">
+ 		<div class="card">
+ 			<div class="card-header py-3">
+     <div class="row align-items-center">
+         <!-- Left Heading -->
+         <div class="col-md-3">
+             <h4><b>List of Created Role</b></h4>
+         </div>
+ 
+         <!-- Filters + Add button on the right -->
+         <div class="col-md-9 d-flex justify-content-end align-items-end">
+ 
+             <!-- Filter Form -->
+             <form id="filterForm" method="GET" action="{{ route('roles.index') }}" class="d-flex align-items-end me-2">

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header">
-         <h4>Salary Components</h4>
-         <a href="{{ route('salary-components.create') }}" class="btn btn-primary btn-sm float-end">+ Add Component</a>
- </div>
- <div class="card-body">
- <table class="table table-bordered table-striped">
- <thead>
- </thead>
- <tbody>
- @php
-     $govtFixedComponents = [
-         'Basic Pay',
-         'Dearness Allowance',
-         'House Rent Allowance',
-         'Transport Allowance',

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <!-- <div class="card-header">
+         <div class="row align-items-end">
+             <div class="col-md-3">
+                 <h4>Salary Components</h4>
+             </div>
+ 
+             <div class=" row col-md-7 align-items-center">
+                 <form method="GET" action="{{ route('salary-components.index') }}" id="filterForm" class="row g-2 mb-3">
+                     <div class="col-md-2">
+                         <label class="form-label">Name</label>
+                         <input type="text" name="name" value="{{ request('name') }}"
+                             class="form-control" placeholder="Name"
+                             onchange="this.form.submit()">
+                     </div>
+                     <div class="col-md-2">

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header d-flex justify-content-between align-items-center">
-         <h4>Salary Groups</h4>
-         <a href="{{ route('salary-groups.create') }}" class="btn btn-success btn-sm">+ Add Group</a>
- </div>
- 
- <div class="card-body">
-         @if(session('success'))
-             <div class="alert alert-success">{{ session('success') }}</div>
-         @endif
- 
- <table class="table table-bordered table-striped">
- <thead>
- <td>{{ $group->description ?? '-' }}</td>
- <td>
- @foreach($group->components as $comp)

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+    
+     <div class="card-header">
+     <div class="row align-items-end">
+         <div class="col-md-4">
+             <h4><b>Salary Groups</b></h4>
+         </div>
+ 
+         <div class="col-md-6 ">
+             <!-- Auto-submit Filter Form -->
+             <form action="{{ route('salary-groups.index') }}" method="GET" id="filterForm">
+                 <div class="row g-2 justify-content-end">
+                     <div class="col-md-5">
+                         <label for="name" class="form-label">Group Name</label>
+                         <select name="name" id="name" class="form-select form-select-sm select2 w-100">
+                             <option value="">-- All --</option>

Removed / Before Commit

- @section('title', 'Salary Slips - ' . $employee->name)
- 
- @section('content')
- <div class="container">
-     <h3 class="mb-4">Salary Slips of {{ $employee->name }}</h3>
- 
- {{-- Create Current Month Salary --}}
- <div class="mb-3">
- <i class="fas fa-plus"></i> Create Current Month Salary Slip
- </button>
- </form>
-     </div>
- 
-     <table class="table table-bordered table-striped">
- <thead class="table-light">
- <tr>
- <th>Month</th>
- @endforeach

Added / After Commit

+ @section('title', 'Salary Slips - ' . $employee->name)
+ 
+ @section('content')
+ 
+ <div class="row">
+     <div class="col">
+         <div class="card">
+             <div class="card-header py-3">
+     <div class="row align-items-center">
+         <!-- Left Side: Heading -->
+         <div class="col-md-7">
+             <h4 class="mb-0"><b>Salary Slips of {{ $employee->name }}</b></h4>
+         </div>
+          <div class="col-md-5">
+             <div class="d-flex justify-content-end ">
+                 <form action="{{ route('salary-slips.createsalary', $employee->id) }}" method="get">
+                 @csrf
+                     <button type="submit" class="btn btn-primary">

Removed / Before Commit

- 
- @section('content')
- <div class="card">
-     <div class="card-header d-flex justify-content-between align-items-center">
-         <h4>Shifts</h4>
-         <a href="{{ route('shifts.create') }}" class="btn btn-primary btn-sm">Add Shift</a>
- </div>
- <div class="card-body">
- <div class="table-responsive">
- <table class="table table-bordered table-striped">
- </td>
- 
- <td>
-                                 <a href="{{ route('shifts.edit', $shift->id) }}" title="Edit"><i class="fas fa-pencil "></i></a>
-                                 <form action="{{ route('shifts.destroy', $shift->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure?')">
- @csrf
- @method('DELETE')
-                                    <i class="fas fa-trash text-dark"></i>

Added / After Commit

+ 
+ @section('content')
+ <div class="card">
+     <!-- <div class="card-header d-flex justify-content-between align-items-center">
+         <h4>Shifts</h4> -->
+        
+         <div class="card-header py-3">
+     <div class="d-flex justify-content-between align-items-end">
+         <!-- Left: Heading -->
+         <h4 class="mb-0"><b>Shifts</b></h4>
+ 
+         <!-- Right: Filters + Add Button -->
+         <div class="d-flex align-items-end gap-2">
+             <!-- Shift filter -->
+             <div class="d-flex flex-column">
+                 <label class="form-label " >Shift</label>
+                 <select id="shiftFilter" class="form-control  select2" style="min-width: 200px;">
+                     <option value="">-- All Shifts --</option>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
-                                 <div class="row align-items-center">
-                                     <div class="col-md-6">
-                                         <h4><b>Sub-Assy Equipments</b></h4>
-                                     </div>
-                                     <div class="col-md-6 text-end">
-                                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subAssyModal">Add Sub-Assy</button>
-                                     </div>
-                                 </div>
-                             </div>
-                             <hr>
- 
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subAssyModal">Add Sub-Assy</button>
- </div>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <div class="card-header py-3">
+                 <div class="row align-items-end">
+                     <div class="col-md-3">
+                         <h4><b>Sub-Assy Equipments</b></h4>
+                     </div>
+ 
+                     <div class="col-md-9">
+                         <div class="d-flex justify-content-end align-items-end gap-4">
+                           
+                         
+                         <div class="">
+                             <label class="form-label">Group</label>
+                             <select id="filterGroup" class="form-select select2">
+                                 <option value="">-- All Groups --</option>
+                                 @foreach($groups as $group)

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Sub Groups</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subGroupModal">Add SubGroup</button>
- </div>
- </div>
- </div>
- <hr>
- 
- <div class="card-body">
- <select class="form-select" id="subGroupGroup">
- <option value="">-- Select Group --</option>
- @foreach($groups as $group)
-                                             <option value="{{ $group->id }}">{{ $group->name }}</option>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>Sub Groups</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subGroupModal">Add SubGroup</button>
+ </div>
+ </div>
+             </div> -->
+ 
+ 
+ 
+             <div class="card-header py-3">
+                 <div class="row align-items-end">
+                     <!-- Heading -->
+                     <div class="col-md-3">

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Units</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#unitModal">Add Unit</button>
- </div>
- </div>
- </div>
- <hr>
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#unitModal">Add Unit</button>
- <div class="mb-3">
- <label class="form-label">Unit Name</label>
- <input type="text" class="form-control" id="unitName">
- </div>

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+                             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>Units</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#unitModal">Add Unit</button>
+ </div>
+ </div>
+                             </div> -->
+ 
+ 
+                             <div class="card-header py-3">
+                                 <div class="row align-items-center">
+                                     <div class="col-md-3">
+                                         <h4 class="mb-0"><b>Units</b></h4>
+                                     </div>

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <style>
+ .select2-container { width: 200px !important; }
+ .table-fixed { table-layout: fixed; width: 100%; }
+ .table-fixed th, .table-fixed td { word-wrap: break-word; text-align: center; vertical-align: middle; }
+ </style>
+ 
+ <div class="card">
+     <div class="card-header d-flex justify-content-between align-items-center">
+         <h4 class="mb-0">Urgency</h4>
+     </div>
+ 
+     <div class="card-body">
+             <div class="table-responsive">
+                 <table class="table table-bordered table-striped table-fixed">
+                     <thead class="table-danger text-center">

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <style>
+ .select2-container { width: 200px !important; }
+ .table-fixed { table-layout: fixed; width: 100%; }
+ .table-fixed th, .table-fixed td { word-wrap: break-word; text-align: center; vertical-align: middle; }
+ </style>
+ 
+ <div class="card">
+     <div class="card-header d-flex justify-content-between align-items-center">
+     <h4 class="mb-0">
+         Urgency Preview (No: {{ $decryptedid }})
+         <span id="lpr-no-display" class="ms-2 fw-bold">
+             {{ $urgency->lpr_no ? '|| LPR NO : ' . $urgency->lpr_no : '' }}
+         </span>
+     </h4>
+

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <style>
+ .select2-container { width: 200px !important; }
+ .table-fixed { table-layout: fixed; width: 100%; }
+ .table-fixed th, .table-fixed td { word-wrap: break-word; text-align: center; vertical-align: middle; }
+ </style>
+ 
+ <div class="card">
+     <div class="card-header d-flex justify-content-between align-items-center">
+         <h4 class="mb-0">Urgency</h4>
+     </div>
+ 
+     <div class="card-body">
+             <div class="table-responsive">
+                 <table class="table table-bordered table-striped table-fixed">
+                     <thead class="table-danger text-center">

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <style>
+ .select2-container { width: 200px !important; }
+ .table-fixed { table-layout: fixed; width: 100%; }
+ .table-fixed th, .table-fixed td { word-wrap: break-word; text-align: center; vertical-align: middle; }
+ </style>
+ 
+ <div class="card">
+     <div class="card-header d-flex justify-content-between align-items-center">
+         <h4 class="mb-0">Urgency Preview (No: {{ $decryptedid }})</h4>
+ 
+         <div class="d-flex align-items-center">
+             <a href="{{ url()->previous() }}" class="btn btn-secondary btn-sm">Back</a>
+         </div>
+     </div>
+

Removed / Before Commit

Added / After Commit

+ @extends('layouts.app')
+ 
+ @section('content')
+ <style>
+ .select2-container { width: 200px !important; }
+ .table-fixed { table-layout: fixed; width: 100%; }
+ .table-fixed th, .table-fixed td { word-wrap: break-word; text-align: center; vertical-align: middle; }
+ </style>
+ 
+ <div class="card">
+     <div class="card-header d-flex justify-content-between align-items-center">
+         <h4 class="mb-0">Urgency Preview (Reg No: {{ decrypt($req_no) }})</h4>
+ 
+         <div class="d-flex align-items-center">
+             <a href="{{ url()->previous() }}" class="btn btn-secondary btn-sm">Back</a>
+         </div>
+     </div>
+

Removed / Before Commit

- @section('content')
- 
- <div class="card">
- 							<div class="card-header py-3">
- 								<div class="row align-items-center">
- 									<div class="col-md-3">
- 										<h4><b>List of Users</b></h4>
- 									</div>
- 								</div>
- 							</div>
- 							<hr>
- 
- 	<div class="card-body">
- 						<td>{{ $user->created_at ? $user->created_at->format('d M, Y') : '-' }}</td>
- 						<td>
- 							@if(!empty($user->roles))
- 								<a href="{{ url('/user-edit/'.$user->id) }}"><i class="fa fa-edit"></i></a>
- 							@endif

Added / After Commit

+ @section('content')
+ 
+ <div class="card">
+ 							<!-- <div class="card-header py-3">
+ 								<div class="row align-items-center">
+ 									<div class="col-md-3">
+ 										<h4><b>List of Users</b></h4>
+ 									</div>
+ 								</div>
+ 							</div> -->
+ 							
+ <!-- <div class="card-header py-3">
+     <div class="row align-items-center">
+         <div class="col-md-3">
+             <h4><b>List of Users</b></h4>
+         </div>
+ 
+         <div class="col-md-9 d-flex justify-content-end">

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
-                                 <div class="row align-items-center">
-                                     <div class="col-md-3">
-                                         <h4><b>Verticals</b></h4>
-                                     </div>
-                                     <div class="col-md-9 text-end">
-                                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#verticalModal">Add Vertical</button>
-                                     </div>
-                                 </div>
-                             </div>
-                             <hr>
- <!-- <div class="card-header text-end">
- 
- </div> -->
- <div class="card-body">

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <div class="card-header py-3">
+     <div class="row align-items-center">
+         <!-- Left Side: Heading -->
+         <div class="col-md-3">
+             <h4 class="mb-0"><b>Verticals</b></h4>
+         </div>
+ 
+         <!-- Right Side: Filter + Button -->
+         <div class="col-md-9">
+             <div class="d-flex justify-content-end align-items-end gap-4 ">
+                 <!-- Filter Form -->
+                 <form id="filterForm" method="GET" action="{{ url('verticals') }}" class="d-flex gap-2">
+                     <div>
+                         <label class="form-label">Vertical</label>
+

Removed / Before Commit

- min-height: 32px;
- }
- form{
-     margin-bottom: 40px;
- }
- </style>
- <style>
- 
- <div class="card">
- <div class="card-header py-3">
-        <div class="row align-items-center">
-             <div class="col-md-5">
-                 <h4><b>Awaiting VIR</b></h4>
- </div>
-             <div class="col-md-7">
-                 <form method="GET" action="{{ route('vir.index') }}" class="mb-1">
-                     <div class="row align-items-end">
-                         {{-- Control Number --}}

Added / After Commit

+ min-height: 32px;
+ }
+ form{
+     /* margin-bottom: 40px; */
+ }
+ </style>
+ <style>
+ 
+ <div class="card">
+ <div class="card-header py-3">
+     <div class="d-flex justify-content-between align-items-end">
+         
+         {{-- Left Heading --}}
+         <h4 class="mb-0"><b>Awaiting VIR</b></h4>
+ 
+         {{-- Right Filters --}}
+         <form method="GET" action="{{ route('vir.index') }}" id="filterForm" class="d-flex gap-3">
+

Removed / Before Commit

- </div>
- @endif
- <div class="card">
-     <div class="card-header"><h4>GENERATE WCN NUMBER</h4></div>
- <div class="card-body">
- 
- <!-- Job Number Dropdown -->
- <div id="generate-section">
-              @if(!empty($commiteddata) && count($commiteddata) >  0)
- @else
-             <form method="GET" action="{{ route('wcn.index') }}" class="row g-3 mb-4">
-                     <div class="col-md-3">
-                         <label for="job_number" class="form-label">Select Job Number</label>
-                         <select name="job_number" class="form-control">
-                             <option value="">-- Select --</option>
-                             @foreach($jobNumbers as $job)
-                                 <option value="{{ $job }}" {{ request('job_number') == $job ? 'selected' : '' }}>
-                                     {{ $job }}

Added / After Commit

+ </div>
+ @endif
+ <div class="card">
+     <div class="card-header">
+         @if(!empty($commiteddata) && count($commiteddata) >  0)
+              @else
+             <div class="row align-items-center justify-content-between">
+                 <div class="col-md-5"><h4><b>Generate WCN Number</b></h4></div>
+                 <div class="col-md-7 ">
+                     <form method="GET" action="{{ route('wcn.index') }}" class="row g-3 mb-4 justify-content-end">
+                             <div class="col-md-3">
+                                 <label for="job_number" class="form-label">Select Job Number</label>
+                                 <select name="job_number" class="form-control">
+                                     <option value="">-- Select --</option>
+                                     @foreach($jobNumbers as $job)
+                                         <option value="{{ $job }}" {{ request('job_number') == $job ? 'selected' : '' }}>
+                                             {{ $job }}
+                                         </option>

Removed / Before Commit

- <div class="row">
- <div class="col">
- <div class="card">
-                             <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
- <h4><b>Workspaces</b></h4>
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#wkspModal">Add Workspace</button>
- </div>
- </div>
- </div>
-                             <hr>
- 
- <!-- <div class="card-header text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#wkspModal">Add Workspace</button>
- <div class="mb-3">
- <label class="form-label">Workspace Name</label>
- <input type="text" class="form-control" id="wkspName">

Added / After Commit

+ <div class="row">
+ <div class="col">
+ <div class="card">
+             <!-- <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+ <h4><b>Workspaces</b></h4>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#wkspModal">Add Workspace</button>
+ </div>
+ </div>
+                             </div> -->
+ 
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
+                     <div class="col-md-3">
+                         <h4 class="mb-0"><b>Workspaces</b></h4>
+                     </div>
+

Removed / Before Commit

- <div class="d-flex gap-2">
- <a href="{{ url('work-orders-unit/' . $order->work_unit_id . '?user_id=' . $order->work_user_id) }}"
- class="text-primary" title="Edit">
-                             <i class="fas fa-edit"></i>
- </a>
-                         <a href="javascript:void(0);" class="text-danger btn-delete" data-id="{{ $order->id }}" title="Delete">
-                             <i class="fas fa-trash-alt"></i>
- </a>
- </div>
- </div>

Added / After Commit

+ <div class="d-flex gap-2">
+ <a href="{{ url('work-orders-unit/' . $order->work_unit_id . '?user_id=' . $order->work_user_id) }}"
+ class="text-primary" title="Edit">
+                             <i class="fas fa-pencil"></i>
+ </a>
+                         <a href="javascript:void(0);" class="text-danger btn-delete ms-2" data-id="{{ $order->id }}" title="Delete">
+                             <i class="fas fa-trash text-dark"></i>
+ </a>
+ </div>
+ </div>

Removed / Before Commit

- use App\Http\Controllers\APDemandController;
- use App\Http\Controllers\SalarySlipController;
- use App\Http\Controllers\EmployeeCategoryController;
- 
- /*
- |--------------------------------------------------------------------------
- Route::post('employee-categories/toggle-status', [EmployeeCategoryController::class, 'toggleStatus'])->name('employee-categories.toggleStatus');
- 
- // Employee Category end
- 
- 
- Route::post('/user-approved-toggle', [UserController::class, 'toggleApproved']);
- Route::get('/timeallotment/print/{id}', [WorkOrderController::class, 'print'])->name('timeallotment.print');
- 
- Route::get('issues/{regn_no}', [IssueController::class, 'show'])->name('issues.show');  // show spares by regn_no
- Route::post('issues/issue-group', [IssueController::class, 'storeIssueGroup'])->name('issues.storeGroup');  // save remark and create issue_group
- 
-

Added / After Commit

+ use App\Http\Controllers\APDemandController;
+ use App\Http\Controllers\SalarySlipController;
+ use App\Http\Controllers\EmployeeCategoryController;
+ use App\Http\Controllers\CommonController;
+ use App\Http\Controllers\LpoFundController;
+ use App\Http\Controllers\FinancialPowerController;
+ use App\Http\Controllers\UrgencyController;
+ 
+ 
+ /*
+ |--------------------------------------------------------------------------
+ Route::post('employee-categories/toggle-status', [EmployeeCategoryController::class, 'toggleStatus'])->name('employee-categories.toggleStatus');
+ 
+ // Employee Category end
+ 
+    
+     // LPO Funds start
+

Commit Review Workspace ?

Review Result ?