From d9421c91598dee1b334b13e82f44c432810bc544 Mon Sep 17 00:00:00 2001 From: Inext68 Date: Tue, 9 Jun 2026 12:04:03 +0200 Subject: [PATCH 1/3] ver 2.0.1.1 --- vendor/composer/autoload_classmap.php | 3 +++ vendor/composer/autoload_static.php | 3 +++ vendor/composer/installed.php | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 8bb607ad..b8f0b910 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -38,6 +38,7 @@ return array( 'App\\Http\\Controllers\\MailingController' => $baseDir . '/app/Http/Controllers/MailingController.php', 'App\\Http\\Controllers\\MailingListController' => $baseDir . '/app/Http/Controllers/MailingListController.php', 'App\\Http\\Controllers\\ReportController' => $baseDir . '/app/Http/Controllers/ReportController.php', + 'App\\Http\\Controllers\\RicercaController' => $baseDir . '/app/Http/Controllers/RicercaController.php', 'App\\Http\\Controllers\\StorageRepositoryController' => $baseDir . '/app/Http/Controllers/StorageRepositoryController.php', 'App\\Http\\Controllers\\VistaReportController' => $baseDir . '/app/Http/Controllers/VistaReportController.php', 'App\\Http\\Middleware\\AdminOnly' => $baseDir . '/app/Http/Middleware/AdminOnly.php', @@ -67,6 +68,7 @@ return array( 'App\\Models\\Ruolo' => $baseDir . '/app/Models/Ruolo.php', 'App\\Models\\SenderAccount' => $baseDir . '/app/Models/SenderAccount.php', 'App\\Models\\StorageRepository' => $baseDir . '/app/Models/StorageRepository.php', + 'App\\Models\\Tag' => $baseDir . '/app/Models/Tag.php', 'App\\Models\\Tenant' => $baseDir . '/app/Models/Tenant.php', 'App\\Models\\TipologiaDocumento' => $baseDir . '/app/Models/TipologiaDocumento.php', 'App\\Models\\TipologiaEvento' => $baseDir . '/app/Models/TipologiaEvento.php', @@ -79,6 +81,7 @@ return array( 'App\\Services\\GoogleCalendarSyncService' => $baseDir . '/app/Services/GoogleCalendarSyncService.php', 'App\\Services\\IcsExportService' => $baseDir . '/app/Services/IcsExportService.php', 'App\\Services\\StorageRepositoryService' => $baseDir . '/app/Services/StorageRepositoryService.php', + 'App\\Traits\\HasTagsLight' => $baseDir . '/app/Traits/HasTagsLight.php', 'As247\\CloudStorages\\Cache\\PathCache' => $vendorDir . '/as247/cloud-storages/src/Cache/PathCache.php', 'As247\\CloudStorages\\Cache\\Stores\\ArrayStore' => $vendorDir . '/as247/cloud-storages/src/Cache/Stores/ArrayStore.php', 'As247\\CloudStorages\\Cache\\Stores\\GoogleDrivePersistentStore' => $vendorDir . '/as247/cloud-storages/src/Cache/Stores/GoogleDrivePersistentStore.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ee022808..cbd181be 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -650,6 +650,7 @@ class ComposerStaticInit74199c0a3889e8d1256a25f93805ef56 'App\\Http\\Controllers\\MailingController' => __DIR__ . '/../..' . '/app/Http/Controllers/MailingController.php', 'App\\Http\\Controllers\\MailingListController' => __DIR__ . '/../..' . '/app/Http/Controllers/MailingListController.php', 'App\\Http\\Controllers\\ReportController' => __DIR__ . '/../..' . '/app/Http/Controllers/ReportController.php', + 'App\\Http\\Controllers\\RicercaController' => __DIR__ . '/../..' . '/app/Http/Controllers/RicercaController.php', 'App\\Http\\Controllers\\StorageRepositoryController' => __DIR__ . '/../..' . '/app/Http/Controllers/StorageRepositoryController.php', 'App\\Http\\Controllers\\VistaReportController' => __DIR__ . '/../..' . '/app/Http/Controllers/VistaReportController.php', 'App\\Http\\Middleware\\AdminOnly' => __DIR__ . '/../..' . '/app/Http/Middleware/AdminOnly.php', @@ -679,6 +680,7 @@ class ComposerStaticInit74199c0a3889e8d1256a25f93805ef56 'App\\Models\\Ruolo' => __DIR__ . '/../..' . '/app/Models/Ruolo.php', 'App\\Models\\SenderAccount' => __DIR__ . '/../..' . '/app/Models/SenderAccount.php', 'App\\Models\\StorageRepository' => __DIR__ . '/../..' . '/app/Models/StorageRepository.php', + 'App\\Models\\Tag' => __DIR__ . '/../..' . '/app/Models/Tag.php', 'App\\Models\\Tenant' => __DIR__ . '/../..' . '/app/Models/Tenant.php', 'App\\Models\\TipologiaDocumento' => __DIR__ . '/../..' . '/app/Models/TipologiaDocumento.php', 'App\\Models\\TipologiaEvento' => __DIR__ . '/../..' . '/app/Models/TipologiaEvento.php', @@ -691,6 +693,7 @@ class ComposerStaticInit74199c0a3889e8d1256a25f93805ef56 'App\\Services\\GoogleCalendarSyncService' => __DIR__ . '/../..' . '/app/Services/GoogleCalendarSyncService.php', 'App\\Services\\IcsExportService' => __DIR__ . '/../..' . '/app/Services/IcsExportService.php', 'App\\Services\\StorageRepositoryService' => __DIR__ . '/../..' . '/app/Services/StorageRepositoryService.php', + 'App\\Traits\\HasTagsLight' => __DIR__ . '/../..' . '/app/Traits/HasTagsLight.php', 'As247\\CloudStorages\\Cache\\PathCache' => __DIR__ . '/..' . '/as247/cloud-storages/src/Cache/PathCache.php', 'As247\\CloudStorages\\Cache\\Stores\\ArrayStore' => __DIR__ . '/..' . '/as247/cloud-storages/src/Cache/Stores/ArrayStore.php', 'As247\\CloudStorages\\Cache\\Stores\\GoogleDrivePersistentStore' => __DIR__ . '/..' . '/as247/cloud-storages/src/Cache/Stores/GoogleDrivePersistentStore.php', diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ae6cd0c4..76e35e83 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'laravel/laravel', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '7d7d384a0d719ca6fa83e01e50577b94c877e676', + 'reference' => '7999c663fe184a13576026be3af0abc1d91d036d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -427,7 +427,7 @@ 'laravel/laravel' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '7d7d384a0d719ca6fa83e01e50577b94c877e676', + 'reference' => '7999c663fe184a13576026be3af0abc1d91d036d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), From 0dd567cf7a14c6f8d125b31379e83e88a32719d3 Mon Sep 17 00:00:00 2001 From: Inext68 Date: Wed, 10 Jun 2026 06:42:49 +0200 Subject: [PATCH 2/3] email documenti --- app/Http/Controllers/EmailController.php | 17 +++- resources/views/email/compose.blade.php | 114 ++++++++++++++++++++++- soci2026-finale.csv | 114 +++++++++++++++++++++++ 3 files changed, 240 insertions(+), 5 deletions(-) create mode 100644 soci2026-finale.csv diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index 59ae9601..f2fab65a 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -94,6 +94,8 @@ class EmailController extends Controller $individui = Individuo::orderBy('cognome')->orderBy('nome')->get(); $senderAccounts = SenderAccount::active()->get(); + $documenti = Documento::orderBy('nome_file')->get(); + $prefill = []; if ($request->reply_to) { $original = EmailMessage::find($request->reply_to); @@ -111,7 +113,7 @@ class EmailController extends Controller } } - return view('email.compose', compact('folders', 'mailingLists', 'gruppi', 'individui', 'prefill', 'senderAccounts')); + return view('email.compose', compact('folders', 'mailingLists', 'gruppi', 'individui', 'documenti', 'prefill', 'senderAccounts')); } public function send(Request $request) @@ -565,6 +567,7 @@ class EmailController extends Controller private function processAttachments(Request $request): array { $paths = []; + if ($request->hasFile('allegati')) { foreach ($request->file('allegati') as $file) { if ($file->isValid()) { @@ -572,6 +575,18 @@ class EmailController extends Controller } } } + + $documentIds = $request->input('documenti_selezionati'); + if (!empty($documentIds)) { + $ids = is_array($documentIds) ? $documentIds : explode(',', $documentIds); + $docs = Documento::whereIn('id', $ids)->get(); + foreach ($docs as $doc) { + if ($doc->file_path && Storage::exists($doc->file_path)) { + $paths[] = Storage::path($doc->file_path); + } + } + } + return $paths; } diff --git a/resources/views/email/compose.blade.php b/resources/views/email/compose.blade.php index fa664833..b28cf6c4 100644 --- a/resources/views/email/compose.blade.php +++ b/resources/views/email/compose.blade.php @@ -87,10 +87,17 @@
- +
+ + +
+
+
@@ -110,10 +117,62 @@ + + @endsection @section('scripts') @endsection diff --git a/resources/views/eventi/index.blade.php b/resources/views/eventi/index.blade.php index eacaa1da..0000e9bf 100644 --- a/resources/views/eventi/index.blade.php +++ b/resources/views/eventi/index.blade.php @@ -5,6 +5,10 @@ @php $canWriteEventi = Auth::user()->canManage('eventi'); $canDeleteEventi = Auth::user()->canDelete('eventi'); +$vistaDefaultJson = isset($vista) ? $vista->toJson() : 'null'; +$visibleColumnsJson = json_encode($visibleColumns ?? []); +$tableColumnsJson = json_encode($tableColumns ?? []); +$entityType = $entityType ?? 'eventi'; @endphp @section('content') @@ -20,6 +24,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi');

Tutti gli Eventi

+ Calendario @@ -75,10 +82,10 @@ $canDeleteEventi = Auth::user()->canDelete('eventi');
- +
- - - - - - - - - + @endif + @if(in_array('created_at', $visibleColumns)) + + @endif @@ -171,6 +194,7 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @if(in_array('nome_evento', $visibleColumns)) + @endif + @if(in_array('descrizione_evento', $visibleColumns)) + @endif + @if(in_array('tipo_evento', $visibleColumns)) + @endif + @if(in_array('tipo_recorrenza', $visibleColumns)) + @endif + @if(in_array('gruppi', $visibleColumns)) + @endif + @if(in_array('responsabili', $visibleColumns)) + @endif + @if(in_array('tag', $visibleColumns)) + @endif + @if(in_array('created_at', $visibleColumns)) + @endif @empty - @@ -284,6 +323,10 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); +@include('partials.table-settings') + + +
+ @if($canDeleteEventi)
@@ -86,7 +93,8 @@ $canDeleteEventi = Auth::user()->canDelete('eventi');
@endif 		+ @if(in_array('nome_evento', $visibleColumns)) + Nome Evento @if(request('sort') === 'nome_evento') @@ -96,7 +104,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @endif + @if(in_array('descrizione_evento', $visibleColumns)) + Descrizione @if(request('sort') === 'descrizione_evento') @@ -106,7 +116,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @endif + @if(in_array('tipo_evento', $visibleColumns)) + Tipologia @if(request('sort') === 'tipo_evento') @@ -116,7 +128,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @endif + @if(in_array('tipo_recorrenza', $visibleColumns)) + Ricorrenza @if(request('sort') === 'tipo_recorrenza') @@ -126,7 +140,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @endif + @if(in_array('gruppi', $visibleColumns)) + Gruppi @if(request('sort') === 'gruppi') @@ -136,7 +152,9 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif + @endif + @if(in_array('responsabili', $visibleColumns)) + Responsabili @if(request('sort') === 'responsabili') @@ -146,8 +164,12 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif Tag + @endif + @if(in_array('tag', $visibleColumns)) + Tag Creato @if(request('sort') === 'created_at') @@ -157,6 +179,7 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); @endif Azioni
@@ -180,7 +204,11 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); Incluso @endif {{ Str::limit($evento->descrizione_evento, 50) ?: '-' }} @if($evento->tipo_evento) @php @@ -195,6 +223,8 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); - @endif @if($evento->tipo_recorrenza && $evento->tipo_recorrenza !== 'singolo') {{ $evento->periodicita_label }} @@ -202,6 +232,8 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); Singolo @endif @forelse($evento->gruppi->take(2) as $gruppo) @@ -214,6 +246,8 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); +{{ $evento->gruppi->count() - 2 }} @endif @forelse($evento->responsabili->take(2) as $resp) {{ $resp->nome_completo }}
@@ -224,12 +258,17 @@ $canDeleteEventi = Auth::user()->canDelete('eventi'); +{{ $evento->responsabili->count() - 2 }} altri @endif 		@foreach($evento->tags as $tag) {{ $tag->name }} @endforeach {{ $evento->created_at->format('d/m/Y') }} @@ -249,7 +288,7 @@ $canDeleteEventi = Auth::user()->canDelete('eventi');
+

