fix: aggiunta categoria da impianti

Pek5892 · Pek5892 · commit 46b0f9ee5e05 · 2025-12-05T14:55:10.000+01:00
diff --git a/modules/articoli/add.php b/modules/articoli/add.php
@@ -47,7 +47,7 @@
 		</div>
 
 		<div class="col-md-3">
-			{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria", "required": 0, "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>" ]}
+			{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria", "required": 0, "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>|is_articolo=1" ]}
 		</div>
 
 		<div class="col-md-3">
diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php
@@ -61,7 +61,7 @@
                         <div class="col-md-3">
                             <?php echo (!empty($record['id_categoria'])) ?
                                 Modules::link('Categorie', $record['id_categoria'], null, null, 'class="pull-right"') : ''; ?>
-                            {[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria_edit", "id": "categoria_edit", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>" ]}
+                            {[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria_edit", "id": "categoria_edit", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>|is_articolo=1" ]}
                         </div>
 
                         <div class="col-md-3">
diff --git a/modules/categorie/add.php b/modules/categorie/add.php
@@ -21,6 +21,8 @@
 use Modules\Articoli\Categoria;
 
 $id_original = filter('id_original');
+$is_impianto_default = filter('is_impianto') !== null ? filter('is_impianto') : 0;
+$is_articolo_default = filter('is_articolo') !== null ? filter('is_articolo') : 1;
 
 if (!empty($id_record)) {
     include __DIR__.'/init.php';
@@ -53,11 +55,11 @@
         </div>
 
         <div class="col-md-2">
-            {[ "type": "checkbox", "label": "<?php echo tr('Articolo'); ?>", "name": "is_articolo_add", "value": "<?php echo $categoria ? $categoria->is_articolo : ($id_original ? Categoria::find($id_original)->is_articolo : 1); ?>", "disabled": "<?php echo !empty($id_original) ? 1 : 0; ?>" ]}
+            {[ "type": "checkbox", "label": "<?php echo tr('Articolo'); ?>", "name": "is_articolo_add", "value": "<?php echo $categoria ? $categoria->is_articolo : ($id_original ? Categoria::find($id_original)->is_articolo : $is_articolo_default); ?>", "disabled": "<?php echo !empty($id_original) ? 1 : 0; ?>" ]}
         </div>
 
         <div class="col-md-2">
-            {[ "type": "checkbox", "label": "<?php echo tr('Impianto'); ?>", "name": "is_impianto_add", "value": "<?php echo $categoria ? $categoria->is_impianto : ($id_original ? Categoria::find($id_original)->is_impianto : 0); ?>", "disabled": "<?php echo !empty($id_original) ? 1 : 0; ?>" ]}
+            {[ "type": "checkbox", "label": "<?php echo tr('Impianto'); ?>", "name": "is_impianto_add", "value": "<?php echo $categoria ? $categoria->is_impianto : ($id_original ? Categoria::find($id_original)->is_impianto : $is_impianto_default); ?>", "disabled": "<?php echo !empty($id_original) ? 1 : 0; ?>" ]}
         </div>
     </div>
 
diff --git a/modules/combinazioni_articoli/add.php b/modules/combinazioni_articoli/add.php
@@ -22,7 +22,7 @@
 
     <div class="row">
         <div class="col-md-6">
-            {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|'.Module::where('name', 'Categorie')->first()->id.'" ]}
+            {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|'.Module::where('name', 'Categorie')->first()->id.'|is_articolo=1" ]}
         </div>
 
         <div class="col-md-6">
diff --git a/modules/combinazioni_articoli/edit.php b/modules/combinazioni_articoli/edit.php
@@ -33,7 +33,7 @@
                     '.Modules::link('Categorie', $combinazione->id_categoria, null, null, 'class="pull-right"');
 }
 echo '
-                    {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|'.Module::where('name', 'Categorie')->first()->id.'" ]}
+                    {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|'.Module::where('name', 'Categorie')->first()->id.'|is_articolo=1" ]}
                 </div>
 
                 <div class="col-md-6">
diff --git a/modules/impianti/add.php b/modules/impianti/add.php
@@ -53,7 +53,7 @@
 
 	<div class="row">
 		<div class="col-md-3">
-			{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "id_categoria", "required": 0, "ajax-source": "categorie_imp", "icon-after": "add|<?php echo $id_modulo_categorie_impianti; ?>" ]}
+			{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "id_categoria", "required": 0, "ajax-source": "categorie_imp", "icon-after": "add|<?php echo $id_modulo_categorie_impianti; ?>|is_impianto=1" ]}
 		</div>
 
 		<div class="col-md-3">
diff --git a/modules/impianti/edit.php b/modules/impianti/edit.php
@@ -87,7 +87,7 @@
 						<div class="col-md-6">
                             <?php echo (!empty($record['id_categoria'])) ?
     Modules::link('Categorie', $record['id_categoria'], null, null, 'class="pull-right"') : ''; ?>
-                            {[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie_imp", "icon-after": "add|<?php echo $id_modulo_categorie_impianti; ?>" ]}
+                            {[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie_imp", "icon-after": "add|<?php echo $id_modulo_categorie_impianti; ?>|is_impianto=1" ]}
                         </div>
 
                         <div class="col-md-6">

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`'.Modules::link('Categorie', $combinazione->id_categoria, null, null, 'class="pull-right"');`
`34`	`34`	`}`
`35`	`35`	`echo '`
`36`		`- {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add\|'.Module::where('name', 'Categorie')->first()->id.'" ]}`
	`36`	`+ {[ "type": "select", "label": "'.tr('Categoria').'", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add\|'.Module::where('name', 'Categorie')->first()->id.'\|is_articolo=1" ]}`
`37`	`37`	`</div>`
`38`	`38`
`39`	`39`	`<div class="col-md-6">`