a
This commit is contained in:
parent
4b9e5f08ea
commit
fab11f8e88
|
|
@ -56,5 +56,4 @@ class ControleurAjaxdemanderdv extends Controleur {
|
||||||
$demandes = $this->rendezvous->getDemandesConsultation();
|
$demandes = $this->rendezvous->getDemandesConsultation();
|
||||||
$this->genererVueAjax(array('demandes' => $demandes));
|
$this->genererVueAjax(array('demandes' => $demandes));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -6,6 +6,8 @@ require_once 'Modele/Menuvueutilisateur.php';
|
||||||
require_once 'Modele/Feuillemaladie.php';
|
require_once 'Modele/Feuillemaladie.php';
|
||||||
require_once 'Modele/Reponseententeprealable.php';
|
require_once 'Modele/Reponseententeprealable.php';
|
||||||
require_once 'Modele/Ententeprealable.php';
|
require_once 'Modele/Ententeprealable.php';
|
||||||
|
require_once 'Modele/Rendezvous.php';
|
||||||
|
require_once 'Modele/Ouinon.php';
|
||||||
|
|
||||||
class ControleurRecherche extends Controleur {
|
class ControleurRecherche extends Controleur {
|
||||||
private $menuvue;
|
private $menuvue;
|
||||||
|
|
@ -14,6 +16,8 @@ class ControleurRecherche extends Controleur {
|
||||||
private $feuillemaladie;
|
private $feuillemaladie;
|
||||||
private $ententeprealable;
|
private $ententeprealable;
|
||||||
private $reponseententeprealable;
|
private $reponseententeprealable;
|
||||||
|
private $rendezvous;
|
||||||
|
private $oui_non;
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
$this->menuvue = new Menuvueutilisateur();
|
$this->menuvue = new Menuvueutilisateur();
|
||||||
|
|
@ -24,6 +28,8 @@ class ControleurRecherche extends Controleur {
|
||||||
$this->feuillemaladie = new Feuillemaladie();
|
$this->feuillemaladie = new Feuillemaladie();
|
||||||
$this->ententeprealable = new Ententeprealable();
|
$this->ententeprealable = new Ententeprealable();
|
||||||
$this->reponseententeprealable = (new Reponseententeprealable())->getListe();
|
$this->reponseententeprealable = (new Reponseententeprealable())->getListe();
|
||||||
|
$this->rendezvous = new Rendezvous();
|
||||||
|
$this->oui_non = new Ouinon();
|
||||||
|
|
||||||
viderContexte();
|
viderContexte();
|
||||||
|
|
||||||
|
|
@ -625,11 +631,14 @@ class ControleurRecherche extends Controleur {
|
||||||
|
|
||||||
$etatFeuille = $_SESSION['etatFeuille'];
|
$etatFeuille = $_SESSION['etatFeuille'];
|
||||||
|
|
||||||
|
|
||||||
$feuillemaladies = $this->feuillemaladie->getfeuillesmaladierecherche($etatFeuille,$codePrestataire, $d1, $d2);
|
$feuillemaladies = $this->feuillemaladie->getfeuillesmaladierecherche($etatFeuille,$codePrestataire, $d1, $d2);
|
||||||
$codeReponseEntentePrealable = "2";
|
$codeReponseEntentePrealable = "2";
|
||||||
$ententeprealables = $this->ententeprealable->getEntenteprealables($codePrestataire, $codeReponseEntentePrealable, $d1, $d2);
|
$ententeprealables = $this->ententeprealable->getEntenteprealables($codePrestataire, $codeReponseEntentePrealable, $d1, $d2);
|
||||||
|
|
||||||
|
$demandeEffectuee = "0";
|
||||||
|
$demandes = $this->rendezvous->getDemandesConsultation($demandeEffectuee);
|
||||||
|
$demandes_effectuees = $this->oui_non->getListe();
|
||||||
|
|
||||||
$beneficiaires = $this->beneficiaire->getBeneficiaireVide();
|
$beneficiaires = $this->beneficiaire->getBeneficiaireVide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -674,7 +683,9 @@ class ControleurRecherche extends Controleur {
|
||||||
'ententeprealables' =>$ententeprealables ,
|
'ententeprealables' =>$ententeprealables ,
|
||||||
'feuillemaladies' =>$feuillemaladies,
|
'feuillemaladies' =>$feuillemaladies,
|
||||||
'derniernumerobeneficiaires'=> $derniernumerobeneficiaires,
|
'derniernumerobeneficiaires'=> $derniernumerobeneficiaires,
|
||||||
'listes' => $listes
|
'listes' => $listes,
|
||||||
|
'demandes' => $demandes,
|
||||||
|
'demandes_effectuees' => $demandes_effectuees
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28817,12 +28817,10 @@ async function ajouter_un_acte_miseenobservation(codeActe, prixBase, prixActe, e
|
||||||
|
|
||||||
function listerdemandesconsultation()
|
function listerdemandesconsultation()
|
||||||
{
|
{
|
||||||
d1 = $("#d1").val();
|
demandeEffectuee = $("#demandeEffectuee").val();
|
||||||
d2 = $("#d2").val();
|
donnees = 'demandeEffectuee=' + demandeEffectuee;
|
||||||
|
|
||||||
donnees = 'd1='+ d1+'&d2='+d2;
|
$("#div_dossiers_demande_consultation").html('<div class="spinner-responsive">' + '<span><i class="fa fa-spinner"></i></span>' + '</div>');
|
||||||
|
|
||||||
$("#div_dossiers").html('<div class="spinner-responsive">' + '<span><i class="fa fa-spinner"></i></span>' + '</div>');
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: $("#racineWeb").val()+"Ajaxdemanderdv/listerdemandesconsultation/",
|
url: $("#racineWeb").val()+"Ajaxdemanderdv/listerdemandesconsultation/",
|
||||||
|
|
@ -28832,7 +28830,7 @@ function listerdemandesconsultation()
|
||||||
},
|
},
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
// alert(data);
|
// alert(data);
|
||||||
$('#div_dossiers').html(data);
|
$('#div_dossiers_demande_consultation').html(data);
|
||||||
},
|
},
|
||||||
complete: function() {
|
complete: function() {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,15 +82,15 @@ class Rendezvous extends Modele {
|
||||||
$this->executerRequete($sql,array($numeroDemandeRdv, $user, $motifReponseRdv));
|
$this->executerRequete($sql,array($numeroDemandeRdv, $user, $motifReponseRdv));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDemandesConsultation()
|
public function getDemandesConsultation($demandeEffectuee)
|
||||||
{
|
{
|
||||||
$demandeEffectuee = contruireParamLike($demandeEffectuee);
|
$demandeEffectuee = contruireParamLike($demandeEffectuee);
|
||||||
|
|
||||||
$codePrestataire = $_SESSION['p_codePrestataire_C'];
|
$codePrestataire = $_SESSION['p_codePrestataire_C'];
|
||||||
|
|
||||||
$sql = 'call sp_get_demande_consultation_prestataire(?, ?)';
|
$sql = 'call sp_a_get_demande_consultations_prestataire(?, ?)';
|
||||||
|
|
||||||
$resultat = $this->executerRequete($sql, array($codePrestataire,$demandeEffectuee));
|
$resultat = $this->executerRequete($sql, array($codePrestataire, $demandeEffectuee));
|
||||||
|
|
||||||
return $resultat->fetchAll(PDO::FETCH_ASSOC);
|
return $resultat->fetchAll(PDO::FETCH_ASSOC);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -393,6 +393,33 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="tab">
|
||||||
|
<input type="radio" name="css-tabs" id="tab-1" checked class="tab-switch">
|
||||||
|
<label for="tab-1" class="tab-label"> <i class="fa fa-folder-open" ></i> <?=_("Demandes de consultation") ?></label>
|
||||||
|
<div class="tab-content" >
|
||||||
|
|
||||||
|
<table class="table table-responsive table-condensed" style='font-size:10pt;'>
|
||||||
|
<tr >
|
||||||
|
<td width="10%" align="center"> <i class="fa fa-flag"></i> <?= _("Effectuée") ?> </td>
|
||||||
|
<td width="20%">
|
||||||
|
<SELECT class="form-select" id="etatFeuille" NAME="etatFeuille" style='font-size:10pt;' onchange="javascript:listerdemandesconsultation();" >
|
||||||
|
<?php liste_options($demandes_effectuees, "0", true); ?>
|
||||||
|
</SELECT>
|
||||||
|
</td>
|
||||||
|
<td> </td>
|
||||||
|
<td> <button style='font-size:10pt;' type="button" class="form-control btn btn-primary" onclick="javascript:filtrefeuilllisterdemandesconsultationerecher();"><i class="fa fa-search" ></i> <?= _("Actualiser...") ?></button> </td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<div id="div_dossiers_demande_consultation">
|
||||||
|
<?php
|
||||||
|
require 'Vue/Ajaxdemanderdv/listerdemandesconsultation.php';
|
||||||
|
?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -908,7 +908,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" />-->
|
<!--<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="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.03.15.09"></script>
|
<script src="Js/fonctions.js?ver=2026.04.04.00"></script>
|
||||||
<script src="Bootstrap/js/bootstrap.min.js"></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://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user