diff --git a/Controleur/ControleurConsulterdetailbaremecollege.php b/Controleur/ControleurConsulterdetailbaremecollege.php
index 8b57e8e..bd6f8cf 100755
--- a/Controleur/ControleurConsulterdetailbaremecollege.php
+++ b/Controleur/ControleurConsulterdetailbaremecollege.php
@@ -30,9 +30,6 @@ class ControleurConsulterdetailbaremecollege extends Controleur {
$idCollege = $_SESSION['idCollege_C'];
- //var_dump($idCollegeTemp);
-
-
$garantiesajoutees = $this->garantie->getGarantiesProduit($bareme["codeProduit"], $idBaremePriseEnCharge);
$actif = $this->oui_non->getListe();
@@ -40,7 +37,6 @@ class ControleurConsulterdetailbaremecollege extends Controleur {
$maxDateEffetBareme = $this->garantie->getMaxDateEffetBareme($idBaremePriseEnCharge);
-
$this->genererVue(array(
'bareme' => $bareme,
'garantiesajoutees' => $garantiesajoutees,
@@ -50,5 +46,4 @@ class ControleurConsulterdetailbaremecollege extends Controleur {
));
}
-
}
\ No newline at end of file
diff --git a/Controleur/ControleurDetailbaremecollege.php b/Controleur/ControleurDetailbaremecollege.php
new file mode 100755
index 0000000..3d34aa9
--- /dev/null
+++ b/Controleur/ControleurDetailbaremecollege.php
@@ -0,0 +1,60 @@
+menuvue = new Menuvueutilisateur();
+ $this->menuvue->getMenuVue('Detailbaremecollege');
+
+ $this->bareme = new Baremepriseencharge();
+ $this->garantie = new Garantiesbaremepriseencharge();
+ $this->oui_non = new Ouinon();
+ }
+
+ public function index()
+ {
+ $idBaremePriseEnCharge = $this->requete->getParametreFormulaire("id");
+
+ $bareme = $this->bareme->getBaremepriseenchargeId($idBaremePriseEnCharge);
+
+ $_SESSION['idBaremePriseEnCharge'] = $idBaremePriseEnCharge;
+
+ $idCollegeTemp = $_SESSION['idCollegeTemp'];
+ $idCollege = $_SESSION['idCollege_C'];
+
+ $garantiesajoutees = $this->garantie->getGarantiesProduit($bareme["codeProduit"], $idBaremePriseEnCharge);
+
+ $actif = $this->oui_non->getListe();
+ $tmBareme = $this->garantie->getTmBareme($idBaremePriseEnCharge);
+
+ $maxDateEffetBareme = $this->garantie->getMaxDateEffetBareme($idBaremePriseEnCharge);
+
+ $_SESSION['OrigineBareme'] = "Detailbaremecollege";
+
+ $this->genererVue(array(
+ 'bareme' => $bareme,
+ 'garantiesajoutees' => $garantiesajoutees,
+ 'actif' => $actif,
+ 'tmBareme' => $tmBareme,
+ 'maxDateEffetBareme' => $maxDateEffetBareme
+ ));
+ }
+
+ public function validerbaremelettrecle()
+ {
+ $this->garantie->validerBaremeLettreCleCollege();
+
+ // $this->rediriger("Consultercollege");
+ $this->rediriger("Collegepolice");
+ }
+
+}
\ No newline at end of file
diff --git a/Js/fonctions.js b/Js/fonctions.js
index 253698c..b2fd5f0 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -17168,21 +17168,9 @@ function change_password()
});
}
-function consulter_detail_bareme_college(idBaremePriseEnCharge)
-{
- window.location.assign($("#racineWeb" ).val()+"Consulterdetailbaremecollege/"+idBaremePriseEnCharge+"/");
-}
-
function retour_fiche_consulter_bareme()
{
- var retour = $('#retour').val();
-
- if(retour=="Ficheadherent"){
- afficher_adherent_id();
- }else{
- afficher_beneficiaire_id();
- }
-
+ afficher_adherent_id();
}
/*
@@ -19057,3 +19045,8 @@ function listerdemandesconsultation()
}
});
}
+
+function consulter_detail_bareme_college(idBaremePriseEnCharge)
+{
+ window.location.assign($("#racineWeb" ).val()+"Consulterdetailbaremecollege/"+idBaremePriseEnCharge+"/");
+}
diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php
index 804c2e7..9975e2d 100755
--- a/Modele/Garantiesbaremepriseencharge.php
+++ b/Modele/Garantiesbaremepriseencharge.php
@@ -1723,4 +1723,23 @@ class Garantiesbaremepriseencharge extends Modele {
return $resultat['maxDateEffetBareme'];
}
*/
+
+ public function getLettreclesGarantieBaremeTemp($idBaremePriseEnCharge, $idCollegeTemp)
+ {
+ $sql = 'CALL sp_afficher_lettre_cle_bareme_temp(?, ?);';
+
+ $resultat = $this->executerRequete($sql, array($idBaremePriseEnCharge, $idCollegeTemp));
+
+ return $resultat->fetchAll(PDO::FETCH_ASSOC);
+ }
+
+ public function getActesGarantieBaremeLettreCleDetailacteTemp($idActesbaremepriseenchargelettrecle_temp)
+ {
+ $sql = "call sp_afficher_lettre_cle_bareme_detail_actes_temp(?);";
+
+ $resultat = $this->executerRequete($sql, array($idActesbaremepriseenchargelettrecle_temp));
+
+ return $resultat->fetchAll(PDO::FETCH_ASSOC);
+ }
+
}
diff --git a/Vue/Consulterdetailbaremecollege/index.php b/Vue/Consulterdetailbaremecollege/index.php
index da6a70d..6c5c139 100755
--- a/Vue/Consulterdetailbaremecollege/index.php
+++ b/Vue/Consulterdetailbaremecollege/index.php
@@ -3,12 +3,8 @@
?>
-
-
-
-
@@ -42,7 +38,7 @@
   
- " style="font-size:13pt;">
+ [-]