Nessun evento trovato
- @if(in_array('nome', $visibleColumns)) - + @endif @if(in_array('descrizione', $visibleColumns)) - + @endif @if(in_array('diocesi', $visibleColumns)) - + @endif @if(in_array('livello', $visibleColumns)) - + @endif @if(in_array('padre', $visibleColumns)) - + @endif @if(in_array('membri', $visibleColumns)) - + @endif @if(in_array('responsabili', $visibleColumns)) - + @endif @if(in_array('indirizzo', $visibleColumns)) - + @endif @if(in_array('citta', $visibleColumns)) - + @endif @if(in_array('telefono', $visibleColumns)) - + @endif @if(in_array('email', $visibleColumns)) - + @endif @if(in_array('tag', $visibleColumns)) - + @endif - + @@ -263,93 +269,7 @@ $visibleColumnsJson = json_encode($visibleColumns); @endif - - {{-- MODAL: Gestione Tag massiva --}}
+
Nome Nome Descrizione Descrizione DiocesiDiocesiLivelloLivelloGruppo PadreGruppo PadreMembriMembriResponsabiliResponsabiliIndirizzoIndirizzoCittàCittàTelefonoTelefonoEmailEmailTagTagAzioniAzioni
- @endif + @if(in_array('data_nascita', $visibleColumns)) + + @endif + @if(in_array('genere', $visibleColumns)) + + @endif + @if(in_array('indirizzo', $visibleColumns)) + + @endif + @if(in_array('cap', $visibleColumns)) + + @endif + @if(in_array('citta', $visibleColumns)) + + @endif + @if(in_array('provincia', $visibleColumns)) + + @endif + @if(in_array('tipo_documento', $visibleColumns)) + + @endif + @if(in_array('numero_documento', $visibleColumns)) + + @endif + @if(in_array('scadenza_documento', $visibleColumns)) + + @endif + @if(in_array('note', $visibleColumns)) + + @endif + @if(in_array('created_at', $visibleColumns)) + + @endif @if(in_array('email', $visibleColumns)) @endif @@ -160,9 +198,9 @@ $canDeleteIndividui = Auth::user()->canDelete('individui'); @endif @if(in_array('tag', $visibleColumns)) - + @endif - + @@ -187,6 +225,39 @@ $canDeleteIndividui = Auth::user()->canDelete('individui'); {{ $ind->nome }} @endif + @if(in_array('data_nascita', $visibleColumns)) + + @endif + @if(in_array('genere', $visibleColumns)) + + @endif + @if(in_array('indirizzo', $visibleColumns)) + + @endif + @if(in_array('cap', $visibleColumns)) + + @endif + @if(in_array('citta', $visibleColumns)) + + @endif + @if(in_array('provincia', $visibleColumns)) + + @endif + @if(in_array('tipo_documento', $visibleColumns)) + + @endif + @if(in_array('numero_documento', $visibleColumns)) + + @endif + @if(in_array('scadenza_documento', $visibleColumns)) + + @endif + @if(in_array('note', $visibleColumns)) + + @endif + @if(in_array('created_at', $visibleColumns)) + + @endif @if(in_array('email', $visibleColumns)) @endif @@ -266,75 +337,7 @@ $canDeleteIndividui = Auth::user()->canDelete('individui'); @endif - -
+
@@ -153,6 +158,39 @@ $canDeleteIndividui = Auth::user()->canDelete('individui'); @if(in_array('nome', $visibleColumns))
Nome Data NascitaGenereIndirizzoCAPCittàProv.Tipo Doc.N. DocumentoScad. Doc.NoteCreato ilEmail Telefono TagTagAzioniAzioni
{{ $ind->data_nascita ? $ind->data_nascita->format('d/m/Y') : '-' }}{{ $ind->genere ?? '-' }}{{ $ind->indirizzo ?? '-' }}{{ $ind->cap ?? '-' }}{{ $ind->città ?? '-' }}{{ $ind->sigla_provincia ?? '-' }}{{ $ind->tipo_documento ? str_replace(['carta_identita', 'patente'], ['C.I.', 'Patente'], $ind->tipo_documento) : '-' }}{{ $ind->numero_documento ?? '-' }}{{ $ind->scadenza_documento ? $ind->scadenza_documento->format('d/m/Y') : '-' }}{{ $ind->note ? Str::limit($ind->note, 50) : '-' }}{{ $ind->created_at ? $ind->created_at->format('d/m/Y') : '-' }}{{ $ind->getEmailPrimariaAttribute() ?: '-' }}