diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js
index bafefe2..87dd853 100644
--- a/src/components/DisplayPartnerStagiaires.js
+++ b/src/components/DisplayPartnerStagiaires.js
@@ -1984,7 +1984,7 @@ const DisplayPartnerStagiaires = (props) => {
-
@@ -2548,7 +2548,7 @@ const DisplayPartnerStagiaires = (props) => {
{p_one_formation && Getall_TrainingSession_result &&
Getall_TrainingSession_result.filter((session_ch) => JSON.parse(session_ch).class_internal_url === p_one_formation).map((mysession) => (
@@ -2556,7 +2556,7 @@ const DisplayPartnerStagiaires = (props) => {
{!p_one_formation && Getall_TrainingSession_result &&
Getall_TrainingSession_result.map((mysession) => (
@@ -2703,7 +2703,7 @@ const DisplayPartnerStagiaires = (props) => {
{Get_List_Partner_Clients_result &&
Get_List_Partner_Clients_result.map((myclient) => (
@@ -2851,7 +2851,7 @@ const DisplayPartnerStagiaires = (props) => {
{Getall_TrainingSession_result &&
Getall_TrainingSession_result.map((mysession) => (
@@ -2885,7 +2885,7 @@ const DisplayPartnerStagiaires = (props) => {
{Get_List_Partner_Clients_result &&
Get_List_Partner_Clients_result.map((myclient) => (
diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js
index ffa5cdb..cbd231c 100644
--- a/src/components/GestionAdministrative.js
+++ b/src/components/GestionAdministrative.js
@@ -416,6 +416,17 @@ function GestionAdministrative(props) {
{ 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_status', headerName: 'Statut', width: 100, editable: false, flex: true,
+ valueFormatter: (params) => {
+ if (String(params.value) === "0")
+ return "Envoyé";
+ else if (String(params.value) === "1")
+ return "Evalué";
+ else
+ return "A envoyer";
+ },
+ },
{ 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, },
@@ -537,7 +548,7 @@ function GestionAdministrative(props) {
//form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA");
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
- form.append("session_id", mysession);
+ form.append("session_id", selected_session_id);
form.append("email", email);
form.append("date", date);
form.append("matin", matin_val);
@@ -554,7 +565,8 @@ function GestionAdministrative(props) {
//console.log(" In UpdateStagiaireData res.data.message r_class = " + res.data.message);
setUpdateStagiaireEmargement_api("true");
setUpdateStagiaireEmargement_result(res.data.message);
- GetListeEmargement(mysession);
+ GetListeEmargement(selected_session_id);
+ alert(" La mise à jour a été bien faite");
} else if (String(res.data.status) === String("Err_Connexion")) {
alert('Erreur: ' + res.data.message);
history.push("/Connexion");
@@ -562,6 +574,7 @@ function GestionAdministrative(props) {
else {
setUpdateStagiaireEmargement_api("false");
setUpdateStagiaireEmargement_message(res.data.message);
+ alert(res.data.message);
}
@@ -569,6 +582,7 @@ function GestionAdministrative(props) {
console.warn('handleClick_valide_emargement : Not good man :( mysearchtext = ' + error);
setUpdateStagiaireEmargement_api("false");
+ alert(" Impossible de valider l'émargement");
})
@@ -778,6 +792,8 @@ function GestionAdministrative(props) {
}
+ const [nb_stagiaire_Preinscrit, setnb_stagiaire_Preinscrit] = useState("0");
+ const [nb_stagiaire_Inscrit, setnb_stagiaire_Inscrit] = useState("0");
function submenu_inscrit() {
setsubmenu("inscrit");
setCreateListEmargement_api();
@@ -1026,7 +1042,7 @@ function GestionAdministrative(props) {
}
else if (String(data['status']) === String("true")) {
setGetListePreinscrit_api("true");
-
+ setnb_stagiaire_Preinscrit(data['message'].length);
}
else {
//console.log("erreur rrrr:" + data['status'])
@@ -1058,8 +1074,8 @@ function GestionAdministrative(props) {
axios.post(myurl, form).then(res => {
if (String(res.data.status) === String("true")) {
- console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status);
- console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message);
+ //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status);
+ //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message);
setGetCurrentClass_trainingsession_api("true");
setGetCurrentClass_trainingsession_result(res.data.message);
}
@@ -1229,7 +1245,7 @@ function GestionAdministrative(props) {
if (String(data['status']) === String("true")) {
//console.log("erreur rrrr:" + data['status'])
setGetListePreinscrit_insc_api("true");
-
+ setnb_stagiaire_Inscrit(data['message'].length);
} else if (String(data['status']) === String("Err_Connexion")) {
alert('Erreur: ' + data['message']);
history.push("/Connexion");
@@ -1518,7 +1534,6 @@ function GestionAdministrative(props) {
function handleChangeSession_v2(event) {
-
//form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA");
const stored_cookie = getCookie('tokenmysypart');
if (String(stored_cookie) === String("")) {
@@ -1534,9 +1549,6 @@ function GestionAdministrative(props) {
const code_session = div1.getAttribute('mysy_code_session');
setselected_code_session(code_session);
-
-
-
setreduction_session("0");
setsessionChanged(false);
clearSessionFields();
@@ -1621,7 +1633,7 @@ function GestionAdministrative(props) {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", internal_url);
- form.append("session_id", mysession);
+ form.append("session_id", selected_session_id);
//alert(" mysession = "+mysession);
@@ -1634,7 +1646,7 @@ function GestionAdministrative(props) {
//console.log(" In UpdateStagiaireData res.data.message r_class = " + res.data.message);
setCreateListEmargement_api("true");
setCreateListEmargement_result(res.data.message);
- GetListeEmargement(mysession);
+ GetListeEmargement(selected_session_id);
} else if (String(res.data.status) === String("Err_Connexion")) {
alert('Erreur: ' + res.data.message);
@@ -1643,12 +1655,14 @@ function GestionAdministrative(props) {
else {
setCreateListEmargement_api("false");
setCreateListEmargement_message(res.data.message);
+ alert(res.data.messag);
}
}).catch((error) => {
console.warn('CreateListEmargement : Not good man :( mysearchtext = ' + error);
setCreateListEmargement_api("false");
+ alert(" Impossible d'initialiser la liste d'émargement");
})
}
@@ -2553,7 +2567,7 @@ function GestionAdministrative(props) {
var nom_liste_emarge = "Liste_Emargement.pdf";
- var url = process.env.REACT_APP_API_URL + "myclass/api/GerneratePDFEmargementList/" + stored_cookie + "/" + mysession + "/" + internal_url;
+ var url = process.env.REACT_APP_API_URL + "myclass/api/GerneratePDFEmargementList/" + stored_cookie + "/" + selected_session_id + "/" + internal_url;
@@ -3198,6 +3212,13 @@ function GestionAdministrative(props) {
}
+ document.getElementsByName("detail_session_class")[0].value = "";
+ if (mylocalattendee.code_session)
+ setp_detail_session_class(mylocalattendee.code_session);
+
+ if (mylocalattendee.session_id)
+ setp_detail_session_class_id(mylocalattendee.session_id);
+
document.getElementsByName("detail_nom")[0].value = "";
if (mylocalattendee.nom)
@@ -3337,6 +3358,192 @@ function GestionAdministrative(props) {
})
}
+
+ // Cette fonction remplit la zone detail de la personne inscrite
+ const [GetAttendee_Data_from_line_id_api, setGetAttendee_Data_from_line_id_api] = useState();
+ const [GetAttendee_Data_from_line_id_message, setGetAttendee_Data_from_line_id_message] = useState();
+ const [GetAttendee_Data_from_line_id_result, setGetAttendee_Data_from_line_id_result] = useState();
+ function GetAttendee_Data_from_line_id(participant_line_id) {
+ clean_old_messages();
+ var form = new FormData();
+
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+ form.append("_id", participant_line_id);
+
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAttendeeDetail_perSession_from_line_id/";
+
+ axios.post(myurl, form).then(res => {
+
+ if (String(res.data.status) === "true") {
+ //console.log(" In GetAttendee_Data_from_line_id res.data.status = " + res.data.status);
+ //console.log(" In GetAttendee_Data_from_line_id res.data.message r_class = " + res.data.message);
+
+
+ setGetAttendee_Data_from_line_id_api("true");
+ setGetAttendee_Data_from_line_id_result(res.data.message);
+ if (res.data.message.length <= 0) {
+ alert(" Aucune information recuperée");
+ } else {
+
+
+ var mylocalattendee = JSON.parse(res.data.message);
+
+
+ if (mylocalattendee.inscription_validation_date) {
+ var date_du = new Date(moment(mylocalattendee.inscription_validation_date, "DD/MM/YYYY HH:mm:ss"));
+ setdetailuser_date_inscription(date_du);
+ }
+
+
+ document.getElementsByName("detail_session_class")[0].value = "";
+ if (mylocalattendee.code_session)
+ setp_detail_session_class(mylocalattendee.code_session);
+
+ if (mylocalattendee.session_id)
+ setp_detail_session_class_id(mylocalattendee.session_id);
+
+
+ document.getElementsByName("detail_nom")[0].value = "";
+ if (mylocalattendee.nom)
+ setp_detail_nom(mylocalattendee.nom);
+
+ document.getElementsByName("detail_prenom")[0].value = "";
+ if (mylocalattendee.prenom)
+ setp_detail_prenom(mylocalattendee.prenom);
+
+ document.getElementsByName("detail_mail")[0].value = "";
+ if (mylocalattendee.email) {
+ setp_detail_mail(mylocalattendee.email);
+ setattendee_lms_login(mylocalattendee.email);
+ }
+
+ document.getElementsByName("detail_client_rattachement")[0].value = "";
+ if (mylocalattendee.client_rattachement_id) {
+ setp_detail_client_rattachement_id(mylocalattendee.client_rattachement_id);
+ setp_detail_client_rattachement_nom(mylocalattendee.client_rattachement_nom);
+
+ }
+
+ document.getElementsByName("detail_status_inscript")[0].value = "";
+ if (mylocalattendee.status) {
+ setp_detail_status_inscrit(mylocalattendee.status);
+ if (String(mylocalattendee.status) === "1")
+ setp_detail_status_inscrit_label("Inscrit");
+ else if (String(mylocalattendee.status) === "0")
+ setp_detail_status_inscrit_label("Preinsc.");
+ else if (String(mylocalattendee.status) === "-1")
+ setp_detail_status_inscrit_label("Annulé");
+ }
+
+
+ document.getElementsByName("detail_opco")[0].value = "";
+ if (mylocalattendee.opco)
+ setp_detail_opco(mylocalattendee.opco);
+
+ document.getElementsByName("detail_tel")[0].value = "";
+ if (mylocalattendee.telephone) {
+ setp_detail_tel(mylocalattendee.telephone);
+ }
+
+ document.getElementsByName("detail_adresse")[0].value = "";
+ if (mylocalattendee.adresse) {
+ setp_detail_adresse(mylocalattendee.adresse);
+ }
+
+ document.getElementsByName("detail_code_postal")[0].value = "";
+ if (mylocalattendee.code_postal) {
+ setp_detail_code_postal(mylocalattendee.code_postal);
+ }
+
+ document.getElementsByName("detail_ville")[0].value = "";
+ if (mylocalattendee.ville) {
+ setp_detail_ville(mylocalattendee.ville);
+ }
+
+
+ document.getElementsByName("detail_cout")[0].value = "";
+ if (mylocalattendee.price) {
+ setp_detail_cout(mylocalattendee.price);
+ }
+
+
+ document.getElementsByName("detail_mode_fin")[0].value = "";
+ if (mylocalattendee.modefinancement) {
+ setp_detail_mode_fin(mylocalattendee.modefinancement);
+ }
+
+
+ document.getElementsByName("detail_employeur")[0].value = "";
+ if (mylocalattendee.employeur) {
+ setp_detail_employeur(mylocalattendee.employeur);
+ }
+
+ document.getElementsByName("date_evaluation")[0].value = "";
+ if (mylocalattendee.eval_date) {
+
+ var date_eval = new Date(moment(mylocalattendee.eval_date, "YYYY/MM/DD"));
+ setdetailuser_date_evaluation(date_eval);
+ }
+
+ document.getElementsByName("certif_date")[0].value = "";
+ if (mylocalattendee.certification_send_date) {
+ //alert(" certification_send_date = ", mylocalattendee.certification_send_date);
+
+ var date_eval = new Date(moment(mylocalattendee.certification_send_date, "DD/MM/YYYY"));
+ setdetailuser_date_certification(date_eval);
+ }
+
+
+
+ document.getElementsByName("note_eval")[0].value = "";
+ if (mylocalattendee.eval_note) {
+ document.getElementsByName("note_eval")[0].value = mylocalattendee.eval_note;
+ }
+
+
+ if (mylocalattendee.eval_eval) {
+ setfield_evaluation(mylocalattendee.eval_eval);
+
+ }
+
+ if (mylocalattendee.lms_pwd) {
+ setattendee_lms_pwd("xxxxxx");
+ }
+
+
+ var myelement;
+
+ if (document.getElementById('ajout_participant')) {
+ myelement = document.getElementById('ajout_participant');
+ }
+
+ if (myelement) {
+ myelement.scrollIntoView({ behavior: 'smooth' });
+ }
+
+ }
+ disableAttendeeDetailFields();
+
+ } else if (String(res.data.status) === String("Err_Connexion")) {
+ alert('Erreur: ' + res.data.message);
+ history.push("/Connexion");
+ }
+
+ else {
+ setGetAttendee_Data_from_line_id_api("false");
+ setGetAttendee_Data_from_line_id_message(res.data.message);
+ alert('Erreur: ' + res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( GetAttendee_Data_from_line_id = ', error);
+ setGetAttendee_Data_from_line_id_api("false");
+ alert(" Impossible de recuperer les données de l'apprenant");
+ })
+ }
+
const [selectedCertif, setselectedCertif] = useState();
const [one_selectedCertif, setone_selectedCertif] = useState();
@@ -3816,11 +4023,10 @@ function GestionAdministrative(props) {
await sleep(100)
}
setSelectionModel_emarg([]);
- actionmass_emarg_val();
- GetListePreinscrit(mysession);
- GetListeInscrit(mysession);
- GetListeEmargement(mysession);
- GetListeEvaluation(mysession);
+ setactionmass_emarg_val();
+
+ GetListeEmargement(selected_session_id);
+
}
@@ -4249,6 +4455,7 @@ function GestionAdministrative(props) {
const [p_date_evaluation, setp_date_evaluation] = useState();
const [p_note_eval, setp_note_eval] = useState();
const [p_detail_session_class, setp_detail_session_class] = useState();
+ const [p_detail_session_class_id, setp_detail_session_class_id] = useState();
const [p_detail_status_inscrit, setp_detail_status_inscrit] = useState();
const [p_detail_status_inscrit_label, setp_detail_status_inscrit_label] = useState();
const [p_detail_opco, setp_detail_opco] = useState();
@@ -4397,7 +4604,7 @@ function GestionAdministrative(props) {
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("class_internal_url", 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);
@@ -4411,6 +4618,8 @@ function GestionAdministrative(props) {
form.append("client_rattachement_id", p_detail_client_rattachement_id);
+
+ console.log(" ### form = ", form);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/UpdateStagiairetoClass/";
axios.post(myurl, form).then(res => {
@@ -4423,11 +4632,14 @@ function GestionAdministrative(props) {
disableAttendeeDetailFields();
setparticipant_data_changed();
setparticipant_data_edit_mode();
- GetAttendee_Data(p_detail_mail, p_detail_session_class);
- GetCurrentClass_trainingsession();
- GetAttestation_Certif();
- Get_List_Partner_Clients();
+ GetListePreinscrit(p_detail_session_class_id);
+ GetListeInscrit(p_detail_session_class_id);
+
+ GetAttendee_Data_from_line_id(selected_id);
+ GetCurrentClass_trainingsession()
+
alert(" La mise à jour été correctement faite.");
+
}
else {
setUpdate_One_StagiaireData_api("false");
@@ -4927,7 +5139,7 @@ function GestionAdministrative(props) {
}}
disabled={false}
className="disabled_style selectsession"
- style={{"border":"solid 1px", "borderRadius":"5px"}}
+ style={{ "border": "solid 1px", "borderRadius": "5px" }}
//value={p_one_detail_client_rattachement_nom}
onChange={handleChangeSession_v2}
@@ -4935,7 +5147,7 @@ function GestionAdministrative(props) {
{GetCurrentClass_trainingsession_result &&
GetCurrentClass_trainingsession_result.map((session) => (