diff --git a/Bootstrap_new/css/help-center.css b/Bootstrap_new/css/help-center.css new file mode 100644 index 0000000..7533b27 --- /dev/null +++ b/Bootstrap_new/css/help-center.css @@ -0,0 +1,100 @@ +/* Style isolé pour le centre d'aide - Position GAUCHE */ + #helpButton { + position: fixed; + bottom: 25px; + left: 25px; /* Changé de right à left pour libérer le bouton de session */ + width: 55px; + height: 55px; + background: #004a99; + color: #fff; + border: none; + border-radius: 50%; + font-size: 26px; + font-weight: bold; + cursor: pointer; + z-index: 9999; + box-shadow: 0 5px 15px rgba(0,0,0,0.3); + transition: 0.2s; + } + + #helpButton:hover { + transform: scale(1.1); + background: #003366; /* Un bleu un peu plus foncé au survol */ + } + + /* Le reste du modal reste inchangé mais bien isolé */ + #helpModal.help-modal-container { + display: none; + position: fixed; + z-index: 10000; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(0,0,0,0.6); + backdrop-filter: blur(3px); + } + + #helpModal .help-modal-content { + background: #fff; + margin: 12% auto; + padding: 30px; + border-radius: 15px; + width: 450px; + position: relative; + box-shadow: 0 15px 40px rgba(0,0,0,0.5); + font-family: sans-serif; + } + + #helpModal .help-close-button { + position: absolute; + top: 15px; + right: 20px; + font-size: 30px; + cursor: pointer; + color: #888; + line-height: 1; + } + + #helpModal .help-grid { + display: flex; + gap: 20px; + margin-top: 25px; + } + + #helpModal .help-card { + flex: 1; + text-decoration: none; + color: #333; + padding: 20px; + border: 2px solid #f0f0f0; + border-radius: 10px; + text-align: center; + transition: 0.3s; + } + + #helpModal .help-card:hover { + border-color: #004a99; + background: #f9fcff; + } + + #helpModal .help-icon { + font-size: 35px; + display: block; + margin-bottom: 10px; + } + + #helpModal .help-title { + color: #004a99; + margin: 0 0 10px 0; + font-size: 22px; + } + + #helpModal .help-modal-footer { + margin-top: 25px; + padding-top: 15px; + border-top: 1px solid #eee; + text-align: center; + font-size: 12px; + color: #999; + } \ No newline at end of file diff --git a/Controleur/ControleurAjaxremplaceradherent.php b/Controleur/ControleurAjaxremplaceradherent.php index dbb29a2..ced64b6 100644 --- a/Controleur/ControleurAjaxremplaceradherent.php +++ b/Controleur/ControleurAjaxremplaceradherent.php @@ -47,6 +47,7 @@ class ControleurAjaxremplaceradherent extends Controleur $this->adherent->initremplacementadherent($idPolice, $idAdherent, $dateSortie , $dateRemplacement, $user, $motifavenant, $fraisCarte); + $remplacementadherent_temp = $this->adherent->getremplacementadherent_temp(); $spadherent = $this->adherent->getRapportSpAdherent($idAdherent, $dateSortie); @@ -61,6 +62,7 @@ class ControleurAjaxremplaceradherent extends Controleur 'adherentremplacanttemp' => $adherentremplacanttemp, 'naturepiece' => $this->naturepiece, 'sexe' => $this->sexe, 'pays' => $this->pays, 'situationfamille' => $this->situationfamille, 'groupesanguin' => $this->groupesanguin, 'remplacementadherent_temp' => $remplacementadherent_temp, 'garantieadherents' => $garantieadherents)); + } public function enregistrerremplacementadherent() @@ -77,7 +79,7 @@ class ControleurAjaxremplaceradherent extends Controleur $adresseGeo = $this->requete->getParametreFormulaire("adresseGeo"); $adressePostale = $this->requete->getParametreFormulaire("adressePostale"); $codePays = $this->requete->getParametre("codePays"); - $telephonFixe = $this->requete->getParametreFormulaire("telephonFixe"); + $telephonFixe = ""; //$this->requete->getParametreFormulaire("telephonFixe"); $telephonePortable = $this->requete->getParametreFormulaire("telephonePortable"); $email = $this->requete->getParametreFormulaire("email"); $fraisCarte = $this->requete->getParametreFormulaire("fraisCarte","numerique"); diff --git a/Docs/HR-Portal-Quickstart-FR.pdf b/Docs/Docs/Guide-Demarrage-FR.pdf similarity index 100% rename from Docs/HR-Portal-Quickstart-FR.pdf rename to Docs/Docs/Guide-Demarrage-FR.pdf diff --git a/Docs/HR-Portal-Full-Manual-FR.pdf b/Docs/Docs/Manuel-Utilisateur-FR.pdf similarity index 100% rename from Docs/HR-Portal-Full-Manual-FR.pdf rename to Docs/Docs/Manuel-Utilisateur-FR.pdf diff --git a/Docs/HR-Portal-Quickstart-EN.pdf b/Docs/Docs/Quick-Start-EN.pdf similarity index 100% rename from Docs/HR-Portal-Quickstart-EN.pdf rename to Docs/Docs/Quick-Start-EN.pdf diff --git a/Docs/HR-Portal-Full-Manual-EN.pdf b/Docs/Docs/User-Manual-EN.pdf similarity index 100% rename from Docs/HR-Portal-Full-Manual-EN.pdf rename to Docs/Docs/User-Manual-EN.pdf diff --git a/Js/fonctions.js b/Js/fonctions.js index 97ff9c4..fcc8e33 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -1568,6 +1568,7 @@ function creer_avenant() window.location.assign($("#racineWeb" ).val()+"Creeravenant/"); } +/* function enregistrer_avenant() { codeTypeAvenant=$("#codeTypeAvenant").val(); @@ -1593,13 +1594,6 @@ function enregistrer_avenant() dt_effet = Math.round(Date.parse(d_effet)/(1000*3600*24)); dt_fin = Math.round(Date.parse(d_fin)/(1000*3600*24)); dt_avenant = Math.round(Date.parse(d_avenant)/(1000*3600*24)); - - /* - alert("dt_effet => "+dt_effet); - alert("dt_fin => "+dt_fin); - alert("dt_avenant => "+dt_avenant); - return; - */ if (dt_avenant>dt_fin || dt_avenant dt_fin || dt_avenant < dt_effet) { + let v_msg = "Veuillez revoir la date ! Elle doit être comprise dans la période de validité du contrat."; + let v_msgEng = "Please review the date! It must be within the contract validity period."; + alert_ebene(v_msg, v_msgEng); + return; + } + + // 4. Vérification du Motif + motifavenant=$("#motifavenant").val(); + + if ($("#motifavenant").val()<" ") + { + v_msg="Veuillez fournir le motif!"; + v_msgEng="Please provide the reason"; + + alert_ebene(v_msg, v_msgEng); + return; + } + + // 5. Confirmation de l'avenant + + v_msg="Confirmez-vous cet avenant?"; + v_msgEng="Do you confirm this amendment to the contract?"; + + confirm_ebene(v_msg, v_msgEng).then(isConfirmed => { + if (isConfirmed) { + var div_attente = $('#div_attente'); + + div_attente.html(` +
+ + + Veuillez patienter... / Please wait... + +
+ `); + + document.getElementById("formAvenant").submit(); + + } + }); +} function pop_afficher_selection_retrait() { const div_selection_assure = $('#div_selection_assure'); @@ -1805,6 +1886,7 @@ function liste_avenant() window.location.assign($("#racineWeb" ).val()+"Listeavenant/"); } +/* function controle_date_avenant() { let codeTypeAvenant = $("#codeTypeAvenant").val(); $("#div_periodidite").html(""); @@ -1812,6 +1894,20 @@ function controle_date_avenant() { //$("#dateAvenant").prop("readonly", true); //$("#motifavenant").prop("readonly", true); } +*/ + +function controle_date_avenant() { + let codeTypeAvenant = $("#codeTypeAvenant").val(); + let codesRestrictifs = ['INC', 'RET', 'INCORPORATION', 'RETRAIT']; + + if (codesRestrictifs.includes(codeTypeAvenant.toUpperCase())) { + // Restreindre le calendrier à partir d'aujourd'hui + $("#dateAvenant").datepicker("option", "minDate", 0); + } else { + // Autoriser les dates passées (selon les bornes du contrat) + $("#dateAvenant").datepicker("option", "minDate", null); + } +} function init_import_assures() { @@ -6446,7 +6542,7 @@ function init_remplacement_adherent() dt11=Math.round(Date.parse(td11)/(1000*3600*24)); dt2=Math.round(Date.parse(td2)/(1000*3600*24)); - if (td11<=td1) + if (td11executerRequete($sql, array($idPolice, $idAdherent, $dateSortie , $dateRemplacement, $user, $motifavenant, $fraisCarte)); } @@ -592,6 +597,13 @@ class Adherent extends Modele { $sql = 'call sp_enregistrer_remplacement_adherent(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'; + /* + var_dump(array($idPolice, $idAdherent, $user, $nom, $prenoms, $codeNaturePiece, $numeroPiece, + $sexe, $dateNaissance, $codeGroupeSanguin, $codeSituationFamille, $nombreEnfants, $adresseGeo, $adressePostale, + $codePays, $telephonFixe, $telephonePortable, $email, $fraisCarte)); + die(); + */ + $this->executerRequete($sql, array($idPolice, $idAdherent, $user, $nom, $prenoms, $codeNaturePiece, $numeroPiece, $sexe, $dateNaissance, $codeGroupeSanguin, $codeSituationFamille, $nombreEnfants, $adresseGeo, $adressePostale, $codePays, $telephonFixe, $telephonePortable, $email, $fraisCarte)); diff --git a/Vue/Ajaxremplaceradherent/init.php b/Vue/Ajaxremplaceradherent/init.php index 81d754a..296372d 100644 --- a/Vue/Ajaxremplaceradherent/init.php +++ b/Vue/Ajaxremplaceradherent/init.php @@ -15,6 +15,34 @@
" nettoyer($remplacementadherent_temp['motif']) ?> "
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
@@ -154,11 +182,27 @@
-
+
@@ -181,4 +225,16 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/Vue/Creeradherent/index.php b/Vue/Creeradherent/index.php index 4e951bb..19590ae 100644 --- a/Vue/Creeradherent/index.php +++ b/Vue/Creeradherent/index.php @@ -169,9 +169,22 @@
- + " + oninput="this.setCustomValidity('')" + oninvalid="this.setCustomValidity('')"> +
+
+
+
@@ -236,4 +249,16 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/Vue/Creeravenant/index.php b/Vue/Creeravenant/index.php index f3963a6..a70eb96 100644 --- a/Vue/Creeravenant/index.php +++ b/Vue/Creeravenant/index.php @@ -94,7 +94,7 @@
- +
diff --git a/Vue/Remplaceradherent/index.php b/Vue/Remplaceradherent/index.php index bf1061b..1991baf 100644 --- a/Vue/Remplaceradherent/index.php +++ b/Vue/Remplaceradherent/index.php @@ -51,6 +51,7 @@ nettoyer($adherent['dateFinPolice']), $_SESSION['lang']) ?>
+
@@ -92,7 +93,7 @@
- +
diff --git a/Vue/gabarit.php b/Vue/gabarit.php index 96f087f..fe34b61 100755 --- a/Vue/gabarit.php +++ b/Vue/gabarit.php @@ -127,8 +127,9 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte']; + - + @@ -237,26 +238,24 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
- +
- - +
- - -