diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js
index aeef3e5..44a1966 100644
--- a/src/components/DisplayPartnerSession.js
+++ b/src/components/DisplayPartnerSession.js
@@ -106,17 +106,18 @@ const DisplayPartnerSession = (props) => {
const columns = [
{ field: 'id', headerName: 'id', hide: true },
+ { field: '_id', headerName: '_id', hide: true },
{ field: 'class_internal_url', headerName: 'class_internal_url', hide: true },
{ field: 'code_session', headerName: 'Code session', hide: false, width: datagrid_columns_size_model1, },
{
field: 'statut', headerName: 'Statut', hide: false, width: datagrid_columns_size_model1,
valueFormatter: (params) => {
if (String(params.value) === "0")
- return "Actif";
- else if (String(params.value) === "1")
return "Inactif";
+ else if (String(params.value) === "1")
+ return "Actif";
else
- return "???";
+ return "?";
},
},
@@ -612,6 +613,9 @@ const DisplayPartnerSession = (props) => {
var internal_url = cellValues.row.class_internal_url;
setselected_internal_url(cellValues.row.class_internal_url);
+ var session_id = cellValues.row._id;
+ setselected_session_id(session_id);
+
setselected_class_title(cellValues.row.title);
@@ -620,11 +624,11 @@ const DisplayPartnerSession = (props) => {
submenu_detail_session();
- GetCurrentSession(cellValues.row.code_session, cellValues.row.class_internal_url);
+ GetCurrentSession(cellValues.row._id, cellValues.row.class_internal_url);
- GetListePreinscrit(cellValues.row.code_session, cellValues.row.class_internal_url);
+ GetListePreinscrit(cellValues.row._id, cellValues.row.class_internal_url);
- GetListeInscrit(cellValues.row.code_session, cellValues.row.class_internal_url);
+ GetListeInscrit(cellValues.row._id, cellValues.row.class_internal_url);
}
@@ -639,16 +643,20 @@ const DisplayPartnerSession = (props) => {
var internal_url = line.class_internal_url;
setselected_internal_url(line.class_internal_url);
+ var session_id = line._id;
+ setselected_session_id(session_id);
+
+
setselected_class_title(line.title);
setEdite_session("1");
submenu_detail_session();
- GetCurrentSession(line.code_session, line.class_internal_url);
+ GetCurrentSession(line._id, line.class_internal_url);
- GetListePreinscrit(line.code_session, line.class_internal_url);
+ GetListePreinscrit(line._id, line.class_internal_url);
- GetListeInscrit(line.code_session, line.class_internal_url);
+ GetListeInscrit(line._id, line.class_internal_url);
}
@@ -754,13 +762,17 @@ const DisplayPartnerSession = (props) => {
var internal_url = cellValues.row.class_internal_url;
setselected_internal_url(cellValues.row.class_internal_url);
+ var session_id = cellValues.row._id;
+ setselected_session_id(session_id);
+
setselected_class_title(cellValues.row.title);
- GetListePreinscrit(cellValues.row.code_session, cellValues.row.class_internal_url);
- GetListeInscrit(cellValues.row.code_session, cellValues.row.class_internal_url);
+ GetListePreinscrit(cellValues.row._id, cellValues.row.class_internal_url);
+ GetListeInscrit(cellValues.row._id, cellValues.row.class_internal_url);
}
const [selected_code_session, setselected_code_session] = useState();
+ const [selected_session_id, setselected_session_id] = useState();
const [selected_internal_url, setselected_internal_url] = useState();
const [selected_class_title, setselected_class_title] = useState();
@@ -789,7 +801,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
- formData.append("session_id", selected_code_session);
+ formData.append("session_id", selected_session_id);
formData.append("class_internal_url", selected_internal_url);
//console.log("token = " + stored_cookie);
@@ -1122,16 +1134,19 @@ const DisplayPartnerSession = (props) => {
setnb_stagiaire_Preinscrit(data['message'].length);
//console.log(" ### setnb_stagiaire_Preinscrit = ", data['message'].length);
+
}
else {
//console.log("erreur rrrr:" + data['status'])
setGetListePreinscrit_api("false");
+ alert(data['message']);
}
}).catch((error) => {
console.error('Error:', error);
setGetListePreinscrit_api("false");
+ alert(" Impossible de recuperer la liste des préinscriptions");
});
}
@@ -1189,7 +1204,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("nom", one_nom_part);
form.append("prenom", one_prenom_part);
form.append("email", one_email_part);
@@ -1213,8 +1228,8 @@ const DisplayPartnerSession = (props) => {
alert(" Le participant a été correctement ajouté");
setaddOneParticipant("0");
//setreduction_session("1");
- GetListePreinscrit(selected_code_session, selected_internal_url);
- GetListeInscrit(selected_code_session, selected_internal_url);
+ GetListePreinscrit(selected_session_id, selected_internal_url);
+ GetListeInscrit(selected_session_id, selected_internal_url);
submenu_inscrit();
@@ -1315,7 +1330,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("email", email);
@@ -1379,8 +1394,8 @@ const DisplayPartnerSession = (props) => {
setSelectionModel_insc([]);
setactionmass_insc_val();
- GetListePreinscrit(selected_code_session, selected_internal_url);
- GetListeInscrit(selected_code_session, selected_internal_url);
+ GetListePreinscrit(selected_session_id, selected_internal_url);
+ GetListeInscrit(selected_session_id, selected_internal_url);
}
@@ -1438,7 +1453,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("nom", nom);
form.append("prenom", prenom);
form.append("email", email);
@@ -1453,8 +1468,8 @@ const DisplayPartnerSession = (props) => {
if (String(res.data.status) === String("true")) {
setDeleteStagiaireData_api("true");
setDeleteStagiaireData_result(res.data.message);
- GetListePreinscrit(selected_code_session, selected_internal_url);
- GetListeInscrit(selected_code_session, selected_internal_url);
+ GetListePreinscrit(selected_session_id, selected_internal_url);
+ GetListeInscrit(selected_session_id, selected_internal_url);
setretval_ch("1");
alert(" La mise à jour été correctement faite.")
@@ -1496,7 +1511,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("nom", nom);
form.append("prenom", prenom);
form.append("email", email);
@@ -1510,6 +1525,8 @@ const DisplayPartnerSession = (props) => {
var myurl = process.env.REACT_APP_API_URL + "myclass/api/UpdateStagiairetoClass/";
+ console.log(" form = ", form);
+
axios.post(myurl, form).then(res => {
//console.log(" In UpdateStagiaireData res.data.status = " + res.data.status);
//console.log(" In UpdateStagiaireData res.data.message r_class = " + res.data.message);
@@ -1517,8 +1534,8 @@ const DisplayPartnerSession = (props) => {
if (String(res.data.status) === String("true")) {
setUpdateStagiaireData_api("true");
setUpdateStagiaireData_result(res.data.message);
- GetListePreinscrit(selected_code_session, selected_internal_url);
- GetListeInscrit(selected_code_session, selected_internal_url);
+ GetListePreinscrit(selected_session_id, selected_internal_url);
+ GetListeInscrit(selected_session_id, selected_internal_url);
setretval_ch("1");
alert(" La mise à jour été correctement faite.");
@@ -1561,7 +1578,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("email", email);
@@ -1575,8 +1592,8 @@ const DisplayPartnerSession = (props) => {
setSendInscriptionCancell_api("true");
setSendInscriptionCancell_result(res.data.message);
- GetListePreinscrit(selected_code_session, selected_internal_url);
- GetListeInscrit(selected_code_session, selected_internal_url);
+ GetListePreinscrit(selected_session_id, selected_internal_url);
+ GetListeInscrit(selected_session_id, selected_internal_url);
submenu_inscrit();
@@ -1667,7 +1684,7 @@ const DisplayPartnerSession = (props) => {
function One_annuleSessionUpdate() {
One_clearSessionFields();
- GetCurrentSession(selected_code_session);
+ GetCurrentSession(selected_session_id);
setsessionChanged(false);
setCreateSessionFormation_api();
setCreateSessionFormation_message();
@@ -2104,7 +2121,7 @@ const DisplayPartnerSession = (props) => {
setsessionChanged(false);
desableSessionFields();
Getall_TrainingSession();
- GetCurrentSession(selected_code_session, selected_internal_url);
+ GetCurrentSession(selected_session_id, selected_internal_url);
alert(String(res.data.message));
} else if (String(res.data.status) === String("Err_Connexion")) {
@@ -2295,7 +2312,7 @@ const DisplayPartnerSession = (props) => {
alert(res.data.message);
One_clearSessionFields();
setaddOneSession();
- GetCurrentSession(p_one_code_session, one_selected_internal_url);
+ //GetCurrentSession(p_one_code_session, one_selected_internal_url);
} else if (String(res.data.status) === String("Err_Connexion")) {
alert('Erreur: ' + res.data.message);
@@ -2378,7 +2395,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", local_selected_internal_url);
- form.append("code_session", local_session_id);
+ form.append("session_id", local_session_id);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetSessionFormation/";
@@ -2483,8 +2500,10 @@ const DisplayPartnerSession = (props) => {
setp_session_ondemande(mylocaltraining.session_ondemande);
if (String(mylocaltraining.session_ondemande) === "1")
setp_session_ondemande_label("Oui");
- else
+ else if (String(mylocaltraining.session_ondemande) === "0")
setp_session_ondemande_label("Non")
+ else
+ setp_session_ondemande_label("?")
}
@@ -2532,7 +2551,9 @@ const DisplayPartnerSession = (props) => {
setsessionStatus(false);
desableSessionFields();
-
+ if (myRef.current) {
+ myRef.current.scrollIntoView({ behavior: "smooth" });
+ }
}
} else if (String(res.data.status) === String("Err_Connexion")) {
@@ -2568,6 +2589,7 @@ const DisplayPartnerSession = (props) => {
const [p_one_myclass_title, setp_one_myclass_title] = useState("");
const [p_one_code_session, setp_one_code_session] = useState("");
+ const [p_one_code_session_id, setp_one_code_session_id] = useState("");
const [p_one_adresse, setp_one_adresse] = useState("");
const [p_one_code_postal, setp_one_code_postal] = useState("");
const [p_one_ville, setp_one_ville] = useState("");
@@ -2596,7 +2618,7 @@ const DisplayPartnerSession = (props) => {
setone_CreateSessionFormation_api();
setone_CreateSessionFormation_message();
setone_CreateSessionFormation_result();
- GetCurrentSession(selected_code_session, selected_internal_url);
+ GetCurrentSession(selected_session_id, selected_internal_url);
}
const [SessionstartDate, setSessionstartDate] = useState();
@@ -2723,7 +2745,7 @@ const DisplayPartnerSession = (props) => {
function One_annuleSessionUpdate() {
One_clearSessionFields();
- GetCurrentSession(selected_code_session);
+ //GetCurrentSession(selected_code_session);
setsessionChanged(false);
setCreateSessionFormation_api();
setCreateSessionFormation_message();
@@ -2959,8 +2981,8 @@ const DisplayPartnerSession = (props) => {
var email = cellValues.row.email;
setselectedattendeeemail(email);
var prenom = cellValues.row.prenom;
- GetAttendee_Data(email, selected_code_session);
- getStagiaireImages(selected_internal_url, selected_code_session, email,);
+ GetAttendee_Data(email, selected_session_id);
+ getStagiaireImages(selected_internal_url, selected_session_id, email,);
}
@@ -3217,7 +3239,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
formData.append("class_internal_url", selected_internal_url);
- formData.append("session_id", selected_code_session);
+ formData.append("session_id", selected_session_id);
formData.append("email", selectedattendeeemail);
console.log(" ### userimgclassprofilchanged =", userimgclassprofilchanged)
@@ -3326,7 +3348,7 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
- formData.append("session_id", selected_code_session);
+ formData.append("session_id", selected_session_id);
var local_mail = ""
if (document.getElementsByName("detail_mail") && document.getElementsByName("detail_mail")[0])
@@ -3482,7 +3504,7 @@ const DisplayPartnerSession = (props) => {
var form = new FormData();
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("attendee_email", selectedattendeeemail);
form.append("class_internal_url", selected_internal_url);
@@ -3518,7 +3540,7 @@ const DisplayPartnerSession = (props) => {
var form = new FormData();
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("attendee_email", email);
form.append("class_internal_url", selected_internal_url);
@@ -3561,7 +3583,7 @@ const DisplayPartnerSession = (props) => {
var form = new FormData();
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("attendee_email", selectedattendeeemail);
form.append("class_internal_url", selected_internal_url);
@@ -3886,6 +3908,7 @@ const DisplayPartnerSession = (props) => {
id: index,
class_internal_url: JSON.parse(item).class_internal_url,
code_session: JSON.parse(item).code_session,
+ _id: JSON.parse(item)._id,
date_debut: JSON.parse(item).date_debut,
date_fin: JSON.parse(item).date_fin,
distantiel: JSON.parse(item).distantiel,
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js
index a572054..afe6f52 100644
--- a/src/components/DisplayPartnerStagiaires.js
+++ b/src/components/DisplayPartnerStagiaires.js
@@ -71,6 +71,7 @@ const DisplayPartnerStagiaires = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
+ { field: 'session_id', headerName: 'session_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
{ field: 'class_internal_url', headerName: 'class_internal_url', hide: true },
@@ -91,7 +92,7 @@ const DisplayPartnerStagiaires = (props) => {
return "???";
},
},
- { field: 'session_id', headerName: 'Code session', hideable: true, },
+ { field: 'code_session', headerName: 'Code session', hideable: true, },
{ field: 'title', headerName: 'Formation', width: datagrid_columns_size_model1, align: "center", hideable: true, },
{
field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2,
@@ -290,8 +291,14 @@ const DisplayPartnerStagiaires = (props) => {
var line = JSON.parse(rowss[selected_row_id]);
- var code_session = line.session_id;
- setselected_code_session(line.session_id);
+ var code_session = line.code_session;
+ setselected_code_session(line.code_session);
+
+
+ var session_id = line.session_id;
+ setselected_session_id(line.session_id);
+
+
var internal_url = line.class_internal_url;
setselected_internal_url(line.class_internal_url);
@@ -311,10 +318,10 @@ const DisplayPartnerStagiaires = (props) => {
myRef.current.scrollIntoView({ behavior: "smooth" });
}
- GetAttendee_Data(participant_email, code_session, internal_url);
+ GetAttendee_Data(participant_email, session_id, internal_url);
// Recuperation de l'image de profiel
- getStagiaireImages(internal_url, code_session, participant_email);
+ getStagiaireImages(internal_url, session_id, participant_email);
/*
GetCurrentSession(line.code_session, line.class_internal_url);
@@ -356,6 +363,8 @@ const DisplayPartnerStagiaires = (props) => {
};
+
+ const [selected_session_id, setselected_session_id] = useState();
const [selected_code_session, setselected_code_session] = useState();
const [selected_internal_url, setselected_internal_url] = useState();
const [selected_class_title, setselected_class_title] = useState();
@@ -561,7 +570,7 @@ const DisplayPartnerStagiaires = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
- formData.append("session_id", selected_code_session);
+ formData.append("session_id", selected_session_id);
var local_mail = ""
if (document.getElementsByName("detail_mail") && document.getElementsByName("detail_mail")[0])
@@ -1009,7 +1018,7 @@ const DisplayPartnerStagiaires = (props) => {
var form = new FormData();
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("attendee_email", selectedattendeeemail);
form.append("class_internal_url", selected_internal_url);
@@ -1045,7 +1054,7 @@ const DisplayPartnerStagiaires = (props) => {
var form = new FormData();
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", selected_code_session);
+ form.append("session_id", selected_session_id);
form.append("attendee_email", email);
form.append("class_internal_url", selected_internal_url);
@@ -1090,7 +1099,7 @@ const DisplayPartnerStagiaires = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
formData.append("class_internal_url", selected_internal_url);
- formData.append("session_id", selected_code_session);
+ formData.append("session_id", selected_session_id);
formData.append("email", selected_participant_email);
@@ -1415,6 +1424,7 @@ const DisplayPartnerStagiaires = (props) => {
console.log(" In GetAttendee res.data.message r_class = " + res.data.message);
setGetAttendee_api("true");
setGetAttendee_result(res.data.message);
+
var mylocalattendee = JSON.parse(res.data.message);
@@ -1609,6 +1619,7 @@ const DisplayPartnerStagiaires = (props) => {
const [getPartnerImages_message, setgetPartnerImages_message] = useState();
const [getPartnerImages_result, setgetPartnerImages_result] = useState();
function getStagiaireImages(local_internal_url, local_selected_code_session, local_email) {
+
var myurl = process.env.REACT_APP_API_URL + "myclass/api/getRecodedStagiaireImage_from_front/";
var form = new FormData();
@@ -1757,6 +1768,8 @@ const DisplayPartnerStagiaires = (props) => {
})
}
+ const myRef_head = useRef(null)
+
const [UpdateStagiaireData_api, setUpdateStagiaireData_api] = useState();
const [UpdateStagiaireData_message, setUpdateStagiaireData_message] = useState();
const [UpdateStagiaireData_result, setUpdateStagiaireData_result] = useState();
@@ -1771,7 +1784,7 @@ const DisplayPartnerStagiaires = (props) => {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", selected_internal_url);
- form.append("session_id", p_detail_session_class);
+ form.append("session_id", p_detail_session_class_id);
form.append("nom", p_detail_nom);
form.append("prenom", p_detail_prenom);
form.append("email", p_detail_mail);
@@ -1821,8 +1834,12 @@ const DisplayPartnerStagiaires = (props) => {
disableAttendeeDetailFields();
setparticipant_data_changed();
setparticipant_data_edit_mode();
- GetAttendee_Data(p_detail_mail, p_detail_session_class, selected_internal_url);
+ GetAttendee_Data(p_detail_mail, p_detail_session_class_id, selected_internal_url);
alert(" La mise à jour été correctement faite.");
+
+
+ myRef_head.current.scrollIntoView({ behavior: "smooth" });
+
}
else {
setUpdateStagiaireData_api("false");
@@ -1985,7 +2002,7 @@ const DisplayPartnerStagiaires = (props) => {
>
-
+
@@ -2030,6 +2047,7 @@ const DisplayPartnerStagiaires = (props) => {