From 1b01924e12713617bf445cbe330fda260085cb6d Mon Sep 17 00:00:00 2001
From: Fabio Lovato <fabiol@openstamanager.com>
Date: Wed, 27 Feb 2019 13:17:47 +0100
Subject: [PATCH] Aggiunta data scadenza da aggiunta intervento

---
 modules/interventi/actions.php |  2 ++
 modules/interventi/add.php     | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/interventi/actions.php b/modules/interventi/actions.php
index 6ba968661..3fe2dc5e8 100644
--- a/modules/interventi/actions.php
+++ b/modules/interventi/actions.php
@@ -74,6 +74,7 @@ switch (post('op')) {
             $idtipointervento = post('idtipointervento');
             $idstatointervento = post('idstatointervento');
             $data_richiesta = post('data_richiesta');
+            $data_scadenza = post('data_scadenza');
 
             $anagrafica = Anagrafica::find($idanagrafica);
             $tipo = TipoSessione::find($idtipointervento);
@@ -104,6 +105,7 @@ switch (post('op')) {
             $intervento->id_preventivo = post('idpreventivo');
             $intervento->id_contratto = post('idcontratto');
             $intervento->richiesta = $richiesta;
+            $intervento->data_scadenza = $data_scadenza;
 
             $intervento->save();
 
diff --git a/modules/interventi/add.php b/modules/interventi/add.php
index 44265b803..c9eaa9a25 100644
--- a/modules/interventi/add.php
+++ b/modules/interventi/add.php
@@ -223,15 +223,19 @@ if (!empty($id_intervento)) {
 		<div class="panel-body">
 			<!-- RIGA 3 -->
 			<div class="row">
-                <div class="col-md-4">
-                    {[ "type": "timestamp", "label": "<?php echo tr('Data e ora richiesta'); ?>", "name": "data_richiesta", "required": 1, "value": "<?php echo $data_richiesta ?: '-now-'; ?>" ]}
+                <div class="col-md-3">
+                    {[ "type": "timestamp", "label": "<?php echo tr('Data/ora richiesta'); ?>", "name": "data_richiesta", "required": 1, "value": "<?php echo $data_richiesta ?: '-now-'; ?>" ]}
+                </div>
+                
+                <div class="col-md-3">
+                    {[ "type": "timestamp", "label": "<?php echo tr('Data/ora scadenza'); ?>", "name": "data_scadenza", "required": 0, "value": "" ]}
                 </div>
 
-				<div class="col-md-4">
+				<div class="col-md-3">
 					{[ "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-4">
+				<div class="col-md-3">
 					{[ "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>