From 6281995a94ec1e2824a9f78b46773d2cc8683f0c Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 26 Jul 2019 18:05:19 +0200
Subject: [PATCH] Miglioramenti minori

---
 actions.php                                   |  8 +-
 include/init/init.php                         |  2 +-
 .../widgets/stampa_calendario.dashboard.php   |  2 +-
 modules/ddt/add_ordine.php                    |  2 +-
 modules/fatture/add_contratto.php             |  2 +-
 modules/fatture/add_ddt.php                   |  2 +-
 modules/fatture/add_ordine.php                |  2 +-
 modules/fatture/add_preventivo.php            |  2 +-
 modules/interventi/add_righe.php              |  2 +-
 modules/interventi/ajax_costi.php             |  2 +-
 modules/interventi/ajax_tecnici.php           |  2 +-
 modules/interventi/manage_sessione.php        |  2 +-
 modules/utenti/self.php                       |  2 +-
 modules/utenti/user.php                       |  2 +-
 .../pianificazione_interventi/add_righe.php   |  2 +-
 .../pianficazione.php                         |  2 +-
 src/HTMLBuilder/Manager/ChecklistManager.php  | 10 +--
 src/Models/Checklist/Check.php                | 74 +++++++++++++++++++
 src/Models/{ => Checklist}/Checklist.php      | 11 +--
 src/Models/Checklist/ChecklistItem.php        | 43 +++++++++++
 src/Traits/Components/ChecklistTrait.php      | 12 ++-
 update/2_4_11.sql                             | 45 ++++++-----
 22 files changed, 179 insertions(+), 54 deletions(-)
 create mode 100644 src/Models/Checklist/Check.php
 rename src/Models/{ => Checklist}/Checklist.php (86%)
 create mode 100644 src/Models/Checklist/ChecklistItem.php

diff --git a/actions.php b/actions.php
index 2e9ae4088..888a7cc5b 100644
--- a/actions.php
+++ b/actions.php
@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/core.php';
 
-use Models\Checklist;
+use Models\Checklist\Check;
 use Models\Note;
 use Models\User;
 
@@ -124,13 +124,13 @@ elseif (filter('op') == 'add_check') {
 
     $assigned_user = User::find(post('assigned_user'));
 
-    $check = Checklist::build($user, $assigned_user, $structure, $id_record, $content, $parent_id);
+    $check = Check::build($user, $assigned_user, $structure, $id_record, $content, $parent_id);
 }
 
 // Rimozione checklist
 elseif (filter('op') == 'delete_check') {
     $check_id = post('check_id');
-    $check = Checklist::find($check_id);
+    $check = Check::find($check_id);
 
     $check->delete();
 }
