From 3767afeb577bf1d4862f0b05b73d265e9b199011 Mon Sep 17 00:00:00 2001 From: KANE LAZENI Date: Sun, 29 Mar 2026 19:52:52 +0000 Subject: [PATCH] a --- Controleur/ControleurBaremepriseenchargelettrecletemp.php | 7 +++++++ Controleur/ControleurDetailbaremecollege.php | 4 +++- Controleur/ControleurDetailbaremecollegetemp.php | 8 ++++---- Js/fonctions.js | 4 +++- Vue/Baremepriseenchargelettrecletemp/index.php | 7 +++++-- Vue/gabarit.php | 2 +- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Controleur/ControleurBaremepriseenchargelettrecletemp.php b/Controleur/ControleurBaremepriseenchargelettrecletemp.php index a77d8a0d..cb449133 100755 --- a/Controleur/ControleurBaremepriseenchargelettrecletemp.php +++ b/Controleur/ControleurBaremepriseenchargelettrecletemp.php @@ -17,6 +17,13 @@ class ControleurBaremepriseenchargelettrecletemp extends Controleur public function index() { + var_dump + ( + array( + "OrigineBaremeControleur" => $_SESSION['OrigineBareme'], + ) + ); + $idBaremePriseEnCharge = $_SESSION['idBaremePriseEnCharge']; $idCollegeTemp = $_SESSION['idCollegeTemp']; diff --git a/Controleur/ControleurDetailbaremecollege.php b/Controleur/ControleurDetailbaremecollege.php index d8219905..d7d6d63e 100755 --- a/Controleur/ControleurDetailbaremecollege.php +++ b/Controleur/ControleurDetailbaremecollege.php @@ -42,8 +42,10 @@ class ControleurDetailbaremecollege extends Controleur { $tmBareme = $this->garantie->getTmBareme($idBaremePriseEnCharge); $maxDateEffetBareme = $this->garantie->getMaxDateEffetBareme($idBaremePriseEnCharge); - //var_dump($maxDateEffetBareme); + // $_SESSION['vueCollege'] = 'Detailbaremecollege'; + $_SESSION['OrigineBareme'] = "Detailbaremecollege"; + $this->genererVue(array( 'bareme' => $bareme, 'garantiesajoutees' => $garantiesajoutees, diff --git a/Controleur/ControleurDetailbaremecollegetemp.php b/Controleur/ControleurDetailbaremecollegetemp.php index 2b22e970..d5aa9a45 100755 --- a/Controleur/ControleurDetailbaremecollegetemp.php +++ b/Controleur/ControleurDetailbaremecollegetemp.php @@ -29,8 +29,7 @@ class ControleurDetailbaremecollegetemp extends Controleur { $_SESSION['idBaremePriseEnCharge'] = $idBaremePriseEnCharge; $idCollegeTemp = $_SESSION['idCollegeTemp']; - - + $garantiesajoutees = $this->garantie->getGarantiesProduitTemp($bareme["codeProduit"], $idBaremePriseEnCharge, $idCollegeTemp); $actif = $this->oui_non->getListe(); @@ -38,9 +37,10 @@ class ControleurDetailbaremecollegetemp extends Controleur { $maxDateEffetBareme = $this->garantie->getMaxDateEffetBaremeTemp($idBaremePriseEnCharge, $idCollegeTemp); - $retour = $_SESSION['vueCollege']; - + + $_SESSION['OrigineBareme'] = "Detailbaremecollegetemp"; + $this->genererVue(array( 'bareme' => $bareme, 'garantiesajoutees' => $garantiesajoutees, diff --git a/Js/fonctions.js b/Js/fonctions.js index 0d3cdfb9..a192363c 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -75594,8 +75594,10 @@ function bareme_college_temp() return; } - + // detail_baremecollege(idBaremePriseEnCharge) + window.location.assign($("#racineWeb" ).val()+"Detailbaremecollegetemp/"+idBaremePriseEnCharge+"/"); + } function detail_baremecollege(idBaremePriseEnCharge) diff --git a/Vue/Baremepriseenchargelettrecletemp/index.php b/Vue/Baremepriseenchargelettrecletemp/index.php index 2c1d0d03..463159a8 100755 --- a/Vue/Baremepriseenchargelettrecletemp/index.php +++ b/Vue/Baremepriseenchargelettrecletemp/index.php @@ -66,11 +66,14 @@
$_SESSION['vueCollege'] + "OrigineBaremeVue" => $_SESSION['OrigineBareme'], ) ); + require "Vue/Ajaxbaremelettrecletemp/index.php"; ?>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php index ee37ee2f..6eb77bfd 100755 --- a/Vue/gabarit.php +++ b/Vue/gabarit.php @@ -976,7 +976,7 @@ - +