sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated mobile view for field jobs

Browse Source
This commit is contained in:
Simon Pocrnjič
2026-04-16 23:11:49 +02:00
parent 187cb4f127
commit 8f8c5c5a12
4 changed files with 896 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PhoneViewController.php
+30 -31
View File
@@ -10,42 +10,40 @@
class PhoneViewController extends Controller
{
public function __construct(protected ReferenceDataCache $referenceCache) {}
public function index(Request $request)
public function index(Request $request): \Inertia\Response
{
$userId = $request->user()->id;
$search = $request->input('search');
$clientFilter = $request->input('client');
$perPage = $request->integer('per_page', 15);
$perPage = max(1, min(100, $perPage));
$query = FieldJob::query()
$eagerLoad = [
'contract' => function ($q) {
$q->with([
'type:id,name',
'account',
'clientCase.person.address.type',
'clientCase.person.phones',
'clientCase.client:id,uuid,person_id',
'clientCase.client.person:id,full_name',
]);
},
];
$baseQuery = FieldJob::query()
->where('assigned_user_id', $userId)
->whereNull('completed_at')
->whereNull('cancelled_at')
->with([
'contract' => function ($q) {
$q->with([
'type:id,name',
'account',
'clientCase.person.address.type',
'clientCase.person.phones',
'clientCase.client:id,uuid,person_id',
'clientCase.client.person:id,full_name',
]);
},
])
->orderByDesc('assigned_at');
->with($eagerLoad);
// Apply client filter
if ($clientFilter) {
$query->whereHas('contract.clientCase.client', function ($q) use ($clientFilter) {
$baseQuery->whereHas('contract.clientCase.client', function ($q) use ($clientFilter) {
$q->where('uuid', $clientFilter);
});
}
// Apply search filter
if ($search) {
$query->where(function ($q) use ($search) {
$baseQuery->where(function ($q) use ($search) {
$q->whereHas('contract', function ($cq) use ($search) {
$cq->where('reference', 'ilike', '%'.$search.'%')
->orWhereHas('clientCase.person', function ($pq) use ($search) {
@@ -58,9 +56,14 @@ public function index(Request $request)
});
}
$jobs = $query->paginate($perPage)->withQueryString();
$pendingQuery = (clone $baseQuery)
->where(fn ($q) => $q->where('added_activity', false)->orWhereNull('added_activity'))
->orderByDesc('assigned_at');
$processedQuery = (clone $baseQuery)
->where('added_activity', true)
->orderByDesc('assigned_at');
// Get unique clients for filter dropdown
$clients = \App\Models\Client::query()
->whereHas('clientCases.contracts.fieldJobs', function ($q) use ($userId) {
$q->where('assigned_user_id', $userId)
@@ -77,7 +80,8 @@ public function index(Request $request)
->values();
return Inertia::render('Phone/Index', [
'jobs' => $jobs,
'pendingJobs' => $pendingQuery->paginate(15, pageName: 'pending'),
'processedJobs' => $processedQuery->paginate(15, pageName: 'processed'),
'clients' => $clients,
'view_mode' => 'assigned',
'filters' => [
@@ -87,13 +91,11 @@ public function index(Request $request)
]);
}
public function completedToday(Request $request)
public function completedToday(Request $request): \Inertia\Response
{
$userId = $request->user()->id;
$search = $request->input('search');
$clientFilter = $request->input('client');
$perPage = $request->integer('per_page', 15);
$perPage = max(1, min(100, $perPage));
$start = now()->startOfDay();
$end = now()->endOfDay();
@@ -138,9 +140,6 @@ public function completedToday(Request $request)
});
}
$jobs = $query->paginate($perPage)->withQueryString();
// Get unique clients for filter dropdown
$clients = \App\Models\Client::query()
->whereHas('clientCases.contracts.fieldJobs', function ($q) use ($userId, $start, $end) {
$q->where('assigned_user_id', $userId)
@@ -157,7 +156,7 @@ public function completedToday(Request $request)
->values();
return Inertia::render('Phone/Index', [
'jobs' => $jobs,
'completedJobs' => $query->paginate(15, pageName: 'completed'),
'clients' => $clients,
'view_mode' => 'completed-today',
'filters' => [