From c61009a91ec78fe4927cec6e56b2bd09bcd417a1 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Wed, 28 Nov 2018 02:10:12 +0100
Subject: [PATCH] Fix minori

---
 modules/categorie_documenti/actions.php     |  4 ++++
 modules/categorie_documenti/ajax/select.php | 24 +++++++++++++++++++++
 modules/fatture/edit.php                    |  6 +++---
 modules/gestione_documentale/add.php        | 11 +++++-----
 modules/gestione_documentale/edit.php       |  2 +-
 5 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 modules/categorie_documenti/ajax/select.php

diff --git a/modules/categorie_documenti/actions.php b/modules/categorie_documenti/actions.php
index bc8c53de5..32daaa71c 100644
--- a/modules/categorie_documenti/actions.php
+++ b/modules/categorie_documenti/actions.php
@@ -38,6 +38,10 @@ switch (post('op')) {
                 ]);
                 $id_record = $dbo->last_inserted_id();
 
+                if (isAjaxRequest()) {
+                    echo json_encode(['id' => $id_record, 'text' => $descrizione]);
+                }
+
                 flash()->info(tr('Nuova categoria documenti aggiunta!'));
             }
         }
diff --git a/modules/categorie_documenti/ajax/select.php b/modules/categorie_documenti/ajax/select.php
new file mode 100644
index 000000000..4d7416981
--- /dev/null
+++ b/modules/categorie_documenti/ajax/select.php
@@ -0,0 +1,24 @@
+<?php
+
+include_once __DIR__.'/../../../core.php';
+
+switch ($resource) {
+	
+    case 'categorie_documenti':
+        $query = 'SELECT id, descrizione FROM zz_documenti_categorie |where| ORDER BY descrizione ASC';
+
+        foreach ($elements as $element) {
+            $filter[] = 'zz_documenti_categorie.id='.prepare($element);
+        }
+
+        if (empty($filter)) {
+            $where[] = 'deleted_at IS NULL';
+        }
+
+        if (!empty($search)) {
+            $search_fields[] = 'descrizione LIKE '.prepare('%'.$search.'%');
+        }
+
+		
+        break;
+}
diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php
index 9fb02b6e9..9f327ff20 100644
--- a/modules/fatture/edit.php
+++ b/modules/fatture/edit.php
@@ -243,15 +243,15 @@ if ($tipodoc == 'Fattura accompagnatoria di vendita') {
         <div class="box-body">
             <div class="row">
                 <div class="col-md-3">
-                    {[ "type": "select", "label": "'.tr('Aspetto beni').'", "name": "idaspettobeni", "placeholder": "-", "values": "query=SELECT id, descrizione FROM dt_aspettobeni ORDER BY descrizione ASC", "value": "$idaspettobeni$", "icon-after": "add|'.Modules::get('Aspetto beni')['id'].'||'.(($record['stato']!='Bozza') ? 'disabled': '' ).'" ]}
+                    {[ "type": "select", "label": "'.tr('Aspetto beni').'", "name": "idaspettobeni", "placeholder": "", "ajax-source": "aspetto-beni", "value": "$idaspettobeni$", "icon-after": "add|'.Modules::get('Aspetto beni')['id'].'||'.(($record['stato']!='Bozza') ? 'disabled': '' ).'" ]}
                 </div>
 
                 <div class="col-md-3">
-                    {[ "type": "select", "label": "'.tr('Causale trasporto').'", "name": "idcausalet", "placeholder": "-", "values": "query=SELECT id, descrizione FROM dt_causalet ORDER BY descrizione ASC", "value": "$idcausalet$", "icon-after": "add|'.Modules::get('Causali')['id'].'||'.(($record['stato']!='Bozza') ? 'disabled': '' ).'" ]}
+                    {[ "type": "select", "label": "'.tr('Causale trasporto').'", "name": "idcausalet", "placeholder": "", "ajax-source": "causali", "value": "$idcausalet$", "icon-after": "add|'.Modules::get('Causali')['id'].'||'.(($record['stato']!='Bozza') ? 'disabled': '' ).'" ]}
                 </div>
 
                 <div class="col-md-3">
-                    {[ "type": "select", "label": "'.tr('Porto').'", "name": "idporto", "placeholder": "-", "values": "query=SELECT id, descrizione FROM dt_porto ORDER BY descrizione ASC", "value": "$idporto$" ]}
+                    {[ "type": "select", "label": "'.tr('Porto').'", "name": "idporto", "placeholder": "", "values": "query=SELECT id, descrizione FROM dt_porto ORDER BY descrizione ASC", "value": "$idporto$" ]}
                 </div>
 
                 <div class="col-md-3">
diff --git a/modules/gestione_documentale/add.php b/modules/gestione_documentale/add.php
index e22769ed1..c98991253 100644
--- a/modules/gestione_documentale/add.php
+++ b/modules/gestione_documentale/add.php
@@ -7,15 +7,16 @@ include_once __DIR__.'/../../core.php';
 	<input type="hidden" name="backto" value="record-edit">
 
 	<div class='row'>
-		<div class="col-md-6">
+		<div class="col-md-12">
 			{[ "type": "text", "label": "Nome", "name": "nome", "required": 1, "class": "", "value": "", "extra": "" ]}
 		</div>
-
-		<div class="col-md-3">
-			{[ "type": "select", "label": "Categoria", "name": "idcategoria", "required": 1, "class": "", "values": "query=SELECT id, descrizione FROM zz_documenti_categorie WHERE deleted_at IS NULL", "value": "", "extra": "" ]}
+	</div>
+	<div class='row'>
+		<div class="col-md-6">
+			{[ "type": "select", "label": "Categoria", "name": "idcategoria", "required": 1, "class": "", "ajax-source": "categorie_documenti" , "value": "", "extra": "", "icon-after": "add|<?php echo Modules::get('Categorie documenti')['id']; ?>"  ]}
 		</div>
 
-		<div class="col-md-3">
+		<div class="col-md-6">
 			{[ "type": "text", "label": "Data", "name": "data", "required": 1, "class": "datepicker text-center", "value": "", "extra": "" ]}
 		</div>
 	</div>
diff --git a/modules/gestione_documentale/edit.php b/modules/gestione_documentale/edit.php
index 3589d302c..e2d26bb72 100644
--- a/modules/gestione_documentale/edit.php
+++ b/modules/gestione_documentale/edit.php
@@ -23,7 +23,7 @@ include_once __DIR__.'/../../core.php';
 
 
 				<div class="col-md-3">
-					{[ "type": "select", "label": "Categoria", "name": "idcategoria", "required": 1, "class": "", "values": "query=SELECT id, descrizione FROM zz_documenti_categorie WHERE deleted_at IS NULL", "value": "$idcategoria$", "extra": "" ]}
+					{[ "type": "select", "label": "Categoria", "name": "idcategoria", "required": 1, "class": "", "ajax-source": "categorie_documenti", "value": "$idcategoria$", "extra": "" ]}
 				</div>