From 277786ab4093fa115b7484dd1a192bfc629cb8b0 Mon Sep 17 00:00:00 2001
From: MatteoPistorello <pistorellomatteo8@gmail.com>
Date: Tue, 22 Feb 2022 14:53:07 +0100
Subject: [PATCH] =?UTF-8?q?Aggiunto=20ordinamento=20per=20descrizione=20se?=
 =?UTF-8?q?lect=20stato=20attivit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/common/importa.php                 | 2 +-
 modules/interventi/add.php                 | 4 ++--
 modules/interventi/bulk.php                | 4 ++--
 modules/interventi/edit.php                | 2 +-
 modules/interventi/modals/duplicazione.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/common/importa.php b/include/common/importa.php
index af0c6faf4..352b94958 100755
--- a/include/common/importa.php
+++ b/include/common/importa.php
@@ -128,7 +128,7 @@ if (!empty($options['create_document'])) {
     elseif ($final_module['name'] == 'Interventi') {
         echo '
             <div class="col-md-6">
-                {[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato_intervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL" ]}
+                {[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato_intervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione" ]}
             </div>
 
             <div class="col-md-6">
diff --git a/modules/interventi/add.php b/modules/interventi/add.php
index 5b7a6734e..e1f637d04 100755
--- a/modules/interventi/add.php
+++ b/modules/interventi/add.php
@@ -207,7 +207,7 @@ echo '
         </div>
 
          <div class="col-md-4">
-            {[ "type": "select", "label": "'.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": "'.$id_stato.'" ]}
+            {[ "type": "select", "label": "'.tr('Stato').'", "name": "idstatointervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione", "value": "'.$id_stato.'" ]}
         </div>
     </div>
 
@@ -363,7 +363,7 @@ echo '
 
             <div class="row ricorrenza">
                 <div class="col-md-4">
-                    {[ "type": "select", "label": "'.tr('Stato ricorrenze').'", "name": "idstatoricorrenze", "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL AND is_completato=0" ]}
+                    {[ "type": "select", "label": "'.tr('Stato ricorrenze').'", "name": "idstatoricorrenze", "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL AND is_completato=0 ORDER BY descrizione" ]}
                 </div>
 
                 <div class="col-md-4">
diff --git a/modules/interventi/bulk.php b/modules/interventi/bulk.php
index 59c4e15fd..6f89edf82 100755
--- a/modules/interventi/bulk.php
+++ b/modules/interventi/bulk.php
@@ -281,7 +281,7 @@ if (App::debug()) {
         'data' => [
             'title' => tr('Vuoi davvero cambiare lo stato per questi interventi?'),
             'msg' => tr('Seleziona lo stato in cui spostare tutti gli interventi non completati').'.<br>
-            <br>{[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL" ]}',
+            <br>{[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione" ]}',
             'button' => tr('Procedi'),
             'class' => 'btn btn-lg btn-warning',
             'blank' => false,
@@ -293,7 +293,7 @@ if (App::debug()) {
         'data' => [
             'title' => tr('Vuoi davvero fare una copia degli interventi selezionati?'),
             'msg' => '<br>{[ "type": "timestamp", "label": "'.tr('Data/ora richiesta').'", "name": "data_richiesta", "required": 0, "value": "-now-", "required":1 ]}
-            <br>{[ "type": "select", "label": "'.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": "" ]}
+            <br>{[ "type": "select", "label": "'.tr('Stato').'", "name": "idstatointervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione", "value": "" ]}
             <br>{[ "type":"checkbox", "label":"'.tr('Duplica righe').'", "name":"righe", "value":"" ]}
             <br>{[ "type":"checkbox", "label":"'.tr('Duplica sessioni').'", "name":"sessioni", "value":"" ]}',
             'button' => tr('Procedi'),
diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php
index 87a7170ca..814381f6d 100755
--- a/modules/interventi/edit.php
+++ b/modules/interventi/edit.php
@@ -297,7 +297,7 @@ echo '
                 </div>
 
                 <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": "$idstatointervento$", "class": "unblockable" ]}
+                    {[ "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 ORDER BY descrizione", "value": "$idstatointervento$", "class": "unblockable" ]}
                 </div>
 <?php
 
diff --git a/modules/interventi/modals/duplicazione.php b/modules/interventi/modals/duplicazione.php
index 3d14ad67a..002ae8a45 100644
--- a/modules/interventi/modals/duplicazione.php
+++ b/modules/interventi/modals/duplicazione.php
@@ -36,7 +36,7 @@ echo '
 
     <div class="row">
         <div class="col-md-6">
-            {[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL", "value": "" ]}
+            {[ "type": "select", "label": "'.tr('Stato').'", "name": "id_stato", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione", "value": "" ]}
         </div>
 
         <div class="col-md-3">