From be94c3316e93999ffee302ffdadf8c85300091ed Mon Sep 17 00:00:00 2001 From: KONE SOREL Date: Wed, 8 Apr 2026 08:41:39 +0000 Subject: [PATCH] derder --- Bootstrap_new/css/theme-modern.css | 8 ++++- Js/fonctions.js | 52 +++++++++++++++++++++++++-- Vue/Ajaxactesgarantiebareme/index.php | 2 +- 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/Bootstrap_new/css/theme-modern.css b/Bootstrap_new/css/theme-modern.css index 753eae20..cfc913e3 100644 --- a/Bootstrap_new/css/theme-modern.css +++ b/Bootstrap_new/css/theme-modern.css @@ -1999,4 +1999,10 @@ select[class*="selectpicker"], .border-primary{border-color: #212e53 !important;} .text-primary { color: #212e53 !important; } .shadow-xs { box-shadow: 0 2px 4px rgba(0,0,0,0.05); } -.bg-primary {background-color: #212e53 !important;} \ No newline at end of file +.bg-primary {background-color: #212e53 !important;} + +/* Force SweetAlert au premier plan absolu (Bootstrap modals sont à 1055) */ +.swal2-container.swal2-high-zindex {z-index: 10000 !important;} + +/* Amélioration de la visibilité sur les fonds sombres de l'ERP */ +.swal2-popup {border: 1px solid rgba(255, 255, 255, 0.1);box-shadow: 0 15px 35px rgba(0, 0, 0, 0.5) !important;} \ No newline at end of file diff --git a/Js/fonctions.js b/Js/fonctions.js index d8e07942..1d5c2de3 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -68,9 +68,53 @@ function confirm_ebene(p_msg, p_msg_eng) { } +/** + * ALERTE SIMPLE + */ +function alert_ebene(p_msg, p_msg_eng) { + let codeLangue = $("#codeLangue").val(); + let message = (codeLangue === "en_US") ? p_msg_eng : p_msg; + + // Détection de la modale active pour le focus + let targetNode = document.querySelector('.modal.show') || document.body; + + Swal.fire({ + title: message, + icon: 'info', + confirmButtonText: codeLangue === "en_US" ? 'OK' : 'D\'accord', + target: targetNode, // Se fixe sur la modale si elle existe + customClass: { container: 'swal2-high-zindex' } // Classe pour le CSS + }); +} + +/** + * CONFIRMATION (Promesse) + */ +function confirm_ebene(p_msg, p_msg_eng) { + let codeLangue = $("#codeLangue").val(); + let message = (codeLangue === "en_US") ? p_msg_eng : p_msg; + let targetNode = document.querySelector('.modal.show') || document.body; + + return Swal.fire({ + title: message, + icon: 'warning', + showCancelButton: true, + confirmButtonText: codeLangue === "en_US" ? 'Yes' : 'Oui', + cancelButtonText: codeLangue === "en_US" ? 'No' : 'Non', + target: targetNode, + customClass: { container: 'swal2-high-zindex' } + }).then((result) => { + return result.isConfirmed; + }); +} + +/** + * PROMPT (Saisie de texte) + */ function prompt_ebene(p_msg, p_msg_eng, p_retour, callback) { let codeLangue = $("#codeLangue").val(); let message = (codeLangue === "en_US") ? p_msg_eng : p_msg; + let targetNode = document.querySelector('.modal.show') || document.body; Swal.fire({ title: message, @@ -78,12 +122,14 @@ function prompt_ebene(p_msg, p_msg_eng, p_retour, callback) { inputValue: p_retour, showCancelButton: true, confirmButtonText: 'OK', - cancelButtonText: 'Annuler' + cancelButtonText: codeLangue === "en_US" ? 'Cancel' : 'Annuler', + target: targetNode, + customClass: { container: 'swal2-high-zindex' } }).then((result) => { if (result.isConfirmed) { - callback(result.value); // Exécute la fonction callback avec la valeur saisie + callback(result.value); } else { - callback(null); // Annule l'opération + callback(null); } }); } diff --git a/Vue/Ajaxactesgarantiebareme/index.php b/Vue/Ajaxactesgarantiebareme/index.php index 7d6a2ed9..ed7bc4f0 100755 --- a/Vue/Ajaxactesgarantiebareme/index.php +++ b/Vue/Ajaxactesgarantiebareme/index.php @@ -346,7 +346,7 @@