diff --git a/Controleur/ControleurDetailbaremecollege.php b/Controleur/ControleurDetailbaremecollege.php index d7d6d63e..010ad17d 100755 --- a/Controleur/ControleurDetailbaremecollege.php +++ b/Controleur/ControleurDetailbaremecollege.php @@ -31,19 +31,13 @@ class ControleurDetailbaremecollege extends Controleur { $idCollegeTemp = $_SESSION['idCollegeTemp']; $idCollege = $_SESSION['idCollege_C']; - //var_dump($idCollegeTemp, $idCollege); die(); - - $garantiesajoutees = $this->garantie->getGarantiesProduit($bareme["codeProduit"], $idBaremePriseEnCharge); - //var_dump($garantiesajoutees); die(); - $actif = $this->oui_non->getListe(); $tmBareme = $this->garantie->getTmBareme($idBaremePriseEnCharge); $maxDateEffetBareme = $this->garantie->getMaxDateEffetBareme($idBaremePriseEnCharge); - // $_SESSION['vueCollege'] = 'Detailbaremecollege'; $_SESSION['OrigineBareme'] = "Detailbaremecollege"; $this->genererVue(array( @@ -55,5 +49,11 @@ class ControleurDetailbaremecollege extends Controleur { )); } + public function validerbaremelettrecle() + { + $this->garantie->validerBaremeLettreCleCollege(); + + $this->rediriger("Consultercollege"); + } } \ No newline at end of file diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php index 4734e5ec..ce7bc81f 100755 --- a/Modele/Garantiesbaremepriseencharge.php +++ b/Modele/Garantiesbaremepriseencharge.php @@ -1815,4 +1815,14 @@ class Garantiesbaremepriseencharge extends Modele { $this->executerRequete($sql, array($idBaremePriseEnCharge, $lettreCle, $dateEffetActe, $forfaitPlafondActe, $ticketModerateurActe, $user, $idCollegeTemp)); } + public function validerBaremeLettreCleCollege() + { + $idCollege = $_SESSION['idCollege']; + $idCollegeTemp = $_SESSION['idCollegeTemp']; + + $sql = 'CALL sp_modifier_bareme_college_lettre_cle(?, ?);'; + + $this->executerRequete($sql, array($idCollege, $idCollegeTemp)); + } + } diff --git a/Societes/ebene/Tarifs/Controleur/Consultercollegeindex.php b/Societes/ebene/Tarifs/Controleur/Consultercollegeindex.php index 929beb1a..8f43e49f 100755 --- a/Societes/ebene/Tarifs/Controleur/Consultercollegeindex.php +++ b/Societes/ebene/Tarifs/Controleur/Consultercollegeindex.php @@ -35,17 +35,12 @@ $idCollege = $_SESSION['idCollege']; $idCollegeTemp = $_SESSION['idCollegeTemp']; - - - + $collegeTemp = $this->college_temp->getCollegeTemp($idCollegeTemp); - - $garantiesbase = $this->college_temp->getGarBaseCollege($idCollegeTemp); $garoptionnelles = $this->college_temp->getGarOptCollege($idCollegeTemp); $garoptacquises = $this->college_temp->getGarOptCollegeAcq($idCollegeTemp); - $codeLienParente = $_SESSION['codeLienParente_C']; diff --git a/Vue/Baremepriseenchargelettrecletemp/index.php b/Vue/Baremepriseenchargelettrecletemp/index.php index c3857e0f..bf44b5cc 100755 --- a/Vue/Baremepriseenchargelettrecletemp/index.php +++ b/Vue/Baremepriseenchargelettrecletemp/index.php @@ -7,7 +7,6 @@