@@ -138,7 +138,7 @@ elseif (filter('op') == 'delete_check') {
 // Gestione check per le checklist
 elseif (filter('op') == 'toggle_check') {
     $check_id = post('check_id');
-    $check = Checklist::find($check_id);
+    $check = Check::find($check_id);
 
     if (!empty($check)) {
         $check->checked_at = $check->checked_at ? null : date('Y-m-d H:i:s');
diff --git a/include/init/init.php b/include/init/init.php
index fe954ce4c..ad4c3535a 100644
--- a/include/init/init.php
+++ b/include/init/init.php
@@ -234,7 +234,7 @@ echo '
     });
 </script>
 <script src="'.$rootdir.'/lib/functions.js"></script>
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
 
 include_once App::filepath('include|custom|', 'bottom.php');
 
diff --git a/modules/dashboard/widgets/stampa_calendario.dashboard.php b/modules/dashboard/widgets/stampa_calendario.dashboard.php
index d6270cffb..ac96f8678 100644
--- a/modules/dashboard/widgets/stampa_calendario.dashboard.php
+++ b/modules/dashboard/widgets/stampa_calendario.dashboard.php
@@ -32,7 +32,7 @@ echo '
 
 </form>';
 
-echo '<<script>$(document).ready(init)</script>';
+echo '<script>$(document).ready(init)</script>';
 echo '<link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/base/jquery-ui.css">';
 
 ?>
diff --git a/modules/ddt/add_ordine.php b/modules/ddt/add_ordine.php
index b4ab96cca..7bf3ab3b7 100644
--- a/modules/ddt/add_ordine.php
+++ b/modules/ddt/add_ordine.php
@@ -44,7 +44,7 @@ echo '
 
 $file = basename(__FILE__);
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
     
 <script>
     var content = $("#righe_documento");
diff --git a/modules/fatture/add_contratto.php b/modules/fatture/add_contratto.php
index c2c744927..c11862121 100644
--- a/modules/fatture/add_contratto.php
+++ b/modules/fatture/add_contratto.php
@@ -47,7 +47,7 @@ echo '
 
 $file = basename(__FILE__);
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
     
 <script>
     var content = $("#righe_documento");
diff --git a/modules/fatture/add_ddt.php b/modules/fatture/add_ddt.php
index ebbac0a0e..f80ae5a7d 100644
--- a/modules/fatture/add_ddt.php
+++ b/modules/fatture/add_ddt.php
@@ -45,7 +45,7 @@ echo '
 
 $file = basename(__FILE__);
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
     
 <script>
     var content = $("#righe_documento");
diff --git a/modules/fatture/add_ordine.php b/modules/fatture/add_ordine.php
index c0e6cc9b3..b49879f59 100644
--- a/modules/fatture/add_ordine.php
+++ b/modules/fatture/add_ordine.php
@@ -45,7 +45,7 @@ echo '
 
 $file = basename(__FILE__);
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
     
 <script>
     var content = $("#righe_documento");
diff --git a/modules/fatture/add_preventivo.php b/modules/fatture/add_preventivo.php
index 8de2b2671..b2e19b5d8 100644
--- a/modules/fatture/add_preventivo.php
+++ b/modules/fatture/add_preventivo.php
@@ -46,7 +46,7 @@ echo '
 
 $file = basename(__FILE__);
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
     
 <script>
     var content = $("#righe_documento");
diff --git a/modules/interventi/add_righe.php b/modules/interventi/add_righe.php
index 0adae90ac..4a10b9c58 100644
--- a/modules/interventi/add_righe.php
+++ b/modules/interventi/add_righe.php
@@ -109,7 +109,7 @@ echo '
 </form>';
 
 echo '
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
 
 ?>
 
diff --git a/modules/interventi/ajax_costi.php b/modules/interventi/ajax_costi.php
index 22d77356c..cb695c918 100644
--- a/modules/interventi/ajax_costi.php
+++ b/modules/interventi/ajax_costi.php
@@ -133,4 +133,4 @@ if ($show_prezzi) {
 }
 
 echo '
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
diff --git a/modules/interventi/ajax_tecnici.php b/modules/interventi/ajax_tecnici.php
index a07f77347..7cae64c55 100644
--- a/modules/interventi/ajax_tecnici.php
+++ b/modules/interventi/ajax_tecnici.php
@@ -221,7 +221,7 @@ if (!$is_completato) {
 }
 
 echo '
-<<script>$(document).ready(init)</script>
+<script>$(document).ready(init)</script>
 
 <script type="text/javascript">
     $(document).ready(function(){';
diff --git a/modules/interventi/manage_sessione.php b/modules/interventi/manage_sessione.php
index 669be6447..26bccbbdf 100644
--- a/modules/interventi/manage_sessione.php
+++ b/modules/interventi/manage_sessione.php
@@ -96,7 +96,7 @@ echo '
 </form>';
 
 echo '
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
 
 echo '
 <script>
diff --git a/modules/utenti/self.php b/modules/utenti/self.php
index 0526e385c..0d4fba91b 100644
--- a/modules/utenti/self.php
+++ b/modules/utenti/self.php
@@ -28,4 +28,4 @@ echo '
 	</div>
 </form>	
 
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
diff --git a/modules/utenti/user.php b/modules/utenti/user.php
index 9f25b1968..f9cb8d33b 100644
--- a/modules/utenti/user.php
+++ b/modules/utenti/user.php
@@ -91,4 +91,4 @@ function submitCheck() {
 }
 </script>
 
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
diff --git a/plugins/pianificazione_interventi/add_righe.php b/plugins/pianificazione_interventi/add_righe.php
index b8bfa16df..d733c7540 100644
--- a/plugins/pianificazione_interventi/add_righe.php
+++ b/plugins/pianificazione_interventi/add_righe.php
@@ -107,7 +107,7 @@ echo '
 </form>';
 
 echo '
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
 
 echo '
 <script type="text/javascript">
diff --git a/plugins/pianificazione_interventi/pianficazione.php b/plugins/pianificazione_interventi/pianficazione.php
index ea581c7db..142dafe86 100644
--- a/plugins/pianificazione_interventi/pianficazione.php
+++ b/plugins/pianificazione_interventi/pianficazione.php
@@ -233,7 +233,7 @@ echo '
 </form>';
 
 echo '
-<<script>$(document).ready(init)</script>';
+<script>$(document).ready(init)</script>';
 
 echo '
 <script>
diff --git a/src/HTMLBuilder/Manager/ChecklistManager.php b/src/HTMLBuilder/Manager/ChecklistManager.php
index 0b67d9672..6325de632 100644
--- a/src/HTMLBuilder/Manager/ChecklistManager.php
+++ b/src/HTMLBuilder/Manager/ChecklistManager.php
@@ -2,7 +2,7 @@
 
 namespace HTMLBuilder\Manager;
 
-use Models\Checklist;
+use Models\Checklist\Check;
 use Modules;
 use Plugins;
 
@@ -29,10 +29,10 @@ class ChecklistManager implements ManagerInterface
 
         // ID del form
         $manager_id = 'checklist_'.$options['id_module'].'_'.$options['id_plugin'];
-        $checklists = $structure->checklists($options['id_record']);
+        $checks = $structure->checks($options['id_record']);
 
         $list = [];
-        foreach ($checklists as $checklist) {
+        foreach ($checks as $checklist) {
             $list[] = [
                 'id' => $checklist->id,
                 'text' => $checklist->content,
@@ -77,7 +77,7 @@ class ChecklistManager implements ManagerInterface
         $result .= '
             <ul class="checklist">';
 
-        foreach ($checklists as $checklist) {
+        foreach ($checks as $checklist) {
             $result .= $this->renderChecklist($checklist);
         }
 
@@ -234,7 +234,7 @@ function reload_'.$manager_id.'() {
         return $result;
     }
 
-    protected function renderChecklist(Checklist $checklist, $level = 0)
+    protected function renderChecklist(Check $checklist, $level = 0)
     {
         $result = '
             <li id="check_'.$checklist->id.'" class="check-item'.(!empty($checklist->checked_at) ? ' checked' : '').'">
diff --git a/src/Models/Checklist/Check.php b/src/Models/Checklist/Check.php
new file mode 100644
index 000000000..11ce8bfbd
--- /dev/null
+++ b/src/Models/Checklist/Check.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Models\Checklist;
+
+use Common\Model;
+use Traits\Components\ChecklistTrait;
+use Traits\HierarchyTrait;
+use Models\User;
+use Models\Module;
+use Models\Plugin;
+
+class Check extends Model
+{
+    use HierarchyTrait;
+
+    protected static $parent_identifier = 'id_parent';
+    protected $table = 'zz_checks';
+
+    /**
+     * Crea un nuovo elemento della checklist.
+     *
+     * @param User      $user
+     * @param User      $assigned_user
+     * @param ChecklistTrait $structure
+     * @param int       $id_record
+     * @param string    $contenuto
+     * @param int       $id_parent
+     *
+     * @return self
+     */
+    public static function build(User $user, User $assigned_user, $structure, $id_record, $contenuto, $id_parent = null)
+    {
+        $model = parent::build();
+
+        $model->user()->associate($user);
+        $model->assignedUser()->associate($assigned_user);
+
+        if ($structure instanceof Module) {
+            $model->module()->associate($structure);
+        } elseif ($structure instanceof Plugin) {
+            $model->plugin()->associate($structure);
+        }
+
+        $model->id_record = $id_record;
+        $model->id_parent = $id_parent;
+        $model->content = $contenuto;
+
+        $model->save();
+
+        return $model;
+    }
+
+    /* Relazioni Eloquent */
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'id_utente');
+    }
+
+    public function assignedUser()
+    {
+        return $this->belongsTo(User::class, 'id_utente_assegnato');
+    }
+
+    public function plugin()
+    {
+        return $this->belongsTo(Plugin::class, 'id_plugin');
+    }
+
+    public function module()
+    {
+        return $this->belongsTo(Module::class, 'id_module');
+    }
+}
diff --git a/src/Models/Checklist.php b/src/Models/Checklist/Checklist.php
similarity index 86%
rename from src/Models/Checklist.php
rename to src/Models/Checklist/Checklist.php
index f56bdf594..c9ae97d0d 100644
--- a/src/Models/Checklist.php
+++ b/src/Models/Checklist/Checklist.php
@@ -1,24 +1,19 @@
 <?php
 
-namespace Models;
+namespace Models\Checklist;
 
 use Common\Model;
-use Traits\HierarchyTrait;
+use Traits\Components\ChecklistTrait;
 use Traits\NoteTrait;
 
 class Checklist extends Model
 {
-    use HierarchyTrait;
-
-    protected static $parent_identifier = 'id_parent';
     protected $table = 'zz_checklists';
 
     /**
      * Crea un nuovo elemento della checklist.
      *
-     * @param User      $user
-     * @param User      $assigned_user
-     * @param NoteTrait $structure
+     * @param ChecklistTrait $structure
      * @param int       $id_record
      * @param string    $contenuto
      * @param int       $id_parent
diff --git a/src/Models/Checklist/ChecklistItem.php b/src/Models/Checklist/ChecklistItem.php
new file mode 100644
index 000000000..7b54a71b9
--- /dev/null
+++ b/src/Models/Checklist/ChecklistItem.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Models\Checklist;
+
+use Common\Model;
+use Traits\HierarchyTrait;
+
+class Checklist extends Model
+{
+    use HierarchyTrait;
+
+    protected static $parent_identifier = 'id_parent';
+    protected $table = 'zz_checklist_items';
+
+    /**
+     * Crea un nuovo elemento della checklist.
+     *
+     * @param Checklist      $checklist
+     * @param string    $contenuto
+     * @param int       $id_parent
+     *
+     * @return self
+     */
+    public static function build(Checklist $checklist, $contenuto, $id_parent = null)
+    {
+        $model = parent::build();
+
+        $model->checklist()->associate($checklist);
+        $model->id_parent = $id_parent;
+        $model->content = $contenuto;
+
+        $model->save();
+
+        return $model;
+    }
+
+    /* Relazioni Eloquent */
+
+    public function checklist()
+    {
+        return $this->belongsTo(Checklist::class, 'id_checklist');
+    }
+}
diff --git a/src/Traits/Components/ChecklistTrait.php b/src/Traits/Components/ChecklistTrait.php
index b3490261d..1bdbe950e 100644
--- a/src/Traits/Components/ChecklistTrait.php
+++ b/src/Traits/Components/ChecklistTrait.php
@@ -2,12 +2,18 @@
 
 namespace Traits\Components;
 
-use Models\Checklist;
+use Models\Checklist\Check;
+use Models\Checklist\Checklist;
 
 trait ChecklistTrait
 {
-    public function checklists($id_record)
+    public function checks($id_record)
     {
-        return $this->hasMany(Checklist::class, $this->component_identifier)->where('id_record', $id_record)->whereNull('id_parent')->orderBy('created_at')->get();
+        return $this->hasMany(Check::class, $this->component_identifier)->where('id_record', $id_record)->whereNull('id_parent')->orderBy('created_at')->get();
+    }
+
+    public function checklists()
+    {
+        return $this->hasMany(Checklist::class, $this->component_identifier)->orderBy('created_at')->get();
     }
 }
diff --git a/update/2_4_11.sql b/update/2_4_11.sql
index e25a46323..34a0ce18c 100644
--- a/update/2_4_11.sql
+++ b/update/2_4_11.sql
@@ -172,11 +172,11 @@ ALTER TABLE `co_righe_contratti` ADD `prezzo_unitario_acquisto` DECIMAL(12,4) NO
 
 -- Fix query Scadenzario
 UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `co_scadenziario`
-    LEFT JOIN `co_documenti`  ON `co_scadenziario`.`iddocumento` = `co_documenti`.`id`
-    LEFT JOIN `an_anagrafiche` ON `co_documenti`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`
-    LEFT JOIN `co_pagamenti` ON `co_documenti`.`idpagamento` = `co_pagamenti`.`id`
-    LEFT JOIN `co_tipidocumento` ON `co_documenti`.`idtipodocumento` = `co_tipidocumento`.`id`
-    LEFT JOIN `co_statidocumento` ON `co_documenti`.`idstatodocumento` = `co_statidocumento`.`id`
+   LEFT JOIN `co_documenti`  ON `co_scadenziario`.`iddocumento` = `co_documenti`.`id`
+   LEFT JOIN `an_anagrafiche` ON `co_documenti`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`
+   LEFT JOIN `co_pagamenti` ON `co_documenti`.`idpagamento` = `co_pagamenti`.`id`
+   LEFT JOIN `co_tipidocumento` ON `co_documenti`.`idtipodocumento` = `co_tipidocumento`.`id`
+   LEFT JOIN `co_statidocumento` ON `co_documenti`.`idstatodocumento` = `co_statidocumento`.`id`
 WHERE 1=1 AND ABS(`co_scadenziario`.`pagato`) < ABS(`co_scadenziario`.`da_pagare`) AND (`co_statidocumento`.`descrizione` IS NULL OR `co_statidocumento`.`descrizione` IN(''Emessa'',''Parzialmente pagato''))
 HAVING 2=2
 ORDER BY `scadenza` ASC' WHERE `name` = 'Scadenzario';
@@ -205,14 +205,14 @@ CREATE TABLE IF NOT EXISTS `zz_notes` (
 ) ENGINE=InnoDB;
 
 -- Sistema di checklists
-CREATE TABLE IF NOT EXISTS `zz_checklists` (
+CREATE TABLE IF NOT EXISTS `zz_checks` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id_module` int(11),
   `id_plugin` int(11),
   `id_record` int(11) NOT NULL,
   `id_utente` int(11) NOT NULL,
   `id_utente_assegnato` int(11) NOT NULL,
-  `checked_at` TIMESTAMP,
+  `checked_at` TIMESTAMP NULL,
   `content` TEXT,
   `id_parent` int(11),
   PRIMARY KEY (`id`),
@@ -220,18 +220,25 @@ CREATE TABLE IF NOT EXISTS `zz_checklists` (
   FOREIGN KEY (`id_plugin`) REFERENCES `zz_plugins`(`id`) ON DELETE CASCADE,
   FOREIGN KEY (`id_utente`) REFERENCES `zz_users`(`id`) ON DELETE CASCADE,
   FOREIGN KEY (`id_utente_assegnato`) REFERENCES `zz_users`(`id`) ON DELETE CASCADE,
-  FOREIGN KEY (`id_parent`) REFERENCES `zz_checklists`(`id`) ON DELETE CASCADE
+  FOREIGN KEY (`id_parent`) REFERENCES `zz_checks`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
-CREATE TABLE IF NOT EXISTS `zz_checklist_templates` (
-   `id` int(11) NOT NULL AUTO_INCREMENT,
-   `id_module` int(11),
-   `id_plugin` int(11),
-   `id_record` int(11) NOT NULL,
-   `content` TEXT,
-   `id_parent` int(11),
-   PRIMARY KEY (`id`),
-   FOREIGN KEY (`id_module`) REFERENCES `zz_modules`(`id`) ON DELETE CASCADE,
-   FOREIGN KEY (`id_plugin`) REFERENCES `zz_plugins`(`id`) ON DELETE CASCADE,
-   FOREIGN KEY (`id_parent`) REFERENCES `zz_checklist_templates`(`id`) ON DELETE CASCADE
+CREATE TABLE IF NOT EXISTS `zz_checklists` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255),
+  `id_module` int(11),
+  `id_plugin` int(11),
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_module`) REFERENCES `zz_modules`(`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`id_plugin`) REFERENCES `zz_plugins`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `zz_checklist_items` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id_checklist` int(11),
+  `content` TEXT,
+  `id_parent` int(11),
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_checklist`) REFERENCES `zz_checklists`(`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`id_parent`) REFERENCES `zz_checklist_items`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB;