Vasyka
cbcf08b28c
Closes "Important pentru produs complet" tier from CONFORMITY-12-15.md.
== M12 — PricingCoefficientResource + breakdown ==
New Filament resource at /app/pricing-coefficients (Admin group, gated
by ADMIN_SETTINGS_EDIT). Replaces the previous "edit JSON in DB"
configuration workflow.
Form structure:
- "Regulă" section: name, multiplier (decimal:3 with +%/-% helper text),
priority, stackable toggle, is_active toggle
- "Condiții" section: vehicle classes multi-select (sedan/suv/commercial/
hybrid/ev/premium), urgency multi-select, age min/max range, VIP-only
toggle. Empty = applies to everything.
Table columns:
- name (searchable + sortable)
- multiplier formatted as +15% / -10% / 0% with color coding (green for
positive, red for negative)
- conditions summarized: "Tip: SUV / Vârstă 10-99 ani / Urgență: Express"
- stackable boolean icon
- priority
- is_active inline toggle column (no edit needed)
For the breakdown display: the existing "Preț inteligent" action on WO
part lines (PartsRelationManager) already opens a modal that renders
`filament/tenant/smart-price.blade.php` with full breakdown — base price,
each applied coefficient with its name + multiplier, and final price.
Confirmed working; no change needed.
== M13 — Mechanic granular state machine ==
Migration adds 8 columns to wo_works:
- mechanic_status enum: pending | in_progress | paused | done | blocked
- mechanic_started_at, mechanic_done_at timestamps
- actual_hours decimal(6,2)
- paused_seconds_total integer (cumulative across multiple pauses)
- paused_at timestamp (when current pause started)
- block_reason enum: missing_part | awaiting_approval | broken_equipment | other
- block_note text (free-form context)
Model defaults via $attributes so create() with no mechanic_status
yields 'pending' (not null).
State machine methods on WorkOrderWork:
- start() pending|blocked → in_progress + sets started_at on first call
- pause() in_progress → paused + sets paused_at
- resume() paused → in_progress + adds paused_at..now to paused_seconds_total
- markDone() any → done + computes actual_hours = elapsed - paused_seconds
- block($reason, $note?) any → blocked + persists reason/note (invalid reasons ignored)
Transitions enforce preconditions silently (no exceptions) — calling
pause() on a pending work is a no-op, which keeps the UI buttons simple.
Efficiency indicator:
- efficiencyClass(): 'green' (actual <= norm), 'amber' (1.0 < ratio <= 1.3),
'red' (ratio > 1.3). null when no actual data.
- efficiencyPct(): integer percentage of norm time used.
== MechanicBoard UI ==
Each WO card now expands to show its WorkOrderWork lines with:
- Title + colored status badge per mechanic_status (gray/blue/amber/green/red)
- Norm hours displayed next to actual hours when known
- Efficiency percentage colored by class
- "⚠ {reason}" line when blocked
- Context-aware transition buttons:
- pending|blocked: [▶ Start]
- in_progress: [⏸ Pauză] [✓ Done] [🔴 Blochez]
- paused: [▶ Reia] [✓ Done]
- done: none (terminal)
Block button opens an inline modal (vanilla CSS, no third-party):
- Select with 4 reasons (lipsă piesă / aștept aprobare / echipament defect / altă problemă)
- Free-form textarea for details
- Confirm/Cancel buttons
- Backdrop click cancels
Safety: every transition + block action verifies $work->workOrder->master_id
matches auth()->id() before mutating. Other mechanics' works are silently
refused (no error leak).
== Tests ==
MechanicWorkflowTest (8):
- start sets mechanic_status=in_progress + started_at
- pause→resume accumulates paused_seconds_total correctly
- markDone computes actual_hours = elapsed - paused, with mid-task pause
- block persists reason + note
- efficiency thresholds: green (<= norm), amber (1.0-1.3x), red (>1.3x), null
- invalid block_reason is silently ignored
- mechanic board startWork refuses other mechanic's work (auth gate)
- confirmBlock modal flow round-trip via Livewire
PricingCoefficientResourceTest (4):
- admin canViewAny → true
- mechanic canViewAny → false (via direct canDo to bypass actingAs team-context fragility)
- coefficient creation + matches(context) round-trip
- PricingEngine.quote() returns both stackable and non-stackable coefficients
with correct names in the applied[] array
Suite: 258 passed (728 assertions). Was 246.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
152 lines
11 KiB
PHP
152 lines
11 KiB
PHP
<x-filament-panels::page>
|
|
@php
|
|
$cols = $this->getColumns();
|
|
$counts = $this->getCounts();
|
|
@endphp
|
|
|
|
<style>
|
|
.mb-stats { display: flex; gap: 12px; margin-bottom: 16px; flex-wrap: wrap; }
|
|
.mb-stat {
|
|
background: #fff; border: 1px solid #e5e7eb; border-radius: 10px;
|
|
padding: 12px 18px; min-width: 140px;
|
|
}
|
|
.dark .mb-stat { background: #1f2937; border-color: #374151; }
|
|
.mb-stat .lbl { font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: .03em; }
|
|
.mb-stat .val { font-size: 28px; font-weight: 700; color: #111827; }
|
|
.dark .mb-stat .val { color: #f9fafb; }
|
|
|
|
.mb-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); gap: 14px; }
|
|
.mb-col {
|
|
background: #f9fafb; border: 1px solid #e5e7eb; border-radius: 12px;
|
|
padding: 12px; min-height: 200px;
|
|
}
|
|
.dark .mb-col { background: #1f2937; border-color: #374151; }
|
|
.mb-col-head {
|
|
font-size: 12px; font-weight: 600; text-transform: uppercase;
|
|
letter-spacing: .04em; padding-bottom: 10px; margin-bottom: 10px;
|
|
border-bottom: 2px solid; display: flex; justify-content: space-between;
|
|
}
|
|
.mb-card {
|
|
background: #fff; border-radius: 10px; padding: 12px 14px;
|
|
margin-bottom: 8px; cursor: pointer; transition: transform .1s, box-shadow .1s;
|
|
border: 1px solid #e5e7eb; text-decoration: none; color: inherit; display: block;
|
|
}
|
|
.dark .mb-card { background: #111827; border-color: #374151; }
|
|
.mb-card:hover { transform: translateY(-1px); box-shadow: 0 4px 12px rgba(0,0,0,.06); }
|
|
.mb-card .num { font-size: 13px; font-weight: 700; color: #3b82f6; }
|
|
.mb-card .plate { font-size: 13px; color: #4b5563; }
|
|
.dark .mb-card .plate { color: #d1d5db; }
|
|
.mb-card .client { font-size: 12px; color: #6b7280; margin-top: 2px; }
|
|
.mb-card .complaint {
|
|
font-size: 12px; color: #374151; margin-top: 8px;
|
|
display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden;
|
|
}
|
|
.dark .mb-card .complaint { color: #e5e7eb; }
|
|
.mb-empty { color: #9ca3af; text-align: center; padding: 20px 8px; font-size: 12px; }
|
|
</style>
|
|
|
|
<div class="mb-stats">
|
|
<div class="mb-stat">
|
|
<div class="lbl">Active acum</div>
|
|
<div class="val">{{ $counts['active'] }}</div>
|
|
</div>
|
|
<div class="mb-stat">
|
|
<div class="lbl">Închise azi</div>
|
|
<div class="val">{{ $counts['closed_today'] }}</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-grid">
|
|
@foreach ($cols as $col)
|
|
<div class="mb-col">
|
|
<div class="mb-col-head" style="border-color: {{ $col['color'] }}; color: {{ $col['color'] }};">
|
|
<span>{{ $col['label'] }}</span>
|
|
<span>{{ $col['items']->count() }}</span>
|
|
</div>
|
|
@forelse ($col['items'] as $wo)
|
|
<div class="mb-card" style="cursor:default;">
|
|
<div style="display:flex;justify-content:space-between;align-items:center;">
|
|
<a href="{{ route('filament.tenant.resources.work-orders.edit', $wo) }}" class="num" style="text-decoration:none;color:#3b82f6;">#{{ $wo->number }}</a>
|
|
<span class="plate">{{ $wo->vehicle?->plate ?? '—' }}</span>
|
|
</div>
|
|
<div class="client">{{ $wo->client?->name ?? 'fără client' }} · {{ $wo->vehicle?->make }} {{ $wo->vehicle?->model }}</div>
|
|
@if ($wo->complaint)
|
|
<div class="complaint">{{ $wo->complaint }}</div>
|
|
@endif
|
|
@php $works = $this->getWorksFor($wo->id) @endphp
|
|
@if (! empty($works))
|
|
<div style="margin-top:8px; border-top:1px solid #f3f4f6; padding-top:8px;">
|
|
@foreach ($works as $w)
|
|
<div style="font-size:12px; margin-bottom:6px; padding:6px 8px; background:#f9fafb; border-radius:6px;">
|
|
@php
|
|
$ms = $w->mechanic_status ?: 'pending';
|
|
$stColor = ['pending' => '#94a3b8', 'in_progress' => '#3b82f6', 'paused' => '#f59e0b', 'done' => '#10b981', 'blocked' => '#dc2626'][$ms];
|
|
$eff = $w->efficiencyClass();
|
|
$effColor = ['green' => '#10b981', 'amber' => '#f59e0b', 'red' => '#dc2626'][$eff ?? ''] ?? null;
|
|
@endphp
|
|
<div style="display:flex;justify-content:space-between;align-items:flex-start;gap:6px;">
|
|
<div style="flex:1;">
|
|
<span style="font-weight:600;">{{ $w->name }}</span>
|
|
<div style="margin-top:3px; display:flex; gap:4px; align-items:center; flex-wrap:wrap;">
|
|
<span style="background:{{ $stColor }}; color:white; padding:1px 6px; border-radius:4px; font-size:10px; font-weight:600;">{{ \App\Models\Tenant\WorkOrderWork::MECHANIC_STATUSES[$ms] }}</span>
|
|
@if ($w->hours > 0)
|
|
<span style="color:#6b7280; font-size:10px;">{{ rtrim(rtrim(number_format($w->hours, 2), '0'), '.') }}h norm</span>
|
|
@endif
|
|
@if ($w->actual_hours > 0 && $effColor)
|
|
<span style="color:{{ $effColor }}; font-weight:600; font-size:10px;">{{ rtrim(rtrim(number_format($w->actual_hours, 2), '0'), '.') }}h real ({{ $w->efficiencyPct() }}%)</span>
|
|
@endif
|
|
@if ($w->block_reason)
|
|
<span style="color:#dc2626; font-size:10px;">⚠ {{ \App\Models\Tenant\WorkOrderWork::BLOCK_REASONS[$w->block_reason] ?? $w->block_reason }}</span>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div style="display:flex; gap:4px; margin-top:6px; flex-wrap:wrap;">
|
|
@if (in_array($ms, ['pending', 'blocked']))
|
|
<button wire:click="startWork({{ $w->id }})" style="background:#3b82f6;color:white;border:none;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">▶ Start</button>
|
|
@endif
|
|
@if ($ms === 'in_progress')
|
|
<button wire:click="pauseWork({{ $w->id }})" style="background:#f59e0b;color:white;border:none;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">⏸ Pauză</button>
|
|
<button wire:click="doneWork({{ $w->id }})" style="background:#10b981;color:white;border:none;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">✓ Done</button>
|
|
<button wire:click="openBlockModal({{ $w->id }})" style="background:#fff;color:#dc2626;border:1px solid #dc2626;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">🔴 Blochez</button>
|
|
@endif
|
|
@if ($ms === 'paused')
|
|
<button wire:click="resumeWork({{ $w->id }})" style="background:#3b82f6;color:white;border:none;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">▶ Reia</button>
|
|
<button wire:click="doneWork({{ $w->id }})" style="background:#10b981;color:white;border:none;padding:4px 8px;border-radius:4px;font-size:11px;cursor:pointer;">✓ Done</button>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
@endforeach
|
|
</div>
|
|
@endif
|
|
</div>
|
|
@empty
|
|
<div class="mb-empty">—</div>
|
|
@endforelse
|
|
</div>
|
|
@endforeach
|
|
</div>
|
|
|
|
{{-- BLOCK REASON MODAL --}}
|
|
@if ($blockingWorkId)
|
|
<div style="position:fixed; inset:0; background:rgba(0,0,0,0.5); z-index:9999; display:flex; align-items:center; justify-content:center;" wire:click="$set('blockingWorkId', null)">
|
|
<div style="background:white; border-radius:12px; padding:20px; max-width:400px; width:90%;" wire:click.stop>
|
|
<h2 style="font-size:16px; font-weight:600; margin-bottom:12px; color:#dc2626;">🔴 Blochez lucrarea</h2>
|
|
<p style="font-size:13px; color:#4b5563; margin-bottom:14px;">Selectează motivul pentru care lucrarea nu poate continua. Va fi vizibil managerului.</p>
|
|
<label style="font-size:11px; color:#6b7280; text-transform:uppercase; font-weight:600; display:block; margin-bottom:4px;">Motiv *</label>
|
|
<select wire:model="blockReason" style="width:100%; padding:8px 10px; border:1px solid #cbd5e1; border-radius:6px; font-size:14px; margin-bottom:12px;">
|
|
@foreach (\App\Models\Tenant\WorkOrderWork::BLOCK_REASONS as $k => $v)
|
|
<option value="{{ $k }}">{{ $v }}</option>
|
|
@endforeach
|
|
</select>
|
|
<label style="font-size:11px; color:#6b7280; text-transform:uppercase; font-weight:600; display:block; margin-bottom:4px;">Detalii (opțional)</label>
|
|
<textarea wire:model="blockNote" rows="2" style="width:100%; padding:8px 10px; border:1px solid #cbd5e1; border-radius:6px; font-size:14px; margin-bottom:14px;" placeholder="Ex: Lipsește filtrul Mann W712/83"></textarea>
|
|
<div style="display:flex; gap:8px;">
|
|
<button wire:click="$set('blockingWorkId', null)" style="flex:1; padding:8px; background:white; color:#4b5563; border:1px solid #cbd5e1; border-radius:6px; cursor:pointer;">Anulează</button>
|
|
<button wire:click="confirmBlock" style="flex:1; padding:8px; background:#dc2626; color:white; border:none; border-radius:6px; cursor:pointer; font-weight:600;">Blochez</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
</x-filament-panels::page>
|