Merge branch 'develop'

Author: jakub-przepiora

backend/app/Http/Controllers/Web/Admin/DashboardController.php

@@ -59,7 +59,15 @@ public function index(Request $request)
             ->limit(5)
             ->get();
 
-        // OEE data for today/yesterday per line
+        // Auto-calculate and fetch OEE for today/yesterday
+        \Illuminate\Support\Facades\Cache::remember('oee_calculated_'.today()->toDateString(), 900, function () {
+            $svc = app(\App\Services\Production\OeeCalculationService::class);
+            $svc->calculateAll(today());
+            $svc->calculateAll(\Carbon\Carbon::yesterday());
+
+            return true;
+        });
+
         $oeeRecords = \App\Models\OeeRecord::whereDate('record_date', today())
             ->orWhereDate('record_date', today()->subDay())
             ->orderByDesc('record_date')

backend/app/Http/Controllers/Web/Admin/OeeController.php

@@ -6,13 +6,16 @@
 use App\Models\Line;
 use App\Models\OeeRecord;
 use App\Services\Production\DowntimeService;
+use App\Services\Production\OeeCalculationService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class OeeController extends Controller
 {
     public function __construct(
         protected DowntimeService $downtimeService,
+        protected OeeCalculationService $oeeService,
     ) {}
 
     public function index(Request $request)
@@ -22,6 +25,9 @@ public function index(Request $request)
         $dateFrom = $request->query('date_from', today()->subDays(7)->toDateString());
         $dateTo = $request->query('date_to', today()->toDateString());
 
+        // Auto-calculate OEE for today if not cached
+        $this->ensureOeeCalculated();
+
         $query = OeeRecord::with(['line', 'shift'])
             ->whereBetween('record_date', [$dateFrom, $dateTo])
             ->orderByDesc('record_date');
@@ -68,6 +74,8 @@ public function show(Line $line, Request $request)
         $dateFrom = $request->query('date_from', today()->subDays(7)->toDateString());
         $dateTo = $request->query('date_to', today()->toDateString());
 
+        $this->ensureOeeCalculated();
+
         $records = OeeRecord::where('line_id', $line->id)
             ->whereBetween('record_date', [$dateFrom, $dateTo])
             ->with('shift')
@@ -82,4 +90,18 @@ public function show(Line $line, Request $request)
 
         return view('admin.oee.show', compact('line', 'records', 'downtimeByReason', 'dateFrom', 'dateTo'));
     }
+
+    /**
+     * Auto-calculate OEE for today and yesterday if not already done.
+     * Cached for 15 minutes to avoid recalculating on every page load.
+     */
+    private function ensureOeeCalculated(): void
+    {
+        Cache::remember('oee_calculated_'.today()->toDateString(), 900, function () {
+            $this->oeeService->calculateAll(today());
+            $this->oeeService->calculateAll(Carbon::yesterday());
+
+            return true;
+        });
+    }
 }

backend/resources/views/admin/oee/index.blade.php

@@ -156,7 +156,7 @@ class="card hover:shadow-lg transition-shadow">
     @else
         <div class="card text-center py-12">
             <p class="text-gray-500 text-lg mb-2">No OEE data available</p>
-            <p class="text-sm text-gray-400">Run <code class="bg-gray-100 dark:bg-gray-700 px-2 py-1 rounded">php artisan oee:calculate</code> to generate records.</p>
+            <p class="text-sm text-gray-400">OEE data will appear once production batches are completed and downtimes are reported.</p>
         </div>
     @endif
 </div>

backend/routes/console.php

@@ -9,3 +9,4 @@
 })->purpose('Display an inspiring quote');
 
 Schedule::command('tenants:prune')->everyMinute();
+Schedule::command('oee:calculate')->dailyAt('01:00');