From bac24293392d1ec8bbdb0d5854091c96f210c3bd Mon Sep 17 00:00:00 2001
From: KANE LAZENI <lkane@ebene.info>
Date: Sat, 4 Apr 2026 10:30:44 +0000
Subject: [PATCH] a

---
 Controleur/ControleurAjaxdemanderdv.php       | 11 ++++++
 .../ControleurConsultationsinitiees.php       |  7 +---
 Js/fonctions.js                               | 38 ++++++++++++++++---
 Modele/Rendezvous.php                         |  9 +++++
 Vue/Consultationsinitiees/index.php           | 20 +++-------
 Vue/gabarit.php                               |  2 +-
 6 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/Controleur/ControleurAjaxdemanderdv.php b/Controleur/ControleurAjaxdemanderdv.php
index 6a35993..cf226a3 100755
--- a/Controleur/ControleurAjaxdemanderdv.php
+++ b/Controleur/ControleurAjaxdemanderdv.php
@@ -71,4 +71,15 @@ class ControleurAjaxdemanderdv extends Controleur {
 		var_dump(array("idDemandeConsultation" => $_SESSION['idDemandeConsultation']));
     }
 
+    public function listerdemandesconsultation() 
+	{
+		$idAdherent	= $_SESSION['idAdherent_C'];
+        $d1			= $this->requete->getParametreDate("d1");
+        $d2			= $this->requete->getParametreDate("d2");
+
+		$demandes	= $this->rendezvous->getDemandesConsultation($idAdherent, $d1, $d2);
+		
+		$this->genererVueAjax(array('demandes' => $demandes));
+    }
+
 }
\ No newline at end of file
diff --git a/Controleur/ControleurConsultationsinitiees.php b/Controleur/ControleurConsultationsinitiees.php
index c2b2e56..ed9a4f8 100755
--- a/Controleur/ControleurConsultationsinitiees.php
+++ b/Controleur/ControleurConsultationsinitiees.php
@@ -20,13 +20,10 @@ class ControleurConsultationsinitiees extends Controleur {
 		$idAdherent 	= $_SESSION['idAdherent_C'];
         $d1 			= $_SESSION['debutMois_C'];
         $d2 			= date('Y-m-d');  
-		$codeEtatRdv 	= $_SESSION['codeEtatRdv'] ?? "";
 
-		$demandes 		= $this->rendezvous->getPrisesRdv($idAdherent, $d1, $d2, $codeEtatRdv);
+		$demandes 		= $this->rendezvous->getDemandesConsultation($idAdherent, $d1, $d2);
 		
-		$reponsedemande = $this->rendezvous->getEtatRdv();
-		
-		$this->genererVue(array('demandes' => $demandes, 'reponsedemande' => $reponsedemande));
+		$this->genererVue(array('demandes' => $demandes));
     }
 	
 }
\ No newline at end of file
diff --git a/Js/fonctions.js b/Js/fonctions.js
index f86a645..0c404af 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -18899,14 +18899,12 @@ function enregistrer_demande_consultation()
 				error: function(errorData) {			
 				},
 				success: function(data) {
-					alert(data);
-					$('#div_test_gabarit').html(data);
-					
+					// alert(data);
+					// $('#div_test_gabarit').html(data);
 				},
 				complete: function() {
 					historique_demande_consultation();
 				}
