diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js
index a1b486a..17ad2e4 100644
--- a/src/components/DisplayDetailClass_new_v2.js
+++ b/src/components/DisplayDetailClass_new_v2.js
@@ -277,6 +277,7 @@ const DisplayDetailClass_new_v2 = (props) => {
const [isdatadock, setisdatadock] = useState();
const [isqualiopi, setisqualiopi] = useState();
const [iscertitrace, setiscertitrace] = useState();
+ const [isbureaucertitrace, setisbureaucertitrace] = useState();
const [partnair_name, setpartnair_name] = useState();
const [website_partenaire, setwebsite_partenaire] = useState();
@@ -386,13 +387,17 @@ const DisplayDetailClass_new_v2 = (props) => {
setiscertitrace(JSON.parse(res.data.message).iscertitrace);
}
+ if (JSON.parse(res.data.message).isbureaucertitrace) {
+ setisbureaucertitrace(JSON.parse(res.data.message).isbureaucertitrace);
+ }
+
if (JSON.parse(res.data.message).nom_partenaire) {
setpartnair_name(JSON.parse(res.data.message).nom_partenaire);
}
if (JSON.parse(res.data.message).nb_pave_a_afficher) {
setnb_pave_a_afficher(JSON.parse(res.data.message).nb_pave_a_afficher);
- console.log(" ### NB setnb_pave_a_afficher = ", JSON.parse(res.data.message).nb_pave_a_afficher);
+ //console.log(" ### NB setnb_pave_a_afficher = ", JSON.parse(res.data.message).nb_pave_a_afficher);
}
@@ -425,32 +430,47 @@ const DisplayDetailClass_new_v2 = (props) => {
var main_h_px;
- console.log("GetCurrentClass_result.length = ", GetCurrentClass_result);
+ console.log("nb_partner_certificat = ", JSON.parse(res.data.message).nb_partner_certificat);
if (window.screen.width < 601) {
+
+ var decalage_pr_certificat = parseInt(String(JSON.parse(res.data.message).nb_partner_certificat)) * 150;
+ console.log("decalage_pr_certificat = ", decalage_pr_certificat);
+
var local_val = parseInt(String(JSON.parse(res.data.message).nb_pave_a_afficher));
+
console.log("### local_val = ", local_val)
if (local_val >= 5) {
console.log(" ON PASSE AU MAX")
- local_tmp = "2300px";
- main_h_px = "4000px";
+ var local_tmp_val = 2300 + decalage_pr_certificat;
+ var local_main_h_px = 4000 + decalage_pr_certificat;
+ //console.log("### local_tmp_val = ", local_tmp_val, " local_main_h_px = ",local_main_h_px);
+ local_tmp = local_tmp_val + "px";
+ main_h_px = local_main_h_px + "px";
if (String(action).toLowerCase() === "information" || String(action).toLowerCase() === "inscription") {
- local_tmp = "2800px";
- main_h_px = "4500px";
+
+ var local_tmp_val = 2800 + decalage_pr_certificat;
+ var local_main_h_px = 4500 + decalage_pr_certificat;
+ local_tmp = local_tmp_val + "px";
+ main_h_px = local_main_h_px + "px";
}
} else {
console.log(" ON PASSE AU MIN");
- local_tmp = "2100px";
- main_h_px = "4800px";
+ var local_tmp_val = 2100 + decalage_pr_certificat;
+ var local_main_h_px = 4800 + decalage_pr_certificat;
+
+ local_tmp = local_tmp_val + "px";
+ main_h_px = local_main_h_px + "px";
if (String(action).toLowerCase() === "information" || String(action).toLowerCase() === "inscription") {
- local_tmp = "2600px";
- main_h_px = "5300px";
+ var local_tmp_val = 2600 + decalage_pr_certificat;
+ var local_main_h_px = 5300 + decalage_pr_certificat;
+ local_tmp = local_tmp_val + "px";
+ main_h_px = local_main_h_px + "px";
}
-
}
document.getElementById('mob_block_cross_sell_cat').style.top = local_tmp;
document.getElementById('mobile').style.height = main_h_px;
@@ -700,10 +720,16 @@ const DisplayDetailClass_new_v2 = (props) => {
if (window.screen.width < 601) {
var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top;
var displaydetailclass_new_v2_hei = document.getElementById('mobile').style.height;
+ var sticky_div_hilight_top = "1300";
+
+
var new_meme_orga_top = parseInt(meme_orga_top) + 900;
var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 900;
+ var new_sticky_div_hilight_top = parseInt(sticky_div_hilight_top) + 900;
+
document.getElementById('mob_block_cross_sell_cat').style.top = new_meme_orga_top + "px";
document.getElementById('mobile').style.height = new_displaydetailclass_new_v2_hei + "px";
+ document.getElementById('sticky_div_hilight_pave').style.top = new_sticky_div_hilight_top + "px";
window.scrollTo(0, 500);
}
@@ -748,10 +774,17 @@ const DisplayDetailClass_new_v2 = (props) => {
var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top;
var displaydetailclass_new_v2_hei = document.getElementById('mobile').style.height;
+ var sticky_div_hilight_top = "1300";
+
var new_meme_orga_top = parseInt(meme_orga_top) + 900;
var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 900;
+ var new_sticky_div_hilight_top = parseInt(sticky_div_hilight_top) + 900;
+
+
document.getElementById('mob_block_cross_sell_cat').style.top = new_meme_orga_top + "px";
document.getElementById('mobile').style.height = new_displaydetailclass_new_v2_hei + "px";
+ document.getElementById('sticky_div_hilight_pave').style.top = new_sticky_div_hilight_top + "px";
+
window.scrollTo(0, 500);
}
@@ -900,11 +933,17 @@ const DisplayDetailClass_new_v2 = (props) => {
if (window.screen.width < 601) {
var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top;
var displaydetailclass_new_v2_hei = document.getElementById('mobile').style.height;
+ var sticky_div_hilight_top = document.getElementById('sticky_div_hilight_pave').style.top;
+
var new_meme_orga_top = parseInt(meme_orga_top) - 900;
var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 900;
+ var new_sticky_div_hilight_top = parseInt(sticky_div_hilight_top) - 900;
+
document.getElementById('mob_block_cross_sell_cat').style.top = new_meme_orga_top + "px";
document.getElementById('mobile').style.height = new_displaydetailclass_new_v2_hei + "px";
+ document.getElementById('sticky_div_hilight_pave').style.top = new_sticky_div_hilight_top + "px";
+
}
@@ -950,11 +989,15 @@ const DisplayDetailClass_new_v2 = (props) => {
if (window.screen.width < 601) {
var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top;
var displaydetailclass_new_v2_hei = document.getElementById('mobile').style.height;
+ var sticky_div_hilight_top = document.getElementById('sticky_div_hilight_pave').style.top;
+
var new_meme_orga_top = parseInt(meme_orga_top) - 900;
var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 900;
+ var new_sticky_div_hilight_top = parseInt(sticky_div_hilight_top) - 900;
document.getElementById('mob_block_cross_sell_cat').style.top = new_meme_orga_top + "px";
document.getElementById('mobile').style.height = new_displaydetailclass_new_v2_hei + "px";
+ document.getElementById('sticky_div_hilight_pave').style.top = new_sticky_div_hilight_top + "px";
}
else if (window.screen.width >= 601 && window.screen.width <= 991) {
var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top;
@@ -1412,7 +1455,7 @@ const DisplayDetailClass_new_v2 = (props) => {
{DetailTraining["programme"] &&
- {parse(String(DetailTraining["programme"]))}
+ {parse(String(DetailTraining["programme"]))}sticky_div_hilight
}
@@ -1436,24 +1479,29 @@ const DisplayDetailClass_new_v2 = (props) => {
- {/*
+ {
{String(isqualiopi) === "1" &&
-

+
}
{String(isdatadock) === "1" &&
-

+
}
{String(iscertitrace) === "1" &&
-

+

+
+
}
+
+ {String(isbureaucertitrace) === "1" &&
+
}
-
*/}
+
}
@@ -2139,6 +2187,11 @@ const DisplayDetailClass_new_v2 = (props) => {
}
+ {String(isbureaucertitrace) === "1" &&
+

+
+
}
+
diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js
index 5f46426..5aaed10 100644
--- a/src/components/GestionAdministrative.js
+++ b/src/components/GestionAdministrative.js
@@ -354,11 +354,12 @@ function GestionAdministrative(props) {
const columns_list_evaluation = [
{ field: 'id', headerName: 'id', hide: true },
- { field: 'email', headerName: 'email', width: 150, hideable: false, flex: 1 },
- { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true },
- { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false },
- { field: 'eval_eval', headerName: 'Evaluation', width: 100, editable: false, },
+ { field: 'email', headerName: 'email', width: 200, hideable: true, resizable: true },
+ { field: 'nom', headerName: 'nom', width: 200, hide: false, editable: true },
+ { field: 'prenom', headerName: 'prenom', width: 200, hide: false, editable: false },
+ { field: 'eval_eval', headerName: 'Evaluation', width: 100, editable: false, flex:true},
{ field: 'eval_note', headerName: 'Note', width: 100, editable: false, },
+ { field: 'eval_pedagogie', headerName: 'Pédagogie', width: 100, editable: false, },
{ field: 'eval_date', headerName: 'Date evalution', width: 100, editable: false, },
{/*
field: "valide", headerName: 'Valider',
@@ -2898,27 +2899,12 @@ function GestionAdministrative(props) {
-
-
-
+
+
- {String(CreateListEmargement_api) === "true" &&
- La liste d'emargement a été créée
-
}
-
- {String(CreateListEmargement_api) === "false" &&
- {CreateListEmargement_message}
-
}
-
- {String(ActionMassListEmargement_api) === "true" &&
- Les demandes d'emargement ont bien été envoyées
-
}
-
- {String(ActionMassListEmargement_api) === "false" &&
- {CreateListEmargement_message}
-
}
+
@@ -2942,6 +2928,7 @@ function GestionAdministrative(props) {
eval_date: String(JSON.parse(item).eval_date).substring(0, 10),
eval_eval: String(JSON.parse(item).eval_eval).replace(/(<([^>]+)>)/ig, ''),
eval_note: JSON.parse(item).eval_note,
+ eval_pedagogie: JSON.parse(item).eval_pedagogie,
}
))}
@@ -2961,7 +2948,7 @@ function GestionAdministrative(props) {
-
+
diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js
index 8205acb..0383942 100644
--- a/src/components/Inscription_Information.js
+++ b/src/components/Inscription_Information.js
@@ -523,6 +523,7 @@ function Inscription_Information(props) {
+/*
var pedagogie = "";
var ele = document.getElementsByName('pedagogie');
@@ -539,19 +540,26 @@ function Inscription_Information(props) {
logistique = ele[i].value;
}
-
+*/
if (!RatingValue) {
- alert(" Vous n'avez pas donné une appreciation globle. Le point N° 1. Merci d'avance")
+ alert(" Aidez-nous à nous améliorer, donnez une appréciation globale svp. Le point N° 1. Merci d'avance")
+ return;
+ }
+
+ if (!RatinpedagogiegValue) {
+
+ alert(" Aidez-nous à nous améliorer, donnez une appréciation sur notre pédagigie svp. Le point N° 2. Merci d'avance")
return;
}
+
formData.append('inscription_id', props.eval_token);
formData.append('eval_note', RatingValue);
+ formData.append('eval_pedagogie', RatinpedagogiegValue);
formData.append('eval_eval', message);
- formData.append('eval_pedagogie', pedagogie);
fetch(
url,
@@ -583,6 +591,7 @@ function Inscription_Information(props) {
};
const [RatingValue, setRatingValue] = useState(0);
+ const [RatinpedagogiegValue, setRatinpedagogiegValue] = useState(0);
let datafromchild = "yaaaaa child";
const [valnom_info, setvalnom_info] = useState();
@@ -885,37 +894,21 @@ function Inscription_Information(props) {
-
-
+