diff --git a/Controleur/ControleurAccueilassure.php b/Controleur/ControleurAccueilassure.php
index 73d09cf..505aff7 100755
--- a/Controleur/ControleurAccueilassure.php
+++ b/Controleur/ControleurAccueilassure.php
@@ -121,11 +121,25 @@ class ControleurAccueilassure extends Controleur {
//var_dump($dataConsoParGaranties); die();
- $this->genererVue(array(
- 'adherent' => $adherent,'beneficiaires' => $beneficiaires,'garantieadherents' => $garantieadherents,
- 'limite_adherent' => $limite_adherent,'prestation' => $prestation,'garanties' => $garanties,
- 'numeroBeneficiaire' => $numeroBeneficiaire, 'actes' => $actes, 'labels_mois' => $labels_mois,
- 'data_consos' => $data_consos, 'labels_liens' => $labels_liens, 'data_liens' => $data_liens,
- 'nbreLienParente' => $nbreLienParente, 'dataConsoParGaranties' => $dataConsoParGaranties));
+ $this->genererVue
+ (
+ array
+ (
+ 'adherent' => $adherent,
+ 'beneficiaires' => $beneficiaires,
+ 'garantieadherents' => $garantieadherents,
+ 'limite_adherent' => $limite_adherent,
+ 'prestation' => $prestation,
+ 'garanties' => $garanties,
+ 'numeroBeneficiaire' => $numeroBeneficiaire,
+ // 'actes' => $actes,
+ 'labels_mois' => $labels_mois,
+ 'data_consos' => $data_consos,
+ 'labels_liens' => $labels_liens,
+ 'data_liens' => $data_liens,
+ 'nbreLienParente' => $nbreLienParente,
+ 'dataConsoParGaranties' => $dataConsoParGaranties
+ )
+ );
}
}
diff --git a/Vue/Accueilassure/index.php b/Vue/Accueilassure/index.php
index f53adfc..c07b437 100755
--- a/Vue/Accueilassure/index.php
+++ b/Vue/Accueilassure/index.php
@@ -474,343 +474,6 @@
-
-
-
-
-
-
-
-
-
-
- = _("Aucun acte plafonné pour la famille!") ?>
-
-
-
-
-
-
-
-
-
-
- | = _('Légende').':'?> |
- = _('Consommation').' >= 50%'?> |
- |
- |
- |
- = _('Consommation').' >= 80%'?> |
- |
- |
- |
- = _('Consommation').' = 100% / '._('Transaction').' = 100%'?> |
- |
- |
-
-
-
-
-
-
-
-
- | = _("Actes "); ?> |
- = _("Taux") ?> |
- = _("Autorisé à"); ?> |
-
- = _("Pour toute la famille") ?> |
- = _("Pour chaque personne") ?> |
-
-
- | = _("Plafond") ?> |
- = _("Période") ?> |
- = _("Dépenses") ?> |
- = _("Solde") ?> |
- = _("Transaction") ?> |
- = _("Période") ?> |
- = _("Prestation") ?> |
- = _("Solde") ?> |
-
- = _("Plafond") ?> |
- = _("Période") ?> |
- = _("Dépenses") ?> |
- = _("Solde") ?> |
- = _("Transaction") ?> |
- = _("Période") ?> |
- = _("Prestation") ?> |
- = _("Solde") ?> |
-
-
-
- nettoyer($v['libelle']);
- $garantie = $this->nettoyer($v['garantie']);
- $codeGarantie = $this->nettoyer($v['codeGarantie']);
- $codePeriodicite = $this->nettoyer($v['codePeriodicite']);
-
-
- $periodicitePlafondFamille = $this->nettoyer($v['periodicitePlafondFamille']);
- $periodiciteFamille = $this->nettoyer($v['periodiciteFamille']);
- $periodicitePlafond = $this->nettoyer($v['periodicitePlafond']);
- $periodicite = $this->nettoyer($v['periodicite']);
-
- $codeLienParente = $this->nettoyer($v['codeLienParente']);
-
- $lienParente = $this->nettoyer($v['lienparente']);
-
- if (est_anglophone())
- {
- $libelle = $this->nettoyer($v['libelleEng']);
- $garantie = $this->nettoyer($v['garantieEng']);
- $lienParente = $this->nettoyer($v['lienparenteEng']);
-
- $periodicitePlafondFamille = $this->nettoyer($v['periodicitePlafondFamilleEng']);
- $periodiciteFamille = $this->nettoyer($v['periodiciteFamilleEng']);
- $periodicitePlafond = $this->nettoyer($v['periodicitePlafondEng']);
- $periodicite = $this->nettoyer($v['periodiciteEng']);
- }
-
- $pourcentConsoFamille = $this->nettoyer($v['pourcentConsoFamille']);
- $pourcentConso = $this->nettoyer($v['pourcentConso']);
- $transactionFamille = $this->nettoyer($v['transactionFamille']);
- $transactionBeneficiaire = $this->nettoyer($v['transactionBeneficiaire']);
- $idBeneficiaire = $this->nettoyer($v['idBeneficiaire']);
- $codeActe = $this->nettoyer($v['codeActe']);
- $exercieReference = $this->nettoyer($v['exercieReference']);
-
- $taux = $this->nettoyer($v['tauxPlafond']);
- $plafondFamille = format_N($this->nettoyer($v['plafondFamille']));
- $plafond = format_N($this->nettoyer($v['forfaitPlafond']));
- ?>
- ='50' && $pourcentConso<'80'): ?>
-
- ='80' && $pourcentConso <'100'): ?>
-
- ='100' || $transactionBeneficiaire=="1"): ?>
-
-
-
-
- | = $libelle ?> |
- = $taux ?> |
- = $lienParente ?> |
-
- = $plafondFamille ?> |
- = $periodicitePlafondFamille ?> |
- = format_N($this->nettoyer($v['consommationFamille'])) ?> |
- = format_N($this->nettoyer($v['soldeActeFamille'])) ?> |
- = format_N($this->nettoyer($v['nbreTransactionFamille'])) ?> |
- = $periodiciteFamille ?> |
- = format_N($this->nettoyer($v['comptePrestationFamille'])) ?> |
- = format_N($this->nettoyer($v['soldeTransactionFamille'])) ?> |
-
- = $plafond ?> |
- = $periodicitePlafond ?> |
- = format_N($this->nettoyer($v['consommation'])) ?> |
- = format_N($this->nettoyer($v['soldeActe'])) ?> |
- = format_N($this->nettoyer($v['nbreTransaction'])) ?> |
- = $periodiciteFamille ?> |
- = format_N($this->nettoyer($v['comptePrestation'])) ?> |
- = format_N($this->nettoyer($v['soldeTransaction'])) ?> |
-
-
-
-
-
-
-
- nettoyer($v['libelle']),0,25);
- $garantie = $this->nettoyer($v['garantie']);
- $codeGarantie = $this->nettoyer($v['codeGarantie']);
- $codePeriodicite = $this->nettoyer($v['codePeriodicite']);
-
-
- $periodicitePlafondFamille = $this->nettoyer($v['periodicitePlafondFamille']);
- $periodiciteFamille = $this->nettoyer($v['periodiciteFamille']);
- $periodicitePlafond = $this->nettoyer($v['periodicitePlafond']);
- $periodicite = $this->nettoyer($v['periodicite']);
-
- $codeLienParente = $this->nettoyer($v['codeLienParente']);
- $lienParente = $this->nettoyer($v['lienparente']);
-
- if (est_anglophone())
- {
- $libelle = substr($this->nettoyer($v['libelleEng']),0,25);
- $garantie = $this->nettoyer($v['garantieEng']);
- $lienParente = $this->nettoyer($v['lienparenteEng']);
-
- $periodicitePlafondFamille = $this->nettoyer($v['periodicitePlafondFamilleEng']);
- $periodiciteFamille = $this->nettoyer($v['periodiciteFamilleEng']);
- $periodicitePlafond = $this->nettoyer($v['periodicitePlafondEng']);
- $periodicite = $this->nettoyer($v['periodiciteEng']);
- }
-
- $pourcentConsoFamille = $this->nettoyer($v['pourcentConsoFamille']);
- $pourcentConso = $this->nettoyer($v['pourcentConso']);
- $transactionFamille = $this->nettoyer($v['transactionFamille']);
- $transactionBeneficiaire = $this->nettoyer($v['transactionBeneficiaire']);
- $idBeneficiaire = $this->nettoyer($v['idBeneficiaire']);
- $codeActe = $this->nettoyer($v['codeActe']);
- $exercieReference = $this->nettoyer($v['exercieReference']);
- $taux = $this->nettoyer($v['tauxPlafond']);
- $plafondFamille = format_N($this->nettoyer($v['plafondFamille']));
- $plafond = format_N($this->nettoyer($v['forfaitPlafond']));
- ?>
-
-
-
-
-
= _("Pour toute la famille")?>
-
-
-
- = _("Plafond") ?>
- = $plafondFamille ?>
-
-
-
-
-
- = _("Période") ?>
- = $periodicitePlafondFamille ?>
-
-
-
-
-
- = _("Dépenses") ?>
- = format_N($this->nettoyer($v['consommationFamille'])) ?>
-
-
-
-
-
- = _("Solde") ?>
- = format_N($this->nettoyer($v['soldeActeFamille'])) ?>
-
-
-
-
-
-
-
- = _("Transaction") ?>
- = format_N($this->nettoyer($v['nbreTransactionFamille'])) ?>
-
-
-
-
- = _("Période") ?>
- = $periodiciteFamille ?>
-
-
-
-
- = _("Prestation") ?>
- = format_N($this->nettoyer($v['comptePrestationFamille'])) ?>
-
-
-
-
- = _("Solde") ?>
- = format_N($this->nettoyer($v['soldeTransactionFamille'])) ?>
-
-
-
-
-
= _("Pour chaque personne")?>
-
-
-
- = _("Plafond") ?>
- = $plafond ?>
-
-
-
-
-
- = _("Période") ?>
- = $periodicitePlafond ?>
-
-
-
-
-
- = _("Dépenses") ?>
- = format_N($this->nettoyer($v['consommation'])) ?>
-
-
-
-
-
- = _("Solde") ?>
- = format_N($this->nettoyer($v['soldeActe'])) ?>
-
-
-
-
-
-
-
- = _("Transaction") ?>
- = $this->nettoyer($v['nbreTransaction']) ?>
-
-
-
-
- = _("Période") ?>
- = $v['periodicite'] ?>
-
-
-
-
- = _("Prestation") ?>
- = $this->nettoyer($v['comptePrestation']) ?>
-
-
-
-
- = _("Solde") ?>
- = $this->nettoyer($v['soldeTransaction']) ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-