From 05906fdf67f3e8259bba4d2e946b2b56c5a6bb67 Mon Sep 17 00:00:00 2001 From: Cherif Date: Fri, 22 May 2026 20:15:56 +0200 Subject: [PATCH] 22/05/2026 - 20h --- src/components/Apprenant.js | 743 +++++---- src/components/Autre_RH.js | 387 +---- src/components/Conseil_Classe.js | 2 + src/components/DisplayPartnerPromotion.js | 1395 ++++++++-------- src/components/DisplayPartnerSession.js | 2 + src/components/DisplayPartnerStagiaires.js | 946 +++++++++-- src/components/Employes.js | 909 +++++----- src/components/Equipe_Team.js | 2 + src/components/Groupe_Apprenant.js | 2 + src/components/Jurys.js | 3 + src/components/Jurys_Admission.js | 2 + .../Module_Admission_Candidat_Document.js | 2 +- .../Module_Bloc_Competence_Pedagogique.js | 6 +- .../Module_Ent_Internal_Email_Management.js | 1 + src/components/Module_Ent_Message_Public.js | 1 + src/components/Module_Ent_Mon_Planning.js | 106 +- .../Module_Internal_Email_Management.js | 1 + ...tranet_Client_Internal_Email_Management.js | 1 + .../Module_Jury_Selection_Apprenants.js | 1 + src/components/Module_Selection_Apprenants.js | 109 +- .../Module_Selection_Evaluation_Apprenants.js | 1 + .../Module_Session_Notes_Classement.js | 1 + .../Module_Session_Planification.js | 343 ++-- src/components/Modules_Mes_Documents.js | 192 ++- src/components/Notes_Evaluation.js | 1 + .../PROD_050426/DisplayPartnerSession.js | 3 + src/components/Partner_Client.js | 1 + src/components/Session_Admission_FI.js | 339 ++-- src/components/UpdateUserInfo.js | 1455 ++++++++++++++--- src/styles/components/_updateuserinfo.scss | 2 +- 30 files changed, 4326 insertions(+), 2633 deletions(-) diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 1f44887..b5c34c9 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -1204,8 +1204,8 @@ const Apprenant = (props) => { setp_detail_num_secu(""); } - if (mylocaltraining.piece_identite_type) { - setp_detail_piece_identite_type(mylocaltraining.piece_identite_type); + if (mylocaltraining.identite_type) { + setp_detail_piece_identite_type(mylocaltraining.identite_type); } else { setp_detail_piece_identite_type(""); } @@ -1352,6 +1352,13 @@ const Apprenant = (props) => { formData.append("object_owner_id", selected_apprenant_id); formData.append("type_document", ""); + if (file_date_expiration) { + formData.append("file_date_expiration", file_date_expiration); + } else { + formData.append("file_date_expiration", "01/01/2099"); + } + + var is_secure_file = "0"; if (securised_file) is_secure_file = "1" @@ -4423,6 +4430,12 @@ const Apprenant = (props) => { setsecurised_file(false); setp_detail_one_file_to_download_type_name(""); + setfile_date_expiration(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }) + const fileUploaded = event.target.files[0]; let file_size = event.target.files[0].size; let file_type = event.target.files[0].type; @@ -4464,6 +4477,13 @@ const Apprenant = (props) => { setsecurised_file(false); setp_detail_one_file_to_download_type_name(""); + setfile_date_expiration(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }) + + const fileUploaded = event.target.files[0]; let file_size = event.target.files[0].size; let file_type = event.target.files[0].type; @@ -4904,6 +4924,12 @@ const Apprenant = (props) => { const [securised_file, setsecurised_file] = useState(false); + const [file_date_expiration, setfile_date_expiration] = useState(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }); + const [file_1_name, setfile_1_name] = useState(); const [file_2_name, setfile_2_name] = useState(); @@ -6793,6 +6819,7 @@ const Apprenant = (props) => { { "id": "cni", "label": "CNI", "value": "cni" }, { "id": "permis", "label": "Permis Conduire", "value": "permis" }, { "id": "passport", "label": "Passport", "value": "passport" }, + { "id": "titre_sejour", "label": "Titre Séjour", "value": "titre_sejour" }, { "id": "autre", "label": "Autre", "value": "passport" }, { "id": "", "label": "", "value": "" }, ] @@ -7254,19 +7281,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -7544,19 +7571,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -7746,19 +7773,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -8000,19 +8027,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8073,19 +8100,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8147,19 +8174,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8184,19 +8211,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8296,19 +8323,19 @@ const Apprenant = (props) => { renderInput={(params) => @@ -8372,19 +8399,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8444,19 +8471,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => } @@ -8505,19 +8532,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8575,19 +8602,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => } @@ -8841,19 +8868,20 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -9690,10 +9718,7 @@ const Apprenant = (props) => { {p_detail_archive && String(p_detail_archive) === "1" &&
Document Archivé
} - +
@@ -9755,7 +9780,7 @@ const Apprenant = (props) => { + }}> Situation Handicape 011
- - -
- - -
- -
- - -
- - -
+
+ +
+ + +
+ + +
+ + +
+ + +
+ +
@@ -10843,27 +10871,41 @@ const Apprenant = (props) => { - {String(props.check_user_acces_right("file_secure", "write")) === "1" &&
Fichier sécurisé ?
- { - setsecurised_file(event.target.checked); + {String(props.check_user_acces_right("file_secure", "write")) === "1" && +
Fichier sécurisé ?
+ { + setsecurised_file(event.target.checked); + } + } + inputProps={{ 'aria-label': 'controlled' }} + /> + +
} + +
Expiration
+ { + setfile_date_expiration(format(date, 'd/MM/yyyy')); + } } - inputProps={{ 'aria-label': 'controlled' }} + showTimeSelect={false} + dateFormat="dd/MM/yyyy" + className="disabled_style enable_style" + locale={'fr'} + /> -
} +
-
- {Record_All_PJ_api && String(Record_All_PJ_api) === "true" &&
Pièce jointe enregistrée
} - - {Record_All_PJ_api && String(Record_All_PJ_api) === "false" &&
{Record_All_PJ_message}
} -
- @@ -10889,6 +10931,29 @@ const Apprenant = (props) => { startIcon={} className="bton_enreg">ENREGISTRER LA PIECE +
+ + +
+ +
+
+ + + } @@ -11178,19 +11243,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11224,19 +11289,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11274,19 +11339,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11371,19 +11436,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11677,19 +11742,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11724,19 +11789,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11775,19 +11840,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11872,19 +11937,19 @@ const Apprenant = (props) => { }} renderInput={(params) => diff --git a/src/components/Autre_RH.js b/src/components/Autre_RH.js index 6df4e70..54a2ecc 100644 --- a/src/components/Autre_RH.js +++ b/src/components/Autre_RH.js @@ -9190,6 +9190,7 @@ const Autre_RH = (props) => { renderInput={(params) => { - {/* -
- -
- -
-
- -
Civilité
- {New_civilite.length > 0 && { - if (value && value.value) { - setp_one_detail_civilite(value.value); - setEmployee_data_changed("1"); - - } - }} - - renderInput={(params) => - } - />} - -
- -
Nom
- { - setp_one_detail_nom(e.target.value); - setEmployee_data_changed("1"); - } - } - - /> -
- -
Prénom
- { - setp_one_detail_prenom(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- - - -
Email
- { - setp_one_detail_mail(e.target.value); - setEmployee_data_changed("1"); - } - } - - /> -
- -
Fonction / Rôle
- { - setp_one_detail_fonction(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- - - -
Date Naissance
- - { - setp_one_detail_naissance(format(date, 'd/MM/yyyy')); - setEmployee_data_changed("1"); - } - } - showTimeSelect={false} - dateFormat="dd/MM/yyyy" - className="disabled_style enable_style" - locale={'fr'} - - /> - - -
- -
-
-   - -   -
- -
- -
-
- - -
Téléphone Mobile
- { - setp_detail_tel_mobile(e.target.value); - setEmployee_data_changed("1"); - } - } - /> -
- -
Téléphone
- { - setp_detail_tel(e.target.value); - setEmployee_data_changed("1"); - } - } - /> -
- -
Adresse
- { - setp_detail_adresse(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
-
Code postal
- { - setp_detail_code_postal(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
-
Ville
- { - setp_detail_ville(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- -
Pays
- { - setp_detail_pays(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- -
Linkedin
- { - setp_detail_linkedIn(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- -
Facebook
- { - setp_detail_facebook(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
- -
X (Twitter)
- { - setp_detail_twitter(e.target.value); - setEmployee_data_changed("1"); - }} - /> -
-
-
- - -   -
- -
- -
Commentaire
- { - setp_one_detail_comment(e.target.value); - - }} - - /> -
- */} +
{
diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index 4a50185..a9706f8 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -8901,6 +8901,7 @@ const Conseil_Classe = (props) => { renderInput={(params) => { renderInput={(params) => { { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, { field: 'formateur_id', headerName: 'formateur_id', hide: true }, - { field: 'diplome_id', headerName: 'diplome_id', hide: true }, + { field: 'diplome_id', headerName: 'diplome_id', hide: true, }, { field: 'diplome_code', headerName: 'Diplome', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'code', headerName: 'Code', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'titre', headerName: 'Titre', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'formateur_prenom_nom', headerName: 'Formateur', minWidth: 150, flex: 1, renderCell: (params) => , }, + { + field: 'couleur', headerName: 'Couleur', Width: 100, maxWidth: 250, hide: false, editable: false, + renderCell: (cellValues) => { + return ( + + ); + } + + }, + { field: "delete", headerName: 'Supprimer', @@ -15601,7 +15611,7 @@ const DisplayPartnerPromotion = (props) => { var local_diplome_id = JSON.parse(x).diplome_id; var local_diplome_code = JSON.parse(x).diplome_code; - + var local_couleur = JSON.parse(x).couleur; //--- @@ -15613,10 +15623,9 @@ const DisplayPartnerPromotion = (props) => { "titre": local_titre, "formateur_id": local_formateur_id, "formateur_prenom_nom": local_formateur_prenom_nom, - "diplome_id": local_diplome_id, "diplome_code": local_diplome_code, - + "couleur": local_couleur, }; new_data2.push(node); @@ -15633,6 +15642,7 @@ const DisplayPartnerPromotion = (props) => { "formateur_prenom_nom": "", "diplome_id": "", "diplome_code": "", + "couleur": "", }; new_data2.push(node); @@ -15786,8 +15796,8 @@ const DisplayPartnerPromotion = (props) => { setselected_ue_seuil_validation(""); setselected_ue_changed(""); setselected_ue_diplome_id(""); - setselected_ue_formateur_id(""); - + setselected_ue_formateur_id(""); + }; @@ -16233,19 +16243,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -16663,19 +16673,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17048,19 +17058,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17214,19 +17224,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17257,19 +17267,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17429,19 +17439,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -17568,19 +17578,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17663,19 +17673,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17936,19 +17946,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17987,19 +17997,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => + sx={{ + "& .MuiOutlinedInput-root": { + "& fieldset": { + border: "solid #e8eef6 1px;", + }, + "&:hover fieldset": { + border: "solid #e8eef6 1px;", + }, + "&.Mui-focused fieldset": { + border: "solid #e8eef6 1px;", + }, + }, + }} /> } /> @@ -18487,19 +18497,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -18813,19 +18823,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -19439,19 +19449,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -19564,19 +19574,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => + sx={{ + "& .MuiOutlinedInput-root": { + "& fieldset": { + border: "solid #e8eef6 1px;", + }, + "&:hover fieldset": { + border: "solid #e8eef6 1px;", + }, + "&.Mui-focused fieldset": { + border: "solid #e8eef6 1px;", + }, + }, + }} /> } /> @@ -19877,19 +19887,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -20988,19 +20998,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -21064,19 +21074,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => } @@ -21129,19 +21139,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -21196,19 +21206,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => } @@ -23354,19 +23364,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23477,19 +23487,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -23611,19 +23621,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23674,19 +23684,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23801,19 +23811,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24104,19 +24114,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24157,19 +24167,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24407,19 +24417,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -24484,19 +24494,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24571,19 +24581,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -24679,19 +24689,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24723,19 +24733,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24767,19 +24777,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24946,19 +24956,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25039,19 +25049,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25081,19 +25091,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25743,19 +25753,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25886,19 +25896,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -25961,19 +25971,19 @@ const DisplayPartnerPromotion = (props) => { value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -26003,19 +26013,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26045,19 +26055,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26122,19 +26132,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26200,19 +26210,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26756,19 +26766,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -26994,19 +27004,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -27140,19 +27150,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -27213,19 +27223,19 @@ const DisplayPartnerPromotion = (props) => { value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -27256,19 +27266,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27298,19 +27308,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27375,19 +27385,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27453,19 +27463,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27837,19 +27847,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -28288,19 +28298,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -28388,19 +28398,19 @@ const DisplayPartnerPromotion = (props) => { value={p_detail_financeur_rattachement_nom} renderInput={(params) => @@ -28666,19 +28676,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -30074,6 +30084,7 @@ const DisplayPartnerPromotion = (props) => { diplome_id: JSON.parse(item).diplome_id, diplome_code: JSON.parse(item).diplome_code, + couleur: JSON.parse(item).couleur, } ))} @@ -30087,7 +30098,7 @@ const DisplayPartnerPromotion = (props) => { setselected_ue_pres_dist_hyp(New_Getall_Class_List_UE_result.filter((data) => (data)._id === String(newSelectionModel.row._id))[0].pres_dist_hyp) setselected_ue_changed(""); setselected_ue_id(newSelectionModel.row._id); - + setselected_ue_diplome_id(newSelectionModel.row.diplome_id); setDialog_Unite_Enseignement_open(true); @@ -30152,7 +30163,7 @@ const DisplayPartnerPromotion = (props) => { {String(props.check_user_acces_right("session", "write")) === "1" &&
} + modal + nested + position="center center" + > + {close => ( +
+ +
MySy Information
+
+ {' '} + + En confirmant cette opération, le tutorat sera définitivement supprimé.
+ +
+
+
+ + +
+
+ +
+
+
+ )} + } + + + + ); + } + } + ] @@ -813,7 +875,58 @@ const DisplayPartnerStagiaires = (props) => { } + const [handleClick_delete_tutorat_api, sethandleClick_delete_tutorat_api] = useState(); + const [handleClick_delete_tutorat_message, sethandleClick_delete_tutorat_message] = useState(); + const [handleClick_delete_tutorat_result, sethandleClick_delete_tutorat_result] = useState(); + function handleClick_delete_tutorat(event, cellValues) { + var local_rh_id = cellValues.row._id; + + var form = new FormData(); + + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("tab_inscription_id", selected_id); + form.append("rh_id", local_rh_id); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_RH_List_Insc_Tutore/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + + setLoading(false); + if (String(res.data.status) === String("true")) { + //console.log(" In handleClick_delete_tutorat res.data.status = " + res.data.status); + //console.log(" In handleClick_delete_tutorat res.data.message r_class = " + res.data.message); + sethandleClick_delete_tutorat_api("true"); + sethandleClick_delete_tutorat_result(res.data.message); + + Getall_Tuteurs(selected_id); + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + + } + else { + sethandleClick_delete_tutorat_api("false"); + sethandleClick_delete_tutorat_message(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( handleClick_delete_tutorat = ', error); + sethandleClick_delete_tutorat_api("false"); + alert(" Impossible de supprimer le tutorat"); + //setmyApimyApiMessage("") + }) + } function handleClick_accept(event, cellValues) { @@ -1115,6 +1228,8 @@ const DisplayPartnerStagiaires = (props) => { setaddOneParticipant(); setdisplay_detail_stagiaire("1"); + + if (document.getElementById('detail_session')) { // myRef.current.scrollIntoView({ behavior: "smooth" }); var divh = document.getElementById('detail_session').offsetTop; @@ -1140,6 +1255,8 @@ const DisplayPartnerStagiaires = (props) => { Get_Inscrit_Notes_Of_Evaluations(stagiaire_id, tab_sudata[1]); Get_Inscrit_Jury(stagiaire_id, tab_sudata[1]); + GetAttendee_Groupe_Inscription(stagiaire_id); + } @@ -2174,6 +2291,17 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_tel")[0].style.backgroundColor = "#f8f9fa"; } + if (document.getElementsByName("type_piece_identite")[0]) { + document.getElementsByName("type_piece_identite")[0].disabled = true; + document.getElementsByName("type_piece_identite")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("num_piece_identite")[0]) { + document.getElementsByName("num_piece_identite")[0].disabled = true; + document.getElementsByName("num_piece_identite")[0].style.backgroundColor = "#f8f9fa"; + } + if (document.getElementsByName("detail_adresse")[0]) { document.getElementsByName("detail_adresse")[0].disabled = true; document.getElementsByName("detail_adresse")[0].style.backgroundColor = "#f8f9fa"; @@ -2552,6 +2680,16 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_tel")[0].style.backgroundColor = "#FFFFFF"; } + if (document.getElementsByName("type_piece_identite")[0]) { + document.getElementsByName("type_piece_identite")[0].disabled = false; + document.getElementsByName("type_piece_identite")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("num_piece_identite")[0]) { + document.getElementsByName("num_piece_identite")[0].disabled = false; + document.getElementsByName("num_piece_identite")[0].style.backgroundColor = "#FFFFFF"; + } + if (document.getElementsByName("detail_adresse")[0]) { document.getElementsByName("detail_adresse")[0].disabled = false; document.getElementsByName("detail_adresse")[0].style.backgroundColor = "#FFFFFF"; @@ -3498,7 +3636,7 @@ const DisplayPartnerStagiaires = (props) => { if (String(res.data.status) === String("true")) { //console.log(" In Get_Inscrit_List_Evaluation_Par_UE res.data.status = " + res.data.status); - console.log(" In Get_Inscrit_List_Evaluation_Par_UE res.data.message r_class = " + res.data.message); + // console.log(" In Get_Inscrit_List_Evaluation_Par_UE res.data.message r_class = " + res.data.message); setGet_Inscrit_List_Evaluation_Par_UE_api("true"); setGet_Inscrit_List_Evaluation_Par_UE_result(res.data.message); @@ -4831,8 +4969,9 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_num_secu(""); } - if (mylocalattendee.piece_identite_type) { - setp_detail_piece_identite_type(mylocalattendee.piece_identite_type); + + if (mylocalattendee.identite_type) { + setp_detail_piece_identite_type(mylocalattendee.identite_type); } else { setp_detail_piece_identite_type(""); } @@ -4970,7 +5109,87 @@ const DisplayPartnerStagiaires = (props) => { } + const [New_GetAttendee_Groupe_Inscription_message, setNew_GetAttendee_Groupe_Inscription_message] = useState([]); + const [GetAttendee_Groupe_Inscription_api, setGetAttendee_Groupe_Inscription_api] = useState(); + const [GetAttendee_Groupe_Inscription_message, setGetAttendee_Groupe_Inscription_message] = useState([]); + const [GetAttendee_Groupe_Inscription_result, setGetAttendee_Groupe_Inscription_result] = useState(); + function GetAttendee_Groupe_Inscription(inscrit_id) { + + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("inscrit_id", inscrit_id); + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Inscrit_List_Groupe/"; + setLoading(true); + axios.post(myurl, form).then(res => { + setLoading(false); + + if (String(res.data.status) === "true") { + // console.log(" In GetAttendee_Groupe_Inscription res.data.status = " + res.data.status); + // console.log(" In GetAttendee_Groupe_Inscription res.data.message r_class = " + res.data.message); + setGetAttendee_Groupe_Inscription_api("true"); + setGetAttendee_Groupe_Inscription_result(res.data.message); + + if (res.data.message) { + + var new_data2 = []; + const new_data = res.data.message.map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var type_groupe_code = JSON.parse(x).type_groupe_code; + var delegue_level = JSON.parse(x).delegue_level; + var groupe_code = JSON.parse(x).groupe_code; + var groupe_nom = JSON.parse(x).groupe_nom; + + + //--- + var node = { + "_id": local_id, + "id": localid, + "type_groupe_code": type_groupe_code, + "delegue_level": delegue_level, + "groupe_code": groupe_code, + "groupe_nom": groupe_nom, + }; + + new_data2.push(node); + }); + + + if (new_data2.length > 0) + setNew_GetAttendee_Groupe_Inscription_message(new_data2); + } + + } else if (String(res.data.status) === String("Err_Connexion")) { + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + + else { + setGetAttendee_Groupe_Inscription_api("false"); + setGetAttendee_Groupe_Inscription_message(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( GetAttendee = ', error); + setGetAttendee_Groupe_Inscription_api("false"); + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de récuperer les groupe de l'apprenant"); + setalert_type("error"); + //setmyApimyApiMessage("") + }) + } const [is_lms_class_code, setis_lms_class_code] = useState(); @@ -6725,6 +6944,14 @@ const DisplayPartnerStagiaires = (props) => { const [tab_convention_pieces_jointes_result, settab_convention_pieces_jointes_result] = useState([]); const [securised_file, setsecurised_file] = useState(false); + + + const [file_date_expiration, setfile_date_expiration] = useState(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }); + const [file_1_name, setfile_1_name] = useState(); const [sessions_file_change_1_api, setsessions_file_change_1_api] = useState(); @@ -6889,13 +7116,19 @@ const DisplayPartnerStagiaires = (props) => { formData.append("object_owner_id", selected_id); formData.append("type_document", ""); + if (file_date_expiration) { + formData.append("file_date_expiration", file_date_expiration); + } else { + formData.append("file_date_expiration", "01/01/2099"); + } + var is_secure_file = "0"; if (securised_file) is_secure_file = "1" formData.append("is_secure_file", is_secure_file); //formData.append("class_internal_url", internal_url); - //console.log("token = " + stored_cookie); + // console.log("file_date_expiration = " + file_date_expiration); setLoading(true); fetch( @@ -8266,6 +8499,9 @@ const DisplayPartnerStagiaires = (props) => { handleClick_edit_session_From_Line(gridline_id); Getall_Tuteurs(selected_id); + + GetAttendee_Groupe_Inscription(selected_id); + Dialog_stagiaire_handleClose_buton(); } @@ -8487,6 +8723,7 @@ const DisplayPartnerStagiaires = (props) => { { "id": "cni", "label": "CNI", "value": "cni" }, { "id": "permis", "label": "Permis Conduire", "value": "permis" }, { "id": "passport", "label": "Passport", "value": "passport" }, + { "id": "titre_sejour", "label": "Titre Séjour", "value": "titre_sejour" }, { "id": "", "label": "", "value": "" }, ] @@ -8716,6 +8953,12 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_one_file_to_download_type_name(""); setRecord_All_PJ_api(""); + setfile_date_expiration(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }) + const fileUploaded = event.target.files[0]; let file_size = event.target.files[0].size; let file_type = event.target.files[0].type; @@ -9104,6 +9347,7 @@ const DisplayPartnerStagiaires = (props) => { setDialog_tuteur_open(false); clear_tuteur_fields(); + setcreate_new_tuteur(""); settuteur_data_changed(""); setadd_one_tuteur("") }; @@ -9130,6 +9374,9 @@ const DisplayPartnerStagiaires = (props) => { const [p_detail_tuteur_date_naissance, setp_detail_tuteur_date_naissance] = useState(""); const [p_detail_tuteur_age, setp_detail_tuteur_age] = useState(""); + + const [create_new_tuteur, setcreate_new_tuteur] = useState(""); + function clear_tuteur_fields() { setp_detail_tuteur_id("") setp_detail_tuteur_nom(""); @@ -9145,7 +9392,8 @@ const DisplayPartnerStagiaires = (props) => { setp_one_detail_tuteur_id(""); setp_detail_tuteur_role_label(""); setp_detail_tuteur_age(""); - setp_detail_tuteur_comment("") + setp_detail_tuteur_comment(""); + setcreate_new_tuteur(""); } const New_Option_Tuteur_Role = [ @@ -9396,37 +9644,44 @@ const DisplayPartnerStagiaires = (props) => { } - const [Add_RH_Tuto_api, setAdd_RH_Tuto_api] = useState(); - const [Add_RH_Tuto_message, setAdd_RH_Tuto_message] = useState(); - const [Add_RH_Tuto_result, setAdd_RH_Tuto_result] = useState(); - function Add_RH_Tuto(event) { + const [Create_RH_And_Add_Tuto_api, setCreate_RH_And_Add_Tuto_api] = useState(); + const [Create_RH_And_Add_Tuto_message, setCreate_RH_And_Add_Tuto_message] = useState(); + const [Create_RH_And_Add_Tuto_result, setCreate_RH_And_Add_Tuto_result] = useState(); + function Create_RH_And_Add_Tuto(event) { var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); var myurl = ""; - myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_RH_List_Insc_Tutore/"; - form.append("rh_id", p_one_detail_tuteur_id); + myurl = process.env.REACT_APP_API_URL + "myclass/api/Create_RH_And_Add_List_Insc_Tutore/"; form.append("inscription_id", selected_id); form.append("role", p_detail_tuteur_role); form.append("include_com", p_detail_tuteur_communication); form.append("comment", p_detail_tuteur_comment); + form.append("rh_nom", p_detail_tuteur_nom); + form.append("rh_prenom", p_detail_tuteur_prenom); + form.append("rh_email", p_detail_tuteur_email); + form.append("rh_tel", p_detail_tuteur_telephone); + form.append("rh_civilite", p_detail_tuteur_civilite); + setLoading(true); axios.post(myurl, form).then(res => { setLoading(false); if (String(res.data.status) === String("true")) { - //console.log(" In Add_RH_Tuto res.data.status = " + res.data.status); - //console.log(" In Add_RH_Tuto res.data.message r_class = " + res.data.message); - setAdd_RH_Tuto_api("true"); - setAdd_RH_Tuto_result(res.data.message); - + //console.log(" In Create_RH_And_Add_Tuto res.data.status = " + res.data.status); + //console.log(" In Create_RH_And_Add_Tuto res.data.message r_class = " + res.data.message); + setCreate_RH_And_Add_Tuto_api("true"); + setCreate_RH_And_Add_Tuto_result(res.data.message); Getall_Tuteurs(selected_id); + // alert(res.data.message); setdisplay_alert_mysy("1"); setalert_message(res.data.message); @@ -9434,8 +9689,8 @@ const DisplayPartnerStagiaires = (props) => { Dialog_tuteur_handleClose_buton(); } else { - setAdd_RH_Tuto_api("false"); - setAdd_RH_Tuto_message(res.data.message); + setCreate_RH_And_Add_Tuto_api("false"); + setCreate_RH_And_Add_Tuto_message(res.data.message); // alert(res.data.message); setdisplay_alert_mysy("1"); setalert_message(res.data.message); @@ -9445,18 +9700,19 @@ const DisplayPartnerStagiaires = (props) => { }).catch((error) => { setLoading(false); - console.warn('Not good man :( Add_RH_Tuto = ', error); - setAdd_RH_Tuto_api("false"); + console.warn('Not good man :( Create_RH_And_Add_Tuto = ', error); + setCreate_RH_And_Add_Tuto_api("false"); // alert(" Impossible de faire la mise à jour"); setdisplay_alert_mysy("1"); - setalert_message(" Impossible de faire la mise à jour"); + setalert_message(" Impossible de créer le tuteur"); setalert_type("error"); //setmyApimyApiMessage("") }) } + const fixedVal_list_ue = []; const [tab_selected_list_ue, settab_selected_list_ue] = useState([...fixedVal_list_ue]); @@ -9650,6 +9906,123 @@ const DisplayPartnerStagiaires = (props) => { }) } + const [Add_One_Employee_Data_api, setAdd_One_Employee_Data_api] = useState(); + const [Add_One_Employee_Data_message, setAdd_One_Employee_Data_message] = useState(); + const [Add_One_Employee_Data_result, setAdd_One_Employee_Data_result] = useState(); + function Add_One_Employee_Data() { + var form = new FormData(); + //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); + + // Controle sur les champs + + if (p_detail_tuteur_civilite.trim() == "") { + setdisplay_alert_mysy("1"); + setalert_message(" Vous devez saisir la civilité"); + setalert_type("error"); + return; + } + + if (p_detail_tuteur_nom.trim() == "") { + setdisplay_alert_mysy("1"); + setalert_message(" Vous devez saisir le nom"); + setalert_type("error"); + return; + } + + + if (p_detail_tuteur_prenom.trim() == "") { + setdisplay_alert_mysy("1"); + setalert_message(" Vous devez saisir le prenom "); + setalert_type("error"); + return; + } + + + + + + if (p_detail_tuteur_email.trim() == "") { + setdisplay_alert_mysy("1"); + setalert_message(" Vous devez saisir l'email"); + setalert_type("error"); + return; + } + + + + var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/; + if (!p_detail_tuteur_email.trim().match(validRegex)) { + setdisplay_alert_mysy("1"); + setalert_message("L'adresse email est invalide."); + setalert_type("error"); + return; + } + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("nom", p_detail_tuteur_nom); + form.append("email", p_detail_tuteur_email); + form.append("prenom", p_detail_tuteur_prenom); + form.append("civilite", p_detail_tuteur_civilite); + + form.append("type_rh", "1"); + + if (p_detail_tuteur_telephone) + form.append("telephone", p_detail_tuteur_telephone); + else + form.append("telephone", ""); + + + + //console.log(" form == ", form); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Ressource_Humaine/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + //console.log(" In Add_One_Employee_Data res.data.status = " + res.data.status); + //console.log(" In Add_One_Employee_Data res.data.message r_class = " + res.data.message); + setLoading(false); + if (String(res.data.status) === String("true")) { + setAdd_One_Employee_Data_api("true"); + setAdd_One_Employee_Data_result(res.data.message); + + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + + if (document.getElementById('myRef_head')) { + var divh = document.getElementById('myRef_head').offsetTop; + window.scrollTo({ + top: divh, + behavior: "smooth", + }); + } + + } + else { + setAdd_One_Employee_Data_api("false"); + setAdd_One_Employee_Data_message(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + console.warn('UpdateStagiaireData : Not good man :( Add_One_Employee_Data = ' + error); + setAdd_One_Employee_Data_api("false"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible d'ajouter le tuteur "); + setalert_type("error"); + + }) + } + + return (
{isLoading &&
@@ -10269,12 +10642,18 @@ const DisplayPartnerStagiaires = (props) => { { setp_one_detail_tuteur_id(""); @@ -10289,6 +10668,73 @@ const DisplayPartnerStagiaires = (props) => { }} + renderInput={(params) => + } + />} + + + +
{ + setcreate_new_tuteur("1"); + } + } + > +
+ + +
+
+ + + +
+ +
+ + + + } + + {add_one_tuteur === "1" && create_new_tuteur === "1" && <> +
+
+ Civilité +
+
+ {New_civilite && New_civilite.length > 0 && + (data).value === String(p_detail_tuteur_civilite))[0].label} + + fullWidth + + options={New_civilite} + onChange={(event, value) => { + if (value && value.value) { + setp_detail_tuteur_civilite(value.value); + } else { + setp_detail_tuteur_civilite(""); + } + }} renderInput={(params) => { /> } />} - -
+
+
+ Nom +
+
+ { + setp_detail_tuteur_nom(e.target.value); + } + } + /> +
+ +
+ +
+
+ Prénom +
+
+ { + setp_detail_tuteur_prenom(e.target.value); + } + } + /> +
+ +
+ +
+
+ Email +
+
+ { + setp_detail_tuteur_email(e.target.value); + } + } + /> +
+ +
+ +
+
+ Téléphone +
+
+ { + setp_detail_tuteur_telephone(e.target.value); + } + } + /> +
+ +
} @@ -10475,7 +11010,7 @@ const DisplayPartnerStagiaires = (props) => {
}
- {String(tuteur_data_changed) === "1" && String(add_one_tuteur) !== "1" && } + {String(create_new_tuteur) === "1" && } + + + {String(create_new_tuteur) !== "1" && String(add_one_tuteur) === "1" && }
@@ -12752,6 +13300,8 @@ const DisplayPartnerStagiaires = (props) => { onRowDoubleClick={(newSelectionModel) => { ///setuserimgclassprofil(""); + setselected_id(newSelectionModel.row._id); + Get_List_UE_From_Class_Id(newSelectionModel.row.class_id); Getall_Class_List_Evalution(newSelectionModel.row.class_id); @@ -13376,7 +13926,7 @@ const DisplayPartnerStagiaires = (props) => { />
- {p_one_civilite_part !== "m" &&
Nom jeune fille 01
+ {p_one_civilite_part !== "m" &&
Nom jeune fille
{
- -
- - -
- -
- - -
- - -
+ +
+ + + +
+ + +
+ + +
+ + +
+ + +
-
- - -
- -
- - -
- -
+ +
+
+ +
+ + +
+ +
+ +
+
- {p_detail_civilite !== "m" &&
Nom Jeune Fille 02
+ {p_detail_civilite !== "m" &&
Nom jeune fille
{ />
+ + {String(participant_data_edit_mode) === "1" && New_Option_Piece_Identite && New_Option_Piece_Identite.length > 0 && +
Type Pièce Identité
+ (data).value === String(p_detail_piece_identite_type))[0].label} + + className="disabled_style" + + options={New_Option_Piece_Identite} + onChange={(event, value) => { + setparticipant_data_changed("1"); + setp_detail_tel_changed("1"); + if (value && value.value) { + setp_detail_piece_identite_type(value.value); + } else { + setp_detail_piece_identite_type(""); + } + }} + renderInput={(params) => } + /> +
} + + + {String(participant_data_edit_mode) !== "1" &&
Type Pièce Identité
+ + {New_Option_Piece_Identite && New_Option_Piece_Identite.length > 0 && (data).id === String(p_detail_piece_identite_type))[0].label} + + />} + +
} + +
Num Pièce Identité
+ { + setp_detail_piece_identite_num(e.target.value); + setparticipant_data_changed("1"); + setp_detail_tel_changed("1"); + } + } + /> +
+ + + {selected_class_is_ftion_initiale === "1" &&
Matricule
{ +
@@ -15920,6 +16562,47 @@ const DisplayPartnerStagiaires = (props) => {
+ + {New_GetAttendee_Groupe_Inscription_message && New_GetAttendee_Groupe_Inscription_message.length > 0 && +
+ Groupe(s) de l'apprenant
+ + + + {New_GetAttendee_Groupe_Inscription_message && New_GetAttendee_Groupe_Inscription_message.length > 0 && +
+ + + + + + + + + + + {New_GetAttendee_Groupe_Inscription_message.map((item) => ( + + + + + + + + ))} + +
CodeNomDélégué ?
{item.groupe_code} {item.groupe_nom}{(item.delegue_level) === "1" ? "Délégué" : ""}
+
} + + +
} + + +
+ +
+ +
@@ -16274,7 +16957,7 @@ const DisplayPartnerStagiaires = (props) => {
-
+
Tuteurs
@@ -16674,26 +17357,43 @@ const DisplayPartnerStagiaires = (props) => {
- {String(props.check_user_acces_right("file_secure", "write")) === "1" &&
Fichier sécurisé ?
- { - setsecurised_file(event.target.checked); + {String(props.check_user_acces_right("file_secure", "write")) === "1" && +
Fichier sécurisé ?
+ { + setsecurised_file(event.target.checked); + } + } + inputProps={{ 'aria-label': 'controlled' }} + /> + +
} + + +
Expiration
+ { + setfile_date_expiration(format(date, 'd/MM/yyyy')); + } } - inputProps={{ 'aria-label': 'controlled' }} + showTimeSelect={false} + dateFormat="dd/MM/yyyy" + className="disabled_style enable_style" + locale={'fr'} + /> -
} +
-
- {Record_All_PJ_api && String(Record_All_PJ_api) === "true" &&
Pièce jointe enregistrée
} - {Record_All_PJ_api && String(Record_All_PJ_api) === "false" &&
{Record_All_PJ_message}
} -
{file_1_name && file_1_name.name &&
@@ -16701,6 +17401,7 @@ const DisplayPartnerStagiaires = (props) => {
+
@@ -17566,5 +18273,40 @@ width: 100%; width: 100%; } +.displaypartnersession .disabled_style_right_bton_visualiser{ +width: 12% !important; + float: right; + cursor: pointer; +} + .ck-card { + background: white; + border-radius: 14px; + padding: 16px; + // max-width: 720px; + box-shadow: 0 8px 20px rgba(0,0,0,0.06); + font-family: "Dm Sans", system-ui, sans-serif; +} + + .ck-title { + margin - bottom: 12px; + font-family: "Dm Sans", system-ui, sans-serif; +} + + .ck-table { + width: 100%; + border-collapse: collapse; + font-family: "Dm Sans", system-ui, sans-serif; + font-size: small !important; +} + + .ck-table th, + .ck-table td { + padding: 10px; + border-bottom: 1px solid #eee; + text-align: left; + font-family: "Dm Sans", system-ui, sans-serif; + font-size: small !important; +} + `; diff --git a/src/components/Employes.js b/src/components/Employes.js index 0e5504c..6fcffb4 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -4936,6 +4936,12 @@ const Employes = (props) => { const [editorRef_competence_limite, seteditorRef_competence_limite] = useState(800); const [securised_file, setsecurised_file] = useState(false); + const [file_date_expiration, setfile_date_expiration] = useState(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }); + const [file_1_name, setfile_1_name] = useState(); const [sessions_file_change_1_api, setsessions_file_change_1_api] = useState(); @@ -4948,6 +4954,12 @@ const Employes = (props) => { setp_detail_one_file_to_download_type_name(""); setRecord_All_PJ_api(""); + setfile_date_expiration(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }) + if (event.target.files[0]) { const fileUploaded = event.target.files[0]; let file_size = event.target.files[0].size; @@ -5073,6 +5085,13 @@ const Employes = (props) => { formData.append("object_owner_id", selected_id); formData.append("type_document", ""); + if (file_date_expiration) { + formData.append("file_date_expiration", file_date_expiration); + } else { + formData.append("file_date_expiration", "01/01/2099"); + } + + var is_secure_file = "0"; if (securised_file) is_secure_file = "1" @@ -7787,19 +7806,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -7848,19 +7867,19 @@ const Employes = (props) => { } }} renderInput={(params) => @@ -7911,19 +7930,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -7973,19 +7992,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -8098,19 +8117,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -8169,19 +8188,19 @@ const Employes = (props) => { } }} renderInput={(params) => @@ -8281,19 +8300,19 @@ const Employes = (props) => { } }} renderInput={(params) => @@ -8410,19 +8429,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -8639,19 +8658,19 @@ const Employes = (props) => { } }} renderInput={(params) => @@ -8753,19 +8772,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -8798,19 +8817,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -9445,19 +9464,19 @@ const Employes = (props) => { options={New_Getall_TrainingSession_Without_Scope_Action_result} renderInput={(params) => @@ -9729,19 +9748,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -9804,19 +9823,19 @@ const Employes = (props) => { value={scope_filt_recherche} options={New_Getall_Partner_Competence_List_result} renderInput={(params) => { }} renderInput={(params) => @@ -9949,19 +9968,19 @@ const Employes = (props) => { value={scope_filt_recherche} options={New_Getall_Partner_Competence_List_result} renderInput={(params) => { }} renderInput={(params) => @@ -10094,19 +10113,19 @@ const Employes = (props) => { value={scope_filt_recherche} options={New_Getall_Partner_Competence_List_result} renderInput={(params) => { }} renderInput={(params) => @@ -10694,19 +10714,19 @@ const Employes = (props) => { } }} renderInput={(params) => @@ -11232,19 +11252,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -11743,19 +11763,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -12111,19 +12131,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -12172,19 +12192,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -12211,19 +12231,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -12889,19 +12909,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -13142,19 +13162,19 @@ const Employes = (props) => { value={scope_class} options={New_GetCurrentPartnerClass_result} renderInput={(params) => @@ -13185,19 +13205,19 @@ const Employes = (props) => { value={scope_session} options={New_Getall_TrainingSession_Without_Scope_Action_result} renderInput={(params) => @@ -13232,19 +13252,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -13444,7 +13464,7 @@ const Employes = (props) => {
- + {file_1_name && file_1_name.name &&
@@ -13486,26 +13506,42 @@ const Employes = (props) => {
- {String(props.check_user_acces_right("file_secure", "write")) === "1" &&
Fichier sécurisé ?
- { - setsecurised_file(event.target.checked); + {String(props.check_user_acces_right("file_secure", "write")) === "1" && +
Fichier sécurisé ?
+ { + setsecurised_file(event.target.checked); + } + } + inputProps={{ 'aria-label': 'controlled' }} + /> + +
} + +
Expiration
+ { + setfile_date_expiration(format(date, 'd/MM/yyyy')); + } } - inputProps={{ 'aria-label': 'controlled' }} + showTimeSelect={false} + dateFormat="dd/MM/yyyy" + className="disabled_style enable_style" + locale={'fr'} + /> -
} +
-
- {Record_All_PJ_api && String(Record_All_PJ_api) === "true" &&
Pièce jointe enregistrée
} - {Record_All_PJ_api && String(Record_All_PJ_api) === "false" &&
{Record_All_PJ_message}
} -
{file_1_name && file_1_name.name &&
@@ -13520,6 +13556,11 @@ const Employes = (props) => { setsecurised_file(false); setp_detail_one_file_to_download_type_name(""); setRecord_All_PJ_api(""); + setfile_date_expiration(() => { + const date = new Date(); + date.setFullYear(date.getFullYear() + 10); + return date; + }) } }>Annuler @@ -13540,33 +13581,7 @@ const Employes = (props) => { } - - {/*file_1_name && file_1_name.name && - */} {Record_All_PJ_api && String(Record_All_PJ_api) === "true" &&
Pièce jointe enregistrée
} @@ -14148,19 +14163,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -14436,19 +14451,19 @@ const Employes = (props) => { }} renderInput={(params) => @@ -14604,19 +14619,19 @@ const Employes = (props) => { }} renderInput={(params) => diff --git a/src/components/Equipe_Team.js b/src/components/Equipe_Team.js index 123ea1b..b972609 100644 --- a/src/components/Equipe_Team.js +++ b/src/components/Equipe_Team.js @@ -2488,6 +2488,7 @@ const Equipe_Team = (props) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => { renderInput={(params) => {

Checklist des pièces

- +
diff --git a/src/components/Module_Bloc_Competence_Pedagogique.js b/src/components/Module_Bloc_Competence_Pedagogique.js index c3979be..340dcc4 100644 --- a/src/components/Module_Bloc_Competence_Pedagogique.js +++ b/src/components/Module_Bloc_Competence_Pedagogique.js @@ -288,7 +288,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { field: 'couleur', headerName: 'Couleur', minWidth: 200, flex: 1, maxWidth: 250, hide: false, editable: false, renderCell: (cellValues) => { return ( - + ); } @@ -404,7 +404,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { field: 'couleur', headerName: 'Couleur', Width: 80, hide: false, editable: false, renderCell: (cellValues) => { return ( - + ); } @@ -4151,7 +4151,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => {
- Liste Unités d'Enseignement + Liste unités d'enseignement
diff --git a/src/components/Module_Ent_Internal_Email_Management.js b/src/components/Module_Ent_Internal_Email_Management.js index 86d7a28..f396e03 100644 --- a/src/components/Module_Ent_Internal_Email_Management.js +++ b/src/components/Module_Ent_Internal_Email_Management.js @@ -2159,6 +2159,7 @@ const Module_Ent_Internal_Email_Management = (props) => { renderInput={(params) => { renderInput={(params) => { const renderEventContent = (eventInfo) => { //console.log(eventInfo); + + var local_grp = [] + if (eventInfo.event.extendedProps.tab_grp_apprenant_ids) { + const new_data = eventInfo.event.extendedProps.tab_grp_apprenant_ids.map((x) => { + local_grp.push(x.code) + }); + } + return ( <> - {eventInfo.timeText}
- {eventInfo.event.title}
{eventInfo.event.extendedProps.local_mode_animation && String(eventInfo.event.extendedProps.local_mode_animation) === "1" && - Distanciel} + {eventInfo.timeText} - Dist. {local_grp.length > 0 && | {local_grp.toString()} }
} + + {eventInfo.event.extendedProps.local_mode_animation !== "1" && + {eventInfo.timeText} {local_grp.length > 0 && | {local_grp.toString()}
}} + + {String(eventInfo.event.extendedProps.local_tab_ressource_materiel).substring(0, 50).toUpperCase()} | {String(eventInfo.event.extendedProps.local_tab_ressource_humaine).substring(0, 50).toUpperCase()}
+ + + + {String(eventInfo.event.title).substring(0, 50)} ) }; @@ -486,7 +501,7 @@ const Module_Ent_Mon_Planning = (props) => { setLoading(true); axios.post(myurl, form).then(res => { // console.log(" In Getall_Sequence_Of_Session res.data.status = " + res.data.status); - // console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); + //console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); setLoading(false); if (String(res.data.status) === String("true")) { @@ -513,7 +528,16 @@ const Module_Ent_Mon_Planning = (props) => { var local_session_id = JSON.parse(x).session_id; var local_session_comment = JSON.parse(x).commentaire; var local_mode_animation = JSON.parse(x).mode_animation; - var local_session_color = "#3788d8"; + var local_obligatoire = JSON.parse(x).obligatoire; + + var local_session_color = JSON.parse(x).grp_apprenant_color; + var local_session_grp_code = JSON.parse(x).grp_apprenant_code; + + var local_liste_groupe_code = JSON.parse(x).liste_groupe_code; + + + var local_domaine_competence_id = JSON.parse(x).domaine_competence_id; + var local_sequence_code_couleur_setup = JSON.parse(x).sequence_code_couleur_setup; var local_type = JSON.parse(x).type; @@ -528,6 +552,18 @@ const Module_Ent_Mon_Planning = (props) => { local_session_color = "#4ea860"; } + if (JSON.parse(x).sequence_code_couleur_setup && JSON.parse(x).sequence_code_couleur_setup === "ue") { + // On affiche les couleurs par couleur de bloc de compétence aux quel est rattaché l'UE + local_session_color = JSON.parse(x).domaine_competence_color + } + else if (JSON.parse(x).sequence_code_couleur_setup && JSON.parse(x).sequence_code_couleur_setup === "grp_apprenant") { + // On affiche les couleurs par couleur de bloc de compétence aux quel est rattaché l'UE + local_session_color = JSON.parse(x).grp_apprenant_color + } else { + local_session_color = "#3573CB" + } + + if (local_type === "eval" && couleur_seq && couleur_seq.length > 0) { local_session_color = couleur_seq; @@ -535,6 +571,25 @@ const Module_Ent_Mon_Planning = (props) => { var local_type = JSON.parse(x).type; + var local_session_ue_id = JSON.parse(x).ue_id; + var local_session_ue_titre = JSON.parse(x).ue_titre; + var local_session_ue_code = JSON.parse(x).ue_code; + var local_session_grp_apprenant_id = JSON.parse(x).grp_apprenant_id; + + var local_session_ue_planif_line_id = JSON.parse(x).unite_enseignement_planif_id; + var local_session_color = JSON.parse(x).grp_apprenant_color; + var local_session_grp_code = JSON.parse(x).grp_apprenant_code; + + var local_mode_animation = JSON.parse(x).mode_animation; + var local_liste_groupe_code = JSON.parse(x).liste_groupe_code; + + var local_tab_grp_apprenant_ids = [] + if (JSON.parse(x).tab_grp_apprenant_ids) { + local_tab_grp_apprenant_ids = JSON.parse(x).tab_grp_apprenant_ids + } else { + + } + //--- var node = { "_id": localid, @@ -543,11 +598,26 @@ const Module_Ent_Mon_Planning = (props) => { "start": local_start, "end": local_end, "local_mode_animation": local_mode_animation, + "local_obligatoire": local_obligatoire, "local_agenda": local_agenda, "local_objectif": local_objectif, "local_comment": local_session_comment, "color": local_session_color, "type": local_type, + + "local_ue_id": local_session_ue_id, + "local_ue_titre": local_session_ue_titre, + "local_ue_code": local_session_ue_code, + + "local_domaine_competence_id": local_domaine_competence_id, + "local_sequence_code_couleur_setup": local_sequence_code_couleur_setup, + + + "local_grp_apprenant_id": local_session_grp_apprenant_id, + "local_ue_planif_line_id": local_session_ue_planif_line_id, + "tab_grp_apprenant_ids": local_tab_grp_apprenant_ids, + "liste_groupe_code": local_liste_groupe_code, + }; new_data2.push(node); @@ -968,19 +1038,19 @@ const Module_Ent_Mon_Planning = (props) => { }} renderInput={(params) => diff --git a/src/components/Module_Internal_Email_Management.js b/src/components/Module_Internal_Email_Management.js index 8a023a6..b8beba3 100644 --- a/src/components/Module_Internal_Email_Management.js +++ b/src/components/Module_Internal_Email_Management.js @@ -2158,6 +2158,7 @@ const Module_Internal_Email_Management = (props) => { renderInput={(params) => { renderInput={(params) => { }} renderInput={(params) => @@ -1026,19 +1026,19 @@ const Module_Selection_Apprenants = (props) => { }} renderInput={(params) => @@ -1050,7 +1050,7 @@ const Module_Selection_Apprenants = (props) => {
} - + {p_filtre2_value && String(p_filtre1_value) === "user_group" &&
@@ -1091,19 +1091,19 @@ const Module_Selection_Apprenants = (props) => { }} renderInput={(params) => @@ -1168,7 +1168,7 @@ const Module_Selection_Apprenants = (props) => { '& .line--statut--selected': { backgroundColor: '#e9f7f1', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--pair': { backgroundColor: 'rgba(235, 235, 235, .7)', @@ -1176,7 +1176,7 @@ const Module_Selection_Apprenants = (props) => { }, '& .line--statut--impair': { backgroundColor: '#FFFFFF', - color: "#0a2a4d", + color: "#0a2a4d", }, [`& .${gridClasses.cell}`]: { py: 1, @@ -1286,19 +1286,20 @@ const Module_Selection_Apprenants = (props) => { }} renderInput={(params) => diff --git a/src/components/Module_Selection_Evaluation_Apprenants.js b/src/components/Module_Selection_Evaluation_Apprenants.js index 8db2699..56e35e3 100644 --- a/src/components/Module_Selection_Evaluation_Apprenants.js +++ b/src/components/Module_Selection_Evaluation_Apprenants.js @@ -1503,6 +1503,7 @@ const Module_Selection_Evaluation_Apprenants = (props) => { renderInput={(params) => { renderInput={(params) => { const [sequence_startDate, setsequence_startDate] = useState(new Date()); const [sequence_endDate, setsequence_endDate] = useState(new Date()); + const [p_detail_sequence_domaine_competence_id, setp_detail_sequence_domaine_competence_id] = useState(""); + const [p_detail_sequence_couleur, setp_detail_sequence_couleur] = useState(""); + const [p_detail_sequence_groupe_apprenant_id, setp_detail_sequence_groupe_apprenant_id] = useState(""); const [p_detail_sequence_ue_id, setp_detail_sequence_ue_id] = useState(""); @@ -1653,7 +1656,7 @@ const Module_Session_Planification = (props) => { setLoading(false); if (String(res.data.status) === String("true")) { //console.log(" In Getall_Sequence_Of_Session res.data.status = " + res.data.status); - // console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); setGetall_Sequence_Of_Session_api("true"); setGetall_Sequence_Of_Session_result(res.data.message); @@ -1704,6 +1707,11 @@ const Module_Session_Planification = (props) => { var local_liste_groupe_code = JSON.parse(x).liste_groupe_code; + + var local_domaine_competence_id = JSON.parse(x).domaine_competence_id; + var local_sequence_code_couleur_setup = JSON.parse(x).sequence_code_couleur_setup; + + var local_mode_animation = JSON.parse(x).mode_animation; var local_obligatoire = JSON.parse(x).obligatoire; @@ -1724,15 +1732,27 @@ const Module_Session_Planification = (props) => { var local_tab_ressource_materiel = "" if (JSON.parse(x).tab_ressource_materiel) { local_tab_ressource_materiel = JSON.parse(x).tab_ressource_materiel; - } + + /// GESTION DES CODES COULEUR // Si il n'y pas de relief avec le groupe d'apprenant, on va introduire un relief avec la notion de présentiel et distantiel if (local_session_color === "" && local_mode_animation === "1") { // sequence en distantiel, on va mettre un code couleur local_session_color = "#4ea860" } + if (JSON.parse(x).sequence_code_couleur_setup && JSON.parse(x).sequence_code_couleur_setup === "ue") { + // On affiche les couleurs par couleur de bloc de compétence aux quel est rattaché l'UE + local_session_color = JSON.parse(x).domaine_competence_color + } + else if (JSON.parse(x).sequence_code_couleur_setup && JSON.parse(x).sequence_code_couleur_setup === "grp_apprenant") { + // On affiche les couleurs par couleur de bloc de compétence aux quel est rattaché l'UE + local_session_color = JSON.parse(x).grp_apprenant_color + } else { + local_session_color = "#3573CB" + } + //--- var node = { @@ -1759,6 +1779,12 @@ const Module_Session_Planification = (props) => { "local_confirmed_date": local_session_confirmed_date, + "local_confirmed_date": local_session_confirmed_date, + + "local_domaine_competence_id": local_domaine_competence_id, + "local_sequence_code_couleur_setup": local_sequence_code_couleur_setup, + + "local_grp_apprenant_id": local_session_grp_apprenant_id, "local_ue_planif_line_id": local_session_ue_planif_line_id, "tab_grp_apprenant_ids": local_tab_grp_apprenant_ids, @@ -2196,6 +2222,7 @@ const Module_Session_Planification = (props) => { setp_detail_sequence_groupe_apprenant_id(""); setp_detail_sequence_ue_id(""); setp_detail_sequence_ue_titre(""); + setp_detail_sequence_domaine_competence_id(""); setp_detail_sequence_ue_code(""); seteu_planif_line_insdispo(""); setp_detail_sequence_ue_planif_line_id(""); @@ -2251,6 +2278,7 @@ const Module_Session_Planification = (props) => { setp_detail_sequence_groupe_apprenant_id(""); setp_detail_sequence_ue_id(""); setp_detail_sequence_ue_titre(""); + setp_detail_sequence_domaine_competence_id(""); setp_detail_sequence_ue_code(""); seteu_planif_line_insdispo(""); setp_detail_sequence_ue_planif_line_id(""); @@ -2369,7 +2397,7 @@ const Module_Session_Planification = (props) => { form.append("tab_grp_apprenant_ids", tab_grp_apprenant_ids); - // console.log(" form == ", form); + console.log(" form == ", form); @@ -2758,7 +2786,7 @@ const Module_Session_Planification = (props) => { setGetall_List_Sequence_Ressource_result([]); setselectionModel_sequence([]); - // console.log(" ### arg.event.extendedProps = ", arg.event.extendedProps); + // console.log(" ### arg.event.extendedProps = ", arg.event.extendedProps); //console.log(" ### arg.event.extendedProps.local_type = ", arg.event.extendedProps.local_type); @@ -2804,18 +2832,29 @@ const Module_Session_Planification = (props) => { val_grp_apprenant([]); + if (arg.event.extendedProps.local_domaine_competence_id) { + setp_detail_sequence_domaine_competence_id(arg.event.extendedProps.local_domaine_competence_id); + } + else + setp_detail_sequence_domaine_competence_id(""); + + if (arg.event.extendedProps.couleur) { + setp_detail_sequence_couleur(arg.event.extendedProps.couleur); + } + else + setp_detail_sequence_couleur(""); + + if (arg.event.extendedProps.local_ue_id) { setp_detail_sequence_ue_id(arg.event.extendedProps.local_ue_id); Get_List_Given_UE_Planif_lines(arg.event.extendedProps.local_ue_id); if (arg.event.extendedProps.local_ue_titre) { setp_detail_sequence_ue_titre(arg.event.extendedProps.local_ue_titre); - } if (arg.event.extendedProps.local_ue_code) { setp_detail_sequence_ue_code(arg.event.extendedProps.local_ue_code); - } @@ -2834,7 +2873,8 @@ const Module_Session_Planification = (props) => { "titre": "", "volume_horaire": "", "in_use": "", - + "couleur": "", + "domaine_competence_id": "", }; var new_data2 = []; @@ -3054,6 +3094,8 @@ const Module_Session_Planification = (props) => { form.append("grp_apprenant_id", p_detail_sequence_groupe_apprenant_id); form.append("ue_id", p_detail_sequence_ue_id); + form.append("domaine_competence_id", p_detail_sequence_domaine_competence_id); + form.append("obligatoire", p_detail_sequence_obligatoire); form.append("ue_planif_line_id", p_detail_sequence_ue_planif_line_id); @@ -3609,7 +3651,7 @@ const Module_Session_Planification = (props) => { setLoading(false); if (String(res.data.status) === String("true")) { //console.log(" In Getall_Session_List_UE res.data.status = " + res.data.status); - //console.log(" In Getall_Session_List_UE res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Session_List_UE res.data.message r_class = " + res.data.message); setGetall_Session_List_UE_api("true"); setGetall_Session_List_UE_result(res.data.message); @@ -3626,6 +3668,11 @@ const Module_Session_Planification = (props) => { var local_credit = JSON.parse(x).credit; var local_pres_dist_hyp = JSON.parse(x).pres_dist_hyp; var local_is_noted = JSON.parse(x).is_noted; + var local_couleur = JSON.parse(x).couleur; + + var local_domaine_competence_id = JSON.parse(x).domaine_competence_id; + var local_competence_id = JSON.parse(x).competence_id; + var local_couleur = JSON.parse(x).couleur; @@ -3639,6 +3686,10 @@ const Module_Session_Planification = (props) => { "credit": local_credit, "pres_dist_hyp": local_pres_dist_hyp, "is_noted": local_is_noted, + "couleur": local_couleur, + "domaine_competence_id": local_domaine_competence_id, + "competence_id": local_competence_id, + "couleur": local_couleur, }; new_data2.push(node); @@ -3654,6 +3705,10 @@ const Module_Session_Planification = (props) => { "credit": "", "pres_dist_hyp": "", "is_noted": "", + "couleur": "", + "domaine_competence_id": "", + "competence_id": "", + "couleur": "", }; new_data2.push(node); @@ -3661,7 +3716,7 @@ const Module_Session_Planification = (props) => { if (new_data2.length > 0) setNew_Getall_Session_List_UE_result(new_data2); - // console.log(" ### new_data2 = ", new_data2); + // console.log(" ### new_data2 = ", new_data2); } else { setGetall_Session_List_UE_api("false"); @@ -4454,19 +4509,19 @@ const Module_Session_Planification = (props) => { }} renderInput={(params) => @@ -5167,19 +5222,19 @@ const Module_Session_Planification = (props) => { }} renderInput={(params) => @@ -5213,19 +5268,19 @@ const Module_Session_Planification = (props) => { }} renderInput={(params) => @@ -5239,7 +5294,7 @@ const Module_Session_Planification = (props) => {