refactor: unificazione e ottimizzazione gestione marche e modelli

Author: loviuz

modules/articoli/edit.php

@@ -70,11 +70,11 @@
 
                         <div class="col-md-3">
                             <?php echo !empty($record['id_marca']) ? Modules::link('Marche', $record['id_marca'], null, null, 'class="pull-right"') : ''; ?>
-                            {[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca_edit", "id": "id_marca_edit", "value":"$id_marca$", "ajax-source": "marche", "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>" ]}
+                            {[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca_edit", "id": "id_marca_edit", "value":"$id_marca$", "ajax-source": "marche", "select-options": <?php echo json_encode(['is_articolo' => true]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>" ]}
                         </div>
                         <div class="col-md-3">
                             <?php echo !empty($record['id_modello']) ? Modules::link('Marche', $record['id_modello'], null, null, 'class="pull-right"') : ''; ?>
-                            {[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello_edit", "id": "id_modello_edit", "value":"$id_modello$", "ajax-source": "modelli", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
+                            {[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello_edit", "id": "id_modello_edit", "value":"$id_modello$", "ajax-source": "modelli", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca'], 'is_articolo' => true]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
                         </div>
                     </div>
                     <div class="row">

modules/impianti/ajax/select.php

@@ -171,41 +171,4 @@
             $custom['link'] = 'module:Categorie';
         }
         break;
-
-    case 'marca':
-        $query = 'SELECT `id`, `name` AS descrizione FROM `zz_marche` |where| ORDER BY `name` ASC';
-
-        foreach ($elements as $element) {
-            $filter[] = '`id`='.prepare($element);
-        }
-
-        $where[] = '`parent` = 0';
-        $where[] = '`is_impianto` = 1';
-
-        if (!empty($search)) {
-            $search_fields[] = '`name` LIKE '.prepare('%'.$search.'%');
-        }
-
-        $custom['link'] = 'module:Marche';
-
-        break;
-
-    case 'modello':
-        if (isset($superselect['id_marca'])) {
-            $query = 'SELECT `id`, `name` AS descrizione FROM `zz_marche` |where| ORDER BY `name` ASC';
-
-            foreach ($elements as $element) {
-                $filter[] = '`id`='.prepare($element);
-            }
-
-            $where[] = '`parent`='.prepare($superselect['id_marca']);
-            $where[] = '`is_impianto` = 1';
-
-            if (!empty($search)) {
-                $search_fields[] = '`name` LIKE '.prepare('%'.$search.'%');
-            }
-
-            $custom['link'] = 'module:Marche';
-        }
-        break;
 }

modules/impianti/edit.php

@@ -79,10 +79,10 @@
 					</div>
 					<div class ="row">
 						<div class="col-md-4">
-							{[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca", "value": "$id_marca$", "ajax-source": "marca", "icon-after": "add|<?php echo $id_modulo_marca_impianti; ?>" ]}
+							{[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca", "value": "$id_marca$", "ajax-source": "marche", "select-options": <?php echo json_encode(['is_impianto' => true]); ?>, "icon-after": "add|<?php echo $id_modulo_marca_impianti; ?>" ]}
 						</div>
 						<div class="col-md-4">
-							{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello", "value": "$id_modello$","ajax-source": "modello", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca']]); ?>, "icon-after": "add|<?php echo $id_modulo_marca_impianti; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
+							{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello", "value": "$id_modello$","ajax-source": "modelli", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca'], 'is_impianto' => true]); ?>, "icon-after": "add|<?php echo $id_modulo_marca_impianti; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
 						</div>
 						<div class="col-md-4">
 							{[ "type": "text", "label": "<?php echo tr('Proprietario'); ?>", "name": "proprietario", "value": "$proprietario$" ]}

modules/marche/ajax/select.php

@@ -10,8 +10,13 @@
             $filter[] = '`id`='.prepare($element);
         }
 
-        $where[] = '`parent` = 0';
-        $where[] = '`is_articolo` = 1';
+        $where[] = '`parent` IS NULL';
+
+        if (isset($superselect['is_articolo'])) {
+            $where[] = '`is_articolo` = 1';
+        } elseif (isset($superselect['is_impianto'])) {
+            $where[] = '`is_impianto` = 1';
+        }
 
         if (!empty($search)) {
             $search_fields[] = '`name` LIKE '.prepare('%'.$search.'%');
@@ -34,7 +39,12 @@
             }
 
             $where[] = '`parent`='.prepare($superselect['id_marca']);
-            $where[] = '`is_articolo` = 1';
+
+            if (isset($superselect['is_articolo'])) {
+                $where[] = '`is_articolo` = 1';
+            } elseif (isset($superselect['is_impianto'])) {
+                $where[] = '`is_impianto` = 1';
+            }
 
             if (!empty($search)) {
                 $search_fields[] = '`name` LIKE '.prepare('%'.$search.'%');