From 89f08d1c51a8e0f57f7df0de973d336092ad16ef Mon Sep 17 00:00:00 2001
From: MatteoPistorello <pistorellomatteo8@gmail.com>
Date: Fri, 19 May 2023 17:15:30 +0200
Subject: [PATCH] Aggiunte note nelle checklist

---
 modules/checklists/ajax.php    | 13 +++++++++++++
 modules/checklists/modutil.php | 23 +++++++++++++----------
 plugins/checks.php             | 14 ++++----------
 update/2_4_45.sql              |  3 ---
 update/2_4_46.sql              |  5 ++++-
 5 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/modules/checklists/ajax.php b/modules/checklists/ajax.php
index b3a3c71e8..ec3263c4d 100644
--- a/modules/checklists/ajax.php
+++ b/modules/checklists/ajax.php
@@ -18,6 +18,7 @@
  */
 
 include_once __DIR__.'/../../core.php';
+
 use Modules\Checklists\Check;
 use Modules\Checklists\ChecklistItem;
 
@@ -65,6 +66,18 @@ switch(post('op')){
 
         break;
 
+    case "save_note":
+        $note = post('note');
+        $id = post('id');
+
+        $record = Check::find($id);
+        $record->note = $note;
+        $record->save();
+
+        flash()->info(tr('Nota salvata correttamente!'));
+
+        break;
+
     case "remove_checkbox":
 
         $id = post('id');
diff --git a/modules/checklists/modutil.php b/modules/checklists/modutil.php
index 5d81f6c79..53d6229ff 100644
--- a/modules/checklists/modutil.php
+++ b/modules/checklists/modutil.php
@@ -39,7 +39,16 @@ function renderChecklist($check, $level = 1, $parent = 0) {
 
     $result .= '
                     <td style="border-top:0px;">
-                        <span class="text" style="'.(!empty($check->checked_at)?'text-decoration:line-through;':'').'">'.$check->content.' </span>';
+                        <span class="text" style="'.(!empty($check->checked_at)?'text-decoration:line-through;':'').'">'.$check->content.' </span>
+                    </td>';
+
+    $result .= '
+                    <td style="width:500px;border-top:0px;"> 
+                        {[ "type": "textarea", "name": "note_checklist", "id": "'.$check->id.'", "value": "'.$check->note.'" ]}
+                    </td>';
+
+    $result .= '
+                    <td style="width:250px;border-top:0px;">';
 
     if (intval($check->assignedUsers->pluck('id')->toArray())>0){
         $result .= '    <span class="label label-info pull-right" style="padding:6px 8px;" data-toggle="tooltip" title="Assegnato a '. implode(', ', $check->assignedUsers->pluck('username')->toArray()).'"><i class="fa fa-user"></i></span>';
@@ -59,10 +68,11 @@ function renderChecklist($check, $level = 1, $parent = 0) {
                     </td>'; 
 
     $result .= '
-                    <td style="width:40px;text-align:center;border-top:0px;">
+                    <td style="width:10px;text-align:center;border-top:0px;">
                         <div class="input-group-btn">
                             <button class="btn btn-warning btn-xs '.(!$enabled ? 'disabled' : '').'" onclick="edit_check(\''.$check->id.'\')"><i class="fa fa-edit"></i></button>
                             <button class="btn btn-danger btn-xs '.(!$enabled ? 'disabled' : '').'" onclick="delete_check(\''.$check->id.'\')"><i class="fa fa-trash"></i></button>
+                            <button class="btn btn-xs btn-default handle" title="Modifica ordine delle righe" draggable="true"><i class="fa fa-sort"></i></button>
                         </div>
                     </td>';
 
@@ -74,7 +84,7 @@ function renderChecklist($check, $level = 1, $parent = 0) {
     if(sizeof($check->children)>0){
         $result .= '
                 <tr>
-                    <td colspan="4" style="padding-left:'.$margin.'px;padding-right:0px;padding-top:0px;padding-bottom:0px;border-top:0px;">
+                    <td colspan="5" style="padding-left:'.$margin.'px;padding-right:10px;padding-top:0px;padding-bottom:0px;border-top:0px;">
                         <table class="table" style="margin-bottom:0px;">
                             <tbody class="sort" data-sonof="'.$check->id.'">';
             $children = $structure->checks()->where('id_parent', $check->id)->orderBy('order')->get();
@@ -91,13 +101,6 @@ function renderChecklist($check, $level = 1, $parent = 0) {
     $result .= '
             </table>
         </td>
-
-        <td style="width:40px;text-align:center;border-top:0px;">
-            <button class="btn btn-xs btn-default handle" title="Modifica ordine delle righe" draggable="true">
-                <i class="fa fa-sort"></i>
-            </button>
-        </td>
-
     </tr>';
 
     return $result;
diff --git a/plugins/checks.php b/plugins/checks.php
index 62e6f372e..819734272 100644
--- a/plugins/checks.php
+++ b/plugins/checks.php
@@ -103,19 +103,13 @@ for(i=0; i<sortable_table; i++){
     });
 }
 
-$("input[name^=\'value\']").keyup(function(){
-    $.post("'.$checklist_module->fileurl('ajax.php').'", {
-        op: "save_value",
-        value: $(this).val(),
-        id: $(this).attr("data-id"),
-    });
-});
-
 $("textarea[name=\'note_checklist\']").keyup(function(){
     $.post("'.$checklist_module->fileurl('ajax.php').'", {
         op: "save_note",
-        value: $(this).val(),
-        id: $(this).attr("data-id"),
+        note: $(this).val(),
+        id: $(this).attr("id"),
+    }, function() {
+        alertPush();
     });
 });
 
diff --git a/update/2_4_45.sql b/update/2_4_45.sql
index dd60532ed..ec1852cdf 100644
--- a/update/2_4_45.sql
+++ b/update/2_4_45.sql
@@ -116,9 +116,6 @@ INSERT INTO `zz_prints` (`id_module`, `is_record`, `name`, `title`, `filename`,
 
 INSERT INTO `zz_settings` (`nome`, `valore`, `tipo`, `editable`, `sezione`, `order`, `help`) VALUES ( "Visualizza solo promemoria assegnati", '0', 'boolean', '1', 'Applicazione', '7', 'Se abilitata permetti ai tecnici la visualizzazione dei soli promemoria in cui risultano come assegnati');
 
--- Aggiunta stampa ddt in entrata
-INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di acquisto'), '1', 'Ddt di acquisto', 'Ddt in entrata', 'DDT num. {numero} del {data}', 'ddt', 'idddt', '{\"pricing\":true}', 'fa fa-print', '', '', '0', '1', '1', '1');
-
 -- Fix query Fatture di acquisto
 UPDATE `zz_modules` SET `options` = "
 SELECT
diff --git a/update/2_4_46.sql b/update/2_4_46.sql
index 35ebc0b34..2be35c533 100644
--- a/update/2_4_46.sql
+++ b/update/2_4_46.sql
@@ -25,4 +25,7 @@ ORDER BY
 DELETE FROM `zz_prints` WHERE `name` = 'Spesometro';
 
 -- Aggiunta stampa ddt in entrata
-INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di acquisto'), '1', 'Ddt di acquisto', 'Ddt in entrata', 'DDT num. {numero} del {data}', 'ddt', 'idddt', '{\"pricing\":true}', 'fa fa-print', '', '', '0', '1', '1', '1');
\ No newline at end of file
+INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di acquisto'), '1', 'Ddt di acquisto', 'Ddt in entrata', 'DDT num. {numero} del {data}', 'ddt', 'idddt', '{\"pricing\":true}', 'fa fa-print', '', '', '0', '1', '1', '1');
+
+-- Aggiunte note checklist
+ALTER TABLE `zz_checks` ADD `note` TEXT NOT NULL AFTER `content`; 
\ No newline at end of file