diff --git a/Controleur/ControleurAjaxbaremelettrecletemp.php b/Controleur/ControleurAjaxbaremelettrecletemp.php
index 42fbd1e4..aad99076 100755
--- a/Controleur/ControleurAjaxbaremelettrecletemp.php
+++ b/Controleur/ControleurAjaxbaremelettrecletemp.php
@@ -37,10 +37,11 @@ class ControleurAjaxbaremelettrecletemp extends Controleur {
public function controle()
{
- $idBaremePriseEnCharge = $this->requete->getParametreFormulaire("idBaremePriseEnCharge");
- $lettreCle = $this->requete->getParametreFormulaire("lettreCle");
+ $idCollegeTemp = $_SESSION['idCollegeTemp'];
+ $idBaremePriseEnCharge = $this->requete->getParametreFormulaire("idBaremePriseEnCharge");
+ $lettreCle = $this->requete->getParametreFormulaire("lettreCle");
- $maxDateEffetActeBareme = $this->garantie->getMaxDateEffetBaremeInitialLette($idBaremePriseEnCharge, $lettreCle);
+ $maxDateEffetActeBareme = $this->garantie->getMaxDateEffetLettreCleBaremeTemp($idBaremePriseEnCharge, $lettreCle, $idCollegeTemp);
$this->genererVueAjax(array
(
diff --git a/Js/fonctions.js b/Js/fonctions.js
index 1b0e3849..ddc8a729 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -92449,9 +92449,6 @@ function supprimer_baremeacte_lettre_cle_detail_temp(adminProd, idActe)
}
function validite_dateEffet_bareme_lettre_cle_temp(){
- alert("validite_dteEffet_bareme_lettre_cle_temp");
- return;
-
var idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
var lettreCle = $("#lettreCle").val();
var dateEffetActe = $("#dateEffetActe").val();
@@ -92464,7 +92461,7 @@ function validite_dateEffet_bareme_lettre_cle_temp(){
donnees += '&lettreCle='+lettreCle;
$.ajax({
- url: $("#racineWeb").val()+"Ajaxbaremelettrecle/controle/",
+ url: $("#racineWeb").val()+"Ajaxbaremelettrecletemp/controle/",
type : 'post',
data: donnees,
error: function(errorData){
@@ -92479,6 +92476,9 @@ function validite_dateEffet_bareme_lettre_cle_temp(){
maxDateEffetActeBareme = $("#maxDateEffetActeBareme").val();
+ alert("maxDateEffetActeBareme => "+maxDateEffetActeBareme);
+ return;
+
dte=Math.round(Date.parse(tde)/(1000*3600*24));
dtj=Math.round(Date.parse(tdj)/(1000*3600*24));
@@ -92496,13 +92496,90 @@ function validite_dateEffet_bareme_lettre_cle_temp(){
$("#dateEffetActe").focus();
return;
}else{
- inserer_bareme_lettre_cle();
+ inserer_bareme_lettre_cle_temp();
}
}else{
- inserer_bareme_lettre_cle();
+ inserer_bareme_lettre_cle_temp();
}
},
complete: function() {
}
});
}
+
+function inserer_bareme_lettre_cle_temp()
+{
+ alert("inserer_bareme_lettre_cle_temp");
+ return;
+
+ idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val();
+ lettreCle = $("#lettreCle").val();
+ dateEffetActe = $("#dateEffetActe").val();
+ forfaitPlafondActe = $("#forfaitPlafondActe").val();
+ ticketModerateurActe = $("#ticketModerateurActe").val();
+
+ forfaitPlafondActe = forfaitPlafondActe.replace(/ /g,"");
+
+ 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;
+ }
+
+ if(forfaitPlafondActe <= "0"){
+ $("#forfaitPlafondActe").focus();
+
+ v_msg="Veuillez entrer un montant!";
+ v_msgEng="Please enter an amount!";
+ alert_ebene(v_msg, v_msgEng);
+
+ return;
+ }
+
+ v_msg="Confirmez-vous cette opération?";
+ v_msgEng="Do you confirm this transaction?";
+
+ confirm_ebene(v_msg, v_msgEng)
+ .then((isConfirmed) => {
+ if (isConfirmed) {
+ $("#div_detail_bareme").html('' + '
');
+
+ donnees = 'idBaremePriseEnCharge='+idBaremePriseEnCharge;
+ donnees += '&lettreCle='+lettreCle;
+ donnees += '&dateEffetActe='+dateEffetActe;
+ donnees += '&forfaitPlafondActe='+forfaitPlafondActe;
+ donnees += '&ticketModerateurActe='+ticketModerateurActe;
+
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxbaremelettrecletemp/ajouter/",
+ type : 'post',
+ data: donnees,
+ error: function(errorData){
+ //alert("Erreur : "+errorData);
+ },
+ success: function(data) {
+ actualiser_bareme_acte_lettre_cle_temp();
+ },
+ complete: function() {
+ }
+ });
+ } else {
+ // L'utilisateur a annulé
+ console.log("Confirmation refusée");
+ }
+ });
+}
diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php
index 466c05e3..7026bbb5 100755
--- a/Modele/Garantiesbaremepriseencharge.php
+++ b/Modele/Garantiesbaremepriseencharge.php
@@ -1284,8 +1284,6 @@ class Garantiesbaremepriseencharge extends Modele {
public function getMaxDateEffetActeBaremeTemp($idBaremePriseEnCharge,$codeGarantie,$codeActe,$idCollegeTemp){
-
-
$sql="SELECT MAX(dateEffet) AS maxDateEffet FROM actesbaremepriseencharge_temp
WHERE idBaremePriseEnCharge = ? AND codeGarantie = ? AND codeActe = ?
AND idCollegeTemp = ? AND supprime !='1' AND DATE(dateEffet) <= CURDATE();";
@@ -1603,8 +1601,6 @@ class Garantiesbaremepriseencharge extends Modele {
}
public function getMaxDateEffetBaremeTemp($idBaremePriseEnCharge, $idCollegeTemp){
-
-
$sql="SELECT MAX(dateEffet) AS maxDateEffetBareme FROM detailbaremepriseencharge_temp
WHERE idBaremePriseEnCharge = ? AND idCollegeTemp = ? AND supprime !='1'
AND DATE(dateEffet) <= CURDATE();";
@@ -1799,4 +1795,15 @@ class Garantiesbaremepriseencharge extends Modele {
$this->executerRequete($sql, array($idActe, $user));
}
+ public function getMaxDateEffetLettreCleBaremeTemp($idBaremePriseEnCharge, $lettreCle, $idCollegeTemp){
+ $sql="SELECT MAX(dateEffet) AS maxDateEffet FROM actesbaremepriseenchargelettrecle_temp
+ WHERE idBaremePriseEnCharge = ? AND lettreCle = ?
+ AND idCollegeTemp = ? AND supprime !='1' AND DATE(dateEffet) <= CURDATE();";
+
+ $resultat = $this->executerRequete($sql, array($idBaremePriseEnCharge, $lettreCle, $idCollegeTemp))->fetch(PDO::FETCH_ASSOC);
+
+ return $resultat['maxDateEffet'];
+
+ }
+
}
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 45afa624..ede3b953 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -976,7 +976,7 @@
-
+