-				
 			});
             
         } else {
@@ -19032,7 +19030,35 @@ function modifier_demande_consultation()
 
 function historique_demande_consultation()
 {
-	alert("historique_demande_consultation");
-	
 	window.location.assign($("#racineWeb" ).val()+"Consultationsinitiees/");
 }
+
+
+function listerdemandesconsultation()
+{
+	alert("listerdemandesconsultation");
+	return;
+
+	d1 			= $("#d1").val();
+	d2 			= $("#d2").val();
+	
+	donnees = 'd1='+ d1+'&d2='+d2;
+	
+	$("#div_dossiers").html('<div class="spinner-responsive">' + '<span><i class="fa fa-spinner"></i></span>' + '</div>');
+	
+	
+	$.ajax({
+		url: $("#racineWeb").val()+"Ajaxdemanderdv/listerdemandesconsultation/",		
+		type: 'POST',			
+		data: donnees,
+		error: function(errorData) {			
+		},
+		success: function(data) {
+			// alert(data);
+			$('#div_dossiers').html(data);
+		},
+		complete: function() {
+			
+		}
+	}); 
+}
diff --git a/Modele/Rendezvous.php b/Modele/Rendezvous.php
index d1d5542..1f29105 100755
--- a/Modele/Rendezvous.php
+++ b/Modele/Rendezvous.php
@@ -105,5 +105,14 @@ class Rendezvous extends Modele {
 		
 		$_SESSION['idDemandeConsultation'] = $resultat['idDemandeConsultation'];
 	}
+
+	public function getDemandesConsultation($idAdherent, $d1, $d2)
+	{
+		$sql = 'call sp_a_get_demande_rdv_famille(?, ?, ?, ?)';
+		
+		$resultat = $this->executerRequete($sql, array($idAdherent, $d1, $d2));
+
+		return $resultat->fetchAll(PDO::FETCH_ASSOC);
+	}
 	
 }
\ No newline at end of file
diff --git a/Vue/Consultationsinitiees/index.php b/Vue/Consultationsinitiees/index.php
index 4200bcf..fa9ad90 100755
--- a/Vue/Consultationsinitiees/index.php
+++ b/Vue/Consultationsinitiees/index.php
@@ -1,23 +1,21 @@
 <?php 
-    $this->titre = "Intersanté - Historique prises Rendez-vous"; 
-    
-    $codeEtatRdv     = $_SESSION['codeEtatRdv'] ?? "";
+    $this->titre = "Intersanté - Historique des demandes de consultation"; 
 ?>
-Consultationsinitiees
+
 <div class="card shadow-lg border-0 mb-4" style="border-radius: 15px;">
 	<div class="card-header bg-primary text-white py-3" style="border-radius: 15px 15px 0 0;">
 		<div class="row align-items-center">
 			<div class="col-8 text-center">
 				<h4 id="h4_titre" class="mb-2 text-center">
 					<i class="fas fa-clock me-2"></i>
-					<?= _("Demandes de rendez-vous") ?>
+					<?= _("Demandes de consultation") ?>
 				</h4>
 			</div>
 		</div>
 	</div>
     <div class="row">
         <div class="col-12">
-            <input class="sr-only" id="nomForm" name="nomForm" value="histordv">
+            <input class="sr-only" id="nomForm" name="nomForm" value="Consultationsinitiees">
             
             <!-- Filtres de recherche -->
             <div class="card shadow-sm mb-8">
@@ -49,18 +47,10 @@ Consultationsinitiees
                                    value="<?= dateCouranteLang($_SESSION['lang'], $_SESSION['lang']) ?>" required>
                         </div>
                         
-                        <!-- État -->
-                        <div class="col-12 col-sm-6 col-md-4 col-lg-2">
-                            <label class="form-label fw-bold"><?= _("Etat") ?></label>
-                            <select class="form-select form-select-sm" id="codeEtatRdv" name="codeEtatRdv">
-                                <?php liste_options_consultation($reponsedemande, $codeEtatRdv); ?>
-                            </select>
-                        </div>
-                        
                         <!-- Bouton Actualiser -->
                         <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                             <button type="button" class="btn btn-primary w-100 btn_autre" 
-                                    onclick="javascript:listerrdv();">
+                                    onclick="javascript:listerdemandesconsultation();">
                                 <i class="fas fa-sync-alt me-2"></i><?= _("Actualiser") ?>
                             </button>
                         </div>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 3e98e67..033998b 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -522,7 +522,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.css" integrity="sha512-3pIirOrwegjM6erE5gPSwkUzO+3cTjpnV9lexlNZqvupR64iZBnOOTiiLPb9M36zpMScbmUNIcHUqKD47M719g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js" integrity="sha512-VEd+nq25CkR676O+pLBnDW09R7VQX9Mdiij052gVCp5yVH3jGtH70Ho/UUv4mJDsEdTvqRCFZg0NKGiojGnUCw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-    <script src="Js/fonctions.js?ver=2026.04.04.04"></script> 
+    <script src="Js/fonctions.js?ver=2026.04.04.07"></script> 
     <script src="Bootstrap/js/bootstrap.min.js"></script>
 	<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>