Merge branch 'main' of git.ebene.ovh:ebene/radiantrh

This commit is contained in:
KANE LAZENI 2026-01-17 12:05:02 +00:00
commit 20946e1803
40 changed files with 132 additions and 91 deletions

View File

@ -71,13 +71,13 @@ class ControleurAjaxexporterunequittanceclient extends Controleurrequete
// 2eme ligne
$pdf->Cell(25,$ht,convertirc(_('Effet')),0,0,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEffet'])),0,0,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEffet']), $_SESSION['lang']),0,0,'L',false);
$pdf->Cell(25,$ht,convertirc(_('Echéance')),0,0,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEcheance'])),0,0,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEcheance']), $_SESSION['lang']),0,0,'L',false);
$pdf->Cell(25,$ht,convertirc(_('Edition')),0,0,'L',false);
$pdf->Cell(0,$ht,convertirc(' : '.heureCouranteLang($_SESSION['lang'])),0,1,'L',false);
$pdf->Cell(0,$ht,convertirc(' : '.heureCouranteLang($_SESSION['lang']), $_SESSION['lang']),0,1,'L',false);
// 3eme ligne
$pdf->Cell(25,$ht,convertirc(_("P Nette Com")),0,0,'L',false);
@ -119,7 +119,7 @@ class ControleurAjaxexporterunequittanceclient extends Controleurrequete
$pdf->Cell(35,$ht,convertirc(" : ".format_N($quittance['nbAliment'])),0,0,'L',false);
$pdf->Cell(25,$ht,convertirc(_("A Payer avant")),0,0,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['datePaiement'])),0,1,'L',false);
$pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['datePaiement']), $_SESSION['lang']),0,1,'L',false);
// 7eme ligne

View File

