refactor: miglioria stampa checklist

Author: Pek5892

modules/checklists/modutil.php

@@ -75,7 +75,7 @@ function renderChecklist($check, $level = 1, $parent = 0, $has_images = false)
                         </td>';
 
             $result .= '
-                        <td style="width:400px;border-top:0px;"> 
+                        <td style="width:400px;border-top:0px;">
                             '.input([
                 'type' => 'textarea',
                 'name' => 'note_checklist',
@@ -203,7 +203,7 @@ function renderChecklistInserimento($check, $level = 1, $parent = 0)
 }
 
 if (!function_exists('renderChecklistHtml')) {
-    function renderChecklistHtml($check, $level = 0, $has_images = false)
+    function renderChecklistHtml($check, $level = 0, $has_images = false, $show_notes = false)
     {
         $user = auth()->getUser();
         $enabled = $check->assignedUsers ? $check->assignedUsers->pluck('id')->search($user->id) !== false : true;
@@ -229,13 +229,25 @@ function renderChecklistHtml($check, $level = 0, $has_images = false)
             $result .= '
                         </td>
                         <td style="border:none;vertical-align:middle;">
-                            <span class="text"><b>'.$check->content.'</b>'.(!empty($check->value) ? ': '.$check->value : '').'</span>
+                            <span class="text"><b>'.$check->content.'</b>'.(!empty($check->value) ? ': '.$check->value : '').'</span>';
+
+            // Aggiunta delle note se richiesto e se presenti
+            if ($show_notes && !empty($check->note)) {
+                $result .= ' <small style="font-weight: normal; color: #666;">'.nl2br($check->note).'</small>';
+            }
+
+            $result .= '
                         </td>
                     </tr>
                 </table>';
         } else {
             $result .= '
                 <span class="text"><b>'.$check->content.'</b>'.(!empty($check->value) ? ': '.$check->value : '').'</span>';
+
+            // Aggiunta delle note se richiesto e se presenti
+            if ($show_notes && !empty($check->note)) {
+                $result .= ' <small style="font-weight: normal; color: #666;">'.nl2br($check->note).'</small>';
+            }
         }
 
         $result .= '
@@ -244,7 +256,7 @@ function renderChecklistHtml($check, $level = 0, $has_images = false)
 
         $children = $check->children;
         foreach ($children as $child) {
-            $result .= renderChecklistHtml($child, $level + 1);
+            $result .= renderChecklistHtml($child, $level + 1, $has_images, $show_notes);
         }
 
         return $result;

templates/interventi/body.php

@@ -630,7 +630,7 @@
         $has_images = $checks->where('id_immagine', '!=', null)->count();
 
         foreach ($checks as $check) {
-            echo renderChecklistHtml($check, 0, $has_images);
+            echo renderChecklistHtml($check, 0, $has_images, $options['note']);
         }
 
         $impianti_collegati = $dbo->fetchArray('SELECT * FROM my_impianti_interventi INNER JOIN my_impianti ON my_impianti_interventi.idimpianto = my_impianti.id WHERE idintervento = '.prepare($id_record));
@@ -646,7 +646,7 @@
                 </th>
             </tr>';
                 foreach ($checks as $check) {
-                    echo renderChecklistHtml($check, 0, $has_images);
+                    echo renderChecklistHtml($check, 0, $has_images, $options['note']);
                 }
             }
         }

update/2_9_5.sql

@@ -77,3 +77,8 @@ ORDER BY
     `mg_articoli_lang`.`title`" WHERE `name` = 'Articoli';
 
 UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = "IF(COALESCE(giacenze.stato_giacenza, 0) = -1, '#ec5353', IF(COALESCE(giacenze.stato_giacenza, 0) = 1, '#CCFFCC', ''))" WHERE `zz_views`.`name` = '_bg_' AND `zz_modules`.`name` = 'Articoli';
+
+-- Aggiunta stampa intervento checklist con note
+INSERT INTO `zz_prints` (`id_module`, `is_record`, `name`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `enabled`, `available_options`) VALUES ((SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi'), '1', 'Intervento & checklist con note', 'interventi', 'idintervento', '{\"pricing\":true, \"checklist\": true, \"note\":true}', 'fa fa-print', '', '', '0', '0', '1', NULL); 
+INSERT INTO `zz_prints_lang` (`id_lang`, `id_record`, `title`, `filename`) VALUES ('1', (SELECT MAX(`id`) FROM `zz_prints`), 'Intervento & checklist con note', 'Intervento num {numero} del {data}'); 
+INSERT INTO `zz_prints_lang` (`id_lang`, `id_record`, `title`, `filename`) VALUES ('2', (SELECT MAX(`id`) FROM `zz_prints`), 'Intervento & checklist con note', 'Intervento num {numero} del {data}');