Просмотр исходного кода

salvataggio conducente proprietario

FabioFratini 11 месяцев назад
Родитель
Сommit
037bcfca40

+ 17 - 7
app/Http/Livewire/Report.php

@@ -1504,17 +1504,24 @@ class Report extends Component
             }
         }
 
-        Log::info("Total attachment pages: {$totalAttachmentPages}");
+        $separatorPageCount = 0;
+        if ($hasPdfAttachments) {
+            $separatorPageCount = 1;
+            Log::info("Separator page count: {$separatorPageCount}");
+        }
 
-        $data['attachment_pages'] = $totalAttachmentPages;
-        $pdf = Pdf::loadView('pdf.verbale', array('data' => $data));
-        $pdf->render();
+        $totalAttachmentPagesWithSeparator = $totalAttachmentPages + $separatorPageCount;
+        Log::info("Total attachment pages (including separator): {$totalAttachmentPagesWithSeparator}");
 
-        $mainPageCount = $pdf->getDomPDF()->getCanvas()->get_page_count();
+        $data['total_pages'] = 0;
+        $initialPdf = Pdf::loadView('pdf.verbale', array('data' => $data));
+        $initialPdf->render();
+        $mainPageCount = $initialPdf->getDomPDF()->getCanvas()->get_page_count();
         Log::info("Main PDF has {$mainPageCount} pages");
 
-        $totalPages = $mainPageCount + $totalAttachmentPages;
-        Log::info("Total pages (main + attachments): {$totalPages}");
+        $totalPages = $mainPageCount + $totalAttachmentPages + $separatorPageCount;
+        Log::info("Total pages breakdown: Main={$mainPageCount}, Attachments={$totalAttachmentPages}, Separator={$separatorPageCount}");
+        Log::info("Total pages (main + attachments + separator): {$totalPages}");
 
         $data['total_pages'] = $totalPages;
         $pdf = Pdf::loadView('pdf.verbale', array('data' => $data));
@@ -1556,6 +1563,9 @@ class Report extends Component
                 $success = $this->mergeWithGhostScript($pdfFiles, $outputPath);
 
                 if ($success) {
+                    $finalPageCount = $this->countPdfPages($outputPath);
+                    Log::info("Final merged PDF has {$finalPageCount} pages (expected around: {$totalPages})");
+
                     Log::info("PDF merge successful, returning merged file");
                     $pdfContent = file_get_contents($outputPath);
 

+ 13 - 2
app/Http/Livewire/Traits/HasAnagrafica.php

@@ -294,6 +294,18 @@ trait HasAnagrafica{
         DB::beginTransaction();
 
         try {
+
+            $conducente = ReportDataVeicoli::where('progressive', $this->currentProgressive)
+            ->where('report_id', $this->dataId)
+            ->first()
+            ->conducente;
+
+            if($this->data_proprietari == $conducente->id){
+                $conducente_uguale_proprietario = true;
+            } else {
+                $conducente_uguale_proprietario = false;
+            }
+
             // Update ReportDataVeicoli instead of delete/create
             $veicolo = ReportDataVeicoli::updateOrCreate(
                 [
@@ -306,6 +318,7 @@ trait HasAnagrafica{
                     'stato_veicolo' => $this->data_stato_veicolo,
                     'polizze' => $this->data_polizze,
                     'proprietari' => $this->data_proprietari,
+                    'conducente_uguale_proprietario'=> $conducente_uguale_proprietario,
                     'coproprietari' => $this->data_coproprietari,
                     'infortunato' => $this->data_infortunato,
                     'infortunato_ospedale' => $this->data_infortunato_ospedale,
@@ -415,7 +428,6 @@ trait HasAnagrafica{
                 ]
             );
 
-            // Update or create ReportDataUsoDelCascoOmologazione
             \App\Models\ReportDataUsoDelCascoOmologazione::updateOrCreate(
                 [
                     'progressive' => $this->currentProgressive,
@@ -489,7 +501,6 @@ trait HasAnagrafica{
                 'infortunato' => $this->data_infortunato_extra_3
             ]);
 
-            // If we reach here, all operations succeeded
             DB::commit();
             session()->flash('success', 'Record aggiornato');
 

+ 22 - 1
app/Http/Livewire/Traits/HasParteCoinvolta.php

@@ -6,6 +6,7 @@ use App\Models\ReportDataPartiCoinvolte;
 use App\Models\ReportDataPedoni;
 use App\Models\ReportDataVeicoli;
 use App\Models\Vehicle;
+use Illuminate\Support\Facades\Log;
 
 trait HasParteCoinvolta{
     public $anag_type;
@@ -64,13 +65,33 @@ trait HasParteCoinvolta{
             $parte->update(['anagrafica' => $anagrafica]);
 
             if ($parte->conducente_o_pedone == 2) {
+
+
+                $proprietarioRelation = ReportDataVeicoli::where('progressive', $progressive)
+                ->where('report_id', $this->dataId)
+                ->first()
+                ->proprietario();
+
+                $proprietario = $proprietarioRelation->first();
+
+                Log::info('Proprietario: '.$proprietario->id);
+                Log::info('Anagrafica: '.$anagrafica);
+
+                if($anagrafica == $proprietario->id){
+                    $conducente_uguale_proprietario = true;
+                } else {
+                    $conducente_uguale_proprietario = false;
+                }
+
+
                 ReportDataVeicoli::updateOrCreate(
                     [
                         'report_id' => $this->dataId,
                         'progressive' => $progressive,
                     ],
                     [
-                        'conducenti' => $anagrafica
+                        'conducenti' => $anagrafica,
+                        'conducente_uguale_proprietario'=> $conducente_uguale_proprietario,
                     ]
                 );
             }else{