admin/GSB-Construction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional Changes
Some checks failed
Tests / PHP 8.3 (push) Has been cancelled
Details
Tests / PHP 8.4 (push) Has been cancelled
Details
Tests / PHP 8.5 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Christopher Boyles
2026-06-02 22:04:03 +08:00
parent e6a9a80c32
commit 64d4b331a8
151 changed files with 15070 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/TaskManagement/app/Http/Controllers/TaskController.php
View File

@@ -70,7 +70,7 @@ class TaskController extends Controller
return Inertia::render('TaskManagement::Tasks/Index', [
'project' => $project,
'projects' => Project::select('id', 'ulid', 'name')->get(),
'projects' => Project::with('parentProject:id,ulid,name,code')->get(['id', 'ulid', 'name', 'code', 'project_type', 'parent_project_id']),
'employees' => $employees,
'availableMaterials' => $availableMaterials,
'delayReasons' => collect(\Modules\ProjectManagement\Enums\DelayReason::cases())->map(fn ($r) => [
@@ -98,6 +98,7 @@ class TaskController extends Controller
'assigned_users' => 'nullable|array',
'assigned_users.*' => 'string',
'labor_cost' => 'nullable|numeric|min:0',
'equipment_cost' => 'nullable|numeric|min:0',
'estimated_hours' => 'nullable|numeric|min:0',
'start_date' => 'nullable|date',
'end_date' => 'nullable|date|after_or_equal:start_date',
@@ -118,6 +119,9 @@ class TaskController extends Controller
if (empty($validated['labor_cost'])) {
$validated['labor_cost'] = 0;
}
if (empty($validated['equipment_cost'])) {
$validated['equipment_cost'] = 0;
}
if (empty($validated['estimated_hours'])) {
$validated['estimated_hours'] = 0;
}
@@ -154,6 +158,7 @@ class TaskController extends Controller
'assigned_users' => 'nullable|array',
'assigned_users.*' => 'string',
'labor_cost' => 'nullable|numeric|min:0',
'equipment_cost' => 'nullable|numeric|min:0',
'estimated_hours' => 'nullable|numeric|min:0',
'actual_hours' => 'nullable|numeric|min:0',
'start_date' => 'nullable|date',
@@ -174,6 +179,9 @@ class TaskController extends Controller
if (array_key_exists('labor_cost', $validated) && empty($validated['labor_cost'])) {
$validated['labor_cost'] = 0;
}
if (array_key_exists('equipment_cost', $validated) && empty($validated['equipment_cost'])) {
$validated['equipment_cost'] = 0;
}
if (array_key_exists('estimated_hours', $validated) && empty($validated['estimated_hours'])) {
$validated['estimated_hours'] = 0;
}