From b128541c35f2651e4199de6ecf1ec88d3b5e3c9a Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Tue, 27 Mar 2018 01:00:15 +0200
Subject: [PATCH] Fix colorpicker stati intervento + associazione componente
 articolo

---
 modules/articoli/add.php         |  2 +-
 modules/articoli/edit.php        |  2 +-
 modules/my_impianti/modutil.php  | 11 +++++++----
 modules/stati_intervento/add.php |  6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/articoli/add.php b/modules/articoli/add.php
index 4ec020d53..df9e3967f 100644
--- a/modules/articoli/add.php
+++ b/modules/articoli/add.php
@@ -10,7 +10,7 @@ unset($_SESSION['superselect']['id_categoria']);
 
 	<div class="row">
 		<div class="col-md-6">
-			{[ "type": "text", "label": "<?php echo tr('Inserisci il codice:'); ?>", "name": "codice", "required": 1, "value": "" ]}
+			{[ "type": "text", "label": "<?php echo tr('Inserisci il codice:'); ?>", "name": "codice", "class":"alphanumeric-mask", "required": 1, "value": "" ]}
 		</div>
 
 		<div class="col-md-6">
diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php
index a52e4f37f..dcafc9b86 100644
--- a/modules/articoli/edit.php
+++ b/modules/articoli/edit.php
@@ -25,7 +25,7 @@ $_SESSION['superselect']['id_categoria'] = $records[0]['id_categoria'];
 
 				<div class="col-md-4">
 
-					{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "codice", "required": 1, "value": "$codice$" ]}
+					{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "codice", "class":"alphanumeric-mask", "required": 1, "value": "$codice$" ]}
 					<br>
 					{[ "type": "checkbox", "label": "<?php echo tr("Seleziona per rendere visibile l'articolo"); ?>", "name": "attivo", "value": "$attivo$", "help": "", "placeholder": "<?php echo tr('ATTIVO'); ?>" ]}
 
diff --git a/modules/my_impianti/modutil.php b/modules/my_impianti/modutil.php
index 90314cef4..a8a3d3d27 100644
--- a/modules/my_impianti/modutil.php
+++ b/modules/my_impianti/modutil.php
@@ -6,10 +6,13 @@ function genera_form_componente($contenuto)
 {
     $fields = \Util\Ini::getFields($contenuto);
     $title = array_shift($fields);
-
+   
     foreach ($fields as $key => $value) {
         $fields[$key] = '<div class="col-md-4">'.$value.'</div>';
     }
-
-    echo $title.PHP_EOL.implode(PHP_EOL, $fields).PHP_EOL.'<script>start_inputmask( "#info_componente" );</script>';
-}
+   
+    echo $title;
+    echo '<div class="row">';
+    echo PHP_EOL.implode(PHP_EOL, $fields).PHP_EOL.'<script>start_inputmask( "#info_componente" );</script>';
+    echo '</div>';
+}
\ No newline at end of file
diff --git a/modules/stati_intervento/add.php b/modules/stati_intervento/add.php
index f4f6f659b..0c31490f4 100644
--- a/modules/stati_intervento/add.php
+++ b/modules/stati_intervento/add.php
@@ -16,7 +16,7 @@ include_once __DIR__.'/../../core.php';
 		</div>
 
 		<div class="col-md-2">
-			{[ "type": "text", "label": "<?php echo tr('Colore'); ?>", "name": "colore", "required": 1, "class": "colorpicker text-center", "value": "#ffffff", "extra": "maxlength='7'", "icon-after": "<div class='img-circle square'></div>" ]}
+			{[ "type": "text", "label": "<?php echo tr('Colore'); ?>", "name": "colore", "id": "colore_", "required": 1, "class": "colorpicker text-center", "value": "#ffffff", "extra": "maxlength='7'", "icon-after": "<div class='img-circle square'></div>" ]}
 		</div>
 	</div>
 
@@ -31,9 +31,9 @@ include_once __DIR__.'/../../core.php';
 <script>
 	$(document).ready( function(){
 		$('.colorpicker').colorpicker().on('changeColor', function(){
-			$('#colore').parent().find('.square').css( 'background', $('#colore').val() );
+			$('#colore_').parent().find('.square').css( 'background', $('#colore_').val() );
 		});
 
-		$('#colore').parent().find('.square').css( 'background', $('#colore').val() );
+		$('#colore_').parent().find('.square').css( 'background', $('#colore_').val() );
 	});
 </script>