@ -46,6 +46,8 @@ class ControleurCreeradherent extends Controleur {
$this->pays = new Pays();
$this->groupesanguin = (new Groupesanguin())->getListe();
$this->tarif = new Tarif();
$this->college = (new Collegepolice())->getListe($_SESSION['idPolice_C']);
$this->avenant = (new Avenant())->getListeEnCours($_SESSION['idPolice_C']);
$this->ouinonprorata = (new Ouinon())->getListe();
@ -58,8 +60,10 @@ class ControleurCreeradherent extends Controleur {
public function index()
{
$idClient = $_SESSION['idClient_C'];
$client = $this->client->getClientId($idClient);
$codeSociete = $_SESSION['codeSociete'];
$codePays = $client['codePays'];
$codeVille = $client['codeVille'];

View File

@ -42,7 +42,10 @@ class ControleurImportassure extends Controleur {
{
if( !mkdir(TARGET, 0755) )
{
$message = 'Erreur : le répertoire cible ne peut-être créé ! Vérifiez que vous diposiez des droits suffisants pour le faire ou créez le manuellement !';
$message = est_anglophone()
? 'Error: the target directory cannot be created! Please check that you have sufficient rights to do so or create it manually!'
: 'Erreur : le répertoire cible ne peut-être créé ! Vérifiez que vous disposiez des droits suffisants pour le faire ou créez le manuellement !';
}
}
@ -74,7 +77,9 @@ class ControleurImportassure extends Controleur {
if(move_uploaded_file($_FILES['fichier_upload']['tmp_name'], TARGET.$nouveau_fichier))
{
// $message = 'Chargé avec succès / Uploaded successfully';
$message = _('Chargé avec succès');
$message = est_anglophone()
? 'Loaded successfully'
: 'Chargé avec succès';
// on va envoyer dans la base de données
@ -83,30 +88,42 @@ class ControleurImportassure extends Controleur {
else
{
// Sinon on affiche une erreur systeme
$message = 'Problème lors du chargement !';
$message = est_anglophone()
? 'Problem while loading!'
: 'Problème lors du chargement !';
}
}
else
{
$message = 'Une erreur interne a empêché le chargement';
$message = 'Une erreur interne a empêché le chargement';$message = est_anglophone()
? 'An internal error prevented loading'
: 'Une erreur interne a empêché le chargement';
}
}
else
{
$message .= $_FILES['fichier_upload']['size']." Erreur dans les dimensions du fichier !";
$message .= $_FILES['fichier_upload']['size'] . (
est_anglophone()
? ' File dimension error!'
: ' Erreur dans les dimensions du fichier !'
);
// $message = 'Erreur dans les dimensions du fichier !';
}
}
else
{
// Sinon on affiche une erreur pour l'extension
$message = 'Extension du fichier est incorrecte !';
$message = est_anglophone()
? 'File extension is incorrect!'
: 'Extension du fichier est incorrecte !';
}
}
else
{
// Sinon on affiche une erreur pour le champ vide
$message = 'Veuillez sélectionner un fichier SVP! / Please select a file!';
$message = est_anglophone()
? 'Please select a file!'
: 'Veuillez sélectionner un fichier SVP!';
}
// fin upload

View File

@ -41,7 +41,7 @@ function dateLang($d, $lang=null)
if (isset($lang) && $lang=="en_US")
{
// return dateEng($d);
return dateFr($d);
return dateEng($d);
}
else
{

View File

@ -168,8 +168,8 @@ function dateLang($d, $lang=null)
{
if (isset($lang) && $lang=="en_US")
{
// return dateEng($d);
return dateFr($d);
return dateEng($d);
}
else
{
@ -193,8 +193,7 @@ function dateheureLang($d, $lang=null)
{
if (isset($lang) && $lang=="en_US")
{
// return dateheureEng($d);
return dateheureFr($d);
return dateheureEng($d);
}
else
{
@ -211,8 +210,8 @@ function heureCouranteLang($lang=null)
{
if (isset($lang) && $lang=="en_US")
{
// return heureCouranteEng();
return heureCouranteFr();
return heureCouranteEng();
}
else
{
@ -234,8 +233,8 @@ function dateCouranteLang($lang=null)
{
if (isset($lang) && $lang=="en_US")
{
// return dateCouranteEng();
return dateCouranteFr();
return dateCouranteEng();
}
else
{

View File

@ -69,7 +69,7 @@ function raffraichier_gabarit()
{
$("#div_ajaxgabarit").html(data);
codeSociete = $("#codeSociete").val();
codeSociete = $("#codeSociete_C").val();
vue = $("#vue").val();
if((codeSociete == undefined || codeSociete <= " ") && vue !="Connexion"){
@ -708,6 +708,8 @@ function est_ce_police_famille()
function creer_adherents()
{
debugger;
// 06/11/2020
if(est_ce_police_famille())
{

View File

@ -67,11 +67,12 @@ class Avenant extends Modele {
{
if (est_anglophone())
{
$sql = 'SELECT A.id AS `code`, CONCAT(B.libelleEng, " of ",DATE_FORMAT(A.dateEffet, "%d/%m/%Y")) AS libelle
$sql = 'SELECT A.id AS `code`, CONCAT(B.libelleEng, " du ",DATE_FORMAT(A.dateEffet, "%d/%m/%Y"), " => ", A.motifavenant) AS libelle
FROM avenant A
JOIN typeavenant B ON (B.codeTypeAvenant=A.codeTypeAvenant)
JOIN police P ON (P.id=A.idPolice)
WHERE (A.idPolice=?) AND (B.ajoutAliment="1")
AND (A.codeTypeAvenant IN ("AFN","INC","RET"))
AND (A.dateEffet>=P.dateEffet)
AND (A.ajoutClient="1")
ORDER BY A.numeroAvenant DESC;';

View File

@ -23,9 +23,9 @@ class Typeavenant extends Modele
{
if (est_anglophone())
{
$sql = 'SELECT A.codeTypeAvenant as `code`, A.libelleEng as libelle FROM typeavenant A
$sql = 'SELECT A.codeTypeAvenant as `code`, A.libelleEng AS libelle FROM typeavenant A
join suiteavenant B on (B.codeTypeAvenant=A.codeTypeAvenant)
where (B.oldCodeTypeAvenant=?) and A.order by A.libelle';
where (B.oldCodeTypeAvenant=?) and A.extranetClient="1" order by A.libelle';
}
else
{

View File

@ -1,2 +1,2 @@
<INPUT style='font-size:10pt;' class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($dateAvenant) ?>" required
<INPUT style='font-size:10pt;' class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($dateAvenant, $_SESSION['lang']) ?>" required
onChange="prorater_prime_adherent();" style='font-size:10pt;'>

View File

@ -1,2 +1,2 @@
<INPUT style='font-size:10pt;' class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($dateAvenant) ?>" required
<INPUT style='font-size:10pt;' class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($dateAvenant, $_SESSION['lang']) ?>" required
onChange="prorater_prime_beneficiaire();" style='font-size:10pt;'>

View File

@ -32,7 +32,7 @@
<?php foreach ($beneficiaires as $beneficiaire): ?>
<tr class="border-bottom">
<td class="text-center text-muted small">
<?= dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?>
<?= dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?>
</td>
<td class="text-center">
<span class="badge bg-light text-dark border fw-normal"><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></span>

View File

@ -94,7 +94,7 @@ KANE LAZENi
<td><?= $this->nettoyer($beneficiaire_sel['nomBeneficiaire']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire_sel['codeLienParente']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire_sel['numeroBeneficiaire']) ?></td>
<td align='center'><?= dateLang($this->nettoyer($beneficiaire_sel['dateEntree'])) ?></td>
<td align='center'><?= dateLang($this->nettoyer($beneficiaire_sel['dateEntree']), $_SESSION['lang']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire_sel['duree']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire_sel['duree_non_acquise']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire_sel['ratioNonAcquise']) ?></td>

View File

@ -31,7 +31,7 @@
</div>
<div class="col-md-2">
<label class="extra-small text-muted text-uppercase fw-bold"><?= _("Date Cons.") ?></label>
<div class="fw-bold border-bottom"><?= dateLang($this->nettoyer($feuillemaladie['dateConsultation'])) ?></div>
<div class="fw-bold border-bottom"><?= dateLang($this->nettoyer($feuillemaladie['dateConsultation']), $_SESSION['lang']) ?></div>
</div>
<div class="col-md-4">
<label class="extra-small text-muted text-uppercase fw-bold"><?= _("Prestataire") ?></label>

View File

@ -38,7 +38,7 @@
?>
<tr>
<td class="text-center">
<div class="small fw-bold text-dark"><?= dateLang($this->nettoyer($ged['dateSysteme'])) ?></div>
<div class="small fw-bold text-dark"><?= dateLang($this->nettoyer($ged['dateSysteme']), $_SESSION['lang']) ?></div>
<div class="extra-small text-muted"><?= date('H:i', strtotime($ged['dateSysteme'])) ?></div>
</td>
<td>

View File

@ -124,11 +124,11 @@
</div>
<div class="col-md-3 border-start">
<span class="text-muted"><?= _("Date Décompte") ?> :</span>
<span class="fw-bold ms-1"><?= dateLang($this->nettoyer($facture['dateDecompte'])) ?></span>
<span class="fw-bold ms-1"><?= dateLang($this->nettoyer($facture['dateDecompte']), $_SESSION['lang']) ?></span>
</div>
<div class="col-md-3 border-start">
<span class="text-muted"><?= _("Règlement") ?> :</span>
<span class="fw-bold ms-1 text-success"><?= dateheureLang($this->nettoyer($facture['heureReglement'])) ?></span>
<span class="fw-bold ms-1 text-success"><?= dateheureLang($this->nettoyer($facture['heureReglement']), $_SESSION['lang']) ?></span>
</div>
</div>
</div>

View File

@ -40,7 +40,7 @@
?>
<tr>
<td class="ps-3 text-center">
<div class="small fw-bold"><?= dateLang($this->nettoyer($verre['dateSysteme'])) ?></div>
<div class="small fw-bold"><?= dateLang($this->nettoyer($verre['dateSysteme']), $_SESSION['lang']) ?></div>
<div class="extra-small text-muted"><?= date('H:i', strtotime($verre['dateSysteme'])) ?></div>
</td>
<td>

View File

@ -43,7 +43,7 @@
<input type="hidden" id="heuresystemefr_C" name="heuresystemefr_C" class="datepicker" value="<?= $this->heuresystemefr ?>">
<input type="hidden" id="dUneSemaineAvant_C" name="dUneSemaineAvant_C" value="<?= $_SESSION['dUneSemaineAvant_C'] ?? '' ?>">
<input type="hidden" id="dUneSemaineAvantFr_C" name="dUneSemaineAvantFr_C" value="<?= isset($_SESSION['dUneSemaineAvant_C']) ? dateLang($_SESSION['dUneSemaineAvant_C'], $_SESSION['dUneSemaineAvant_C']) : '' ?>">
<input type="hidden" id="dUneSemaineAvantFr_C" name="dUneSemaineAvantFr_C" value="<?= isset($_SESSION['dUneSemaineAvant_C']) ? dateLang($_SESSION['dUneSemaineAvant_C'], $_SESSION['lang']) : '' ?>">
<input type="hidden" id="debutExercice_C" name="debutExercice_C" value="<?= $_SESSION['debutExercice_C'] ?? '' ?>">
<input type="hidden" id="debutExerciceFr_C" name="debutExerciceFr_C" value="<?= $_SESSION['debutExerciceFr_C'] ?? '' ?>">
<input type="hidden" id="debutMois_C" name="debutMois_C" value="<?= $_SESSION['debutMois_C'] ?? '' ?>">

View File

@ -28,7 +28,7 @@
</td>
<td class="text-center">
<span class="badge bg-light text-dark border fw-bold px-2 py-1">
<?= dateLang($this->nettoyer($avenant['dateEffet'])) ?>
<?= dateLang($this->nettoyer($avenant['dateEffet']), $_SESSION['lang']) ?>
</span>
</td>
<td>

View File

@ -92,9 +92,9 @@
</td>
<td class="text-center">
<div class="small">
<span class="text-success fw-bold"><?= dateLang($this->nettoyer($adherent['dateEntree'])) ?></span>
<span class="text-success fw-bold"><?= dateLang($this->nettoyer($adherent['dateEntree']), $_SESSION['lang']) ?></span>
<i class="fas fa-arrow-right mx-1 text-muted"></i>
<span class="text-danger fw-bold"><?= $adherent['dateSortie'] ? dateLang($this->nettoyer($adherent['dateSortie'])) : '--' ?></span>
<span class="text-danger fw-bold"><?= $adherent['dateSortie'] ? dateLang($this->nettoyer($adherent['dateSortie']), $_SESSION['lang']) : '--' ?></span>
</div>
</td>
<td class="text-center">

View File

@ -27,7 +27,7 @@
<td><?= $this->nettoyer($beneficiaire['nomBeneficiaire']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire['numeroBeneficiaire']) ?></td>
<td align='center'><?= dateLang($this->nettoyer($beneficiaire['dateEntree'])) ?></td>
<td align='center'><?= dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire['duree']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire['duree_non_acquise']) ?></td>
<td align='center'><?= $this->nettoyer($beneficiaire['ratioNonAcquise']) ?></td>

View File

@ -26,7 +26,7 @@
<label class="form-label small fw-bold text-muted text-uppercase"><?= _("Période du") ?></label>
<div class="input-group shadow-sm">
<span class="input-group-text bg-white border-end-0"><i class="fa-solid fa-calendar-day text-primary"></i></span>
<input style='text-align:center; font-size:10pt;' class="form-control datepicker border-start-0" type="text" id="debutPeriode" name="debutPeriode" value="<?= dateLang($this->nettoyer($adherent['dateEffet'])) ?>">
<input style='text-align:center; font-size:10pt;' class="form-control datepicker border-start-0" type="text" id="debutPeriode" name="debutPeriode" value="<?= dateLang($this->nettoyer($adherent['dateEffet']), $_SESSION['lang']) ?>">
</div>
</div>
@ -34,7 +34,7 @@
<label class="form-label small fw-bold text-muted text-uppercase"><?= _("Au") ?></label>
<div class="input-group shadow-sm">
<span class="input-group-text bg-white border-end-0"><i class="fa-solid fa-calendar-check text-primary"></i></span>
<input style='text-align:center; font-size:10pt;' class="form-control datepicker border-start-0" type="text" id="finPeriode" name="finPeriode" value="<?= dateLang($this->nettoyer($adherent['dateFinPolice'])) ?>">
<input style='text-align:center; font-size:10pt;' class="form-control datepicker border-start-0" type="text" id="finPeriode" name="finPeriode" value="<?= dateLang($this->nettoyer($adherent['dateFinPolice']), $_SESSION['lang']) ?>">
</div>
</div>

View File

@ -35,7 +35,7 @@
<tr>
<td> <?= _("Entrée") ?> </td>
<td><INPUT class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($this->nettoyer($adherent['dateEntree'])) ?>" readonly></td>
<td><INPUT class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($this->nettoyer($adherent['dateEntree']), $_SESSION['lang']) ?>" readonly></td>
<td align="center"> <?= _("Etat") ?> </td>
<td><INPUT class="form-control" TYPE="text" id="etatbeneficiaire" NAME="etatbeneficiaire" value="<?= $etatadherent ?>" readonly ></td>

View File

@ -35,7 +35,7 @@
<tr>
<td> <?= _("Entrée") ?> </td>
<td><INPUT class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($this->nettoyer($beneficiaire['dateEntree'])) ?>" readonly></td>
<td><INPUT class="form-control datepicker" TYPE="text" id="dateEntree" NAME="dateEntree" value="<?= dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?>" readonly></td>
<td align="center"> <?= _("Etat") ?> </td>
<td><INPUT class="form-control" TYPE="text" id="etatbeneficiaire" NAME="etatbeneficiaire" value="<?= $etatbeneficiaire ?>" readonly ></td>

View File

@ -164,7 +164,7 @@
<label class="form-label fw-bold small text-uppercase"><?= _("Date d'Entrée") ?></label>
<div id="div_date_avenant">
<input type="text" class="form-control datepicker fw-bold text-uppercase" id="dateEntree" name="dateEntree"
value="<?= dateLang($_SESSION['dateAvenant_C']) ?>" required onChange="prorater_prime_adherent();">
value="<?= dateLang($_SESSION['dateAvenant_C'], $_SESSION['lang']) ?>" required onChange="prorater_prime_adherent();">
</div>
</div>
<div class="row g-2 mb-4">

View File

@ -36,7 +36,7 @@
<div class="mb-3">
<label class="form-label small fw-bold text-uppercase"><?= _("Date d'Entrée") ?></label>
<div id="div_date_avenant">
<input class="form-control form-control-sm datepicker" type="text" id="dateEntree" name="dateEntree" value="<?= dateLang($_SESSION['dateAvenant_C']) ?>" required onChange="prorater_prime_beneficiaire();">
<input class="form-control form-control-sm datepicker" type="text" id="dateEntree" name="dateEntree" value="<?= dateLang($_SESSION['dateAvenant_C'], $_SESSION['lang']) ?>" required onChange="prorater_prime_beneficiaire();">
</div>
</div>

View File

@ -32,7 +32,7 @@
<label class="form-label fw-bold"><?= _("Période du") ?></label>
<input class="form-control form-control-sm datepicker" type="text"
id="date1" name="date1"
value="<?= dateLang($_SESSION['d1_C']) ?>"
value="<?= dateLang($_SESSION['d1_C'], $_SESSION['lang']) ?>"
required autocomplete="off">
</div>
@ -41,7 +41,7 @@
<label class="form-label fw-bold"><?= _("au") ?></label>
<input class="form-control form-control-sm datepicker" type="text"
id="date2" name="date2"
value="<?= dateLang($_SESSION['d2_C']) ?>"
value="<?= dateLang($_SESSION['d2_C'], $_SESSION['lang']) ?>"
required autocomplete="off">
</div>

View File

@ -68,7 +68,7 @@
<div class="alert alert-danger d-flex align-items-center mb-4 shadow-sm" role="alert">
<i class="fas fa-exclamation-triangle me-3 fa-2x"></i>
<div>
<h4 class="alert-heading mb-0"><?= _("Adhérent sorti le") . " : " . dateLang($dateSortieAdherent) ?></h4>
<h4 class="alert-heading mb-0"><?= _("Adhérent sorti le") . " : " . dateLang($dateSortieAdherent, $_SESSION['lang']) ?></h4>
</div>
</div>
<?php endif; ?>
@ -561,7 +561,7 @@
data: {
labels: dataConso.garanties,
datasets: [{
label: 'Dépenses',
label: '<?= _('Dépenses')?>',
data: dataConso.depenses,
backgroundColor: 'rgba(54, 162, 235, 0.7)',
borderColor: 'rgba(54, 162, 235, 1)',
@ -584,7 +584,7 @@
borderWidth: 2,
borderDash: [6, 6],
label: {
content: `Plafond: ${formatMoney(plafond)}`,
content: `<?= _('Plafond').': '?> ${formatMoney(plafond)}`,
enabled: true,
position: 'right'
}
@ -598,13 +598,13 @@
callbacks: {
label: function(context) {
const plafond = dataConso.plafonds[context.dataIndex];
let tooltip = `Dépenses: ${formatMoney(context.parsed.y)}`;
let tooltip = `<?= _('Dépenses').':'?> ${formatMoney(context.parsed.y)}`;
if (plafond !== null) {
const pourcentage = Math.min(100, Math.round((context.parsed.y / plafond) * 100));
tooltip += ` (${pourcentage}% du plafond)`;
tooltip += ` (${pourcentage}% <?= _('du plafond')?>)`;
} else {
tooltip += ' (plafond illimité)';
tooltip += ' <?= _('(plafond illimité)')?>';
}
return tooltip;
@ -617,7 +617,7 @@
beginAtZero: true,
title: {
display: true,
text: `Montant des dépenses`,
text: '<?= _("Montant des dépenses") ?>',
font: {
weight: 'bold'
}
@ -632,7 +632,7 @@
x: {
title: {
display: true,
text: 'Garanties',
text: '<?= _('Garanties')?>',
font: {
weight: 'bold'
}

View File

@ -94,7 +94,7 @@
<h4 class="h4 mb-0 text-secondary">
<?= _("Bénéficiaire") ?> : <span class="fw-bold"><?= $beneficiaire['numeroBeneficiaire'] ?></span>
</h4>
<small class="text-muted"><?= _("Date Effet") ?> : <?= dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?></small>
<small class="text-muted"><?= _("Date Effet") ?> : <?= dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?></small>
</div>
<div class="text-end">
@ -134,7 +134,7 @@
<div class="col-md-4">
<label class="form-label small text-uppercase fw-bold"><?= _("Naissance & Âge") ?></label>
<input class="form-control bg-light" type="text" value="<?= dateLang($this->nettoyer($beneficiaire['dateNaissance'])).' ('.$beneficiaire['age'].' ans)' ?>" readonly>
<input class="form-control bg-light" type="text" value="<?= dateLang($this->nettoyer($beneficiaire['dateNaissance']), $_SESSION['lang']).' ('.$beneficiaire['age'].' ans)' ?>" readonly>
</div>
<div class="col-md-4">
<label class="form-label small text-uppercase fw-bold"><?= _("Lien Parenté") ?></label>
@ -196,7 +196,7 @@
<div class="alert alert-warning border-0 shadow-sm d-flex align-items-center">
<i class="fa-solid fa-door-open fa-2x me-3"></i>
<div>
<div class="fw-bold"><?= _("Sortie le") ?> : <?= dateLang($dateSortieBeneficiaire) ?></div>
<div class="fw-bold"><?= _("Sortie le") ?> : <?= dateLang($dateSortieBeneficiaire, $_SESSION['lang']) ?></div>
<small><?= $motifsortie ?></small>
</div>
</div>
@ -546,7 +546,7 @@
data: {
labels: dataConso.garanties,
datasets: [{
label: 'Dépenses',
label: '<?= _('Dépenses')?>',
data: dataConso.depenses,
backgroundColor: 'rgba(54, 162, 235, 0.7)',
borderColor: 'rgba(54, 162, 235, 1)',
@ -569,7 +569,7 @@
borderWidth: 2,
borderDash: [6, 6],
label: {
content: `Plafond: ${formatMoney(plafond)}`,
content: `<?= _('Plafond')?>: ${formatMoney(plafond)}`,
enabled: true,
position: 'right'
}
@ -583,13 +583,13 @@
callbacks: {
label: function(context) {
const plafond = dataConso.plafonds[context.dataIndex];
let tooltip = `Dépenses: ${formatMoney(context.parsed.y)}`;
let tooltip = `<?= _('Dépenses')?>: ${formatMoney(context.parsed.y)}`;
if (plafond !== null) {
const pourcentage = Math.min(100, Math.round((context.parsed.y / plafond) * 100));
tooltip += ` (${pourcentage}% du plafond)`;
} else {
tooltip += ' (plafond illimité)';
tooltip += ' <?= _('(plafond illimité)')?>';
}
return tooltip;
@ -602,7 +602,7 @@
beginAtZero: true,
title: {
display: true,
text: `Montant des dépenses`,
text: '<?= _("Montant des dépenses") ?>',
font: {
weight: 'bold'
}
@ -617,7 +617,7 @@
x: {
title: {
display: true,
text: 'Garanties',
text: '<?= _('Garanties')?>',
font: {
weight: 'bold'
}

View File

@ -14,6 +14,20 @@
$etatPolice = $isAnglophone ? $police['etatPoliceEng'] : $police['etatPolice'];
$prestationPossible = $this->nettoyer($police['prestationPossible']);
var_dump(array(
'0: ' => $_SESSION['lang'],
'1: ' => dateLang($this->nettoyer($police['dateEffet']), $_SESSION['lang']),
'2: ' => dateLang("2025-01-11", $_SESSION['lang']),
'3: ' => dateLang("2025-01-11", "en_US"),
'4: ' => dateLang("2025-01-11", "fr_FR"),
'5: ' => $this->nettoyer($police['dateEffet']),
'6: ' => dateEng("2025-01-11"),
'7: ' => dateFr("2025-01-11"),
'8: ' => strtotime("2025-01-11")
));
?>
<div id="div_police" class="container-fluid py-1">
@ -171,7 +185,7 @@
<tbody>
<?php foreach ($geds as $ged): ?>
<tr>
<td class="small"><?= dateheureLang($this->nettoyer($ged['dateSysteme'])) ?></td>
<td class="small"><?= dateheureLang($this->nettoyer($ged['dateSysteme']), $_SESSION['lang']) ?></td>
<td>
<i class="far fa-file-alt me-2 text-muted"></i>
<?= $this->nettoyer($ged['nomOrigine']) ?>
@ -196,7 +210,7 @@
<span class="fw-bold text-muted text-uppercase small"><?= _("Quittances du") ?></span>
</div>
<div class="col-md-2">
<input class="form-control datepicker text-center" id="debut" NAME="debut" value="<?= dateLang($_SESSION['dateEffet_C']) ?>">
<input class="form-control datepicker text-center" id="debut" NAME="debut" value="<?= dateLang($_SESSION['dateEffet_C'], $_SESSION['lang']) ?>">
</div>
<div class="col-auto">
<span class="fw-bold text-muted text-uppercase small"><?= _("au") ?></span>

View File

@ -27,12 +27,12 @@
<tbody>
<tr>
<td> <?= dateLang($this->nettoyer($emission['dateEffet'])) ?> </td>
<td> <?= dateLang($this->nettoyer($emission['dateEcheance'])) ?> </td>
<td> <?= dateLang($this->nettoyer($emission['dateEffet']), $_SESSION['lang']) ?> </td>
<td> <?= dateLang($this->nettoyer($emission['dateEcheance']), $_SESSION['lang']) ?> </td>
<td> <?= $this->nettoyer($emission['dureePolice']) ?> </td>
<td> <?= dateLang($this->nettoyer($avenant['dateEffet'])) ?> </td>
<td> <?= dateLang($this->nettoyer($avenant['dateEcheance'])) ?> </td>
<td> <?= dateLang($this->nettoyer($avenant['dateEffet']), $_SESSION['lang']) ?> </td>
<td> <?= dateLang($this->nettoyer($avenant['dateEcheance']), $_SESSION['lang']) ?> </td>
<td> <?= $this->nettoyer($avenant['dureeAvenant']) ?> </td>
</tr>

View File

@ -1,7 +1,11 @@
<?php
$etatPolice = $this->nettoyer($police['etatPolice']);
$codeEtat = $this->nettoyer($police['codeEtatPolice']);
$etatPolice =
$etatPolice = est_anglophone()
? $this->nettoyer($police['etatPoliceEng'])
: $this->nettoyer($police['etatPolice']);
$codeEtat = $this->nettoyer($police['codeEtatPolice']);
//
?>
<div id="div_liste_adherent" class="container-fluid py-1 animate__animated animate__fadeIn">
<input type="hidden" id="etape2" value="<?= $fichierimport['etape2'] ?>">
@ -32,8 +36,8 @@
</div>
<div class="col-md-3 text-end border-start">
<h6 class="text-muted small fw-bold mb-1 text-uppercase"><?= _("Période") ?></h6>
<div class="small fw-bold">Du <?= dateLang($this->nettoyer($police['dateEffet'])) ?></div>
<div class="small fw-bold">Au <?= dateLang($this->nettoyer($police['dateEcheance'])) ?></div>
<div class="small fw-bold"><?= _('Du').' '.dateLang($this->nettoyer($police['dateEffet']),$_SESSION['lang']) ?></div>
<div class="small fw-bold"><?= _('Au').' '.dateLang($this->nettoyer($police['dateEcheance']),$_SESSION['lang'])?></div>
</div>
</div>
</div>

View File

@ -39,7 +39,7 @@
<td>
<div class="fw-bold"><?= $libelleAvenant ?></div>
<div class="x-small text-muted" style="font-size: 0.75rem;">
<?= dateheureLang($this->nettoyer($avenant['dateSysteme'])) ?>
<?= dateheureLang($this->nettoyer($avenant['dateSysteme']), $_SESSION['lang']) ?>
</div>
</td>
<td class="text-muted small italic">

View File

@ -115,8 +115,8 @@
<div class="fw-bold small"><?= $this->nettoyer($beneficiaire['sexe']) ?></div>
</td>
<td class="text-center">
<div class="small text-muted"><?= _("Né le") ?> <?= dateLang($this->nettoyer($beneficiaire['dateNaissance'])) ?></div>
<div class="small fw-bold text-primary"><?= _("Effet") ?> <?= dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?></div>
<div class="small text-muted"><?= _("Né le") ?> <?= dateLang($this->nettoyer($beneficiaire['dateNaissance']), $_SESSION['lang']) ?></div>
<div class="small fw-bold text-primary"><?= _("Effet") ?> <?= dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?></div>
</td>
<td class="text-end fw-bold"><?= format_N($this->nettoyer($beneficiaire['primeHt'])) ?></td>
<td class="text-end fw-bold text-dark"><?= format_N($this->nettoyer($beneficiaire['primeTtc'])) ?></td>

View File

@ -63,7 +63,7 @@
<tr>
<td class="ps-3 fw-bold text-primary">
<i class="far fa-calendar-alt me-2 text-muted"></i>
<?= dateLang($this->nettoyer($nonfacture['dateEffet'])) ?>
<?= dateLang($this->nettoyer($nonfacture['dateEffet']), $_SESSION['lang']) ?>
</td>
<td class="text-center">
<span class="badge bg-light text-dark border"><?= format_N($nonfacture['nbLignes']) ?></span>

View File

@ -47,7 +47,7 @@
<tbody>
<?php foreach ($nonfactures as $nonfacture):?>
<tr>
<td> <?= dateLang($this->nettoyer($nonfacture['dateEffet'])) ?> </td>
<td> <?= dateLang($this->nettoyer($nonfacture['dateEffet']), $_SESSION['lang']) ?> </td>
<td> <?= format_N($this->nettoyer($nonfacture['nbLignes'])) ?> </td>
<td> <?= format_N($this->nettoyer($nonfacture['primeHt'])) ?> </td>
<td> <?= format_N($this->nettoyer($nonfacture['taxe'])) ?> </td>

View File

@ -83,7 +83,7 @@
<span class="badge bg-info-subtle text-info small border border-info-subtle"><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></span>
<div class="x-small text-muted mt-1 fw-bold"><?= $this->nettoyer($beneficiaire['sexe']) ?></div>
</td>
<td class="text-center"><?= dateLang($this->nettoyer($beneficiaire['dateNaissance'])) ?></td>
<td class="text-center"><?= dateLang($this->nettoyer($beneficiaire['dateNaissance']), $_SESSION['lang']) ?></td>
<td class="text-center small">
<i class="fas fa-phone-alt me-1 text-muted x-small"></i> <?= $this->nettoyer($beneficiaire['telephonePortable']) ?: '--' ?>
</td>

View File

@ -36,7 +36,7 @@
<i class="fa-solid fa-user-slash me-2"></i>
<div>
<small class="d-block lh-1 text-uppercase fw-bold" style="font-size: 0.65rem;"><?= _("Membre sorti le") ?></small>
<span class="fw-bold"><?= dateLang($dateSortieAdherent) ?></span>
<span class="fw-bold"><?= dateLang($dateSortieAdherent, $_SESSION['lang']) ?></span>
</div>
</div>
<?php endif; ?>
@ -89,9 +89,9 @@
<tr>
<td class="ps-3 text-muted"><?= _("Effet / Échéance") ?></td>
<td class="text-end pe-3 fw-bold">
<?= dateLang($this->nettoyer($spadherent['dateEffet'])) ?>
<?= dateLang($this->nettoyer($spadherent['dateEffet']), $_SESSION['lang']) ?>
<i class="fa-solid fa-arrow-right mx-1 text-muted"></i>
<?= dateLang($this->nettoyer($spadherent['dateEcheance'])) ?>
<?= dateLang($this->nettoyer($spadherent['dateEcheance']), $_SESSION['lang']) ?>
</td>
</tr>
<tr>
@ -124,7 +124,7 @@
<tr>
<td class="ps-3 text-muted"><?= _("Effet Famille") ?></td>
<td class="text-end pe-3 fw-bold">
<?= dateLang($this->nettoyer($spadherent['dateEffetAdherent'])) ?>
<?= dateLang($this->nettoyer($spadherent['dateEffetAdherent']), $_SESSION['lang']) ?>
</td>
</tr>
<tr>

View File

@ -22,12 +22,12 @@
<div class="d-flex justify-content-around align-items-center mt-2">
<div>
<div class="small text-muted"><?= _("Effet") ?></div>
<div class="fw-bold"><?= dateLang($this->nettoyer($sppoliceentete['dateEffet'])) ?></div>
<div class="fw-bold"><?= dateLang($this->nettoyer($sppoliceentete['dateEffet']), $_SESSION['lang']) ?></div>
</div>
<i class="fas fa-arrow-right text-light"></i>
<div>
<div class="small text-muted"><?= _("Échéance") ?></div>
<div class="fw-bold"><?= dateLang($this->nettoyer($sppoliceentete['dateEcheance'])) ?></div>
<div class="fw-bold"><?= dateLang($this->nettoyer($sppoliceentete['dateEcheance']), $_SESSION['lang']) ?></div>
</div>
</div>
</div>

View File

@ -14,12 +14,12 @@
<div class="card-body py-1 d-flex align-items-center justify-content-around">
<div class="text-center">
<div class="small text-muted text-uppercase fw-bold"><?= _("Effet") ?></div>
<div class="fw-bold text-dark"><?= dateLang($this->nettoyer($sppoliceentete['dateEffet'])) ?></div>
<div class="fw-bold text-dark"><?= dateLang($this->nettoyer($sppoliceentete['dateEffet']), $_SESSION['lang']) ?></div>
</div>
<i class="fas fa-long-arrow-alt-right text-dark fa-2x"></i>
<div class="text-center">
<div class="small text-muted text-uppercase fw-bold"><?= _("Échéance") ?></div>
<div class="fw-bold text-dark"><?= dateLang($this->nettoyer($sppoliceentete['dateEcheance'])) ?></div>
<div class="fw-bold text-dark"><?= dateLang($this->nettoyer($sppoliceentete['dateEcheance']), $_SESSION['lang']) ?></div>
</div>
</div>
</div>

View File

@ -527,12 +527,12 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
<i class="bi bi-lightning"></i>
<span><?= _('Actions rapides') ?></span>
</div>
<!--
<button class="action-btn" onclick="appNotifications.showMessagesModal()" aria-label="Gérer les notifications">
<i class="bi bi-chat-dots"></i>
<span><?= _('Gérer les notifications') ?></span>
</button>
-->
<button class="action-btn" onclick="change_password()" aria-label="Changer le mot de passe">
<i class="bi bi-key"></i>
<span><?= _('Changer le mot de passe') ?></span>
@ -663,7 +663,7 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<!-- Application Scripts -->
<script src="/Js/fonctions.js?ver=2026.01.16.12"></script>
<script src="/Js/fonctions.js?ver=2026.01.17.01"></script>
<script type="text/javascript">
raffraichier_gabarit();