From b8dfc80215c188f9159c54361097095e4653b14b Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Fri, 26 Oct 2018 01:00:44 +0200
Subject: [PATCH] Colonna natura iva e codice iva

---
 lib/functions.js           |  7 ++++++-
 modules/interventi/add.php | 38 ++++++++++++++++++--------------------
 update/2_4_2.sql           |  7 ++++++-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/lib/functions.js b/lib/functions.js
index f298bd637..466708afc 100644
--- a/lib/functions.js
+++ b/lib/functions.js
@@ -960,10 +960,15 @@ jQuery.fn.selectClear = function () {
 /**
  * Resetta i contenuti di un <select> creato con select2.
  */
-jQuery.fn.selectReset = function () {
+jQuery.fn.selectReset = function (placeholder) {
     this.selectClear();
     this.empty();
 
+    if (placeholder != undefined){
+     this.next().find('.select2-selection__placeholder').text(placeholder);
+     this.next().find('input.select2-search__field').attr('placeholder', placeholder);
+    }
+
     return this;
 };
 
diff --git a/modules/interventi/add.php b/modules/interventi/add.php
index 65359c5e3..d06e43ef9 100644
--- a/modules/interventi/add.php
+++ b/modules/interventi/add.php
@@ -201,6 +201,10 @@ if (!empty($id_intervento)) {
 
 			<!-- RIGA 2 -->
 			<div class="row">
+                <div class="col-md-4">
+                    {[ "type": "select", "label": "<?php echo tr('Zona'); ?>", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( ' - ', nome, descrizione) AS descrizione FROM an_zone ORDER BY nome", "value": "<?php echo $idzona; ?>", "placeholder": "<?php echo tr('Nessuna zona'); ?>", "help":"<?php echo 'La zona viene definita automaticamente in base al cliente selezionato'; ?>.", "extra": "readonly", "value": "<?php echo $idzona; ?>" ]}
+                </div>
+
 				<div class="col-md-4">
                     {[ "type": "select", "label": "<?php echo tr('Preventivo'); ?>", "name": "idpreventivo", "value": "<?php echo $idpreventivo; ?>"<?php echo !empty($idanagrafica) ? '' : ', "placeholder": "'.tr('Seleziona prima un cliente').'..."'; ?>, "ajax-source": "preventivi" ]}
 				</div>
@@ -208,14 +212,14 @@ if (!empty($id_intervento)) {
 				<div class="col-md-4">
                     {[ "type": "select", "label": "<?php echo tr('Contratto'); ?>", "name": "idcontratto", "value": "<?php echo $idcontratto; ?>"<?php echo !empty($idanagrafica) ? '' : ', "placeholder": "'.tr('Seleziona prima un cliente').'..."'; ?>, "ajax-source": "contratti" ]}
 				</div>
-
-				<div class="col-md-4" id='impianti'>
-                    {[ "type": "select", "label": "<?php echo tr('Impianto'); ?>", "multiple": 1, "name": "idimpianti[]", "value": "<?php echo $idimpianto; ?>"<?php echo !empty($idanagrafica) ? '' : ', "placeholder": "'.tr('Seleziona prima un cliente').'..."'; ?>, "ajax-source": "impianti-cliente", "icon-after": "add|<?php echo Modules::get('MyImpianti')['id']; ?>|source=Attività|<?php echo (empty($idimpianto)) ? '' : 'disabled'; ?>", "data-heavy": 0 ]}
-				</div>
 			</div>
 
 			<div class="row">
-				<div class="col-md-12">
+                <div class="col-md-6" id='impianti'>
+                    {[ "type": "select", "label": "<?php echo tr('Impianto'); ?>", "multiple": 1, "name": "idimpianti[]", "value": "<?php echo $idimpianto; ?>"<?php echo !empty($idanagrafica) ? '' : ', "placeholder": "'.tr('Seleziona prima un cliente').'..."'; ?>, "ajax-source": "impianti-cliente", "icon-after": "add|<?php echo Modules::get('MyImpianti')['id']; ?>|source=Attività|<?php echo (empty($idimpianto)) ? '' : 'disabled'; ?>", "data-heavy": 0 ]}
+                </div>
+
+                <div class="col-md-6">
                     {[ "type": "select", "label": "<?php echo tr('Componenti'); ?>", "multiple": 1, "name": "componenti[]", "placeholder": "<?php echo tr('Seleziona prima un impianto'); ?>...", "ajax-source": "componenti" ]}
 				</div>
 			</div>
@@ -231,22 +235,15 @@ if (!empty($id_intervento)) {
 		<div class="panel-body">
 			<!-- RIGA 3 -->
 			<div class="row">
-				<div class="col-md-6">
-					{[ "type": "timestamp", "label": "<?php echo tr('Data richiesta'); ?>", "name": "data_richiesta", "required": 1, "value": "<?php echo $data_richiesta ?: '-now-'; ?>" ]}
-				</div>
+                <div class="col-md-4">
+                    {[ "type": "timestamp", "label": "<?php echo tr('Data richiesta'); ?>", "name": "data_richiesta", "required": 1, "value": "<?php echo $data_richiesta ?: '-now-'; ?>" ]}
+                </div>
 
 				<div class="col-md-4">
-					{[ "type": "select", "label": "<?php echo tr('Zona'); ?>", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( ' - ', nome, descrizione) AS descrizione FROM an_zone ORDER BY nome", "value": "<?php echo $idzona; ?>", "placeholder": "<?php echo tr('Nessuna zona'); ?>", "help":"<?php echo 'La zona viene definita automaticamente in base al cliente selezionato'; ?>.", "extra": "readonly", "value": "<?php echo $idzona; ?>" ]}
-				</div>
-			</div>
-
-			<!-- RIGA 4 -->
-			<div class="row">
-				<div class="col-md-6">
 					{[ "type": "select", "label": "<?php echo tr('Tipo attività'); ?>", "name": "idtipointervento", "required": 1, "values": "query=SELECT idtipointervento AS id, descrizione FROM in_tipiintervento ORDER BY descrizione ASC", "value": "<?php echo $idtipointervento; ?>", "ajax-source": "tipiintervento" ]}
 				</div>
 
-				<div class="col-md-6">
+				<div class="col-md-4">
 					{[ "type": "select", "label": "<?php echo tr('Stato'); ?>", "name": "idstatointervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL", "value": "<?php echo $idstatointervento; ?>" ]}
 				</div>
 			</div>
@@ -364,19 +361,20 @@ if (!empty($id_intervento)) {
 		session_set('superselect,idanagrafica', $(this).val(), 0);
 
         var value = !$(this).val() ? true : false;
+        var placeholder = !$(this).val() ? '<?php echo tr("Seleziona prima un cliente...");?>' : '<?php echo tr("-Seleziona un\'opzione-");?>';
 
 		$("#idsede").prop("disabled", value);
-		$("#idsede").selectReset();
+		$("#idsede").selectReset(placeholder);
 
 		$("#idpreventivo").prop("disabled", value);
-		$("#idpreventivo").selectReset();
+		$("#idpreventivo").selectReset(placeholder);
 
 		$("#idcontratto").prop("disabled", value);
-		$("#idcontratto").selectReset();
+		$("#idcontratto").selectReset(placeholder);
 
 		$("#idimpianti").prop("disabled", value);
         $("#impianti").find("button").prop("disabled", value);
-		$("#idimpianti").selectReset();
+		$("#idimpianti").selectReset(placeholder);
 
 		if (($(this).val())) {
 			if (($(this).selectData().idzona)){
diff --git a/update/2_4_2.sql b/update/2_4_2.sql
index 05fde81c3..2ae485099 100644
--- a/update/2_4_2.sql
+++ b/update/2_4_2.sql
@@ -580,4 +580,9 @@ INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`,
 ((SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie impianti'), 'Nome', 'nome', 2, 1, 0, 1, 1);
 
 -- Per i preventivi già in essere imposto master_revision = id e default_revision = 1
-UPDATE `co_preventivi` SET `master_revision` = `id`, `default_revision` = 1;
\ No newline at end of file
+UPDATE `co_preventivi` SET `master_revision` = `id`, `default_revision` = 1;
+
+-- Colonna natura iva e codice iva
+INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `visible`, `summable`, `default`) VALUES
+(NULL,  (SELECT `id` FROM `zz_modules` WHERE `name` = 'IVA'), 'Natura', 'codice_natura_fe', 2, 1, 0, 0, 1, 0, 1),
+(NULL,  (SELECT `id` FROM `zz_modules` WHERE `name` = 'IVA'), 'Codice', 'codice', 1, 1, 0, 0, 1, 0, 1);
\ No newline at end of file