Showing AI reviews for army
Project AI Score ?
67%
Quality Avg ?
72%
Security Avg ?
54%
Reviews ?
37

Review Result ?

jattin01/army · cad08a27
The commit adds export classes for equipment and MCO scale data, and updates the CrcEntryController for better filtering, validations, and data handling of CRC entries with issuing parts. The export classes are generally well structured using interfaces from Maatwebsite Excel package. The controller includes reasonable logic for validating prior entries before allowing creation of new ones and handles filtering parameters. However, the code has some potential issues including lack of validation on input request parameters which may lead to errors or vulnerabilities, some awkward possible null handling that can be improved, and missing comments or documentation for complex branch decisions. The patch improves business value by supporting necessary export and filtering but has moderate risk from insufficient input validation and potential for silent failures.
Quality ?
70%
Security ?
50%
Business Value ?
75%
Maintainability ?
65%
Issues & Suggested Fixes ?
1AI detects the issue
2Shows file, line, or evidence
3Suggests the fix to apply
Use Better Null Safety And Check For Relat...
Where app/Exports/EquipmentExport.php:21
Issue / Evidence Use better null safety and check for related model existence explicitly
Suggested Fix add comments or assertions to clarify assumptions and avoid silent null reference issues
Security Issue
Where app/Exports/McoScaleDataExport.php:19
Issue / Evidence Direct DB table usage with dynamic table name can pose security risks
Suggested Fix validate or sanitize table names to avoid SQL injection
Missing Validation
Where app/Http/Controllers/CrcEntryController.php:40
Issue / Evidence Add validation for 'crc_no' request parameter to avoid malformed queries or runtime errors
Suggested Fix Review and simplify this section.
Missing Validation
Where app/Http/Controllers/CrcEntryController.php:45
Issue / Evidence Add validation and sanitize inputs used in 'job_no' filter to prevent wildcard abuse or injection issues
Suggested Fix Review and simplify this section.
Missing Validation
Where app/Http/Controllers/CrcEntryController.php:51
Issue / Evidence Add validation and sanitization for 'part_no' filter input
Suggested Fix Review and simplify this section.
Missing Validation
Where app/Http/Controllers/CrcEntryController.php:57
Issue / Evidence Validate and sanitize 'unit_name' filter input
Suggested Fix Review and simplify this section.
Add Comments Describing Business Rule For...
Where app/Http/Controllers/CrcEntryController.php:22
Issue / Evidence Add comments describing business rule for blocking creation when a pending CRC entry exists
Suggested Fix Review and simplify this section.
Wrap The Db::begintransaction() With Error...
Where app/Http/Controllers/CrcEntryController.php:176
Issue / Evidence Wrap the DB::beginTransaction() with error catch to rollback on exception and avoid dangling transactions
Suggested Fix Review and simplify this section.
Add Comments Clarifying Grouping Logic For...
Where app/Http/Controllers/CrcEntryController.php:189
Issue / Evidence Add comments clarifying grouping logic for equipment parts
Suggested Fix Review and simplify this section.
Provide A More Descriptive Commit Message...
Where commit message
Issue / Evidence Provide a more descriptive commit message explaining changes and link to related ticket or purpose
Suggested Fix improve maintainability and reviewer understanding
Code Change Preview · app/Exports/EquipmentExport.php ?
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ 
+ namespace App\Exports;
+ 
+ use Illuminate\Contracts\Support\Responsable;
+ use Maatwebsite\Excel\Concerns\FromCollection;
+ use Maatwebsite\Excel\Concerns\WithHeadings;
+ use Illuminate\Support\Collection;
+ 
+ class EquipmentExport implements FromCollection, WithHeadings
+ {
+     protected $equipments;
+ 
+     public function __construct(Collection $equipments)
+     {
+         $this->equipments = $equipments;
+     }
+ 
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ namespace App\Exports;
+ 
+ use Illuminate\Support\Facades\DB;
+ use Maatwebsite\Excel\Concerns\FromCollection;
+ use Maatwebsite\Excel\Concerns\WithHeadings;
+ 
+ class McoScaleDataExport implements FromCollection, WithHeadings
+ {
+     protected $table;
+ 
+     public function __construct($table)
+     {
+         $this->table = $table;
+     }
+ 
+     public function collection()
+     {
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ namespace App\Exports;
+ 
+ use App\Models\McoScale;
+ use Maatwebsite\Excel\Concerns\FromArray;
+ use Maatwebsite\Excel\Concerns\WithTitle;
+ 
+ class McoScaleExport implements FromArray, WithTitle
+ {
+     protected $scale;
+ 
+     public function __construct(McoScale $scale)
+     {
+         $this->scale = $scale;
+     }
+ 
+     public function array(): array
+     {
Removed / Before Commit
- use Illuminate\Http\Request;
- use App\Models\Unit;
- use App\Models\MasterCommand;
- use DB;
- 
- class CrcEntryController extends Controller
- {
-     public function create()
- {
- $units = Unit::select('id', 'name')->get();
- $commands = MasterCommand::select('id', 'name')->get();
- 
- return view('crc.entries.create', compact('units', 'commands'));
- }
- 
- public function store(Request $request)
- {
- // ✅ Validate all incoming request data
Added / After Commit
+ use Illuminate\Http\Request;
+ use App\Models\Unit;
+ use App\Models\MasterCommand;
+ use App\Models\CrcJob;
+ use App\Models\CrcRepair;
+ use Illuminate\Support\Str;
+ use DB;
+ 
+ class CrcEntryController extends Controller
+ {
+    public function create()
+ {
+     // 🔍 Check if any CRC entry exists without jobs
+     $pendingEntry = CrcEntry::whereDoesntHave('jobs')->latest()->first();
+ 
+     if ($pendingEntry) {
+         return redirect()->route('crc.entries.issue', $pendingEntry->id)
+             ->with('error', 'Please complete issuing for the previous CRC entry before creating a new one.');
Removed / Before Commit
- <?php
- namespace App\Http\Controllers;
- use App\Models\CrcRepair;
- use Illuminate\Http\Request;
- use Illuminate\Support\Str;
- 
- class CrcRepairController extends Controller
- {
- public function index(Request $request)
- {
-         // Get only job_nos that still have at least one row with wcn fields null
-         $pendingRepairs = CrcRepair::with('master')
-             ->whereNull('wcn_no')
-             ->orWhereNull('wcn_serial_no')
- ->get();
- 
-         // Extract unique job_nos that are still pending WCN initiation
-         $pendingJobNos = $pendingRepairs->map(function ($repair) {
Added / After Commit
+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ use App\Models\CrcRepair;
+ use App\Models\CrcRepairRemark;
+ use App\Models\CrcJob;
+ use App\Models\Unit;
+ use Illuminate\Support\Str;
+ use Illuminate\Support\Facades\DB;
+ 
+ class CrcRepairController extends Controller
+ {
+     // List CRC Repairs with filters
+ public function index(Request $request)
+ {
+         $repairs = CrcRepair::with(['job', 'crcEntry.unit'])
Removed / Before Commit
- 
- use App\Models\Equipment;
- use App\Models\SubGroup;
- use App\Models\SubAssyEquipment;
- use Illuminate\Http\Request;
- 
- public function index()
- {
- $equipments = Equipment::with('subgroup.group')->get();
-         $subgroups = SubGroup::with('group')->get();
-         return view('equipment.index', compact('equipments', 'subgroups'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([
-             'name' => 'required',
-             'code' => 'required',
Added / After Commit
+ 
+ use App\Models\Equipment;
+ use App\Models\SubGroup;
+ use App\Models\Group;
+ use App\Models\SubAssyEquipment;
+ use Illuminate\Http\Request;
+ 
+ public function index()
+ {
+ $equipments = Equipment::with('subgroup.group')->get();
+         $groups = Group::with('subgroups')->get();
+ 
+         return view('equipment.index', compact('equipments', 'groups'));
+ }
+ 
+ public function store(Request $request)
+ {
+ $request->validate([
Removed / Before Commit
- <?php
- 
- namespace App\Http\Controllers;
- use App\Models\WorkEquipment;
- use App\Models\Group;
- use App\Models\Unit;
- use Illuminate\Http\Request;
- use App\Models\Div;
- use App\Models\MasterCommand;
- use App\Models\Wksp;
- use App\Models\Corp;
- use App\Models\Co;
- use App\Models\RepairClass;
- use App\Models\Equipment;
- use App\Models\SubAssyEquipment;
- use App\Models\WorkOrder;
- use Carbon\Carbon;
- 
Added / After Commit
+ <?php
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ use App\Models\WorkEquipment;
+ use App\Models\Group;
+ use App\Models\Unit;
+ use App\Models\Div;
+ use App\Models\MasterCommand;
+ use App\Models\Wksp;
+ use App\Models\Corp;
+ use App\Models\Co;
+ use App\Models\RepairClass;
+ use App\Models\QCCheck;
+ use App\Models\VIR;
+ use App\Models\GatePassDetail;
+ use App\Models\EquipmentRepair;
+ use DB;
Removed / Before Commit
- 
- return response()->json(['success' => true, 'message' => 'Group deleted successfully!']);
- }
- }
Added / After Commit
+ 
+ return response()->json(['success' => true, 'message' => 'Group deleted successfully!']);
+ }
+     public function toggleStatus($id, Request $request)
+ {
+     $group = Group::findOrFail($id);
+     $group->status = $request->input('status') ? 1 : 0;
+     $group->save();
+ 
+     return response()->json(['message' => 'Status updated successfully.']);
+ }
+ 
+ }
Removed / Before Commit
- $command = MasterCommand::findOrFail($id);
- $command->update([
- 'name' => $request->name,
-             'status' => $request->status ?? false,
- ]);
- 
- return response()->json(['message' => 'Command updated successfully']);
- MasterCommand::findOrFail($id)->delete();
- return response()->json(['message' => 'Command deleted successfully']);
- }
- }
Added / After Commit
+ $command = MasterCommand::findOrFail($id);
+ $command->update([
+ 'name' => $request->name,
+             'status' => $request->status ?? 0,
+ ]);
+ 
+ return response()->json(['message' => 'Command updated successfully']);
+ MasterCommand::findOrFail($id)->delete();
+ return response()->json(['message' => 'Command deleted successfully']);
+ }
+ 
+     public function toggleStatus(Request $request,$id)
+ {
+     $command = MasterCommand::findOrFail($id);
+     $command->status = $request->status;
+     $command->save();
+ 
+     return response()->json([
Removed / Before Commit
- public function store(Request $request)
- {
- $validator = Validator::make($request->all(), [
- 'title' => 'required|string|max:255',
- 'logo' => 'nullable|image|mimes:png,jpg,jpeg,svg|max:2048',
- 'favicon' => 'nullable|image|mimes:png,ico|max:1024',
- ], [
-         'title.required' => 'Website title is required.',
- 'logo.image' => 'Logo must be an image file.',
- 'logo.mimes' => 'Logo must be a PNG, JPG, JPEG, or SVG file.',
- 'logo.max' => 'Logo must not exceed 2MB in size.',
- return back()->withErrors($validator)->withInput();
- }
- 
-     $data = ['title' => $request->title];
- 
- if ($request->hasFile('logo')) {
- $data['logo_path'] = $request->file('logo')->store('logos', 'public');
Added / After Commit
+ public function store(Request $request)
+ {
+ $validator = Validator::make($request->all(), [
+         'name' => 'required|string|max:255',
+ 'title' => 'required|string|max:255',
+ 'logo' => 'nullable|image|mimes:png,jpg,jpeg,svg|max:2048',
+ 'favicon' => 'nullable|image|mimes:png,ico|max:1024',
+ ], [
+         'name.required' => 'Name is required.',
+         'title.required' => 'Title is required.',
+ 'logo.image' => 'Logo must be an image file.',
+ 'logo.mimes' => 'Logo must be a PNG, JPG, JPEG, or SVG file.',
+ 'logo.max' => 'Logo must not exceed 2MB in size.',
+ return back()->withErrors($validator)->withInput();
+ }
+ 
+     $data = ['title' => $request->title,'name'=>$request->name];
+ 
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ use App\Models\McoScale;
+ use App\Models\Group;
+ use App\Models\RepairClass;
+ use App\Models\Equipment;
+ use App\Models\McoScaleDesignColumn;
+ use Illuminate\Support\Facades\DB;
+ use Illuminate\Support\Facades\Schema;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Str;
+ use Illuminate\Support\Facades\Log;
+ use App\Exports\McoScaleExport;
+ use App\Imports\McoScaleImport;
+ use App\Exports\McoScaleDataExport;
Removed / Before Commit
- <?php
- 
- // app/Http/Controllers/ProductionYearController.php
- 
- namespace App\Http\Controllers;
- 
- use App\Models\ProductionYear;
- use Illuminate\Http\Request;
- 
- 
- class ProductionYearController extends Controller
- {
- public function index()
- {
-         $productionYears = ProductionYear::all();
- return view('production-year.index', compact('productionYears'));
- }
- 
Added / After Commit
+ <?php
+ 
+ namespace App\Http\Controllers;
+ 
+ use Illuminate\Http\Request;
+ use App\Models\ProductionYear;
+ 
+ class ProductionYearController extends Controller
+ {
+ public function index()
+ {
+         $productionYears = ProductionYear::orderByDesc('financial_year')->get();
+ return view('production-year.index', compact('productionYears'));
+ }
+ 
+ public function store(Request $request)
+ {
+         if ($request->is_active) {
Removed / Before Commit
- use App\Models\Equipment;
- use Illuminate\Http\Request;
- use Illuminate\Support\Facades\Auth;
- 
- class SubAssyEquipmentController extends Controller
- {
-     public function index()
-     {
-         $subAssys = SubAssyEquipment::with('equipment')->get();
-         $equipments = Equipment::all();
-         return view('sub-assy.index', compact('subAssys', 'equipments'));
- }
- 
- public function store(Request $request)
- {
- $request->validate([
Added / After Commit
+ use App\Models\Equipment;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Auth;
+ use App\Models\Group;
+ 
+ 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);
Removed / Before Commit
- SubGroup::findOrFail($id)->delete();
- return response()->json(['message' => 'SubGroup deleted successfully']);
- }
- }
Added / After Commit
+ SubGroup::findOrFail($id)->delete();
+ return response()->json(['message' => 'SubGroup deleted successfully']);
+ }
+     public function toggleStatus($id, Request $request)
+ {
+     $subGroup = SubGroup::findOrFail($id);
+     $subGroup->status = $request->status ? 1 : 0;
+     $subGroup->save();
+ 
+     return response()->json(['message' => 'Status updated successfully']);
+ }
+ 
+ }
Removed / Before Commit
- 
- return response()->json(['message' => 'Vertical deleted successfully!']);
- }
- }
Added / After Commit
+ 
+ return response()->json(['message' => 'Vertical deleted successfully!']);
+ }
+     public function toggleStatus(Request $request, $id)
+ {
+     $vertical = Vertical::findOrFail($id);
+     $vertical->status = $request->status;
+     $vertical->save();
+ 
+     return response()->json(['message' => 'Status updated successfully.']);
+ }
+ 
+ }
Removed / Before Commit
- ]);
- }
- 
-     // 🔍 Find last used base ID for this group
-     $lastWorkOrder = WorkOrder::whereHas('vir', function ($q) use ($groupId) {
-         $q->whereHas('workEquipment', function ($subQ) use ($groupId) {
-             $subQ->where('group_id', $groupId);
-         });
-     })->orderByDesc('id')->first();
- 
-     $lastBaseId = 0;
- 
-     if ($lastWorkOrder && preg_match('/\/(\d+)\/\d{4}-\d{4}/', $lastWorkOrder->job_no, $matches)) {
- $lastBaseId = (int) $matches[1];
- }
- 
- $newBaseId = $lastBaseId + 1;
- 
Added / After Commit
+ ]);
+ }
+ 
+        // 1. Fiscal year setup
+     $today = now();
+     $year = $today->year;
+     $fiscalYear = $today->month > 3 ? "$year-" . ($year + 1) : ($year - 1) . "-$year";
+ 
+     // 2. Get last job_no for this group and fiscal year
+     $lastJob = WorkOrder::where('job_no', 'like', "{$groupName}/%/{$fiscalYear}")
+         ->orderByDesc('id')
+         ->first();
+ 
+     // 3. Extract base id
+     $lastBaseId = 0;
+     if ($lastJob && preg_match('/\/(\d+)\/\d{4}-\d{4}/', $lastJob->job_no, $matches)) {
+ $lastBaseId = (int) $matches[1];
+ }
Removed / Before Commit
- 
- public function index()
- {
-    $workOrders = WorkOrder::with(['workUnit', 'workUser', 'equipments'])->get();
- 
-    return view('work-order.index', compact('workOrders'));
- }
Added / After Commit
+ 
+ public function index()
+ {
+     $workOrders = WorkOrder::with(['workUnit', 'workUser', 'equipments'])
+         ->whereNull('job_no')  // 👈 show only work orders without a job number
+         ->paginate(6); // 👈 paginate 6 per page (adjust as needed)
+ 
+     return view('work-order.index', compact('workOrders'));
+ }
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ // app/Imports/McoScaleImport.php
+ 
+ namespace App\Imports;
+ 
+ use Illuminate\Support\Collection;
+ use Illuminate\Support\Facades\DB;
+ use Maatwebsite\Excel\Concerns\ToCollection;
+ use Maatwebsite\Excel\Concerns\WithHeadingRow;
+ 
+ class McoScaleImport implements ToCollection, WithHeadingRow
+ {
+     protected $tableName;
+ 
+     public function __construct($tableName)
+     {
+         $this->tableName = $tableName;
+     }
Removed / Before Commit
- {
- return $this->hasMany(CrcIvUnit::class);
- }
- }
Added / After Commit
+ {
+ return $this->hasMany(CrcIvUnit::class);
+ }
+ 
+     public function jobs()
+ {
+     return $this->hasMany(CrcJob::class);
+ }
+ public function unit()
+ {
+     return $this->belongsTo(Unit::class);
+ }
+ 
+ 
+ 
+ }
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ 
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Model;
+ 
+ class CrcJob extends Model
+ {
+     protected $table = 'crc_jobs';
+ 
+    protected $fillable = [
+     'crc_entry_id',
+     'iv_unit_id',
+     'part_no',
+     'equipment_name',
+     'nomenclature',
+     'qty',
+     'job_no',
Removed / Before Commit
- 
- class CrcRepair extends Model
- {
- protected $fillable = [
-         'crc_iv_master_id',
- 'part_no',
- 'equipment_name',
- 'nomenclature',
-         'hours',
-         'entry_iv_no',
-         'issued_by_crc',
- ];
- 
-     public function master()
- {
-         return $this->belongsTo(CrcIvMaster::class, 'crc_iv_master_id');
- }
- }
Added / After Commit
+ 
+ class CrcRepair extends Model
+ {
+     protected $table = 'crc_repairs';
+ 
+ protected $fillable = [
+         'crc_entry_id',
+         'crc_job_id',
+         'issue_iv_no',
+ 'part_no',
+ 'equipment_name',
+ 'nomenclature',
+         'qty',
+         'wcn',
+         'iv_entry',
+         'initiated_to_wcn',
+         'wcn_no',
+         'wcn_date'
Removed / Before Commit

                                                
Added / After Commit
+ <?php
+ 
+ namespace App\Models;
+ 
+ use Illuminate\Database\Eloquent\Model;
+ 
+ class CrcRepairRemark extends Model
+ {
+     protected $fillable = [
+         'crc_repair_id',
+         'remark',
+     ];
+ 
+     public function repair()
+     {
+         return $this->belongsTo(CrcRepair::class, 'crc_repair_id');
+     }
+ }
Removed / Before Commit
- {
- protected $table = 'equipments';
- 
-     protected $fillable = ['name', 'code', 'subgroup_id'];
- 
- public function subgroup()
- {
-         return $this->belongsTo(SubGroup::class);
- }
- 
- }
Added / After Commit
+ {
+ protected $table = 'equipments';
+ 
+     protected $fillable = ['name', 'code', 'subgroup_id','group_id'];
+ 
+ public function subgroup()
+ {
+         return $this->belongsTo(SubGroup::class,'subgroup_id');
+     }
+     public function group()
+     {
+         return $this->belongsTo(Group::class,'group_id');
+ }
+ 
+ }
Removed / Before Commit
- {
- return $this->belongsTo(Vertical::class);
- }
- }
Added / After Commit
+ {
+ return $this->belongsTo(Vertical::class);
+ }
+     public function subgroups()
+ {
+     return $this->hasMany(SubGroup::class);
+ }
+ }
Removed / Before Commit
- 
- class MasterLogo extends Model
- {
-     protected $fillable = ['title', 'logo_path', 'favicon_path'];
- }
Added / After Commit
+ 
+ class MasterLogo extends Model
+ {
+     protected $fillable = ['title', 'logo_path', 'favicon_path','name'];
+ }
Removed / Before Commit
- {
- protected $fillable = [
- 'group_id',
- 'scale_name',
- 'repair_class_id',
- 'scale_ref_auth',
- 'no_of_items',
- ];
- 
- public function group()
- {
- return $this->belongsTo(Group::class, 'group_id');
- }
- 
- public function repairClass()
- {
- return $this->belongsTo(RepairClass::class, 'repair_class_id');
- }
Added / After Commit
+ {
+ protected $fillable = [
+ 'group_id',
+         'equipment_id',
+ 'scale_name',
+ 'repair_class_id',
+ 'scale_ref_auth',
+ 'no_of_items',
+         'table_name'
+ ];
+ 
+ public function group()
+ {
+ return $this->belongsTo(Group::class, 'group_id');
+ }
+ 
+ public function equipment()
+ {
Removed / Before Commit
- class McoScaleDesignColumn extends Model
- {
- protected $fillable = [
-         'mco_scale_design_id',
- 'column_name',
- 'type',
- 'length',
Added / After Commit
+ class McoScaleDesignColumn extends Model
+ {
+ protected $fillable = [
+         'mco_scale_id',
+ 'column_name',
+ 'type',
+ 'length',
Removed / Before Commit
- {
- return $this->hasMany(WorkEquipment::class, 'work_order_id');
- }
- 
- 
- public function vir()
Added / After Commit
+ {
+ return $this->hasMany(WorkEquipment::class, 'work_order_id');
+ }
+     public function equipment()
+     {
+         return $this->belongsTo(WorkEquipment::class, 'id','work_order_id');
+     }
+ 
+ 
+ public function vir()
Removed / Before Commit
- "license": "MIT",
- "require": {
- "php": "^8.1",
- "guzzlehttp/guzzle": "^7.2",
- "laravel/framework": "^10.10",
- "laravel/sanctum": "^3.3",
-         "laravel/tinker": "^2.8"
- },
- "require-dev": {
- "fakerphp/faker": "^1.9.1",
Added / After Commit
+ "license": "MIT",
+ "require": {
+ "php": "^8.1",
+         "barryvdh/laravel-dompdf": "^3.1",
+ "guzzlehttp/guzzle": "^7.2",
+ "laravel/framework": "^10.10",
+ "laravel/sanctum": "^3.3",
+         "laravel/tinker": "^2.8",
+         "maatwebsite/excel": "^3.1"
+ },
+ "require-dev": {
+ "fakerphp/faker": "^1.9.1",
Removed / Before Commit
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
- "This file is @generated automatically"
- ],
-     "content-hash": "347e54049de989570e0b95589fd2868a",
- "packages": [
- {
- "name": "brick/math",
- "version": "0.12.3",
- ],
- "time": "2023-12-11T17:09:12+00:00"
- },
- {
- "name": "dflydev/dot-access-data",
- "version": "v3.0.3",
- "time": "2024-02-05T11:56:58+00:00"
- },
- {
-             "name": "dragonmantank/cron-expression",
Added / After Commit
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "This file is @generated automatically"
+ ],
+     "content-hash": "e1b45bd2ad838d68ce63a3ceef44af79",
+ "packages": [
+         {
+             "name": "barryvdh/laravel-dompdf",
+             "version": "v3.1.1",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
+                 "reference": "8e71b99fc53bb8eb77f316c3c452dd74ab7cb25d"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/8e71b99fc53bb8eb77f316c3c452dd74ab7cb25d",
+                 "reference": "8e71b99fc53bb8eb77f316c3c452dd74ab7cb25d",
+                 "shasum": ""
Removed / Before Commit
- 						</div>
- 
- 						<div class="text-center mb-5">
- 							<h5 class="">509 Army Workshop</h5>
- 							<p class="mb-0">Login to your account</p>
- 						</div>
- 
- 						{{-- Errors --}}
- 									</div>
- 								</div>
- 
- 								<!-- <div class="col-12 d-flex justify-content-between">
- 									<div class="form-check">
- 										<input class="form-check-input" type="checkbox" name="remember" id="remember">
- 										<label class="form-check-label" for="remember">Remember me</label>
- 									</div>
- 									 <a href="#">Forgot Password?</a> 
- 								</div> -->
Added / After Commit
+ 						</div>
+ 
+ 						<div class="text-center mb-5">
+ 							<h5 class="">509 Army Base Workshop</h5>
+ 							<p class="mb-0">Sign in to your account</p> {{-- Changed from Login --}}
+ 						</div>
+ 
+ 						{{-- Errors --}}
+ 									</div>
+ 								</div>
+ 
+ 								<div class="col-12">
+ 									<div class="d-grid">
+ 										<button type="submit" class="btn btn-primary">Sign In</button> {{-- Already correct --}}
+ 									</div>
+ 								</div>
+ 								<div class="col-12 text-center mt-3">
+ 	<p class="mb-0">Don't have an account? 
Removed / Before Commit
- 						</div>
- 
- 						<div class="text-center mb-5">
- 							<h5 class="">509 Army Workshop</h5>
- 							<p class="mb-0">Login to your account</p>
- 						</div>
- 
- 						{{-- Errors --}}
- 						@if(session('error'))
- 							<div class="alert alert-danger">{{ session('error') }}</div>
- 						@endif
- 						@endif
- 
- 						<div class="form-body">
- 								<form class="row g-3" method="POST" action="{{ route('register') }}">
- 									@csrf
- 
- 									<div class="col-6 mb-2">
Added / After Commit
+ 						</div>
+ 
+ 						<div class="text-center mb-5">
+ 							<h5 class="">509 Army Base Workshop</h5>
+ 							<p class="mb-0">Login to your account</p>
+ 						</div>
+ 
+ 						@if(session('error'))
+ 							<div class="alert alert-danger">{{ session('error') }}</div>
+ 						@endif
+ 						@endif
+ 
+ 						<div class="form-body">
+ 							<form class="row g-3" method="POST" action="{{ route('register') }}">
+ 								@csrf
+ 
+ 								<div class="col-6 mb-2">
+ 									<label for="tno" class="form-label">T NO.</label>
Removed / Before Commit
- <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
-                                         <h4><b>BDEs</b></h4>
- </div>
- <div class="col-md-9 text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#bdeModal">Add BDE</button>
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>#</th>
- <td>{{ $index + 1 }}</td>
- <td>{{ $bde->name }}</td>
- <td class="d-flex gap-2">
-                                 <div class="font-22 text-primary icon-view btn-edit" data-id="{{ $bde->id }}" 
Added / After Commit
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+                                         <h4><b>BDE</b></h4>
+ </div>
+ <div class="col-md-9 text-end">
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#bdeModal">Add BDE</button>
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>#</th>
+ <td>{{ $index + 1 }}</td>
+ <td>{{ $bde->name }}</td>
+ <td class="d-flex gap-2">
+                                 <a class="btn-edit" data-id="{{ $bde->id }}" 
Removed / Before Commit
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>Corps Name</th>
- <th>Actions</th>
- </tr>
- <tr>
- <td>{{ $index + 1 }}</td>
- <td>{{ $corp->name }}</td>
-                             <td class="d-flex gap-2">
-                                 <div class="font-22 text-primary icon-view btn-edit" data-id="{{ $corp->id }}" data-name="{{ $corp->name }}"><i class="bx bxs-edit"></i></div>
-                                 <div class="font-22 text-primary icon-trash btn-delete" data-id="{{ $corp->id }}"><i class="fadeIn animated bx bx-trash-alt"></i></div>
- </td>
- </tr>
Added / After Commit
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+                             <th>Serial No</th>
+ <th>Corps Name</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td>{{ $index + 1 }}</td>
+ <td>{{ $corp->name }}</td>
+                             <td>
+                                 <a class="btn-edit" data-id="{{ $corp->id }}" 
+                                 data-name="{{ $corp->name }}"><i class="fas fa-edit"></i></a>
+                                 <a class="btn-delete" data-id="{{ $corp->id }}">
+                                      <i class="fas fa-trash-alt"></i></a>
Removed / Before Commit
- <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
-                                         <h4><b>COs</b></h4>
- </div>
- <div class="col-md-9 text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#coModal">Add CO</button>
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>CO Name</th>
- <th>Actions</th>
- </tr>
- <tr>
Added / After Commit
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+                                         <h4><b>C/O</b></h4>
+ </div>
+ <div class="col-md-9 text-end">
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#coModal">Add CO</button>
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+                             <th>Serail No</th>
+ <th>CO Name</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @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>
+ 
+ 
+     <div class="card-body">
+         {{-- 🔍 Filter Form --}}
+         <form method="GET" action="{{ route('crc.entries.index') }}" class="row g-3 mb-4">
+             <div class="col-md-3">
+                 <label><b>CRC No</b></label>
+                 <select name="crc_no" class="form-select select2" data-placeholder="Select CRC No">
Removed / Before Commit
- <td>{{ $part->nomenclature }}</td>
- <td>1</td>
- <td>
-                                                 <input type="text" name="issued_parts[{{ $ivUnit->id }}][{{ $part->id }}][]" class="form-control" placeholder="Enter Issue IV No" required>
- </td>
- </tr>
- @endfor
Added / After Commit
+ <td>{{ $part->nomenclature }}</td>
+ <td>1</td>
+ <td>
+                                                 <input type="text" name="issued_parts[{{ $ivUnit->id }}][{{ $part->id }}][]" class="form-control" placeholder="Enter Issue IV No" >
+ </td>
+ </tr>
+ @endfor
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ <div class="card">
+     <div class="card-header py-3">
+         <h4><b>CRC Entry Details</b></h4>
+     </div>
+ 
+     <div class="card-body">
+         <!-- 🔹 CRC Header Info -->
+         <div class="row mb-4">
+             <div class="col-md-3">
+                 <label><b>CRC No</b></label>
+                 <div class="form-control bg-light">{{ $entry->crc_no }}</div>
+             </div>
+             <div class="col-md-3">
+                 <label><b>CRC Date</b></label>
+                 <div class="form-control bg-light">{{ \Carbon\Carbon::parse($entry->crc_date)->format('d-m-Y') }}</div>
Removed / Before Commit
- \ No newline at end of file
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ <div class="card">
+     <div class="card-header">
+         <h4><b>Repair History</b></h4>
+         <p class="mb-0"><b>Part No:</b> {{ $repair->part_no }} | <b>Job No:</b> {{ $repair->job?->job_no }} | <b>Unit:</b> {{ $repair->crcEntry?->unit?->name }}</p>
+     </div>
+     <div class="card-body">
+         @if(count($remarks))
+         <div class="table-responsive">
+             <table class="table table-bordered">
+                 <thead class="table-success">
+                     <tr>
+                         <th>#</th>
+                         <th>Remark</th>
+                         <th>Date</th>
+                     </tr>
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @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>
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @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">
+                     <option value="">-- Select Unit --</option>
+                     @foreach($units as $unit)
+                         <option value="{{ $unit->id }}" {{ request('unit_id') == $unit->id ? 'selected' : '' }}>
+                             {{ $unit->name }}
+                         </option>
+                     @endforeach
Removed / Before Commit
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>Division Name</th>
- <th>Actions</th>
- </tr>
- <tr>
- <td>{{ $index + 1 }}</td>
- <td>{{ $div->name }}</td>
-                             <td class="d-flex gap-2">
-                                 <div class="font-22 text-primary icon-view btn-edit" data-id="{{ $div->id }}" 
-                                     data-name="{{ $div->name }}"><i class="bx bxs-edit"></i></div>
-                                 <div class="font-22 text-primary icon-trash btn-delete" data-id="{{ $div->id }}"><i class="fadeIn animated bx bx-trash-alt"></i></div>
- </td>
Added / After Commit
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+                             <th>Serail No</th>
+ <th>Division Name</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td>{{ $index + 1 }}</td>
+ <td>{{ $div->name }}</td>
+                             <td>
+                                 <a class="btn-edit" data-id="{{ $div->id }}" 
+                                     data-name="{{ $div->name }}"><i class="fas fa-edit"></i></a>
+                                 <a class="btn-delete" data-id="{{ $div->id }}">
+                                     <i class="fas fa-trash-alt"></i></a>
Removed / Before Commit

                                                
Added / After Commit
+ <!DOCTYPE html>
+ <html>
+ <head>
+     <meta charset="utf-8">
+     <title>Equipment Report PDF</title>
+     <style>
+         body {
+             font-family: sans-serif;
+             font-size: 10px;
+         }
+         table {
+             border-collapse: collapse;
+             width: 100%;
+             table-layout: fixed;
+         }
+         th, td {
+             border: 1px solid #999;
+             padding: 4px;
Removed / Before Commit
- @extends('layouts.app')
- @section('content')
- <style>
- .select2-container {
-     width: 100% !important;
- }
- .select2-selection {
-     min-height: 32px;
- }
- form{
-     margin-bottom: 40px;
- }
- </style>
- <style>
- .select2-results__option {
-     padding-left: 10px;
-     display: flex;
-     align-items: center;
Added / After Commit
+ @extends('layouts.app')
+ @section('content')
+     <style>
+         .select2-container {
+             width: 100% !important;
+         }
+ 
+         .select2-selection {
+             min-height: 32px;
+         }
+ 
+         form {
+             margin-bottom: 40px;
+         }
+ 
+         .select2-results__option {
+             padding-left: 10px;
+             display: flex;
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ @section('content')
+ <style>
+ .select2-container { width: 100% !important; }
+ .select2-selection { min-height: 32px; }
+ form { margin-bottom: 40px; }
+ .select2-results__option { padding-left: 10px; display: flex; align-items: center; }
+ .stat-box { padding: 15px; background: #f1f5f9; border-left: 5px solid #0d6efd; border-radius: 4px; margin-bottom: 15px; }
+ </style>
+ @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>
Removed / Before Commit
- @extends('layouts.app')
- 
- @section('content')
- <!-- <h4 class="mb-3"><b>Equipments</b></h4>
- <hr/> -->
- 
- <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>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>
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><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>
+             <hr>
+ <div class="card-body">
Removed / Before Commit
- </select>
- </div>
- <div class="col-md-3 align-self-end">
-                 <button type="submit" class="btn btn-primary">Search</button>
- </div>
- </form>
- @endif
Added / After Commit
+ </select>
+ </div>
+ <div class="col-md-3 align-self-end">
+                 <button type="submit" class="btn btn-search">Search</button>
+ </div>
+ </form>
+ @endif
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>Groups</b></h4>
-                                     </div>
-                                     <div class="col-md-9 text-end">
-                                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#groupModal">Add Group</button>
-                                     </div>
-                                 </div>
-                             </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">
+                     <div class="col-md-3">
+                         <h4><b>Groups</b></h4>
+                     </div>
+                     <div class="col-md-9 text-end">
+                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#groupModal">Add Group</button>
+                     </div>
+                 </div>
+             </div>
+             <hr>
+ 
Removed / Before Commit
- 	<link href="{{url('assets/css/bootstrap-extended.css')}}" rel="stylesheet">
- 	
- 	<link href="{{url('assets/sass/app.css')}}" rel="stylesheet">
- 	<link href="{{url('assets/css/boxicons.min.css')}}" rel="stylesheet">
- 	<link href="{{url('assets/plugins/datatable/css/dataTables.bootstrap5.min.css')}}" rel="stylesheet">
- 	<title>509 Army Workshop</title>
Added / After Commit
+ 	<link href="{{url('assets/css/bootstrap-extended.css')}}" rel="stylesheet">
+ 	
+ 	<link href="{{url('assets/sass/app.css')}}" rel="stylesheet">
+ 	<link href="{{ asset('assets/plugins/fontawesome/css/all.min.css') }}" rel="stylesheet">
+ 	<link href="{{url('assets/plugins/datatable/css/dataTables.bootstrap5.min.css')}}" rel="stylesheet">
+ 	<title>509 Army Workshop</title>
Removed / Before Commit
- 	<script src="{{url('assets/plugins/simplebar/js/simplebar.min.js')}}"></script>
- 	<script src="{{url('assets/plugins/metismenu/js/metisMenu.min.js')}}"></script>
- 	<script src="{{url('assets/plugins/perfect-scrollbar/js/perfect-scrollbar.js')}}"></script>
- 	<!-- Vector map JavaScript -->
- 	<script src="{{url('assets/plugins/vectormap/jquery-jvectormap-2.0.2.min.js')}}"></script>
- 	<script src="{{url('assets/plugins/vectormap/jquery-jvectormap-world-mill-en.js')}}"></script>
- 
- 	<!--app JS-->
- 	<script src="{{url('assets/js/pace.min.js')}}"></script>
- 	
- 	<script src="{{url('assets/js/app.js')}}"></script>
- 	<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
- <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
- <script src="{{url('assets/plugins/datatable/js/jquery.dataTables.min.js')}}"></script>
- 	<script src="{{url('assets/plugins/datatable/js/dataTables.bootstrap5.min.js')}}"></script>
- 
- <script>
- $(document).ready(function() {
Added / After Commit
+ 	<script src="{{url('assets/plugins/simplebar/js/simplebar.min.js')}}"></script>
+ 	<script src="{{url('assets/plugins/metismenu/js/metisMenu.min.js')}}"></script>
+ 	<script src="{{url('assets/plugins/perfect-scrollbar/js/perfect-scrollbar.js')}}"></script>
+ 	<!--app JS-->
+ 	<script src="{{url('assets/js/pace.min.js')}}"></script>
+ 	<script src="{{url('assets/js/app.js')}}"></script>
+ 	<script src="{{url('assets/plugins/datatable/js/jquery.dataTables.min.js')}}"></script>
+ 	<script src="{{url('assets/plugins/datatable/js/dataTables.bootstrap5.min.js')}}"></script>
+   	<link href="{{ url('assets/plugins/select2/css/select2.min.css') }}" rel="stylesheet">
+ <script src="{{ url('assets/plugins/select2/js/select2.min.js') }}"></script>
+ 
+ <script>
+ $(document).ready(function() {
+ </script>
+ <script>
+ 		$(document).ready(function() {
+ 			  $('#example').DataTable({
+             pageLength: 20,
Removed / Before Commit
- @extends('layouts.app')
- 
- @section('content')
- 
- <!-- <h4 class="mb-3"><b>Master Command Entry</b></h4>
- <hr/> -->
- 
- <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>Master Command Entry</b></h4>
-                                     </div>
-                                     <div class="col-md-6 text-end">
-                                         <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#commandModal">Add Command</button>
-                                     </div>
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-6">
+                         <h4><b>Commands</b></h4>
+                     </div>
+                     <div class="col-md-6 text-end">
+                         <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#commandModal">Add Command</button>
+                     </div>
+                 </div>
+             </div>
+             <hr>
+ 
Removed / Before Commit
- @extends('layouts.app')
- 
- @section('content')
- 
- <!-- <h4 class="mb-3"><b>Master Logo</b></h4>
- <hr/> -->
- 
- <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>Master Logo</b></h4>
-                                     </div>
-                                     <div class="col-md-9 text-end">
-                                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#logoModal">
-                     {{ $logo ? 'Edit Logo' : 'Add Logo' }}
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><b>Master Logo</b></h4>
+                     </div>
+                     <div class="col-md-9 text-end">
+                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#logoModal">
+                             {{ $logo ? 'Edit Logo' : 'Add Logo' }}
+                         </button>
+                     </div>
+                 </div>
+             </div>
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ @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-lg-12">
+         <div class="card">
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @push('styles')
+ <style>
+     .section-header {
+         background-color: #0d6efd;
+         color: #fff;
+         padding: 10px;
+         font-weight: bold;
+         border-radius: 5px 5px 0 0;
+         margin-bottom: 15px;
+     }
+ 
+     .form-label {
+         font-weight: 500;
+     }
+ 
+     .btn {
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ <div class="row">
+     <div class="col-lg-12">
+         <div class="card">
+             <div class="card-header py-3">
+                 <div class="row align-items-center">
+                     <div class="col-md-12">
+                         <h4><b>Edit Scale: {{ $scale->scale_name }}</b></h4>
+                     </div>
+                 </div>
+             </div>
+             <hr>
+ 
+             <div class="card-body p-4">
+                 @if ($errors->any())
+                     <div class="alert alert-danger">
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @push('styles')
+ <style>
+     .section-header {
+         background-color: #0d6efd;
+         color: #fff;
+         padding: 10px;
+         font-weight: bold;
+         border-radius: 5px 5px 0 0;
+         margin-bottom: 15px;
+     }
+ 
+     .form-label {
+         font-weight: 500;
+     }
+ 
+     .btn {
Removed / Before Commit

                                                
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ @if(session('success'))
+     <div class="alert alert-success">{{ session('success') }}</div>
+ @endif
+ 
+ @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">
Removed / Before Commit
- 							<table id="example" class="table table-striped table-bordered" style="width:100%">
- 								<thead>
- 									 <tr>
- 										<th>#</th>
- 										<th>Name</th>
- 										<th>Icon</th>
- 										<th>Route</th>
- @endforeach
- </td> -->
- <td>
-                             <a href="{{ route('menus.edit', $menu->id) }}" class="btn btn-sm btn-warning">Edit</a>
- <!-- <form action="{{ route('menus.destroy', $menu->id) }}" method="POST" style="display:inline-block;" onsubmit="return confirm('Delete this menu?')">
- @csrf
- @method('DELETE')
Added / After Commit
+ 							<table id="example" class="table table-striped table-bordered" style="width:100%">
+ 								<thead>
+ 									 <tr>
+ 										<th>Serial No</th>
+ 										<th>Name</th>
+ 										<th>Icon</th>
+ 										<th>Route</th>
+ @endforeach
+ </td> -->
+ <td>
+                             <a href="{{ route('menus.edit', $menu->id) }}"><i class="fa fa-edit"></i></a>
+ <!-- <form action="{{ route('menus.destroy', $menu->id) }}" method="POST" style="display:inline-block;" onsubmit="return confirm('Delete this menu?')">
+ @csrf
+ @method('DELETE')
Removed / Before Commit
- <li>
- @if($menu->children->isNotEmpty())
- <a href="javascript:;" class="has-arrow">
-                 <div class="parent-icon"><i class="{{ $menu->icon }}"></i></div>
- <div class="menu-title">{{ $menu->name }}</div>
- </a>
- <ul>
- @include('partials.submenu-recursive', ['submenus' => $menu->children])
- </ul>
- @else
- <a href="{{ $menu->route ? url($menu->route) : 'javascript:;' }}">
-                 <div class="parent-icon"><i class="{{ $menu->icon }}"></i></div>
- <div class="menu-title">{{ $menu->name }}</div>
- </a>
- @endif
Added / After Commit
+ <li>
+ @if($menu->children->isNotEmpty())
+ <a href="javascript:;" class="has-arrow">
+                 <div class="parent-icon">{!! $menu->icon !!}</div>
+ <div class="menu-title">{{ $menu->name }}</div>
+ </a>
+ <ul>
+ @include('partials.submenu-recursive', ['submenus' => $menu->children])
+ </ul>
+ @else
+ <a href="{{ $menu->route ? url($menu->route) : 'javascript:;' }}">
+                 <div class="parent-icon">{!! $menu->icon !!}</div>
+ <div class="menu-title">{{ $menu->name }}</div>
+ </a>
+ @endif
Removed / Before Commit
- <li>
- @if($menu->children->isNotEmpty())
- <a href="javascript:;" class="has-arrow">
-                 <div class="parent-icon"><i class="{{ $menu->icon }}"></i></div>
- <div class="menu-title">{{ $menu->name }}</div>
- </a>
- <ul>
- @include('partials.submenu-recursive', ['submenus' => $menu->children])
- </ul>
- @else
- <a href="{{ $menu->route ? url($menu->route) : 'javascript:;' }}">
-                 <div class="parent-icon"><i class="{{ $menu->icon }}"></i></div>
- <div class="menu-title">{{ $menu->name }}</div>
- </a>
- @endif
Added / After Commit
+ <li>
+ @if($menu->children->isNotEmpty())
+ <a href="javascript:;" class="has-arrow">
+                 <div class="parent-icon">{!! $menu->icon !!}</i></div>
+ <div class="menu-title">{{ $menu->name }}</div>
+ </a>
+ <ul>
+ @include('partials.submenu-recursive', ['submenus' => $menu->children])
+ </ul>
+ @else
+ <a href="{{ $menu->route ? url($menu->route) : 'javascript:;' }}">
+                 <div class="parent-icon">{!! $menu->icon !!}</i></div>
+ <div class="menu-title">{{ $menu->name }}</div>
+ </a>
+ @endif
Removed / Before 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-9">
- <h4><b>Production Year</b></h4>
- </div>
- <div class="col-md-3 text-end">
-                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">Add/Update</button>
-                     </div>
-                  </div>
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-9">
+ <h4><b>Production Year</b></h4>
+ </div>
+ <div class="col-md-3 text-end">
+                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">
+                             Add
+                         </button>
+ </div>
+ </div>
+             </div>
Removed / Before Commit
- </div>
- 
- <div class="col-md-3 d-flex align-items-end gap-2">
-         <button type="submit" class="btn btn-primary">Filter</button>
-         <a href="{{ route('qa-inspections.index') }}" class="btn btn-secondary">Reset</a>
- </div>
- </form>
Added / After Commit
+ </div>
+ 
+ <div class="col-md-3 d-flex align-items-end gap-2">
+         <button type="submit" class="btn btn-filter">Filter</button>
+         <a href="{{ route('qa-inspections.index') }}" class="btn btn-info">Reset</a>
+ </div>
+ </form>
Removed / Before Commit
- 
- <div class="col-md-3 d-flex align-items-end gap-2">
- <button type="submit" class="btn btn-filter">Filter</button>
-         <a href="{{ route('qa.index') }}" class="btn btn-secondary">Reset</a>
- </div>
- </form>
Added / After Commit
+ 
+ <div class="col-md-3 d-flex align-items-end gap-2">
+ <button type="submit" class="btn btn-filter">Filter</button>
+         <a href="{{ route('qa.index') }}" class="btn btn-info">Reset</a>
+ </div>
+ </form>
Removed / Before Commit
- </select>
- </div>
- <div class="col-md-3 d-flex align-items-end gap-2">
-             <button type="submit" class="btn btn-primary">Filter</button>
-             <a href="{{ route('qc-inspection.index') }}" class="btn btn-secondary">Reset</a>
- </div>
- </form>
Added / After Commit
+ </select>
+ </div>
+ <div class="col-md-3 d-flex align-items-end gap-2">
+             <button type="submit" class="btn btn-filter">Filter</button>
+             <a href="{{ route('qc-inspection.index') }}" class="btn btn-info">Reset</a>
+ </div>
+ </form>
Removed / Before Commit
- </div>
- 
- <div class="col-md-3 d-flex align-items-end gap-2">
-         <button type="submit" class="btn btn-primary">Filter</button>
-         <a href="{{ route('qc.index') }}" class="btn btn-secondary">Reset</a>
- </div>
- </form>
Added / After Commit
+ </div>
+ 
+ <div class="col-md-3 d-flex align-items-end gap-2">
+         <button type="submit" class="btn btn-filter">Filter</button>
+         <a href="{{ route('qc.index') }}" class="btn btn-info">Reset</a>
+ </div>
+ </form>
Removed / Before Commit
- <div class="card-header py-3">
- <div class="row align-items-center">
- <div class="col-md-3">
-                                         <h4><b>Repair Classes</b></h4>
- </div>
- <div class="col-md-9 text-end">
- <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#repairClassModal">Add Repair Class</button>
- <div class="modal-body">
- <input type="hidden" id="repairClassId">
- <div class="mb-3">
-                                     <label class="form-label">Repair Class Name</label>
- <input type="text" class="form-control" id="repairClassName">
- </div>
- </div>
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
Added / After Commit
+ <div class="card-header py-3">
+ <div class="row align-items-center">
+ <div class="col-md-3">
+                                         <h4><b>Repair Class</b></h4>
+ </div>
+ <div class="col-md-9 text-end">
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#repairClassModal">Add Repair Class</button>
+ <div class="modal-body">
+ <input type="hidden" id="repairClassId">
+ <div class="mb-3">
+                                     <label class="form-label">Name</label>
+ <input type="text" class="form-control" id="repairClassName">
+ </div>
+ </div>
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
Removed / Before Commit
- 										<div class="row mb-3">
- <label for="input" class="col-sm-3 col-form-label">Parent Role (Optional)</label>
- 											<div class="col-sm-4">
-                                                 <select name="parent_ids[]" multiple class="form-control">
- <option value="">-- No Parent Role --</option>
- @foreach($roles as $role)
- <option value="{{ $role->id }}">{{ $role->name }}</option>
- <div class="row mb-5">
- <label for="input" class="col-sm-3 col-form-label">Group (Optional)</label>
- 											<div class="col-sm-4">
-                                                 <select name="group_id" multiple class="form-control">
-                                                     <option value="">-- Add Group --</option>
-                                                     @foreach($groups as $group)
-                                                         <option value="{{ $group->id }}">{{ $group->name }}</option>
-                                                     @endforeach
-                                                 </select>
- 											</div>
- </div>
Added / After Commit
+ 										<div class="row mb-3">
+ <label for="input" class="col-sm-3 col-form-label">Parent Role (Optional)</label>
+ 											<div class="col-sm-4">
+                                                 <select name="parent_ids[]" class="form-control select2" multiple>
+ <option value="">-- No Parent Role --</option>
+ @foreach($roles as $role)
+ <option value="{{ $role->id }}">{{ $role->name }}</option>
+ <div class="row mb-5">
+ <label for="input" class="col-sm-3 col-form-label">Group (Optional)</label>
+ 											<div class="col-sm-4">
+                                                <select name="group_id" class="form-control select2">
+                                                 <option value="">-- Add Group --</option>
+                                                 @foreach($groups as $group)
+                                                     <option value="{{ $group->id }}">{{ $group->name }}</option>
+                                                 @endforeach
+                                             </select>
+ 											</div>
+ </div>
Removed / Before Commit
- @extends('layouts.app')
- 
- @section('content')
- <!-- <div class="page-breadcrumb d-none d-sm-flex align-items-center mb-3">
-     <div class="breadcrumb-title pe-3">Edit Role</div>
-     <div class="ps-3">
-         <nav aria-label="breadcrumb">
-             <ol class="breadcrumb mb-0 p-0">
-                 <li class="breadcrumb-item"><a href="javascript:;"><i class="bx bx-home-alt"></i></a></li>
-                 <li class="breadcrumb-item active" aria-current="page">Form</li>
-             </ol>
-         </nav>
-     </div>
- </div> -->
- <!--end breadcrumb-->
- 
- <div class="row">
- <div class="col-lg-12">
Added / After Commit
+ @extends('layouts.app')
+ 
+ @section('content')
+ 
+ 
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="row mb-3">
+ <label for="input" class="col-sm-3 col-form-label">Parent Role (Optional)</label>
+ <div class="col-sm-4">
+                              <select name="parent_ids[]" class="form-control select2" multiple>
+ @foreach($roles as $parentRole)
+ <option value="{{ $parentRole->id }}" 
+ {{ in_array($parentRole->id, old('parent_ids', $role->parents->pluck('id')->toArray())) ? 'selected' : '' }}>
+ <div class="row mb-5">
+ <label for="input" class="col-sm-3 col-form-label">Group (Optional)</label>
+ <div class="col-sm-4">
+                            <select name="group_id" class="form-control select2">
Removed / Before Commit
- 
- @section('content')
- 
- 				
- 				
- 				
- 				
- 				<div class="row">
- 					<div class="col">
- 						<div class="card">
- 									<table id="example" class="table table-striped table-bordered" style="width:100%">
- 										<thead>
- 											<tr>
- 												<th scope="row">S. No</th>
- 												<th>Name</th>
- 												<th>Parent Roles</th>
- 												<th>Group</th>
- 												<th>Permissions</th>
Added / After Commit
+ 
+ @section('content')
+ 
+ 				<div class="row">
+ 					<div class="col">
+ 						<div class="card">
+ 									<table id="example" class="table table-striped table-bordered" style="width:100%">
+ 										<thead>
+ 											<tr>
+ 												<th scope="row">Serial No</th>
+ 												<th>Role Name</th>
+ 												<th>Parent Roles</th>
+ 												<th>Group</th>
+ 												<th>Permissions</th>
+ 													<td><a href="{{ url('/permission-view/'.$role->id) }}">view</a>/<a href="{{ url('/permission-create/'.$role->id) }}">create</a></td>
+ 													<td>{{ date('d M, Y',strtotime($role->created_at)) }}</td>
+ 													<td>
+ 														<a href="{{ route('roles.edit', $role->id) }}">
Removed / Before Commit
- </div>
- 
- <div class="mb-3">
-                                     <label class="form-label">Time Allot (minutes)</label>
- <input type="number" class="form-control" id="timeAllot">
- </div>
- 
- </div>
- </div>
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>Sub Equipment Name</th>
- <th>Equipment</th>
Added / After Commit
+ </div>
+ 
+ <div class="mb-3">
+                                     <label class="form-label">Time Allot (hours)</label>
+ <input type="number" class="form-control" id="timeAllot">
+ </div>
+ 
+ </div>
+ </div>
+ </div>
+                 <form method="GET" action="{{ route('sub-assy.index') }}">
+     <div class="row align-items-end mb-3">
+         {{-- Group Filter --}}
+         <div class="col-md-4">
+             <label for="group_id" class="form-label">Group</label>
+             <select name="group_id" class="form-select">
+                 <option value="">-- Select Group --</option>
+                 @foreach($groups as $group)
Removed / Before Commit
- 
- @section('content')
- 
- <!-- <h4 class="mb-3"><b>Sub Groups</b></h4>
- <hr/> -->
- 
- <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>
-                                     </div>
-                                     <div class="col-md-9 text-end">
-                                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subGroupModal">Add SubGroup</button>
-                                     </div>
-                                 </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">
+                     <div class="col-md-3">
+                         <h4><b>Sub Groups</b></h4>
+                     </div>
+                     <div class="col-md-9 text-end">
+                         <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#subGroupModal">Add SubGroup</button>
+                     </div>
+                 </div>
+ </div>
+             <hr>
+ 
Removed / Before Commit
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>Unit Name</th>
- <th>Actions</th>
- </tr>
- <td>{{ $index + 1 }}</td>
- <td>{{ $unit->name }}</td>
- <td class="d-flex gap-2">
-                                 <div class="font-22 text-primary icon-view btn-edit" data-id="{{ $unit->id }}" 
-                                     data-name="{{ $unit->name }}"><i class="bx bxs-edit"></i></div>
-                                 <div class="font-22 text-primary icon-trash btn-delete" data-id="{{ $unit->id }}"><i class="fadeIn animated bx bx-trash-alt"></i></div>
- </td>
- </tr>
Added / After Commit
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+                             <th>Serail No</th>
+ <th>Unit Name</th>
+ <th>Actions</th>
+ </tr>
+ <td>{{ $index + 1 }}</td>
+ <td>{{ $unit->name }}</td>
+ <td class="d-flex gap-2">
+                                 <a class="btn-edit" data-id="{{ $unit->id }}" 
+                                     data-name="{{ $unit->name }}">
+                                      <i class="fas fa-edit"></i>
+ </a>
+                                 <a class="btn-delete" data-id="{{ $unit->id }}">
Removed / Before Commit
- 			<table id="example" class="table table-striped table-bordered" style="width:100%">
- 				<thead>
- 					<tr>
- 						<th>S. No</th>
- 						<th>Name</th>
- 						<th>Username</th>
- 						<th>TNO</th>
- 						<td>{{ $user->created_at ? $user->created_at->format('d M, Y') : '-' }}</td>
- 						<td>
- 							@if(!empty($user->roles))
- 								<a href="{{ url('/user-edit/'.$user->id) }}" class="btn btn-sm btn-warning">Edit</a>
- 							@endif
- 						</td>
- 					</tr>
Added / After Commit
+ 			<table id="example" class="table table-striped table-bordered" style="width:100%">
+ 				<thead>
+ 					<tr>
+ 						<th>Serial No</th>
+ 						<th>Name</th>
+ 						<th>Username</th>
+ 						<th>TNO</th>
+ 						<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
+ 						</td>
+ 					</tr>
Removed / Before Commit
- @extends('layouts.app')
- 
- @section('content')
- 
- 
- </div> -->
- <div class="card-body">
- {{-- Modal --}}
-                 <div class="modal fade" id="verticalModal" tabindex="-1" aria-labelledby="verticalModalLabel" aria-hidden="true">
-                     <div class="modal-dialog">
-                         <div class="modal-content">
-                             <div class="modal-header">
-                                 <h5 class="modal-title" id="verticalModalTitle">Add Vertical</h5>
-                                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                             </div>
-                             <div class="modal-body">
-                                 <input type="hidden" id="verticalId">
-                                 <div class="mb-3">
Added / After Commit
+ @extends('layouts.app')
+ @section('content')
+ 
+ 
+ </div> -->
+ <div class="card-body">
+ {{-- Modal --}}
+                {{-- Modal --}}
+ <div class="modal fade" id="verticalModal" tabindex="-1" aria-labelledby="verticalModalLabel" aria-hidden="true">
+     <div class="modal-dialog">
+         <div class="modal-content">
+             <div class="modal-header">
+                 <h5 class="modal-title" id="verticalModalTitle">Add Vertical</h5>
+                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+             </div>
+             <div class="modal-body">
+                 <input type="hidden" id="verticalId">
+ 
Removed / Before Commit
- data-url="{{ url('/timeallotment/print/' . $virs[0]->workOrder->id) }}">
- Commit
- </button>
-                     <a href="{{url('vir/job-create')}}"><button class="btn btn-secondary px-5 rounded-0" >
- Back
- </button></a>
Added / After Commit
+ data-url="{{ url('/timeallotment/print/' . $virs[0]->workOrder->id) }}">
+ Commit
+ </button>
+                     <a href="{{url('vir/job-create')}}"><button class="text-white btn btn-secondary px-5 rounded-0" >
+ Back
+ </button></a>
Removed / Before Commit
- 
- {{-- Submit & Reset Buttons --}}
- <div class="col-md-3">
-             <button type="submit" class="btn btn-search px-5 rounded-0">Search</button>
- <a href="{{ route('vir.index') }}" class="btn btn-info px-5 rounded-0">Reset</a>
- </div>
- </div>
- <td>{{ $equipment->vir?->status ?? 'AWAITING VIR' }}</td>
- <td>
- <button type="button"
-     class="btn btn-sm btn-primary vir-decision-btn"
- data-bs-toggle="modal"
- data-bs-target="#virModal"
- data-workorder-id="{{ $workOrder->id }}"
Added / After Commit
+ 
+ {{-- Submit & Reset Buttons --}}
+ <div class="col-md-3">
+             <button type="submit" class="btn btn-search btn-sm px-5 rounded-0">Search</button>
+ <a href="{{ route('vir.index') }}" class="btn btn-info px-5 rounded-0">Reset</a>
+ </div>
+ </div>
+ <td>{{ $equipment->vir?->status ?? 'AWAITING VIR' }}</td>
+ <td>
+ <button type="button"
+     class="btn btn-sm text-white btn-primary vir-decision-btn"
+ data-bs-toggle="modal"
+ data-bs-target="#virModal"
+ data-workorder-id="{{ $workOrder->id }}"
Removed / Before Commit
- </select>
- </div>
- <div class="col-md-3 d-flex align-items-end gap-2">
-                         <button type="submit" class="btn btn-primary">Filter</button>
-                         <a href="{{ route('wcn.index') }}" class="btn btn-secondary">Reset</a>
- </div>
- </form>
- @endif
Added / After Commit
+ </select>
+ </div>
+ <div class="col-md-3 d-flex align-items-end gap-2">
+                         <button type="submit" class="btn btn-filter">Filter</button>
+                         <a href="{{ route('wcn.index') }}" class="btn btn-info">Reset</a>
+ </div>
+ </form>
+ @endif
Removed / Before Commit
- 		<div class="row g-0">
- 
- 			<div class="col-12 col-xl-7 col-xxl-8 auth-cover-left align-items-center justify-content-center d-none d-xl-flex">
- 				<!-- <div class="card shadow-none bg-transparent shadow-none rounded-0 mb-0">
- 					<div>
- 						<img src="{{ asset('assets/images/login.jpeg') }}" class="img-fluid auth-img-cover-login" width="100%" alt=""/>
- 					</div>
- 				</div> -->
- 			</div>
- 
- 			<div class="col-12 col-xl-5 col-xxl-4 auth-cover-right align-items-center justify-content-center">
- 				<div class="card rounded-0 m-3 shadow-none bg-transparent mb-0">
- 					<div class="card-body p-sm-5">
- 
- 						<div class="mb-3 text-center">
- 							<img src="{{ url('/assets/images/509logo.png') }}" width="60" alt="" />
- 						</div>
- 
Added / After Commit
+ 		<div class="row g-0">
+ 
+ 			<div class="col-12 col-xl-7 col-xxl-8 auth-cover-left align-items-center justify-content-center d-none d-xl-flex">
+ 				<div class="card shadow-none bg-transparent shadow-none rounded-0 mb-0">
+ 					<!-- <div>
+ 						<img src="{{ asset('assets/images/login.jpeg') }}" class="img-fluid auth-img-cover-login" width="100%" alt=""/>
+ 					</div> -->
+ 				</div>
+ 			</div>
+ 
+ 			<div class="col-12 col-xl-5 col-xxl-4 auth-cover-right align-items-center justify-content-center">
+ 				<div class="card rounded-0 m-3 shadow-none bg-transparent mb-0">
+ 					<div class="card-body p-sm-5">
+ 
+ 						<div class="mb-3 text-center">
+ 							<img src="{{ url('/assets/images/arm_logo.JPG') }}" width="60" alt="" />
+ 						</div>
+ 
Removed / Before Commit
- </div>
- 
- {{-- Table --}}
-                 <table class="table table-bordered table-striped">
- <thead>
- <tr>
-                             <th>#</th>
- <th>Workspace Name</th>
- <th>Actions</th>
- </tr>
- <tr>
- <td>{{ $index + 1 }}</td>
- <td>{{ $wksp->name }}</td>
-                             <td class="d-flex gap-2">
-                                 <div class="font-22 text-primary icon-view btn-edit" data-id="{{ $wksp->id }}" 
-                                     data-name="{{ $wksp->name }}"><i class="bx bxs-edit"></i></div>
-                                 <div class="font-22 text-primary icon-trash btn-delete" data-id="{{ $wksp->id }}"><i class="fadeIn animated bx bx-trash-alt"></i></div>
- </td>
Added / After Commit
+ </div>
+ 
+ {{-- Table --}}
+                 <table id="example" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+                             <th>Searil no</th>
+ <th>Workspace Name</th>
+ <th>Actions</th>
+ </tr>
+ <tr>
+ <td>{{ $index + 1 }}</td>
+ <td>{{ $wksp->name }}</td>
+                             <td>
+                                 <a class="btn-edit" data-id="{{ $wksp->id }}" 
+                                     data-name="{{ $wksp->name }}">
+                                      <i class="fas fa-edit"></i>
+ </a>
Removed / Before Commit
- <select name="group_id" id="groupSelect" class="form-select">
- <option value="" disabled selected>Select Group</option>
- @foreach($groups as $group)
-                                         <option value="{{ $group->id }}" {{ old('group_id', $equipment->group_id ?? '') == $group->id ? 'selected' : '' }}>
- {{ $group->name }}
- </option>
- @endforeach
- </select>
- </div>
- </div>
- <h5 class="mb-4 ch">Reg. Details</h5>
- <div id="equipmentFieldsContainer" class="mb-3"></div>
- <div class="d-flex gap-3">
-                             <button type="submit" class="btn btn-primary px-5 rounded-0">Confirm and Generate Control/Job Number</button>
- <button type="button" id="backToEqptBtn" class="btn btn-secondary px-5 rounded-0">Back</button>
- </div>
- </div>
- toggleFieldsBasedOnSelection();
Added / After Commit
+ <select name="group_id" id="groupSelect" class="form-select">
+ <option value="" disabled selected>Select Group</option>
+ @foreach($groups as $group)
+                                         <option 
+                                             value="{{ $group->id }}" 
+                                             data-name="{{ $group->name }}" 
+                                             {{ old('group_id', $equipment->group_id ?? '') == $group->id ? 'selected' : '' }}>
+ {{ $group->name }}
+ </option>
+ @endforeach
+ 
+ </select>
+ </div>
+ </div>
+ <h5 class="mb-4 ch">Reg. Details</h5>
+ <div id="equipmentFieldsContainer" class="mb-3"></div>
+ <div class="d-flex gap-3">
+                             <button type="submit" class="btn btn-primary px-5 rounded-0">Confirm and Generate Control Number</button>
Removed / Before Commit
- 					<div class="row">
- 						<div class="col-md-6">
- 							<div class="row mb-3">
- 								<label class="col-sm-4 col-form-label">User Unit</label>
- 								<div class="col-sm-8">
- 									<select name="unit" class="form-select">
- 										<option value="" disabled {{ old('unit_id', optional($workunit)->unit) ? '' : 'selected' }}>Select</option>
- 										@foreach ($units as $uni)
- 										<option value="{{ $uni->id }}" {{ old('unit_id', optional($workunit)->unit) == $uni->id ? 'selected' : '' }}>
- 											{{ $uni->name }}
- 										</option>
- 										@endforeach
- 									</select>
- 								</div>
- 							</div>
- 
- 							<div class="row mb-3">
- 								<label class="col-sm-4 col-form-label">WKSP</label>
Added / After Commit
+ 					<div class="row">
+ 						<div class="col-md-6">
+ 							<div class="row mb-3">
+ 								<label class="col-sm-4 col-form-label">Command</label>
+ 								<div class="col-sm-8">
+ 									<select name="command" id="commandSelect" class="form-select">
+ 										<option value="" disabled {{ old('command', optional($workunit)->command) ? '' : 'selected' }}>Select</option>
+ 										@foreach($commands as $c)
+ 										<option value="{{$c->id}}" {{ old('command', optional($workunit)->command) == $c->id ? 'selected' : '' }}>
+ 											{{$c->name}}
+ 										</option>
+ 										@endforeach
+ 									</select>
+ 								</div>
+ 							</div>							
+ 							<div class="row mb-3">
+ 								<label class="col-sm-4 col-form-label">CORPS</label>
+ 								<div class="col-sm-8">
Removed / Before 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><b>List of Work Order</b></h4>
- </div>
- <div class="col-md-9 text-end">
- 	                  <form class="float-md-end">
- 						<div class="row row-cols-md-auto g-lg-3">
- 							<a href="{{ url('work-orders-unit') }}"><button type="button" class="btn btn-primary">Add Work Order</button></a>
- 						</div>
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><b>List of Work Order</b></h4>
+ </div>
+ <div class="col-md-9 text-end">
+                         <a href="{{ url('work-orders-unit') }}" class="btn btn-primary">Add Work Order</a>
+                     </div>
+ </div>
+ </div>
+ 
+             <div class="card-body">
Removed / Before Commit
- use App\Http\Controllers\WcnController;
- use App\Http\Controllers\GatePassController;
- use App\Http\Controllers\MRProcessController;
- use App\Http\Controllers\McoUserScaleController;
- use App\Http\Controllers\CrcEntryController;
- 
- /*
- |--------------------------------------------------------------------------
- Route::put('menus/update/{id}', [MenuController::class, 'update'])->name('menus.update')
- ->middleware('check.permission:Menu,modify');
- Route::post('menus/delete', [MenuController::class, 'destroy'])->name('menus.destroy')->middleware('check.permission:Menu,delete');;
- Route::get('/production-year', [ProductionYearController::class, 'index'])->name('production-year.index');
- Route::post('/production-year/store', [ProductionYearController::class, 'store'])->name('production-year.store');
- Route::post('/production-year/update/{id}', [ProductionYearController::class, 'update'])->name('production-year.update');
- Route::delete('/production-year/delete/{id}', [ProductionYearController::class, 'destroy'])->name('production-year.destroy');
- Route::get('/production-year/show/{id}', [ProductionYearController::class, 'show'])->name('production-year.show');
- Route::get('/groups', [GroupController::class, 'index'])->name('groups.index');
- Route::post('/groups/store', [GroupController::class, 'store'])->name('groups.store');
Added / After Commit
+ use App\Http\Controllers\WcnController;
+ use App\Http\Controllers\GatePassController;
+ use App\Http\Controllers\MRProcessController;
+ use App\Http\Controllers\McoScaleController;
+ use App\Http\Controllers\CrcEntryController;
+ use App\Http\Controllers\CrcRepairController;
+ 
+ /*
+ |--------------------------------------------------------------------------
+ Route::put('menus/update/{id}', [MenuController::class, 'update'])->name('menus.update')
+ ->middleware('check.permission:Menu,modify');
+ Route::post('menus/delete', [MenuController::class, 'destroy'])->name('menus.destroy')->middleware('check.permission:Menu,delete');;
+ Route::get('/production-year', [ProductionYearController::class, 'index']);
+ Route::post('/production-year/store', [ProductionYearController::class, 'store']);
+ Route::post('/production-year/update/{id}', [ProductionYearController::class, 'update']);
+ Route::delete('/production-year/delete/{id}', [ProductionYearController::class, 'destroy']);
+ Route::post('/production-year/toggle-status/{id}', [ProductionYearController::class, 'toggleStatus']);
+ Route::get('/groups', [GroupController::class, 'index'])->name('groups.index');