From 4afe2fa5e6f985014b054d4fd5a7dca9333a9212 Mon Sep 17 00:00:00 2001
From: Luca <lucas@devcode.it>
Date: Thu, 24 Nov 2022 15:49:50 +0100
Subject: [PATCH] =?UTF-8?q?Avviso=20gruppo=20o=20username=20gi=C3=A0=20in?=
 =?UTF-8?q?=20uso=20in=20fase=20di=20creazione=20/=20modifica?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/utenti/add.php                  | 22 +++++++++++++++++++---
 modules/utenti/user.php                 |  4 ++++
 src/HTMLBuilder/Wrapper/HTMLWrapper.php |  8 ++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/modules/utenti/add.php b/modules/utenti/add.php
index 066da9a6a..bfab4d6ad 100755
--- a/modules/utenti/add.php
+++ b/modules/utenti/add.php
@@ -21,18 +21,34 @@ include_once __DIR__.'/../../core.php';
 
 ?><form action="" method="post" id="add-form">
 	<input type="hidden" name="op" value="add">
-	<input type="hidden" name="backto" value="record-edit">
+	<input type="hidden" name="backto" value="record-list">
 
 	<div class="row">
 		<div class="col-md-12">
-			{[ "type": "text", "label": "<?php echo tr('Nome gruppo'); ?>", "name": "nome", "required": 1, "validation": "gruppo", "help": "<?php echo tr("Compilando questo campo verrà creato un nuovo gruppi di utenti."); ?>" ]}
+			{[ "type": "text", "label": "<?php echo tr('Nome gruppo'); ?>", "name": "nome", "required": 1, "validation": "gruppo", "help": "<?php echo tr("Compilando questo campo verrà creato un nuovo gruppo di utenti."); ?>" ]}
 		</div>
 	</div>
 
 	<!-- PULSANTI -->
 	<div class="row">
 		<div class="col-md-12 text-right">
-			<button type="submit" class="btn btn-primary"><i class="fa fa-plus"></i> <?php echo tr('Aggiungi'); ?></button>
+			<button type="button" onclick="submitCheck()" class="btn btn-primary"><i class="fa fa-plus"></i> <?php echo tr('Aggiungi'); ?></button>
 		</div>
 	</div>
 </form>
+
+
+
+<script>
+function submitCheck() {
+	var nome = parseInt($("#nome").attr("valid"));
+
+	if(nome) {
+		$("#add-form").submit();
+	}else{
+		$("input[name=nome]").focus();
+		swal("<?php echo tr('Impossibile procedere'); ?>", "<?php echo tr('Nome gruppo già in uso'); ?>", "error");
+		
+	}
+}
+</script>
\ No newline at end of file
diff --git a/modules/utenti/user.php b/modules/utenti/user.php
index 95865ee3e..df1de601d 100755
--- a/modules/utenti/user.php
+++ b/modules/utenti/user.php
@@ -112,6 +112,10 @@ function submitCheck() {
 
     if(username) {
         $("#user_update").submit();
+    }else{
+        $("input[name=username]").focus();
+        swal("'.tr('Impossibile procedere').'", "'.tr('Nome utente già in uso').'", "error");
+        
     }
 }
 </script>
diff --git a/src/HTMLBuilder/Wrapper/HTMLWrapper.php b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
index 3bcd40d5f..6abea7c0e 100755
--- a/src/HTMLBuilder/Wrapper/HTMLWrapper.php
+++ b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
@@ -130,11 +130,7 @@ class HTMLWrapper implements WrapperInterface
             var icon = container.find("i");
 
             var id_record = "'.$id_record.'";
-
-            /*La validazione su finestra modali deve essere sempre permessa anche per record già esistenti*/
-            /*if ($(".modal-content").is(":visible")) {
-                var id_record = "";
-            }*/ 
+            var id_module = "'.$id_module.'";
 
             icon.attr("class", "fa fa-spinner fa-spin");
 
@@ -142,7 +138,7 @@ class HTMLWrapper implements WrapperInterface
                 url: globals.rootdir + "/actions.php",
                 type: "post",
                 data: {
-                    id_module: "'.$id_module.'",
+                    id_module: id_module,
                     id_record: id_record,
                     name: "'.$name.'",
                     value: value,