a
This commit is contained in:
parent
e92aff0557
commit
f3a0cd9dac
|
|
@ -20,9 +20,6 @@ class ControleurAjaxfacturepartielle extends Controleur {
|
|||
|
||||
$nbreSelec = $this->prestation->compteselection($numeroFeuilleMaladie, $codePrestataire);
|
||||
|
||||
//var_dump($prestations);
|
||||
//die();
|
||||
|
||||
$this->genererVueAjax(array('prestations' => $prestations, 'nbreSelec' => $nbreSelec));
|
||||
}
|
||||
|
||||
|
|
@ -33,8 +30,6 @@ class ControleurAjaxfacturepartielle extends Controleur {
|
|||
$choix = $this->requete->getParametre("choix");
|
||||
|
||||
$this->prestation->selectionnerunacte($idPrestationactes, $choix);
|
||||
|
||||
//$this->executerAction("index");
|
||||
}
|
||||
|
||||
public function selectionnertous()
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ class ControleurAjaximprimerfacturepartielle extends Controleurrequete
|
|||
$codeTypePrestation = $this->requete->getParametreFormulaire("codeTypePrestation");
|
||||
|
||||
$factures = $this->prestationacte->getFacturepartielle($idPrestationactes);
|
||||
//highlight_string("<?php\n\$datas =\n" . var_export($factures , true) . ";\n>");
|
||||
//die();
|
||||
$feuilleMaladie = $_SESSION['p_numeroFeuilleMaladie_C'];
|
||||
|
||||
$codeActe = $factures['codeActe'];
|
||||
|
|
|
|||
|
|
@ -18,14 +18,8 @@ class ControleurAjaximprimerfacturepartielleselection extends Controleurrequete
|
|||
public function index()
|
||||
{
|
||||
$idEnteteFacture = $this->requete->getParametre("idEnteteFacture");
|
||||
|
||||
|
||||
$feuilleMaladie = $_SESSION['p_numeroFeuilleMaladie_C'];
|
||||
|
||||
|
||||
|
||||
//var_dump($idEnteteFacture)
|
||||
|
||||
if($idEnteteFacture=="0"){
|
||||
$idEnteteFacture = $this->prestationacte->getEnteteFacturepartielleId();
|
||||
}
|
||||
|
|
@ -91,9 +85,6 @@ class ControleurAjaximprimerfacturepartielleselection extends Controleurrequete
|
|||
|
||||
$pdf->SetFont('Arial','', 12);
|
||||
|
||||
/* $pdf->SetFont('Arial','', 12);
|
||||
$pdf->Cell(30,$ht,convertirc(_('Souscripteur')),0,0,'L',false);
|
||||
$pdf->Cell(45,$ht,convertirc(" : ".$_SESSION['p_nomClient_C']),0,1,'L',false);*/
|
||||
$pdf->SetFont('Arial','', 12);
|
||||
$pdf->Cell(55,$ht,convertirc(_('Garant / Souscripteur')),0,0,'L',false);
|
||||
$pdf->SetFont('Arial','B', 12);
|
||||
|
|
@ -124,14 +115,6 @@ class ControleurAjaximprimerfacturepartielleselection extends Controleurrequete
|
|||
$pdf->SetFont('Arial','B', 12);
|
||||
$pdf->Cell(25,$ht,convertirc(": ".$_SESSION['p_numeroBonConsultation_C']),0,0,'L',false);
|
||||
|
||||
/*
|
||||
$pdf->SetFont('Arial','', 12);
|
||||
$pdf->Cell(30,$ht,convertirc(_('Prise en charge')),0,0,'L',false);
|
||||
$pdf->SetFont('Arial','B', 12);
|
||||
$pdf->Cell(55,$ht,convertirc(": ".taux_couverture($_SESSION['p_tm_C'])),0,1,'L',false);
|
||||
*/
|
||||
|
||||
|
||||
$pdf->Ln(2);
|
||||
|
||||
///////////////////////////////////////////////////////
|
||||
|
|
@ -272,8 +255,6 @@ class ControleurAjaximprimerfacturepartielleselection extends Controleurrequete
|
|||
$pdf->Ln(2);
|
||||
$pdf->Cell(0,6,convertirc($_SESSION['p_prestataire_C']),0,0,'R',false);
|
||||
}
|
||||
//highlight_string("<?php\n\$datas =\n" . var_export($_SESSION , true) . ";\n>");
|
||||
|
||||
|
||||
$fichier="Temp/TMP_facture_partielle_selection"."_".uniqid().".pdf";
|
||||
$pdf->Output($fichier,"F");
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require_once 'Framework/Controleur.php';
|
|||
require_once 'Modele/Menuvueutilisateur.php';
|
||||
require_once 'Modele/Prestationactes.php';
|
||||
|
||||
class ControleurFacturepartielle extends Controleur {
|
||||
class ControleurFacturepartielle extends Controleur {
|
||||
private $menuvue;
|
||||
private $prestation;
|
||||
|
||||
|
|
@ -22,13 +22,8 @@ class ControleurFacturepartielle extends Controleur {
|
|||
|
||||
$prestations = $this->prestation->getprestationsfacturepartielle($numeroFeuilleMaladie, $codePrestataire);
|
||||
|
||||
//var_dump($prestations);
|
||||
|
||||
$nbreSelec = $this->prestation->compteselection($numeroFeuilleMaladie, $codePrestataire);
|
||||
|
||||
//var_dump($nbreSelec);
|
||||
//die();
|
||||
|
||||
$this->genererVue(array('prestations' => $prestations, 'nbreSelec' => $nbreSelec));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20456,17 +20456,14 @@ function supprimer_miseenobservation()
|
|||
|
||||
function select_prestatation_a_facturer(p_choix, idPrestationactes)
|
||||
{
|
||||
|
||||
donnees = 'idPrestationactes='+idPrestationactes;
|
||||
donnees += '&choix='+p_choix;
|
||||
|
||||
|
||||
|
||||
$.ajax({
|
||||
url: $("#racineWeb").val()+"Ajaxfacturepartielle/selectionnerunacte/",
|
||||
type: 'POST',
|
||||
data: donnees,
|
||||
success: function(data) {
|
||||
//$("#div_liste_actes").html(data);
|
||||
facturepartielle();
|
||||
},
|
||||
error: function(data) {
|
||||
|
|
@ -20487,7 +20484,6 @@ function selectionner_tous_actes_a_facturer()
|
|||
type: 'POST',
|
||||
data: donnees,
|
||||
success: function(data) {
|
||||
//$("#div_liste_actes").html(data);
|
||||
facturepartielle();
|
||||
},
|
||||
error: function(data) {
|
||||
|
|
@ -20508,7 +20504,6 @@ function annuler_selection_actes_a_facturer()
|
|||
data: donnees,
|
||||
success: function(data) {
|
||||
$("#div_liste_actes").html(data);
|
||||
//facturepartielle();
|
||||
},
|
||||
error: function(data) {
|
||||
},
|
||||
|
|
@ -20529,7 +20524,6 @@ function imprimerfactureselection(idEnteteFacture)
|
|||
|
||||
donnees = 'idEnteteFacture='+idEnteteFacture;
|
||||
|
||||
|
||||
var div_export = $('#div_facture_selection');
|
||||
div_export.html('<div style="text-align:center; color: #4caf50 ; font-size:14px;"><span><i class="fa fa-spinner fa-spin fa-5x" >' + '</span></div>');
|
||||
|
||||
|
|
@ -20542,15 +20536,12 @@ function imprimerfactureselection(idEnteteFacture)
|
|||
success: function(data)
|
||||
{
|
||||
div_export.html(data);
|
||||
//facturepartielle();
|
||||
},
|
||||
error : function(resultat, statut, erreur)
|
||||
{
|
||||
},
|
||||
complete: function(data)
|
||||
{
|
||||
//
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -20572,7 +20563,7 @@ function imprimerfactureselection(idEnteteFacture)
|
|||
async function supprimefactureselection(idEnteteFacture, numeroFacture) {
|
||||
alert("supprimefactureselection");
|
||||
return;
|
||||
|
||||
|
||||
// Préparation des données et messages
|
||||
const donnees = `idEnteteFacture=${idEnteteFacture}`;
|
||||
const messages = {
|
||||
|
|
|
|||
|
|
@ -480,11 +480,9 @@ class Prestationactes extends Modele
|
|||
{
|
||||
$codePrestataire = $_SESSION['p_codePrestataire_C'];
|
||||
$numeroFeuilleMaladie = $_SESSION['p_numeroFeuilleMaladie_C'];
|
||||
|
||||
$user = $_SESSION['p_login'];
|
||||
$idSaisie = $_SESSION['p_idSaisie'];
|
||||
|
||||
|
||||
$sql = 'call sp_p_facturepartielle_newversion(?, ?, ?, ?, ?)';
|
||||
|
||||
$resultat = $this->executerRequete($sql, array($idPrestationactes, $codePrestataire, $numeroFeuilleMaladie, $idSaisie, $user));
|
||||
|
|
@ -517,7 +515,6 @@ class Prestationactes extends Modele
|
|||
AND (codeTypePrestation !="HOSP")
|
||||
AND (consultation="1");';
|
||||
|
||||
//var_dump($numeroFeuilleMaladie, $codePrestataire);die();
|
||||
$this->executerRequete($sql, array($numeroFeuilleMaladie, $codePrestataire, $codeActeConsultationGratuite));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@
|
|||
<tr>
|
||||
<?php if($idEnteteFacture > '0'): ?>
|
||||
<td>
|
||||
<button type="button" class="form-control btn btn-danger" onClick="onClick="javascript:supprimefactureselection('<?= $idEnteteFacture ?>', '<?= $numeroFacture ?>');">
|
||||
<button type="button" class="form-control btn btn-danger" onClick="javascript:supprimefactureselection('<?= $idEnteteFacture ?>', '<?= $numeroFacture ?>');">
|
||||
<i class="fa fa-times" aria-hidden="true"></i>
|
||||
</button>
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user