diff --git a/Controleur/ControleurAjaxbaremelettrecle.php b/Controleur/ControleurAjaxbaremelettrecle.php
index fe911571..c45609ef 100755
--- a/Controleur/ControleurAjaxbaremelettrecle.php
+++ b/Controleur/ControleurAjaxbaremelettrecle.php
@@ -25,53 +25,26 @@ class ControleurAjaxbaremelettrecle extends Controleur {
public function ajouter()
{
- $codeGarantie = $this->requete->getParametreFormulaire("codeGarantie");
$idBaremePriseEnCharge = $this->requete->getParametreFormulaire("idBaremePriseEnCharge");
-
- $codeActe = $this->requete->getParametreFormulaire("codeActe");
-
+ $lettreCle = $this->requete->getParametreFormulaire("lettreCle");
$dateEffetActe = $this->requete->getParametreDate("dateEffetActe");
- $forfaitPlafondActeAdherent = $this->requete->getParametreFormulaire("forfaitPlafondActeAdherent");
- $codePeriodicitePlafondActeAdherent = $this->requete->getParametreFormulaire("codePeriodicitePlafondActeAdherent");
- $nbreTransactionActeAdherent = $this->requete->getParametreFormulaire("nbreTransactionActeAdherent");
- $codePeriodiciteActeAdherent = $this->requete->getParametreFormulaire("codePeriodiciteActeAdherent");
$forfaitPlafondActe = $this->requete->getParametreFormulaire("forfaitPlafondActe");
- $codePeriodicitePlafondActe = $this->requete->getParametreFormulaire("codePeriodicitePlafondActe");
- $nbreTransactionActe = $this->requete->getParametreFormulaire("nbreTransactionActe");
- $codePeriodiciteActe = $this->requete->getParametreFormulaire("codePeriodiciteActe");
- $codeTypeRemboursementActe = $this->requete->getParametreFormulaire("codeTypeRemboursementActe");
- $delaiCarenceActe = $this->requete->getParametreFormulaire("delaiCarenceActe");
$ticketModerateurActe = $this->requete->getParametreFormulaire("ticketModerateurActe");
- $ageMinimumActe = $this->requete->getParametreFormulaire("ageMinimumActe");
- $ageMaximumActe = $this->requete->getParametreFormulaire("ageMaximumActe");
- $actifActe = $this->requete->getParametreFormulaire("actifActe");
-
- $forfaitTmActe = $this->requete->getParametreFormulaire("forfaitTmActe");
-
-
-
- $this->garantie->insererActeBaremeInitial($idBaremePriseEnCharge,$codeGarantie,$codeActe,$dateEffetActe,$forfaitPlafondActeAdherent,
- $codePeriodicitePlafondActeAdherent,$nbreTransactionActeAdherent,$codePeriodiciteActeAdherent,$forfaitPlafondActe,
- $codePeriodicitePlafondActe,$nbreTransactionActe,$codePeriodiciteActe,$codeTypeRemboursementActe,$delaiCarenceActe,
- $ticketModerateurActe,$ageMinimumActe,$ageMaximumActe,$actifActe, $forfaitTmActe);
-
+ $this->garantie->insererActeBaremeInitialLettreCle($idBaremePriseEnCharge, $lettreCle, $dateEffetActe, $forfaitPlafondActe, $ticketModerateurActe);
}
public function controle()
{
- $codeGarantie = $this->requete->getParametreFormulaire("codeGarantie");
$idBaremePriseEnCharge = $this->requete->getParametreFormulaire("idBaremePriseEnCharge");
- $codeActe = $this->requete->getParametreFormulaire("codeActe");
+ $lettreCle = $this->requete->getParametreFormulaire("lettreCle");
- $maxDateEffetActeBareme = $this->garantie->getMaxDateEffetActeBaremeInitial($idBaremePriseEnCharge,$codeGarantie,$codeActe);
+ $maxDateEffetActeBareme = $this->garantie->getMaxDateEffetBaremeInitialLette($idBaremePriseEnCharge, $codeActe);
$this->genererVueAjax(array
(
'maxDateEffetActeBareme' => $maxDateEffetActeBareme
));
-
-
}
public function supprimer()
diff --git a/Js/fonctions.js b/Js/fonctions.js
index 3703a26c..e2004d67 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -63768,7 +63768,6 @@ function supprimer_detailbareme(adminProd, idDetail)
}
-// inserer_bareme()
function inserer_bareme()
{
idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
@@ -92198,28 +92197,22 @@ function afficherMasquerActeBaremeLettre()
}
function validiteDateEffetBaremeLettreCle(){
-
- alert("validiteDateEffetBaremeLettreCle");
- return;
-
- var codeGarantie = $("#codeGarantie").val();
- var idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
-
- var codeActe = $("#codeActe").val();
-
- var dateEffetActe = $("#dateEffetActe").val();
- var datejour = $("#datejour_C").val();
+ var idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
+ var lettreCle = $("#lettreCle").val();
+ var dateEffetActe = $("#dateEffetActe").val();
+ var datejour = $("#datejour_C").val();
var str = dateEffetActe.split('/');
var effet = str[2]+'-'+str[1]+'-'+str[0];
- donnees = 'codeGarantie='+codeGarantie;
- donnees += '&idBaremePriseEnCharge='+idBaremePriseEnCharge;
- donnees += '&codeActe='+codeActe;
-
-
+ donnees = 'idBaremePriseEnCharge='+idBaremePriseEnCharge;
+ donnees += '&lettreCle='+lettreCle;
+
+ alert(donnees);
+ return;
+
$.ajax({
- url: $("#racineWeb").val()+"Ajaxinsererbaremeacte/controle/",
+ url: $("#racineWeb").val()+"Ajaxbaremelettrecle/controle/",
type : 'post',
data: donnees,
error: function(errorData){
@@ -92251,13 +92244,67 @@ function validiteDateEffetBaremeLettreCle(){
$("#dateEffetActe").focus();
return;
}else{
- inserer_bareme_acte();
+ inserer_bareme_lettre_cle();
}
}else{
- inserer_bareme_acte();
+ inserer_bareme_lettre_cle();
}
},
complete: function() {
}
});
}
+
+function inserer_bareme_lettre_cle()
+{
+ idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
+ lettreCle = $("#lettreCle").val();
+ dateEffetActe = $("#dateEffetActe").val();
+ forfaitPlafondActe = $("#forfaitPlafondActe").val();
+ ticketModerateurActe = $("#ticketModerateurActe").val();
+
+ if(lettreCle <= " "){
+ $("#lettreCle").focus();
+
+ v_msg="Veuillez entrer une lettre clé!";
+ v_msgEng="Please enter a key letter!";
+ alert_ebene(v_msg, v_msgEng);
+
+ return;
+ }
+
+ if(dateEffetActe <= " "){
+ $("#dateEffetActe").focus();
+
+ v_msg="Veuillez entrer une date d'effet!";
+ v_msgEng="Please enter an effective date!";
+ alert_ebene(v_msg, v_msgEng);
+
+ return;
+ }
+
+ $("#div_detail_bareme").html('' + '
');
+
+ donnees = 'idBaremePriseEnCharge='+idBaremePriseEnCharge;
+ donnees += '&lettreCle='+lettreCle;
+ donnees += '&dateEffetActe='+dateEffetActe;
+ donnees += '&forfaitPlafondActe='+forfaitPlafondActe;
+ donnees += '&ticketModerateurActe='+ticketModerateurActe;
+
+ alert(donnees);
+ return;
+
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxbaremelettrecle/ajouter/",
+ type : 'post',
+ data: donnees,
+ error: function(errorData){
+ //alert("Erreur : "+errorData);
+ },
+ success: function(data) {
+ actualiser_bareme_acte_lettre_cle();
+ },
+ complete: function() {
+ }
+ });
+}
diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php
index 59f07607..f2d5bb31 100755
--- a/Modele/Garantiesbaremepriseencharge.php
+++ b/Modele/Garantiesbaremepriseencharge.php
@@ -1753,4 +1753,24 @@ class Garantiesbaremepriseencharge extends Modele {
return $resultat->fetchAll(PDO::FETCH_ASSOC);
}
+ public function getMaxDateEffetBaremeInitialLette($idBaremePriseEnCharge, $lettreCle){
+
+ $sql="SELECT MAX(dateEffet) AS maxDateEffet FROM actesbaremeinitiallettrecle
+ WHERE idBaremePriseEnCharge = ? AND lettreCle = ?
+ AND supprime !='1' AND DATE(dateEffet) <= CURDATE();";
+
+ $resultat = $this->executerRequete($sql, array($idBaremePriseEnCharge, $lettreCle))->fetch(PDO::FETCH_ASSOC);
+
+ return $resultat['maxDateEffet'];
+ }
+
+ public function insererActeBaremeInitialLettreCle($idBaremePriseEnCharge, $lettreCle, $dateEffetActe, $forfaitPlafondActe, $ticketModerateurActe)
+ {
+ $user = $_SESSION['login'];
+
+ $sql = 'CALL sp_ajouteractebaremepriseencharge_initial_lettrecle(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
+
+ $this->executerRequete($sql, array($idBaremePriseEnCharge, $lettreCle, $dateEffetActe, $forfaitPlafondActe, $ticketModerateurActe, $user));
+ }
+
}
diff --git a/Vue/Baremepriseenchargelettrecle/index.php b/Vue/Baremepriseenchargelettrecle/index.php
index 258c553d..4e99abcb 100755
--- a/Vue/Baremepriseenchargelettrecle/index.php
+++ b/Vue/Baremepriseenchargelettrecle/index.php
@@ -50,12 +50,12 @@
+ onblur="formatMonetaire(this);" id="forfaitPlafondActe" name="forfaitPlafondActe" >
|
+ id="ticketModerateurActe" name="ticketModerateurActe" >
|
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index de27d1a2..03432145 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -976,7 +976,7 @@
-
+