++ fix: Rientro assegnazione e territorio

2026-04-08 11:55:14 +00:00
parent 777f239c7a
commit 6f8010514d
36 changed files with 1186 additions and 91 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,9 @@
 /storage/*.key
 /storage/app/.app_key
 /storage/app/.db_seeded
-/storage/app/public/territori-pdf/*.pdf
+/storage/app/public/territori-pdf/*.*
+/storage/app/public/territori-thumbnails/*.*
+/storage/app/livewire-tmp/*.*
 /storage/logs/
 /storage/framework/
 /bootstrap/cache/
--- a/app/Http/Controllers/Settings/TerritoryPdfImportController.php
+++ b/app/Http/Controllers/Settings/TerritoryPdfImportController.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use App\Http\Controllers\Controller;
+use App\Services\TerritorioPdfImportDispatcher;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use RuntimeException;
+
+class TerritoryPdfImportController extends Controller
+{
+    public function storeZip(Request $request, TerritorioPdfImportDispatcher $dispatcher): JsonResponse|RedirectResponse
+    {
+        $request->validate([
+            'pdfZip' => ['required', 'file', 'mimes:zip', 'max:256000'],
+        ]);
+
+        try {
+            $importId = $dispatcher->dispatchUploadedZip($request->file('pdfZip'), auth()->id());
+        } catch (RuntimeException $exception) {
+            if ($request->expectsJson()) {
+                return response()->json([
+                    'message' => $exception->getMessage(),
+                    'errors' => ['pdfZip' => [$exception->getMessage()]],
+                ], 422);
+            }
+
+            return back()->withErrors(['pdfZip' => $exception->getMessage()]);
+        }
+
+        $redirectUrl = route('xml.exchange', ['pdf-import' => $importId]);
+
+        if ($request->expectsJson()) {
+            return response()->json([
+                'message' => 'Import PDF avviato in background.',
+                'import_id' => $importId,
+                'redirect_url' => $redirectUrl,
+            ]);
+        }
+
+        return redirect($redirectUrl)
+            ->with('success', 'Import PDF avviato in background. I log si aggiorneranno automaticamente.');
+    }
+}
--- a/app/Jobs/ImportTerritoryPdfFolder.php
+++ b/app/Jobs/ImportTerritoryPdfFolder.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Territorio;
+use App\Models\User;
+use App\Services\TerritorioPdfImportState;
+use App\Services\TerritorioThumbnailService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class ImportTerritoryPdfFolder implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public int $tries = 1;
+    public int $timeout = 0;
+
+    public function __construct(
+        public string $importId,
+        public array $files,
+        public int $actorId,
+    ) {
+    }
+
+    public function handle(TerritorioPdfImportState $stateService, TerritorioThumbnailService $thumbnailService): void
+    {
+        $stateService->markRunning($this->importId);
+        $stateService->appendLog($this->importId, 'Worker avviato. Inizio elaborazione dei PDF.');
+
+        $territoriMap = [];
+        foreach (Territorio::withTrashed()->get() as $territorio) {
+            $territoriMap[$this->normalizeTerritoryNumber($territorio->numero)] = $territorio;
+        }
+
+        $actor = User::find($this->actorId);
+        $seenNumbers = [];
+
+        try {
+            foreach ($this->files as $file) {
+                $originalName = $file['original_name'] ?? 'file-sconosciuto.pdf';
+                $stateService->increment($this->importId, 'processed');
+
+                $territoryMatch = $this->resolveTerritoryFromFilename($originalName, $territoriMap);
+
+                if ($territoryMatch === null) {
+                    $stateService->increment($this->importId, 'skipped');
+                    $stateService->appendLog($this->importId, '[SKIP] ' . $originalName . ' - nessun numero territorio riconosciuto nel nome file.');
+                    $stateService->addIssue($this->importId, [
+                        'file' => $originalName,
+                        'type' => 'no-match',
+                        'message' => 'Nessun numero territorio riconosciuto nel nome file.',
+                    ]);
+                    continue;
+                }
+
+                if (($territoryMatch['type'] ?? 'single') === 'ambiguous') {
+                    $stateService->increment($this->importId, 'skipped');
+                    $stateService->appendLog($this->importId, '[SKIP] ' . $originalName . ' - nome ambiguo, possibili territori: ' . implode(', ', $territoryMatch['matched_numbers']) . '.');
+                    $stateService->addIssue($this->importId, [
+                        'file' => $originalName,
+                        'type' => 'ambiguous',
+                        'message' => 'Nome ambiguo.',
+                        'matched_numbers' => $territoryMatch['matched_numbers'],
+                    ]);
+                    continue;
+                }
+
+                $normalizedNumber = $territoryMatch['normalized_number'];
+                $matchedNumber = $territoryMatch['matched_number'];
+                $territorio = $territoryMatch['territorio'];
+
+                if (isset($seenNumbers[$normalizedNumber])) {
+                    $stateService->increment($this->importId, 'skipped');
+                    $stateService->appendLog($this->importId, '[SKIP] ' . $originalName . ' - territorio ' . $matchedNumber . ' presente piu volte nella stessa importazione.');
+                    $stateService->addIssue($this->importId, [
+                        'file' => $originalName,
+                        'type' => 'duplicate-in-batch',
+                        'message' => 'Territorio presente piu volte nella stessa importazione.',
+                        'matched_numbers' => [$matchedNumber],
+                    ]);
+                    continue;
+                }
+
+                $seenNumbers[$normalizedNumber] = true;
+
+                $sourcePath = Storage::disk('local')->path($file['stored_path']);
+
+                if (! is_file($sourcePath)) {
+                    $stateService->increment($this->importId, 'errors');
+                    $stateService->appendLog($this->importId, '[ERR] ' . $originalName . ' - file temporaneo non trovato.');
+                    $stateService->addIssue($this->importId, [
+                        'file' => $originalName,
+                        'type' => 'missing-temp-file',
+                        'message' => 'File temporaneo non trovato.',
+                        'matched_numbers' => [$matchedNumber],
+                    ]);
+                    continue;
+                }
+
+                try {
+                    if ($territorio->pdf_path) {
+                        Storage::disk('public')->delete($territorio->pdf_path);
+                    }
+
+                    if ($territorio->thumbnail_path) {
+                        $thumbnailService->delete($territorio->thumbnail_path);
+                    }
+
+                    $storedFilename = Str::slug('territorio-' . $territorio->numero) . '.pdf';
+                    $publicPath = 'territori-pdf/' . $storedFilename;
+                    Storage::disk('public')->put($publicPath, file_get_contents($sourcePath));
+                    $thumbnailPath = $thumbnailService->generate($publicPath);
+
+                    $territorio->update([
+                        'pdf_path' => $publicPath,
+                        'thumbnail_path' => $thumbnailPath,
+                    ]);
+
+                    if ($actor) {
+                        activity()->causedBy($actor)
+                            ->performedOn($territorio)
+                            ->withProperties([
+                                'numero' => $territorio->numero,
+                                'pdf' => $originalName,
+                                'bulk_import' => true,
+                            ])
+                            ->log('bulk_uploaded_pdf');
+                    }
+
+                    $stateService->increment($this->importId, 'updated');
+                    $stateService->appendLog(
+                        $this->importId,
+                        '[OK] ' . $originalName . ' - aggiornato territorio ' . $territorio->numero . ($thumbnailPath ? ' con thumbnail generata.' : ' ma la thumbnail non e stata generata.')
+                    );
+                } catch (\Throwable $exception) {
+                    $stateService->increment($this->importId, 'errors');
+                    $stateService->appendLog($this->importId, '[ERR] ' . $originalName . ' - ' . $exception->getMessage());
+                    $stateService->addIssue($this->importId, [
+                        'file' => $originalName,
+                        'type' => 'processing-error',
+                        'message' => $exception->getMessage(),
+                        'matched_numbers' => [$matchedNumber],
+                    ]);
+                }
+            }
+
+            $stateService->appendLog($this->importId, 'Import completato.');
+            $stateService->markCompleted($this->importId);
+        } catch (\Throwable $exception) {
+            $stateService->increment($this->importId, 'errors');
+            $stateService->appendLog($this->importId, '[ERR] Errore fatale del job: ' . $exception->getMessage());
+            $stateService->markFailed($this->importId);
+
+            throw $exception;
+        } finally {
+            Storage::disk('local')->deleteDirectory('bulk-territori-imports/' . $this->importId);
+        }
+    }
+
+    protected function resolveTerritoryFromFilename(string $filename, array $territoriMap): ?array
+    {
+        if ($territoriMap === []) {
+            return null;
+        }
+
+        $basename = pathinfo($filename, PATHINFO_FILENAME);
+        $normalizedBasename = mb_strtoupper($basename);
+        $normalizedBasename = preg_replace('/[^A-Z0-9]+/u', ' ', $normalizedBasename);
+        $normalizedBasename = trim(preg_replace('/\s+/', ' ', $normalizedBasename));
+
+        $territoryKeys = array_keys($territoriMap);
+        usort($territoryKeys, function (string $left, string $right) {
+            $lengthComparison = mb_strlen($right) <=> mb_strlen($left);
+
+            if ($lengthComparison !== 0) {
+                return $lengthComparison;
+            }
+
+            return strnatcasecmp($left, $right);
+        });
+
+        $matches = [];
+
+        foreach ($territoryKeys as $normalizedNumber) {
+            if (! $this->filenameContainsTerritoryNumber($normalizedBasename, $normalizedNumber)) {
+                continue;
+            }
+
+            $matches[] = [
+                'normalized_number' => $normalizedNumber,
+                'matched_number' => $territoriMap[$normalizedNumber]->numero,
+                'territorio' => $territoriMap[$normalizedNumber],
+            ];
+        }
+
+        if ($matches === []) {
+            return null;
+        }
+
+        if (count($matches) > 1) {
+            return [
+                'type' => 'ambiguous',
+                'matched_numbers' => array_values(array_map(fn(array $match) => $match['matched_number'], $matches)),
+            ];
+        }
+
+        return $matches[0];
+    }
+
+    protected function filenameContainsTerritoryNumber(string $normalizedBasename, string $normalizedNumber): bool
+    {
+        $escapedNumber = preg_quote($normalizedNumber, '/');
+
+        if (preg_match('/^\d+$/', $normalizedNumber)) {
+            $escapedNumber = '0*' . preg_quote(ltrim($normalizedNumber, '0') ?: '0', '/');
+        }
+
+        return (bool) preg_match('/(^| )' . $escapedNumber . '(?= |$)/', $normalizedBasename);
+    }
+
+    protected function normalizeTerritoryNumber(string $number): string
+    {
+        $normalized = preg_replace('/\s+/', ' ', trim(mb_strtoupper($number)));
+
+        if ($normalized !== '' && preg_match('/^\d+$/', $normalized)) {
+            return ltrim($normalized, '0') ?: '0';
+        }
+
+        return $normalized;
+    }
+}
--- a/app/Livewire/Home.php
+++ b/app/Livewire/Home.php
@@ -49,15 +49,26 @@ class Home extends Component
        }

        // Quick lists
-        $daAssegnare = Territorio::daAssegnare()
+        $territoriDaAssegnare = Territorio::inReparto()
            ->with('zona', 'tipologia', 'ultimaAssegnazione')
-            ->take(10)
-            ->get();
+            ->get()
+            ->sort(function (Territorio $left, Territorio $right) {
+                $priorityComparison = (int) $right->is_prioritario <=> (int) $left->is_prioritario;

-        $prioritari = Territorio::prioritari()
-            ->with('zona', 'tipologia', 'ultimaAssegnazione')
+                if ($priorityComparison !== 0) {
+                    return $priorityComparison;
+                }
+
+                $giacenzaComparison = $right->giorni_giacenza <=> $left->giorni_giacenza;
+
+                if ($giacenzaComparison !== 0) {
+                    return $giacenzaComparison;
+                }
+
+                return strnatcasecmp((string) $left->numero, (string) $right->numero);
+            })
            ->take(10)
-            ->get();
+            ->values();

        $daRientrare = Territorio::daRientrare()
            ->with(['zona', 'assegnazioneCorrente.proclamatore'])
@@ -73,8 +84,7 @@ class Home extends Component
            'territoriPercorsi' => $territoriPercorsi,
            'mediaPercorrenzaMensile' => $mediaPercorrenzaMensile,
            'campagnaStats' => $campagnaStats,
-            'daAssegnare' => $daAssegnare,
-            'prioritari' => $prioritari,
+            'territoriDaAssegnare' => $territoriDaAssegnare,
            'daRientrare' => $daRientrare,
        ]);
    }
--- a/app/Livewire/Settings/XmlExchange.php
+++ b/app/Livewire/Settings/XmlExchange.php
@@ -2,6 +2,7 @@

 namespace App\Livewire\Settings;

+use App\Jobs\ImportTerritoryPdfFolder;
 use App\Models\AnnoTeocratico;
 use App\Models\Assegnazione;
 use App\Models\Campagna;
@@ -11,9 +12,12 @@ use App\Models\Territorio;
 use App\Models\Tipologia;
 use App\Models\User;
 use App\Models\Zona;
+use App\Services\TerritorioPdfImportDispatcher;
+use App\Services\TerritorioPdfImportState;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 use Livewire\Component;
 use Livewire\WithFileUploads;

@@ -25,6 +29,22 @@ class XmlExchange extends Component
    public $xmlImport;
    public array $importStats = [];
    public array $importIssues = [];
+    public array $pdfFolder = [];
+    public array $pdfImportLogs = [];
+    public array $pdfImportStats = [];
+    public array $pdfImportIssues = [];
+    public ?string $currentPdfImportId = null;
+    public string $pdfImportStatus = 'idle';
+    public string $pdfImportLogText = '';
+
+    public function mount(): void
+    {
+        $this->currentPdfImportId = request()->query('pdf-import');
+
+        if ($this->currentPdfImportId) {
+            $this->refreshPdfImportStatus();
+        }
+    }

    public function convertLegacySqlToXml()
    {
@@ -257,6 +277,70 @@ class XmlExchange extends Component
        session()->flash('success', $message);
    }

+    public function importTerritoryPdfFolder(): void
+    {
+        $this->validate([
+            'pdfFolder' => ['required', 'array', 'min:1'],
+            'pdfFolder.*' => ['file', 'mimes:pdf', 'max:10240'],
+        ]);
+
+        $importId = (string) Str::uuid();
+        $storedFiles = [];
+
+        foreach ($this->pdfFolder as $index => $file) {
+            $originalName = $file->getClientOriginalName();
+            $safeName = Str::slug(pathinfo($originalName, PATHINFO_FILENAME));
+            $extension = strtolower($file->getClientOriginalExtension() ?: 'pdf');
+            $storedPath = $file->storeAs(
+                'bulk-territori-imports/' . $importId,
+                str_pad((string) $index, 4, '0', STR_PAD_LEFT) . '-' . $safeName . '.' . $extension,
+                'local'
+            );
+
+            $storedFiles[] = [
+                'original_name' => $originalName,
+                'stored_path' => $storedPath,
+            ];
+        }
+
+        $this->pdfFolder = [];
+
+    }
+
+    public function refreshPdfImportStatus(): void
+    {
+        if (! $this->currentPdfImportId) {
+            return;
+        }
+
+        $state = app(TerritorioPdfImportState::class)->get($this->currentPdfImportId);
+
+        if (! $state) {
+            return;
+        }
+
+        $this->pdfImportStatus = $state['status'] ?? 'idle';
+        $this->pdfImportStats = $state['stats'] ?? [];
+        $this->pdfImportLogs = $state['logs'] ?? [];
+        $this->pdfImportIssues = $state['issues'] ?? [];
+        $this->pdfImportLogText = implode(PHP_EOL, $this->pdfImportLogs);
+    }
+
+    protected function dispatchPdfImport(string $importId, array $storedFiles, string $initialLog): void
+    {
+        $state = app(TerritorioPdfImportDispatcher::class)
+            ->dispatchStoredFiles($importId, $storedFiles, auth()->id(), $initialLog);
+
+        $this->currentPdfImportId = $importId;
+        $this->pdfImportStatus = $state['status'] ?? 'queued';
+        $this->pdfImportStats = $state['stats'] ?? [];
+        $this->pdfImportLogs = $state['logs'] ?? [];
+        $this->pdfImportIssues = $state['issues'] ?? [];
+        $this->refreshPdfImportStatus();
+
+        session()->flash('success', 'Import PDF avviato in background. I log si aggiorneranno automaticamente.');
+    }
+
    public function downloadImportLogPdf()
    {
        if (empty($this->importStats)) {
--- a/app/Livewire/Territori/TerritorioIndex.php
+++ b/app/Livewire/Territori/TerritorioIndex.php
@@ -2,6 +2,7 @@

 namespace App\Livewire\Territori;

+use Illuminate\Pagination\LengthAwarePaginator;
 use Livewire\Component;
 use Livewire\WithPagination;
 use App\Models\Territorio;
@@ -16,6 +17,9 @@ class TerritorioIndex extends Component
    public string $filterZona = '';
    public string $filterTipologia = '';
    public string $filterStato = '';
+    public string $filterPriorita = '';
+    public string $filterPdf = '';
+    public string $filterContenuti = '';
    public string $sortField = 'numero';
    public string $sortDirection = 'asc';

@@ -24,6 +28,9 @@ class TerritorioIndex extends Component
        'filterZona' => ['except' => ''],
        'filterTipologia' => ['except' => ''],
        'filterStato' => ['except' => ''],
+        'filterPriorita' => ['except' => ''],
+        'filterPdf' => ['except' => ''],
+        'filterContenuti' => ['except' => ''],
    ];

    public function updatingSearch()
@@ -31,6 +38,36 @@ class TerritorioIndex extends Component
        $this->resetPage();
    }

+    public function updatingFilterZona()
+    {
+        $this->resetPage();
+    }
+
+    public function updatingFilterTipologia()
+    {
+        $this->resetPage();
+    }
+
+    public function updatingFilterStato()
+    {
+        $this->resetPage();
+    }
+
+    public function updatingFilterPriorita()
+    {
+        $this->resetPage();
+    }
+
+    public function updatingFilterPdf()
+    {
+        $this->resetPage();
+    }
+
+    public function updatingFilterContenuti()
+    {
+        $this->resetPage();
+    }
+
    public function sortBy(string $field)
    {
        if ($this->sortField === $field) {
@@ -41,6 +78,22 @@ class TerritorioIndex extends Component
        }
    }

+    public function clearFilters(): void
+    {
+        $this->reset([
+            'search',
+            'filterZona',
+            'filterTipologia',
+            'filterStato',
+            'filterPriorita',
+            'filterPdf',
+            'filterContenuti',
+        ]);
+        $this->sortField = 'numero';
+        $this->sortDirection = 'asc';
+        $this->resetPage();
+    }
+
    public function toggleActive(Territorio $territorio)
    {
        $territorio->update(['attivo' => !$territorio->attivo]);
@@ -73,7 +126,14 @@ class TerritorioIndex extends Component
        $query = Territorio::with(['zona', 'tipologia', 'assegnazioneCorrente.proclamatore']);

        if ($this->search) {
-            $query->where('numero', 'like', "%{$this->search}%");
+            $search = $this->search;
+            $query->where(function ($subQuery) use ($search) {
+                $subQuery->where('numero', 'like', "%{$search}%")
+                    ->orWhere('note', 'like', "%{$search}%")
+                    ->orWhere('confini', 'like', "%{$search}%")
+                    ->orWhereHas('zona', fn($zonaQuery) => $zonaQuery->where('nome', 'like', "%{$search}%"))
+                    ->orWhereHas('tipologia', fn($tipologiaQuery) => $tipologiaQuery->where('nome', 'like', "%{$search}%"));
+            });
        }

        if ($this->filterZona) {
@@ -90,16 +150,104 @@ class TerritorioIndex extends Component
                'assegnato' => $query->assegnato(),
                'da_rientrare' => $query->daRientrare(),
                'inattivo' => $query->where('attivo', false),
+                'prioritari' => $query->inReparto(),
                default => null,
            };
        }

-        $query->orderBy($this->sortField, $this->sortDirection);
+        if ($this->filterPdf) {
+            match ($this->filterPdf) {
+                'con_pdf' => $query->whereNotNull('pdf_path'),
+                'senza_pdf' => $query->whereNull('pdf_path'),
+                'con_thumbnail' => $query->whereNotNull('thumbnail_path'),
+                'senza_thumbnail' => $query->whereNull('thumbnail_path'),
+                default => null,
+            };
+        }
+
+        if ($this->filterContenuti) {
+            match ($this->filterContenuti) {
+                'con_note' => $query->whereNotNull('note')->where('note', '!=', ''),
+                'senza_note' => $query->where(function ($subQuery) {
+                    $subQuery->whereNull('note')->orWhere('note', '');
+                }),
+                'con_confini' => $query->whereNotNull('confini')->where('confini', '!=', ''),
+                'senza_confini' => $query->where(function ($subQuery) {
+                    $subQuery->whereNull('confini')->orWhere('confini', '');
+                }),
+                default => null,
+            };
+        }
+
+        $territori = $query->get();
+
+        if ($this->filterStato === 'prioritari') {
+            $territori = $territori->filter(fn(Territorio $territorio) => $territorio->is_prioritario)->values();
+        }
+
+        if ($this->filterPriorita) {
+            $territori = $territori->filter(function (Territorio $territorio) {
+                return match ($this->filterPriorita) {
+                    'prioritari' => $territorio->is_prioritario,
+                    'manuali' => $territorio->prioritario,
+                    'automatici' => $territorio->is_prioritario && !$territorio->prioritario,
+                    'non_prioritari' => !$territorio->is_prioritario,
+                    default => true,
+                };
+            })->values();
+        }
+
+        if ($this->usesPriorityOrdering()) {
+            $territori = $territori->sort(function (Territorio $left, Territorio $right) {
+                $priorityComparison = (int) $right->is_prioritario <=> (int) $left->is_prioritario;
+
+                if ($priorityComparison !== 0) {
+                    return $priorityComparison;
+                }
+
+                $giacenzaComparison = $right->giorni_giacenza <=> $left->giorni_giacenza;
+
+                if ($giacenzaComparison !== 0) {
+                    return $giacenzaComparison;
+                }
+
+                return strnatcasecmp((string) $left->numero, (string) $right->numero);
+            })->values();
+        } else {
+            $territori = $territori->sort(function (Territorio $left, Territorio $right) {
+                $result = strnatcasecmp((string) data_get($left, $this->sortField), (string) data_get($right, $this->sortField));
+
+                return $this->sortDirection === 'asc' ? $result : -$result;
+            })->values();
+        }
+
+        $perPage = 20;
+        $page = $this->getPage();
+        $items = $territori->slice(($page - 1) * $perPage, $perPage)->values();
+        $paginatedTerritori = new LengthAwarePaginator(
+            $items,
+            $territori->count(),
+            $perPage,
+            $page,
+            ['path' => request()->url(), 'query' => request()->query()]
+        );

        return view('livewire.territori.territorio-index', [
-            'territori' => $query->paginate(20),
+            'territori' => $paginatedTerritori,
            'zone' => Zona::attive()->get(),
            'tipologie' => Tipologia::attive()->get(),
+            'usesPriorityOrdering' => $this->usesPriorityOrdering(),
        ]);
    }
+
+    protected function usesPriorityOrdering(): bool
+    {
+        return $this->sortField === 'numero'
+            && $this->sortDirection === 'asc'
+            && (
+                in_array($this->filterStato, ['in_reparto', 'prioritari'], true)
+                || $this->filterPriorita !== ''
+            );
+    }
+
 }
--- a/app/Services/TerritorioPdfImportDispatcher.php
+++ b/app/Services/TerritorioPdfImportDispatcher.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Services;
+
+use App\Jobs\ImportTerritoryPdfFolder;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Str;
+use RuntimeException;
+use ZipArchive;
+
+class TerritorioPdfImportDispatcher
+{
+    public function __construct(
+        protected TerritorioPdfImportState $stateService,
+    ) {
+    }
+
+    public function dispatchStoredFiles(string $importId, array $storedFiles, ?int $actorId, string $initialLog): array
+    {
+        $state = $this->stateService->initialize($importId, count($storedFiles));
+        $this->stateService->appendLog($importId, $initialLog);
+
+        ImportTerritoryPdfFolder::dispatch($importId, $storedFiles, $actorId);
+
+        return $this->stateService->get($importId) ?? $state;
+    }
+
+    public function dispatchUploadedZip(UploadedFile $zipFile, ?int $actorId): string
+    {
+        $importId = (string) Str::uuid();
+        $zipStoredPath = $zipFile->storeAs(
+            'bulk-territori-imports/' . $importId,
+            'archivio-' . $importId . '.zip',
+            'local'
+        );
+
+        $zipAbsolutePath = storage_path('app/' . $zipStoredPath);
+        $zip = new ZipArchive();
+
+        if ($zip->open($zipAbsolutePath) !== true) {
+            throw new RuntimeException('Impossibile aprire il file ZIP.');
+        }
+
+        $storedFiles = [];
+        $entryIndex = 0;
+
+        try {
+            for ($index = 0; $index < $zip->numFiles; $index++) {
+                $entryName = $zip->getNameIndex($index);
+
+                if (! $entryName || str_ends_with($entryName, '/')) {
+                    continue;
+                }
+
+                if (strtolower(pathinfo($entryName, PATHINFO_EXTENSION)) !== 'pdf') {
+                    continue;
+                }
+
+                $content = $zip->getFromIndex($index);
+                if ($content === false) {
+                    continue;
+                }
+
+                $originalName = basename($entryName);
+                $safeName = Str::slug(pathinfo($originalName, PATHINFO_FILENAME));
+                $storedPath = 'bulk-territori-imports/' . $importId . '/zip-' . str_pad((string) $entryIndex, 4, '0', STR_PAD_LEFT) . '-' . $safeName . '.pdf';
+
+                file_put_contents(storage_path('app/' . $storedPath), $content);
+
+                $storedFiles[] = [
+                    'original_name' => $originalName,
+                    'stored_path' => $storedPath,
+                ];
+
+                $entryIndex++;
+            }
+        } finally {
+            $zip->close();
+        }
+
+        if ($storedFiles === []) {
+            throw new RuntimeException('Lo ZIP non contiene file PDF validi.');
+        }
+
+        $this->dispatchStoredFiles(
+            $importId,
+            $storedFiles,
+            $actorId,
+            'Archivio ZIP ricevuto: ' . count($storedFiles) . ' PDF estratti e messi in coda per l\'elaborazione.'
+        );
+
+        return $importId;
+    }
+}
--- a/app/Services/TerritorioPdfImportState.php
+++ b/app/Services/TerritorioPdfImportState.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Facades\Cache;
+
+class TerritorioPdfImportState
+{
+    protected int $ttlSeconds = 86400;
+
+    public function initialize(string $importId, int $totalFiles): array
+    {
+        $state = [
+            'id' => $importId,
+            'status' => 'queued',
+            'stats' => [
+                'total' => $totalFiles,
+                'processed' => 0,
+                'updated' => 0,
+                'skipped' => 0,
+                'errors' => 0,
+            ],
+            'logs' => [
+                'Import creato. In attesa del worker di coda.',
+            ],
+            'issues' => [],
+            'started_at' => null,
+            'finished_at' => null,
+        ];
+
+        $this->put($importId, $state);
+
+        return $state;
+    }
+
+    public function get(string $importId): ?array
+    {
+        return Cache::get($this->key($importId));
+    }
+
+    public function put(string $importId, array $state): void
+    {
+        Cache::put($this->key($importId), $state, $this->ttlSeconds);
+    }
+
+    public function update(string $importId, callable $callback): ?array
+    {
+        $state = $this->get($importId);
+
+        if (! $state) {
+            return null;
+        }
+
+        $updatedState = $callback($state) ?? $state;
+        $this->put($importId, $updatedState);
+
+        return $updatedState;
+    }
+
+    public function appendLog(string $importId, string $message): void
+    {
+        $this->update($importId, function (array $state) use ($message) {
+            $timestamp = now()->format('H:i:s');
+            $state['logs'][] = '[' . $timestamp . '] ' . $message;
+
+            return $state;
+        });
+    }
+
+    public function increment(string $importId, string $metric, int $amount = 1): void
+    {
+        $this->update($importId, function (array $state) use ($metric, $amount) {
+            $state['stats'][$metric] = ($state['stats'][$metric] ?? 0) + $amount;
+
+            return $state;
+        });
+    }
+
+    public function addIssue(string $importId, array $issue): void
+    {
+        $this->update($importId, function (array $state) use ($issue) {
+            $state['issues'][] = $issue;
+
+            return $state;
+        });
+    }
+
+    public function markRunning(string $importId): void
+    {
+        $this->update($importId, function (array $state) {
+            $state['status'] = 'running';
+            $state['started_at'] = now()->toDateTimeString();
+
+            return $state;
+        });
+    }
+
+    public function markCompleted(string $importId): void
+    {
+        $this->update($importId, function (array $state) {
+            $state['status'] = 'completed';
+            $state['finished_at'] = now()->toDateTimeString();
+
+            return $state;
+        });
+    }
+
+    public function markFailed(string $importId): void
+    {
+        $this->update($importId, function (array $state) {
+            $state['status'] = 'failed';
+            $state['finished_at'] = now()->toDateTimeString();
+
+            return $state;
+        });
+    }
+
+    protected function key(string $importId): string
+    {
+        return 'territori-pdf-import:' . $importId;
+    }
+}
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -0,0 +1,47 @@
+<?php
+
+return [
+
+    'class_namespace' => 'App\\Livewire',
+
+    'view_path' => resource_path('views/livewire'),
+
+    'layout' => 'components.layouts.app',
+
+    'lazy_placeholder' => null,
+
+    'temporary_file_upload' => [
+        'disk' => null,
+        'rules' => ['required', 'file', 'max:256000'],
+        'directory' => null,
+        'middleware' => null,
+        'preview_mimes' => [
+            'png', 'gif', 'bmp', 'svg', 'wav', 'mp4',
+            'mov', 'avi', 'wmv', 'mp3', 'm4a',
+            'jpg', 'jpeg', 'mpga', 'webp', 'wma',
+        ],
+        'max_upload_time' => 15,
+        'cleanup' => true,
+    ],
+
+    'render_on_redirect' => false,
+
+    'legacy_model_binding' => false,
+
+    'inject_assets' => true,
+
+    'navigate' => [
+        'show_progress_bar' => true,
+        'progress_bar_color' => '#2299dd',
+    ],
+
+    'inject_morph_markers' => true,
+
+    'smart_wire_keys' => false,
+
+    'pagination_theme' => 'tailwind',
+
+    'release_token' => env('APP_VERSION'),
+
+    'inject_assets_after_styles' => false,
+];
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,33 @@ services:
      app:
        condition: service_healthy

+  queue-worker:
+    build:
+      context: .
+      dockerfile: docker/php/Dockerfile
+    container_name: termanager2_queue
+    restart: unless-stopped
+    user: "1000:1000"
+    working_dir: /var/www/html
+    volumes:
+      - ./:/var/www/html
+    networks:
+      - termanager2
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    command: ["php", "artisan", "queue:work", "redis", "--queue=default", "--sleep=1", "--tries=1", "--timeout=0"]
+    environment:
+      - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
+      - SEED_DEV_DATA=${SEED_DEV_DATA:-false}
+      - RUN_DB_SEED_ON_FIRST_START=${RUN_DB_SEED_ON_FIRST_START:-true}
+      - ENSURE_INITIAL_ADMIN_ON_EMPTY_DB=${ENSURE_INITIAL_ADMIN_ON_EMPTY_DB:-true}
+      - INITIAL_ADMIN_NAME=${INITIAL_ADMIN_NAME:-}
+      - INITIAL_ADMIN_EMAIL=${INITIAL_ADMIN_EMAIL:-}
+      - INITIAL_ADMIN_PASSWORD=${INITIAL_ADMIN_PASSWORD:-}
+
  mariadb:
    image: mariadb:11
    container_name: termanager2_db
--- a/docker/php/php.ini
+++ b/docker/php/php.ini
@@ -1,6 +1,6 @@
 [PHP]
-upload_max_filesize = 64M
-post_max_size = 64M
+upload_max_filesize = 256M
+post_max_size = 256M
 memory_limit = 256M
 max_execution_time = 120
 max_input_vars = 3000
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -140,7 +140,7 @@
                        <a href="{{ route('xml.exchange') }}"
                           class="flex items-center gap-3 px-3 py-2 text-sm font-medium rounded-lg {{ request()->routeIs('xml.*') ? 'bg-indigo-50 text-indigo-700' : 'text-gray-700 hover:bg-gray-100' }}">
                            <svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 16v4m0 0l-3-3m3 3l3-3M4 12a8 8 0 1116 0v1a3 3 0 01-3 3h-1M7 16H6a2 2 0 01-2-2v-2"/></svg>
-                            XML Exchange
+                            Import
                        </a>
                    </div>
                    @endcan
--- a/resources/views/livewire/assegnazioni/assegna.blade.php
+++ b/resources/views/livewire/assegnazioni/assegna.blade.php
@@ -5,7 +5,7 @@
        <a href="{{ route('territori.index') }}" class="text-sm text-indigo-600 hover:text-indigo-800">← Torna ai territori</a>
    </div>

-    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6 max-w-lg">
+    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-4 sm:p-6 max-w-2xl">
        <form wire:submit="save" class="space-y-4">
            <div>
                @if(!$preselectedTerritorioId)
@@ -31,14 +31,17 @@

                @if($territorio_id)
                <div class="mt-3">
-                    <p class="text-xs text-gray-500 mb-1">Anteprima territorio</p>
+                    <p class="text-xs text-gray-500 mb-2">Anteprima territorio</p>
                    @if($this->selectedThumbnailUrl)
+                    <div class="overflow-hidden rounded-xl border border-gray-200 bg-gray-50 shadow-sm">
                        <img src="{{ $this->selectedThumbnailUrl }}"
-                         alt="Anteprima territorio"
-                         class="rounded-lg border border-gray-200 shadow-sm max-h-64 w-auto">
+                             alt="Thumbnail territorio selezionato"
+                             class="block w-full h-auto max-h-[70vh] object-contain bg-white">
+                    </div>
+                    <p class="mt-2 text-xs text-gray-500">Miniatura del territorio ottimizzata per consultazione rapida anche da mobile.</p>
                    @else
                    <div class="rounded-lg border border-dashed border-gray-300 bg-gray-50 px-4 py-6 text-sm text-gray-500">
-                        Nessun PDF disponibile per questo territorio.
+                        Nessuna thumbnail disponibile per questo territorio.
                    </div>
                    @endif
                </div>
@@ -62,7 +65,7 @@
                @error('assigned_at') <p class="text-red-500 text-xs mt-1">{{ $message }}</p> @enderror
            </div>

-            <div class="flex items-center gap-3 pt-4">
+            <div class="flex flex-col-reverse gap-3 pt-4 sm:flex-row sm:items-center">
                <button type="submit" class="px-4 py-2 text-sm font-medium text-white bg-indigo-600 rounded-lg hover:bg-indigo-700 transition">Assegna</button>
                <a href="{{ route('territori.index') }}" class="px-4 py-2 text-sm font-medium text-gray-700 bg-gray-100 rounded-lg hover:bg-gray-200 transition">Annulla</a>
            </div>
--- a/resources/views/livewire/home.blade.php
+++ b/resources/views/livewire/home.blade.php
@@ -46,18 +46,29 @@
    </div>

    {{-- Quick lists --}}
-    <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+    <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
        {{-- Da assegnare --}}
        <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
            <div class="px-4 py-3 bg-green-50 border-b border-green-100">
                <h3 class="text-sm font-semibold text-green-800">Da Assegnare</h3>
+                <p class="mt-1 text-xs text-green-700">Prima i prioritari, poi i territori con piu tempo in reparto</p>
            </div>
            <ul class="divide-y divide-gray-100">
-                @forelse($daAssegnare as $t)
+                @forelse($territoriDaAssegnare as $t)
                <li class="px-4 py-2.5 flex items-center justify-between hover:bg-gray-50">
                    <div>
+                        <div class="flex items-center gap-2">
                            <a href="{{ route('territori.show', $t) }}" class="text-sm font-semibold text-gray-900 hover:text-indigo-600">N° {{ $t->numero }}</a>
-                        <p class="text-xs text-gray-500">{{ $t->zona?->nome }} — {{ $t->tipologia?->nome }}</p>
+                            @if($t->is_prioritario)
+                                <span class="inline-flex items-center rounded-full bg-amber-100 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-amber-800">Prioritario</span>
+                            @endif
+                        </div>
+                        <p class="text-xs text-gray-500">
+                            {{ $t->zona?->nome }} — {{ $t->tipologia?->nome }}
+                            @if($t->giorni_giacenza > 0)
+                                — in reparto da {{ $t->giorni_giacenza }} giorni
+                            @endif
+                        </p>
                    </div>
                    @can('territori.assign')
                    <a href="{{ route('assegnazioni.assegna', ['territorioId' => $t->id]) }}" class="text-xs font-medium text-green-600 hover:text-green-800">Assegna →</a>
@@ -67,45 +78,13 @@
                <li class="px-4 py-4 text-sm text-gray-400 text-center">Tutti assegnati</li>
                @endforelse
            </ul>
-            @if($daAssegnare->count() >= 10)
+            @if($territoriDaAssegnare->count() >= 10)
            <div class="px-4 py-2 bg-gray-50 border-t text-center">
                <a href="{{ route('territori.index') }}?filtroStato=in_reparto" class="text-xs text-indigo-600 hover:text-indigo-800">Vedi tutti →</a>
            </div>
            @endif
        </div>

-        {{-- Prioritari --}}
-        <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
-            <div class="px-4 py-3 bg-amber-50 border-b border-amber-100">
-                <h3 class="text-sm font-semibold text-amber-800">★ Prioritari</h3>
-            </div>
-            <ul class="divide-y divide-gray-100">
-                @forelse($prioritari as $t)
-                <li class="px-4 py-2.5 flex items-center justify-between hover:bg-gray-50">
-                    <div>
-                        <a href="{{ route('territori.show', $t) }}" class="text-sm font-semibold text-gray-900 hover:text-indigo-600">N° {{ $t->numero }}</a>
-                        <p class="text-xs text-gray-500">
-                            {{ $t->zona?->nome }}
-                            @if($t->ultimaAssegnazione?->returned_at)
-                            — ultimo rientro {{ $t->ultimaAssegnazione->returned_at->diffForHumans() }}
-                            @endif
-                        </p>
-                    </div>
-                    <span class="text-xs font-medium text-amber-600">
-                        {{ $t->prioritario ? 'Man' : 'Auto' }}
-                    </span>
-                </li>
-                @empty
-                <li class="px-4 py-4 text-sm text-gray-400 text-center">Nessun territorio prioritario</li>
-                @endforelse
-            </ul>
-            @if($prioritari->count() >= 10)
-            <div class="px-4 py-2 bg-gray-50 border-t text-center">
-                <a href="{{ route('territori.index') }}?filtroStato=prioritari" class="text-xs text-indigo-600 hover:text-indigo-800">Vedi tutti →</a>
-            </div>
-            @endif
-        </div>
-
        {{-- Da rientrare --}}
        <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
            <div class="px-4 py-3 bg-red-50 border-b border-red-100">
--- a/resources/views/livewire/registro.blade.php
+++ b/resources/views/livewire/registro.blade.php
@@ -66,8 +66,17 @@
                    @forelse($assegnazioni as $a)
                    <tr class="hover:bg-gray-50">
                        <td class="px-3 py-2">
+                            <div class="flex items-center gap-2">
+                                @if($a->territorio?->thumbnail_path)
+                                    <img src="{{ asset('storage/' . $a->territorio->thumbnail_path) }}"
+                                         alt="Thumbnail territorio {{ $a->territorio?->numero }}"
+                                         class="h-8 w-6 rounded border border-gray-200 object-cover bg-gray-50 flex-none">
+                                @endif
+                                <div class="min-w-0">
                                    <a href="{{ route('territori.show', $a->territorio_id) }}" class="text-indigo-600 hover:underline font-medium">N° {{ $a->territorio?->numero }}</a>
                                    <span class="text-xs text-gray-400 ml-1">{{ $a->territorio?->zona?->nome }}</span>
+                                </div>
+                            </div>
                        </td>
                        <td class="px-3 py-2">{{ $a->proclamatore?->nome_completo ?? 'N/A' }}</td>
                        <td class="px-3 py-2">{{ $a->assigned_at->format('d/m/Y') }}</td>
@@ -89,6 +98,14 @@
                        </td>
                        @can('settings.manage')
                        <td class="px-3 py-2 whitespace-nowrap">
+                            @can('territori.return')
+                            @if(!$a->returned_at)
+                            <a href="{{ route('assegnazioni.rientra', ['assegnazione' => $a->id]) }}"
+                               class="inline-block text-xs font-medium text-red-600 hover:text-red-800 mr-3">
+                                Rientra
+                            </a>
+                            @endif
+                            @endcan
                            <button wire:click="openEdit({{ $a->id }})"
                                    style="background:#e0e7ff;color:#4338ca;border:none;border-radius:6px;padding:4px 10px;font-size:12px;cursor:pointer;margin-right:4px;">
                                Modifica
@@ -102,7 +119,7 @@
                    </tr>
                    @empty
                    <tr>
-                        <td colspan="7" class="px-4 py-8 text-center text-gray-500">Nessuna assegnazione trovata.</td>
+                        <td colspan="8" class="px-4 py-8 text-center text-gray-500">Nessuna assegnazione trovata.</td>
                    </tr>
                    @endforelse
                </tbody>
--- a/resources/views/livewire/settings/settings-edit.blade.php
+++ b/resources/views/livewire/settings/settings-edit.blade.php
@@ -4,16 +4,13 @@
    </div>

    <div class="mb-6 bg-white rounded-xl shadow-sm border border-gray-200 p-4 max-w-lg">
-        <p class="text-sm font-medium text-gray-700 mb-3">Import / Export dati XML</p>
+        <p class="text-sm font-medium text-gray-700 mb-3">Sezione Import</p>
        <div class="flex flex-wrap gap-2">
-            <a href="{{ route('xml.exchange') }}" class="inline-flex items-center px-4 py-2 text-sm font-medium text-white bg-amber-600 rounded-lg hover:bg-amber-700 transition">
-                Import XML
-            </a>
-            <a href="{{ route('xml.exchange') }}" class="inline-flex items-center px-4 py-2 text-sm font-medium text-white bg-emerald-600 rounded-lg hover:bg-emerald-700 transition">
-                Export XML
+            <a href="{{ route('xml.exchange') }}" class="inline-flex items-center px-4 py-2 text-sm font-medium text-white bg-indigo-600 rounded-lg hover:bg-indigo-700 transition">
+                Apri strumenti di import
            </a>
        </div>
-        <p class="text-xs text-gray-500 mt-2">I pulsanti aprono la sezione XML Exchange con gli strumenti di conversione, import e export.</p>
+        <p class="text-xs text-gray-500 mt-2">Qui trovi import PDF territori, conversione legacy SQL, import XML ed export XML.</p>
    </div>

    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6 max-w-lg">
--- a/resources/views/livewire/settings/xml-exchange.blade.php
+++ b/resources/views/livewire/settings/xml-exchange.blade.php
@@ -1,7 +1,245 @@
 <div class="space-y-6">
    <div>
-        <h1 class="text-2xl font-bold text-gray-900">Import/Export XML</h1>
-        <p class="text-sm text-gray-500 mt-1">Converti dump SQL legacy in XML, importa XML nell'app ed esporta i dati correnti in XML.</p>
+        <h1 class="text-2xl font-bold text-gray-900">Import</h1>
+        <p class="text-sm text-gray-500 mt-1">Centro importazioni: PDF territori, conversione legacy SQL, import XML ed export XML.</p>
+    </div>
+
+    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6 space-y-4"
+         x-data="{
+            uploadLog: '',
+            uploadProgress: 0,
+            uploading: false,
+            zipUploading: false,
+            zipProgress: 0,
+            selectedFiles: 0,
+            selectedZip: '',
+            append(message) {
+                this.uploadLog = this.uploadLog ? this.uploadLog + '\n' + message : message;
+            },
+            submitZip(event) {
+                const form = event.target;
+                const formData = new FormData(form);
+
+                this.uploadLog = '';
+                this.zipUploading = true;
+                this.zipProgress = 0;
+                this.append('Upload ZIP diretto al server avviato...');
+
+                const xhr = new XMLHttpRequest();
+                xhr.open('POST', form.action);
+                xhr.setRequestHeader('Accept', 'application/json');
+                xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+
+                xhr.upload.addEventListener('progress', (uploadEvent) => {
+                    if (!uploadEvent.lengthComputable) {
+                        return;
+                    }
+
+                    this.zipProgress = Math.round((uploadEvent.loaded / uploadEvent.total) * 100);
+                });
+
+                xhr.addEventListener('load', () => {
+                    this.zipUploading = false;
+
+                    let payload = {};
+
+                    try {
+                        payload = JSON.parse(xhr.responseText || '{}');
+                    } catch (error) {
+                        payload = {};
+                    }
+
+                    if (xhr.status >= 200 && xhr.status < 300) {
+                        this.zipProgress = 100;
+                        this.append('Archivio ricevuto. Reindirizzamento alla console import...');
+                        window.location = payload.redirect_url || window.location.href;
+                        return;
+                    }
+
+                    const message = payload.message || (payload.errors && payload.errors.pdfZip ? payload.errors.pdfZip[0] : 'Errore durante il caricamento dello ZIP.');
+                    this.append(message);
+                });
+
+                xhr.addEventListener('error', () => {
+                    this.zipUploading = false;
+                    this.append('Errore di rete durante il caricamento dello ZIP.');
+                });
+
+                xhr.send(formData);
+            }
+         }"
+         x-on:livewire-upload-start="if ($event.detail.id === 'pdfFolder') { uploading = true; uploadProgress = 0; append('Upload cartella avviato...'); }"
+         x-on:livewire-upload-progress="if ($event.detail.id === 'pdfFolder') { uploadProgress = $event.detail.progress; append('Upload Livewire in corso: ' + $event.detail.progress + '%'); }"
+         x-on:livewire-upload-finish="if ($event.detail.id === 'pdfFolder') { uploading = false; uploadProgress = 100; append('Upload completato. Avvio preparazione import lato server...'); }"
+         x-on:livewire-upload-error="if ($event.detail.id === 'pdfFolder') { uploading = false; append('Errore durante l\'upload temporaneo dei file.'); }">
+        <h2 class="text-lg font-semibold text-gray-900">Import PDF territori</h2>
+        <p class="text-xs text-gray-500">Puoi importare una cartella di PDF oppure, meglio per archivi grandi, un file ZIP contenente i PDF. Il nome file puo variare: basta che contenga il numero di un territorio gia presente nell'app. I PDF verranno associati ai territori esistenti e verra generata anche la thumbnail.</p>
+
+        <form wire:submit.prevent="importTerritoryPdfFolder" class="space-y-4">
+            <div>
+                <input wire:model="pdfFolder"
+                       x-on:change="selectedFiles = $event.target.files.length; uploadLog = ''; if (selectedFiles > 0) { append('Cartella selezionata: ' + selectedFiles + ' file.'); append('In attesa dell\'upload temporaneo Livewire...'); }"
+                       type="file"
+                       multiple
+                       webkitdirectory
+                       directory
+                       accept=".pdf,application/pdf"
+                       class="block w-full text-sm text-gray-600 file:mr-3 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-medium file:bg-indigo-50 file:text-indigo-700 hover:file:bg-indigo-100">
+                @error('pdfFolder') <p class="text-red-500 text-xs mt-1">{{ $message }}</p> @enderror
+                @error('pdfFolder.*') <p class="text-red-500 text-xs mt-1">{{ $message }}</p> @enderror
+            </div>
+
+            <div x-show="selectedFiles > 0 || uploading" x-cloak class="rounded-lg border border-indigo-100 bg-indigo-50 px-3 py-3">
+                <div class="flex items-center justify-between gap-3 text-xs text-indigo-800">
+                    <span x-text="uploading ? 'Upload file in corso...' : 'Upload file pronto'"></span>
+                    <span x-text="selectedFiles > 0 ? selectedFiles + ' file selezionati' : ''"></span>
+                </div>
+                <div class="mt-2 h-2 overflow-hidden rounded-full bg-indigo-100">
+                    <div class="h-full rounded-full bg-indigo-600 transition-all duration-300" :style="'width:' + uploadProgress + '%' "></div>
+                </div>
+            </div>
+
+            <div class="flex flex-col gap-3 sm:flex-row sm:items-center">
+                <button
+                    type="submit"
+                    class="px-4 py-2 text-sm font-medium text-white bg-indigo-600 rounded-lg hover:bg-indigo-700 transition border border-indigo-700"
+                    style="display:inline-flex;align-items:center;justify-content:center;min-height:40px;background:#4f46e5;color:#fff;border:1px solid #3730a3;border-radius:10px;padding:10px 14px;"
+                    wire:loading.attr="disabled"
+                    @disabled(empty($pdfFolder))
+                >
+                    Importa PDF territori
+                </button>
+                <div wire:loading wire:target="importTerritoryPdfFolder" class="text-sm text-indigo-700">Preparazione import in corso...</div>
+            </div>
+        </form>
+
+        <div class="border-t border-gray-200 pt-4">
+            <h3 class="text-sm font-semibold text-gray-900">Import da archivio ZIP</h3>
+            <p class="mt-1 text-xs text-gray-500">Consigliato per grandi volumi: carichi un solo file e il server estrae automaticamente tutti i PDF.</p>
+
+            <form action="{{ route('imports.territori.pdf-zip') }}" method="POST" enctype="multipart/form-data" class="mt-3 space-y-4" @submit.prevent="submitZip">
+                @csrf
+                <div>
+                    <input name="pdfZip"
+                           x-on:change="selectedZip = $event.target.files[0] ? $event.target.files[0].name : ''; uploadLog = ''; zipProgress = 0; if (selectedZip) { append('Archivio ZIP selezionato: ' + selectedZip); append('Pronto per upload diretto al server.'); }"
+                           type="file"
+                           accept=".zip,application/zip"
+                           class="block w-full text-sm text-gray-600 file:mr-3 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-medium file:bg-emerald-50 file:text-emerald-700 hover:file:bg-emerald-100">
+                    @error('pdfZip') <p class="text-red-500 text-xs mt-1">{{ $message }}</p> @enderror
+                </div>
+
+                <div x-show="selectedZip || zipUploading" x-cloak class="rounded-lg border border-emerald-100 bg-emerald-50 px-3 py-3">
+                    <div class="flex items-center justify-between gap-3 text-xs text-emerald-800">
+                        <span x-text="zipUploading ? 'Upload ZIP in corso...' : 'ZIP pronto per l\'invio' "></span>
+                        <span x-text="selectedZip"></span>
+                    </div>
+                    <div class="mt-2 h-2 overflow-hidden rounded-full bg-emerald-100">
+                        <div class="h-full rounded-full bg-emerald-600 transition-all duration-300" :style="'width:' + zipProgress + '%' "></div>
+                    </div>
+                </div>
+
+                <div class="flex flex-col gap-3 sm:flex-row sm:items-center">
+                    <button
+                        type="submit"
+                        class="px-4 py-2 text-sm font-medium text-white bg-emerald-600 rounded-lg hover:bg-emerald-700 transition border border-emerald-700"
+                        style="display:inline-flex;align-items:center;justify-content:center;min-height:40px;background:#059669;color:#fff;border:1px solid #065f46;border-radius:10px;padding:10px 14px;"
+                        x-bind:disabled="!selectedZip || zipUploading"
+                    >
+                        Importa ZIP PDF
+                    </button>
+                    <div x-show="zipUploading" x-cloak class="text-sm text-emerald-700">Caricamento ZIP diretto in corso...</div>
+                </div>
+            </form>
+        </div>
+
+        <div x-show="uploadLog || uploading || zipUploading || selectedZip" x-cloak>
+            <div class="mb-2 text-sm font-medium text-gray-800">Console upload</div>
+            <textarea readonly rows="8" x-bind:value="uploadLog" class="block w-full rounded-lg border border-gray-300 bg-gray-950 px-3 py-3 font-mono text-xs leading-5 text-gray-100 focus:border-indigo-500 focus:ring-indigo-500"></textarea>
+        </div>
+
+        @if($currentPdfImportId && (!empty($pdfImportStats) || !empty($pdfImportLogs)))
+        <div class="rounded-xl border border-indigo-200 bg-indigo-50/40 p-4" @if(in_array($pdfImportStatus, ['queued', 'running'], true)) wire:poll.1000ms="refreshPdfImportStatus" @endif>
+            <div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
+                <div>
+                    <div class="text-sm font-medium text-gray-800">Stato import PDF</div>
+                    <div class="mt-1 text-xs text-gray-500">ID import: {{ $currentPdfImportId }}</div>
+                </div>
+                <span class="inline-flex items-center rounded-full px-2.5 py-1 text-xs font-semibold
+                    {{ match($pdfImportStatus) {
+                        'queued' => 'bg-amber-100 text-amber-800',
+                        'running' => 'bg-blue-100 text-blue-800',
+                        'completed' => 'bg-green-100 text-green-800',
+                        'failed' => 'bg-red-100 text-red-800',
+                        default => 'bg-gray-100 text-gray-700',
+                    } }}">
+                    {{ match($pdfImportStatus) {
+                        'queued' => 'In coda',
+                        'running' => 'In esecuzione',
+                        'completed' => 'Completato',
+                        'failed' => 'Fallito',
+                        default => 'Inattivo',
+                    } }}
+                </span>
+            </div>
+
+            @if(!empty($pdfImportStats))
+            <div class="mt-4 grid grid-cols-2 gap-3 text-sm sm:grid-cols-4">
+                <div class="rounded-lg bg-white px-3 py-2 border border-gray-200">
+                    <div class="text-xs text-gray-500">Processati</div>
+                    <div class="font-semibold text-gray-900">{{ $pdfImportStats['processed'] ?? 0 }} / {{ $pdfImportStats['total'] ?? 0 }}</div>
+                </div>
+                <div class="rounded-lg bg-green-50 px-3 py-2 border border-green-100">
+                    <div class="text-xs text-green-700">Aggiornati</div>
+                    <div class="font-semibold text-green-900">{{ $pdfImportStats['updated'] ?? 0 }}</div>
+                </div>
+                <div class="rounded-lg bg-amber-50 px-3 py-2 border border-amber-100">
+                    <div class="text-xs text-amber-700">Saltati</div>
+                    <div class="font-semibold text-amber-900">{{ $pdfImportStats['skipped'] ?? 0 }}</div>
+                </div>
+                <div class="rounded-lg bg-red-50 px-3 py-2 border border-red-100">
+                    <div class="text-xs text-red-700">Errori</div>
+                    <div class="font-semibold text-red-900">{{ $pdfImportStats['errors'] ?? 0 }}</div>
+                </div>
+            </div>
+            @endif
+
+            <div class="mt-4">
+                <div class="mb-2 flex items-center justify-between gap-3">
+                    <div class="text-sm font-medium text-gray-800">Log import PDF</div>
+                    <button type="button" wire:click="refreshPdfImportStatus" class="inline-flex items-center justify-center rounded-lg border border-gray-300 px-3 py-1.5 text-xs font-medium text-gray-700 hover:bg-white transition">
+                        Aggiorna log
+                    </button>
+                </div>
+                <textarea readonly rows="12" class="block w-full rounded-lg border border-gray-300 bg-gray-950 px-3 py-3 font-mono text-xs leading-5 text-gray-100 focus:border-indigo-500 focus:ring-indigo-500 sm:rows-14">{{ $pdfImportLogText }}</textarea>
+            </div>
+
+            @if(!empty($pdfImportIssues))
+            <div class="mt-4">
+                <div class="mb-2 text-sm font-medium text-gray-800">Riepilogo file non associati o problematici</div>
+                <div class="overflow-x-auto rounded-lg border border-gray-200 bg-white">
+                    <table class="min-w-full divide-y divide-gray-200 text-sm">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th class="px-3 py-2 text-left text-xs font-medium uppercase text-gray-500">File</th>
+                                <th class="px-3 py-2 text-left text-xs font-medium uppercase text-gray-500">Motivo</th>
+                                <th class="px-3 py-2 text-left text-xs font-medium uppercase text-gray-500">Territori rilevati</th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-100">
+                            @foreach($pdfImportIssues as $issue)
+                            <tr>
+                                <td class="px-3 py-2 text-gray-900">{{ $issue['file'] ?? '-' }}</td>
+                                <td class="px-3 py-2 text-gray-600">{{ $issue['message'] ?? '-' }}</td>
+                                <td class="px-3 py-2 text-gray-600">{{ !empty($issue['matched_numbers']) ? implode(', ', $issue['matched_numbers']) : '-' }}</td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            @endif
+        </div>
+        @endif
    </div>

    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6 space-y-4">
--- a/resources/views/livewire/territori/territorio-index.blade.php
+++ b/resources/views/livewire/territori/territorio-index.blade.php
@@ -12,8 +12,8 @@

    {{-- Filters --}}
    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-4 mb-4">
-        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
-            <input wire:model.live.debounce.300ms="search" type="text" placeholder="Cerca numero..."
+        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 xl:grid-cols-7 gap-3">
+            <input wire:model.live.debounce.300ms="search" type="text" placeholder="Cerca numero, zona, tipologia, note..."
                   class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
            <select wire:model.live="filterZona" class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
                <option value="">Tutte le zone</option>
@@ -30,10 +30,46 @@
            <select wire:model.live="filterStato" class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
                <option value="">Tutti gli stati</option>
                <option value="in_reparto">In reparto</option>
+                <option value="prioritari">Prioritari</option>
                <option value="assegnato">Assegnato</option>
                <option value="da_rientrare">Da rientrare</option>
                <option value="inattivo">Inattivo</option>
            </select>
+            <select wire:model.live="filterPriorita" class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                <option value="">Tutte le priorita</option>
+                <option value="prioritari">Solo prioritari</option>
+                <option value="manuali">Prioritari manuali</option>
+                <option value="automatici">Prioritari automatici</option>
+                <option value="non_prioritari">Solo non prioritari</option>
+            </select>
+            <select wire:model.live="filterPdf" class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                <option value="">PDF e thumbnail</option>
+                <option value="con_pdf">Con PDF</option>
+                <option value="senza_pdf">Senza PDF</option>
+                <option value="con_thumbnail">Con thumbnail</option>
+                <option value="senza_thumbnail">Senza thumbnail</option>
+            </select>
+            <select wire:model.live="filterContenuti" class="rounded-lg border-gray-300 text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                <option value="">Note e confini</option>
+                <option value="con_note">Con note</option>
+                <option value="senza_note">Senza note</option>
+                <option value="con_confini">Con confini</option>
+                <option value="senza_confini">Senza confini</option>
+            </select>
+        </div>
+        <div class="mt-3 flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
+            <p class="text-xs text-gray-500">
+                @if($usesPriorityOrdering)
+                    Ordinamento attivo: prioritari prima, poi territori con piu tempo in reparto.
+                @else
+                    Ordinamento predefinito: numero territorio dal piu piccolo al piu grande.
+                @endif
+            </p>
+            <button wire:click="clearFilters"
+                    type="button"
+                    class="inline-flex items-center justify-center rounded-lg border border-gray-300 px-3 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 transition">
+                Azzera filtri
+            </button>
        </div>
    </div>

@@ -57,7 +93,14 @@
                    @forelse($territori as $territorio)
                    <tr class="hover:bg-gray-50">
                        <td class="px-4 py-3 text-sm font-semibold text-gray-900">
+                            <div class="flex items-center gap-2">
+                                @if($territorio->thumbnail_path)
+                                    <img src="{{ asset('storage/' . $territorio->thumbnail_path) }}"
+                                         alt="Thumbnail territorio {{ $territorio->numero }}"
+                                         class="h-8 w-6 rounded border border-gray-200 object-cover bg-gray-50 flex-none">
+                                @endif
                                <a href="{{ route('territori.show', $territorio) }}" class="hover:text-indigo-600">{{ $territorio->numero }}</a>
+                            </div>
                        </td>
                        <td class="px-4 py-3 text-sm text-gray-600">{{ $territorio->zona?->nome ?? '-' }}</td>
                        <td class="px-4 py-3 text-sm text-gray-600">{{ $territorio->tipologia?->nome ?? '-' }}</td>
@@ -85,6 +128,11 @@
                        </td>
                        <td class="px-4 py-3 text-sm text-right space-x-1">
                            <a href="{{ route('territori.show', $territorio) }}" class="text-indigo-600 hover:text-indigo-800 text-xs font-medium">Dettaglio</a>
+                            @can('territori.return')
+                            @if($territorio->assegnazioneCorrente)
+                            <a href="{{ route('assegnazioni.rientra', ['assegnazione' => $territorio->assegnazioneCorrente->id]) }}" class="text-red-600 hover:text-red-800 text-xs font-medium">Rientra</a>
+                            @endif
+                            @endcan
                            <a href="{{ route('territori.edit', $territorio) }}" class="text-gray-600 hover:text-gray-800 text-xs font-medium">Modifica</a>
                            <button wire:click="toggleActive({{ $territorio->id }})" class="text-xs font-medium {{ $territorio->attivo ? 'text-amber-600 hover:text-amber-800' : 'text-green-600 hover:text-green-800' }}">
                                {{ $territorio->attivo ? 'Disattiva' : 'Attiva' }}
--- a/resources/views/livewire/territori/territorio-show.blade.php
+++ b/resources/views/livewire/territori/territorio-show.blade.php
@@ -4,8 +4,15 @@
            <h1 class="text-2xl font-bold text-gray-900">Territorio {{ $territorio->numero }}</h1>
            <a href="{{ route('territori.index') }}" class="text-sm text-indigo-600 hover:text-indigo-800">← Torna alla lista</a>
        </div>
+        <div class="flex items-center gap-2">
+            @can('territori.return')
+            @if($territorio->assegnazioneCorrente)
+                <a href="{{ route('assegnazioni.rientra', ['assegnazione' => $territorio->assegnazioneCorrente->id]) }}" class="px-4 py-2 text-sm font-medium text-white bg-red-600 rounded-lg hover:bg-red-700 transition">Rientra</a>
+            @endif
+            @endcan
            <a href="{{ route('territori.edit', $territorio) }}" class="px-4 py-2 text-sm font-medium text-white bg-indigo-600 rounded-lg hover:bg-indigo-700 transition">Modifica</a>
        </div>
+    </div>

    {{-- Info card --}}
    <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6 mb-6">
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php

 use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\Settings\TerritoryPdfImportController;
 use App\Http\Controllers\Auth\LoginController;
 use App\Livewire\Home;
 use App\Livewire\Territori\TerritorioIndex;
@@ -107,6 +108,7 @@ Route::middleware('auth')->group(function () {
        Route::get('zone', ZoneIndex::class)->name('zone.index');
        Route::get('tipologie', TipologieIndex::class)->name('tipologie.index');
        Route::get('xml-exchange', XmlExchange::class)->name('xml.exchange');
+        Route::post('imports/territori/pdf-zip', [TerritoryPdfImportController::class, 'storeZip'])->name('imports.territori.pdf-zip');
    });

    // Privacy / Informativa GDPR
--- a/storage/app/livewire-tmp/8FqixhiMFw5CGYHNfcvt9RXe0tKalv-metaVEVSUklUT1JJTyA5LnBkZg==-.pdf
+++ b/storage/app/livewire-tmp/8FqixhiMFw5CGYHNfcvt9RXe0tKalv-metaVEVSUklUT1JJTyA5LnBkZg==-.pdf
--- a/storage/app/livewire-tmp/9AjKmI3B2nXz3odxkCv1DlWQIbuw9b-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/9AjKmI3B2nXz3odxkCv1DlWQIbuw9b-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/FVHGo6gZ9TayUBwXq2sTc1IZMiq0k8-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
+++ b/storage/app/livewire-tmp/FVHGo6gZ9TayUBwXq2sTc1IZMiq0k8-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
--- a/storage/app/livewire-tmp/J2IV9G47wEqymn23iUvNZT4nLqtzeT-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/J2IV9G47wEqymn23iUvNZT4nLqtzeT-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/RnlqUwaKWQYHsIejd4p7UfAwXH0Mv3-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/RnlqUwaKWQYHsIejd4p7UfAwXH0Mv3-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/beDPzrePFf3jfn7M9LbV5SMsO9YZBv-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/beDPzrePFf3jfn7M9LbV5SMsO9YZBv-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/dGhBFARO9PS93KtVuF7S1O6MpSo0S1-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/dGhBFARO9PS93KtVuF7S1O6MpSo0S1-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/hCdgdr5ijV0hcvzWqUZ3oQ02jdaIWG-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/hCdgdr5ijV0hcvzWqUZ3oQ02jdaIWG-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/lKn6c7zf7u4QCxrxWUUapjRGSb7zIU-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/lKn6c7zf7u4QCxrxWUUapjRGSb7zIU-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/nZufby3LDZrzLhyQ3ZH9q6kZkp7qLl-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
+++ b/storage/app/livewire-tmp/nZufby3LDZrzLhyQ3ZH9q6kZkp7qLl-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
--- a/storage/app/livewire-tmp/s3YcARTOhPe0fx7r3JK3iI3Zm0vbBw-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
+++ b/storage/app/livewire-tmp/s3YcARTOhPe0fx7r3JK3iI3Zm0vbBw-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
--- a/storage/app/livewire-tmp/tTMZxzc3r7vjTiTQi73BaR6k56p52D-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
+++ b/storage/app/livewire-tmp/tTMZxzc3r7vjTiTQi73BaR6k56p52D-metadGVybWFuYWdlci1jb252ZXJzaW9uLnhtbA==-.xml
--- a/storage/app/livewire-tmp/xA6jpyJnKAnXhnaxcVugQfge0WP0fd-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
+++ b/storage/app/livewire-tmp/xA6jpyJnKAnXhnaxcVugQfge0WP0fd-metaVEVSUklUT1JJTyAxMDAucGRm-.pdf
--- a/storage/app/livewire-tmp/xRrGxeAfqbetviRXwo7dCv1unymrMO-metaVEVSUklUT1JJTyA5LnBkZg==-.pdf
+++ b/storage/app/livewire-tmp/xRrGxeAfqbetviRXwo7dCv1unymrMO-metaVEVSUklUT1JJTyA5LnBkZg==-.pdf
--- a/storage/app/public/territori-thumbnails/Fju1L1OpyLLkwGXFOdkT6CGrxeeTgHhgyHnhOksy.png
+++ b/storage/app/public/territori-thumbnails/Fju1L1OpyLLkwGXFOdkT6CGrxeeTgHhgyHnhOksy.png
--- a/storage/app/public/territori-thumbnails/nCFpqSLnPB8GM6SkQpI4GIJ1N5MLz2EPujHSBUdQ.png
+++ b/storage/app/public/territori-thumbnails/nCFpqSLnPB8GM6SkQpI4GIJ1N5MLz2EPujHSBUdQ.png