виправлено назви таблиць у міграціях, оновлено відображення активних завдань у шаблоні index.blade.php, виправлено обчислення друкованих частин у моделі Task

Author: realshade

app/Http/Controllers/Api/TaskController.php

@@ -203,10 +203,6 @@ public function index()
             });
         $printers = auth()->user()->printers()
             ->with([
-                'printingTasks',
-                'printingTasks.partTask',
-                'printingTasks.partTask.task',
-                'printingTasks.partTask.part',
                 'filamentSlots',
                 'filamentSlots.filamentSpool',
                 'filamentSlots.filamentSpool.packaging',

app/Http/Controllers/PrinterController.php

@@ -3,20 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Enums\PrinterStatus;
-use App\Enums\PrintJobStatus;
-use App\Enums\PrintTaskEventSource;
-use App\Events\PrintCompleted;
 use App\Http\Requests\PrinterRequest;
-use App\Models\PartTask;
 use App\Models\Printer;
-use App\Models\PrintingTaskLog;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
-use Throwable;
 
 class PrinterController extends Controller
 {

app/Models/PartTask.php

@@ -17,7 +17,7 @@
  * @property int            $count_printed
  * @property Part           $part
  * @property Task           $task
- * @property PrintingTask[] $printJobs
+ * @property PrintJob[]     $printJobs
  * @property int            $count_printing
  * @property int            $count_planned
  * @property int            $count_remaining

app/Models/Printer.php

@@ -56,11 +56,6 @@ public function activeJobs() : HasMany
             ->where('status', PrintJobStatus::PRINTING);
     }
 
-    public function printingTasks() : HasMany
-    {
-        return $this->hasMany(PrintingTask::class);
-    }
-
     /* **************************************** Protected **************************************** */
     protected static function booted() : void
     {

app/Models/PrintingTask.php

@@ -77,7 +77,7 @@ public function getCountSetPrintingAttribute()
 
     public function isPrinting() : bool
     {
-        return $this->parts()->get()->map(fn($part) => $part->pivot->printJobs->count())->sum() > 0;
+        return $this->parts()->get()->map(fn($part) => $part->pivot->count_printing)->sum() > 0;
     }
 
     /* **************************************** Protected **************************************** */
@@ -92,11 +92,5 @@ protected static function booted() : void
                 }
             }
         });
-
-        static::deleting(function(Task $task) {
-            $task->parts->each(function($part) {
-                $part->pivot->printingTasks()->delete();
-            });
-        });
     }
 }

app/Models/PrintingTaskLog.php

@@ -1,7 +1,6 @@
 <?php
 
 use App\Models\PartTask;
-use App\Models\PrintingTask;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,7 +11,7 @@
      */
     public function up() : void
     {
-        Schema::create(app(PrintingTask::class)->getTable(), function(Blueprint $table) {
+        Schema::create('printing_tasks', function(Blueprint $table) {
             $table->id();
             $table->foreignId('printer_id')->constrained()->cascadeOnDelete();
             $table->foreignId('part_task_id')->constrained(app(PartTask::class)->getTable())->cascadeOnDelete();
@@ -26,6 +25,6 @@ public function up() : void
      */
     public function down() : void
     {
-        Schema::dropIfExists(app(PrintingTask::class)->getTable());
+        Schema::dropIfExists('printing_tasks');
     }
 };

app/Models/Task.php

@@ -1,7 +1,6 @@
 <?php
 
 use App\Models\PartTask;
-use App\Models\PrintingTaskLog;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,7 +11,7 @@
      */
     public function up() : void
     {
-        Schema::create(app(PrintingTaskLog::class)->getTable(), function(Blueprint $table) {
+        Schema::create('printing_task_logs', function(Blueprint $table) {
             $table->id();
             $table->foreignId('part_task_id')->constrained(app(PartTask::class)->getTable())->cascadeOnDelete();
             $table->foreignId('printer_id')->nullable()->constrained()->nullOnDelete();
@@ -27,6 +26,6 @@ public function up() : void
      */
     public function down() : void
     {
-        Schema::dropIfExists(app(PrintingTaskLog::class)->getTable());
+        Schema::dropIfExists('printing_task_logs');
     }
 };

database/migrations/2025_03_19_190313_create_printing_tasks_table.php

@@ -46,7 +46,7 @@ class="btn btn-primary"
                         <td>{{ $spool->filament->type->name }}</td>
                         <td>{{ $spool->filament->vendor->name }}</td>
                         <td>{{ number_format($spool->weight_used ?? 0, 2) }} г</td>
-                        <td>{{ number_format($spool->remaining_weight, 2) }} г</td>
+                        <td>{{ number_format($spool->weight_remaining, 2) }} г</td>
                         <td>{{ $spool->date_last_used ? $spool->date_last_used->format('Y-m-d H:m:s') : '' }}</td>
                         <td class="text-end">
                             <button type="button" class="btn btn-sm btn-primary"