diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 0c9d187..08a4891 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -17,6 +17,7 @@ import parse from 'html-react-parser'; import fileDownload from 'js-file-download'; import 'react-tooltip/dist/react-tooltip.css'; import { Tooltip } from 'react-tooltip'; +import { FcOpenedFolder } from "react-icons/fc"; import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; @@ -1605,7 +1606,7 @@ const AddClassManual = (props) => { Getall_Partner_Type_Evalution_List(); Getall_Class_List_Evalution(); setfield_contenu_attestation(""); - Getall_Parter_referentiel_padagogique(); + Getall_Parter_bloc_competence(); fillfield(); @@ -1636,12 +1637,12 @@ const AddClassManual = (props) => { const [mytraining_ref_peda_id, setmytraining_ref_peda_id] = useState(""); - const [New_Getall_Parter_referentiel_padagogique_result, setNew_Getall_Parter_referentiel_padagogique_result] = useState([]); + const [New_Getall_Parter_bloc_competence_result, setNew_Getall_Parter_bloc_competence_result] = useState([]); - const [Getall_Parter_referentiel_padagogique_api, setGetall_Parter_referentiel_padagogique_api] = useState(); - const [Getall_Parter_referentiel_padagogique_message, setGetall_Parter_referentiel_padagogique_message] = useState(); - const [Getall_Parter_referentiel_padagogique_result, setGetall_Parter_referentiel_padagogique_result] = useState([]); - function Getall_Parter_referentiel_padagogique(event) { + const [Getall_Parter_bloc_competence_api, setGetall_Parter_bloc_competence_api] = useState(); + const [Getall_Parter_bloc_competence_message, setGetall_Parter_bloc_competence_message] = useState(); + const [Getall_Parter_bloc_competence_result, setGetall_Parter_bloc_competence_result] = useState([]); + function Getall_Parter_bloc_competence(event) { var form = new FormData(); @@ -1649,17 +1650,17 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Ref_Pedagogique_no_filter/"; + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_bloc_competence_no_filter/"; setLoading(true); axios.post(myurl, form).then(res => { setLoading(false); if (String(res.data.status) === String("true")) { - //console.log(" In Getall_Parter_referentiel_padagogique res.data.status = " + res.data.status); - //console.log(" In Getall_Parter_referentiel_padagogique res.data.message r_class = " + res.data.message); - setGetall_Parter_referentiel_padagogique_api("true"); - setGetall_Parter_referentiel_padagogique_result(res.data.message); + //console.log(" In Getall_Parter_bloc_competence res.data.status = " + res.data.status); + //console.log(" In Getall_Parter_bloc_competence res.data.message r_class = " + res.data.message); + setGetall_Parter_bloc_competence_api("true"); + setGetall_Parter_bloc_competence_result(res.data.message); //setRows(res.data.message); var new_data2 = []; @@ -1699,12 +1700,12 @@ const AddClassManual = (props) => { new_data2.push(node); if (new_data2.length > 0) - setNew_Getall_Parter_referentiel_padagogique_result(new_data2); + setNew_Getall_Parter_bloc_competence_result(new_data2); } else { - setGetall_Parter_referentiel_padagogique_api("false"); - setGetall_Parter_referentiel_padagogique_message(res.data.message); + setGetall_Parter_bloc_competence_api("false"); + setGetall_Parter_bloc_competence_message(res.data.message); // alert(res.data.message) setdisplay_alert_mysy("1"); setalert_message(res.data.message); @@ -1713,8 +1714,8 @@ const AddClassManual = (props) => { }).catch((error) => { setLoading(false); - console.warn('Not good man :( Getall_Parter_referentiel_padagogique = ', error); - setGetall_Parter_referentiel_padagogique_api("false"); + console.warn('Not good man :( Getall_Parter_bloc_competence = ', error); + setGetall_Parter_bloc_competence_api("false"); alert(" Impossible de recuperer la liste des référentiels pédagogiques"); //setmyApimyApiMessage("") }) @@ -3432,7 +3433,7 @@ const AddClassManual = (props) => { value: 'alpha', label: 'Alphanumérique', }, - { + { value: '', label: '', }, @@ -3592,6 +3593,17 @@ const AddClassManual = (props) => { new_data2.push(node); }); + + var node2 = { + "_id": "", + "id": "", + "label": "", + "description": "", + "code": "", + + }; + new_data2.push(node2); + if (new_data2.length > 0) setNew_Get_List_Niveau_Formation_result(new_data2); @@ -8055,8 +8067,6 @@ const AddClassManual = (props) => { setmycertif_label(value.label); setdatamodification("1"); - console.log(" ### setmycertif = ", value.value) - } else { setmycertif(""); setmycertif_label(""); @@ -8354,32 +8364,50 @@ const AddClassManual = (props) => { } - {New_Getall_Parter_referentiel_padagogique_result && New_Getall_Parter_referentiel_padagogique_result.length > 0 &&
- 0 && +
+ (data)._id === String(mytraining_ref_peda_id))[0].label} + value={New_Getall_Parter_bloc_competence_result.filter((data) => (data)._id === String(mytraining_ref_peda_id))[0].label} - onChange={(event, value) => { - setdatamodification("1"); + onChange={(event, value) => { + setdatamodification("1"); - if (value && value._id) { - setmytraining_ref_peda_id(value._id); - } else { - setmytraining_ref_peda_id(""); + if (value && value._id) { + setmytraining_ref_peda_id(value._id); + } else { + setmytraining_ref_peda_id(""); + } + }} + + renderInput={(params) => } - }} + /> - renderInput={(params) => +
{ + + if (mytraining_ref_peda_id && mytraining_ref_peda_id.length > 5) { + window.open( + process.env.REACT_APP_FRONT_URL + "Partner/competence_pedagogique/" + String(mytraining_ref_peda_id) + "/bloc_competence", + '_blank' + ); + } } - /> + } + > +
+ -
} +
+
+ +
} diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index a0e3039..b1ee977 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -194,7 +194,7 @@ const Apprenant = (props) => { }, }, - + { field: 'matricule', headerName: 'Matricule', hide: false, maxWidth: 250, flex: 1, renderCell: (params) => , }, { field: 'nom', headerName: 'Nom', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'prenom', headerName: 'Prénom', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'email', headerName: 'Email', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, @@ -208,7 +208,7 @@ const Apprenant = (props) => { { field: 'client_nom', headerName: 'Client', hide: true, disableExport: true, editable: false }, { - field: 'is_ent_compte', headerName: 'ENT compte', minWidth: 100, flex: 1, hide: false, editable: false, renderCell: (cellValues) => { + field: 'is_ent_compte', headerName: 'ENT compte', maxWidth: 100, flex: 1, hide: false, editable: false, renderCell: (cellValues) => { return (
{String(cellValues.row.is_ent_compte) === "1" && "Oui"}  @@ -720,6 +720,8 @@ const Apprenant = (props) => { const [p_detail_type_mobilite, setp_detail_type_mobilite] = useState(""); const [p_detail_telephone_bis, setp_detail_telephone_bis] = useState(""); + const [p_detail_matricule, setp_detail_matricule] = useState(""); + // fin 04/06/2025 const [p_detail_nom, setp_detail_nom] = useState(""); @@ -1208,6 +1210,12 @@ const Apprenant = (props) => { setp_detail_piece_identite_num(""); } + if (mylocaltraining.matricule) { + setp_detail_matricule(mylocaltraining.matricule); + } else { + setp_detail_matricule(""); + } + if (mylocaltraining.type_mobilite) { setp_detail_type_mobilite(mylocaltraining.type_mobilite); } else { @@ -1661,6 +1669,9 @@ const Apprenant = (props) => { setp_detail_piece_identite_type(''); setp_detail_piece_identite_num(''); + + setp_detail_matricule(''); + setp_detail_type_mobilite(''); setp_detail_telephone_bis(''); @@ -1960,7 +1971,7 @@ const Apprenant = (props) => { } const list_champs = ["field_detail_lieu_naissance", "field_detail_departement_naissance", "field_detail_pays_naissance", "field_type_pi", "field_num_pi", - "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss"] + "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule"] for (let i = 0; i < list_champs.length; i++) { if (document.getElementsByName(String(list_champs[i])) && document.getElementsByName(String(list_champs[i]))[0]) { @@ -2047,7 +2058,7 @@ const Apprenant = (props) => { } const list_champs = ["field_detail_lieu_naissance", "field_detail_departement_naissance", "field_detail_pays_naissance", "field_type_pi", "field_num_pi", - "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss"] + "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule"] for (let i = 0; i < list_champs.length; i++) { if (document.getElementsByName(String(list_champs[i])) && document.getElementsByName(String(list_champs[i]))[0]) { @@ -2440,6 +2451,11 @@ const Apprenant = (props) => { else form.append("telephone_bis", ""); + if (p_detail_matricule) + form.append("matricule", p_detail_matricule); + else + form.append("matricule", ""); + /* @@ -2540,6 +2556,8 @@ const Apprenant = (props) => { const [selected_apprenant_email, setselected_apprenant_email] = useState(""); + const [selected_apprenant_matricule, setselected_apprenant_matricule] = useState(""); + function handleClick_edit_apprenant_From_Line(selected_row_id) { @@ -4919,6 +4937,7 @@ const Apprenant = (props) => { form.append("telephone_bis", ""); + /* Gestion des champs spécifiques ajoutés pour l'apprenant */ @@ -6716,6 +6735,7 @@ const Apprenant = (props) => { { "id": "email", "label": "Email ", "value": "email" }, { "id": "nom", "label": "Nom ", "value": "nom" }, { "id": "prenom", "label": "Prénom ", "value": "prenom" }, + { "id": "matricule", "label": "Matricule ", "value": "matricule" }, { "id": "archive", "label": "Archive", "value": "archive" }, { "id": "", "label": "", "value": "" }, { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. @@ -7075,7 +7095,7 @@ const Apprenant = (props) => { aria-labelledby="draggable-dialog-title" > - Apprenant + Apprenant - {selected_apprenant_matricule}
@@ -8253,6 +8273,7 @@ const Apprenant = (props) => { client_nom: JSON.parse(item).client_rattachement_nom, is_ent_compte: JSON.parse(item).is_ent_compte, + matricule: JSON.parse(item).matricule, } @@ -8269,6 +8290,7 @@ const Apprenant = (props) => { setselected_apprenant_id(newSelectionModel.row._id); setselected_apprenant_row_id(newSelectionModel.row.id); setselected_apprenant_email(newSelectionModel.row.email); + setselected_apprenant_matricule(newSelectionModel.row.matricule); Clear_Apprenant_Invoice_Fields(); @@ -8712,6 +8734,9 @@ const Apprenant = (props) => { />
+ + +
Situation Maritale
{New_Option_Famille_Situation && New_Option_Famille_Situation.length > 0 && {
+ +
+
+ +
+ Champs spécifiques +
+ +
+ + {rows_champs_specifics && + rows_champs_specifics.map((champ_spec) => ( + +
{String(JSON.parse(champ_spec).is_mandatory) === "1" && {JSON.parse(champ_spec).field_label} } + {String(JSON.parse(champ_spec).is_mandatory) !== "1" && {JSON.parse(champ_spec).field_label} }
+ {String(JSON.parse(champ_spec).field_type) === "float" && { + change_champs_spec_handle(e.target.value); + + }} + //onChange={change_champs_spec_handle} + + + />} + + {String(JSON.parse(champ_spec).field_type) === "string" && { + change_champs_spec_handle(e.target.value); + + }} + //onChange={change_champs_spec_handle} + + + />} + +
+ ))} + +
+
+
+ - {/* -- début champs specifiques **/} - {rows_champs_specifics && rows_champs_specifics.length > 0 && -
-
- -
-
- -
-
- - {rows_champs_specifics && - rows_champs_specifics.map((champ_spec) => ( - -
{String(JSON.parse(champ_spec).is_mandatory) === "1" && {JSON.parse(champ_spec).field_label} } - {String(JSON.parse(champ_spec).is_mandatory) !== "1" && {JSON.parse(champ_spec).field_label} }
- {String(JSON.parse(champ_spec).field_type) === "float" && { - change_champs_spec_handle(e.target.value); - - }} - //onChange={change_champs_spec_handle} - - - />} - - {String(JSON.parse(champ_spec).field_type) === "string" && { - change_champs_spec_handle(e.target.value); - - }} - //onChange={change_champs_spec_handle} - - - />} - -
- ))} - -
- -
- - - -
-   -
- {/* -- end champs specifiques **/} -
-
}
@@ -9588,6 +9603,29 @@ const Apprenant = (props) => { } />
+ +
Matricule zzz1
+ { + setp_detail_matricule(e.target.value); + setapprenant_data_changed("1"); + } + } + /> +
+ +
  @@ -9876,89 +9914,81 @@ const Apprenant = (props) => {
+ {rows_champs_specifics && rows_champs_specifics.length > 0 &&
+
+ +
+
+ +
+ Champs spécifiques +
+ +
+ + {rows_champs_specifics && + rows_champs_specifics.map((champ_spec) => ( + +
{JSON.parse(champ_spec).field_label}
+
+ {String(JSON.parse(champ_spec).field_type) === "float" && { + change_champs_spec_handle(e.target.value); + setapprenant_data_changed("1"); + }} + //onChange={change_champs_spec_handle} - {rows_champs_specifics && rows_champs_specifics.length > 0 &&
-
-
- + + />} + + {String(JSON.parse(champ_spec).field_type) === "string" && { + change_champs_spec_handle(e.target.value); + setapprenant_data_changed("1"); + + }} + //onChange={change_champs_spec_handle} + + + />} + +
+ ))} + + +
+
- -
-
- - {rows_champs_specifics && - rows_champs_specifics.map((champ_spec) => ( - -
{JSON.parse(champ_spec).field_label}
-
- {String(JSON.parse(champ_spec).field_type) === "float" && { - change_champs_spec_handle(e.target.value); - setapprenant_data_changed("1"); - }} - //onChange={change_champs_spec_handle} - - - />} - - {String(JSON.parse(champ_spec).field_type) === "string" && { - change_champs_spec_handle(e.target.value); - setapprenant_data_changed("1"); - - }} - //onChange={change_champs_spec_handle} - - - />} - -
- ))} - -
- -
- - - -
-   -
- {/* -- end champs specifiques **/} -
} + diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 76601cc..6394336 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -2114,7 +2114,7 @@ const DistplayPartnerTraningsPage = (props) => { Get_List_Domaines(); Get_List_Metiers(); Get_List_Categorie(); - Getall_Parter_referentiel_padagogique(); + Getall_Parter_bloc_competence(); Get_Partner_Object_Specific_Fields("myclass"); @@ -2159,12 +2159,12 @@ const DistplayPartnerTraningsPage = (props) => { - const [New_Getall_Parter_referentiel_padagogique_result, setNew_Getall_Parter_referentiel_padagogique_result] = useState([]); + const [New_Getall_Parter_bloc_competence_result, setNew_Getall_Parter_bloc_competence_result] = useState([]); - const [Getall_Parter_referentiel_padagogique_api, setGetall_Parter_referentiel_padagogique_api] = useState(); - const [Getall_Parter_referentiel_padagogique_message, setGetall_Parter_referentiel_padagogique_message] = useState(); - const [Getall_Parter_referentiel_padagogique_result, setGetall_Parter_referentiel_padagogique_result] = useState([]); - function Getall_Parter_referentiel_padagogique(event) { + const [Getall_Parter_bloc_competence_api, setGetall_Parter_bloc_competence_api] = useState(); + const [Getall_Parter_bloc_competence_message, setGetall_Parter_bloc_competence_message] = useState(); + const [Getall_Parter_bloc_competence_result, setGetall_Parter_bloc_competence_result] = useState([]); + function Getall_Parter_bloc_competence(event) { var form = new FormData(); @@ -2172,17 +2172,17 @@ const DistplayPartnerTraningsPage = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Ref_Pedagogique_no_filter/"; + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_bloc_competence_no_filter/"; setLoading(true); axios.post(myurl, form).then(res => { setLoading(false); - // console.log(" In Getall_Parter_referentiel_padagogique res.data.status = " + res.data.status); - // console.log(" In Getall_Parter_referentiel_padagogique res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Parter_bloc_competence res.data.status = " + res.data.status); + // console.log(" In Getall_Parter_bloc_competence res.data.message r_class = " + res.data.message); if (String(res.data.status) === String("true")) { - setGetall_Parter_referentiel_padagogique_api("true"); - setGetall_Parter_referentiel_padagogique_result(res.data.message); + setGetall_Parter_bloc_competence_api("true"); + setGetall_Parter_bloc_competence_result(res.data.message); //setRows(res.data.message); var new_data2 = []; @@ -2222,12 +2222,12 @@ const DistplayPartnerTraningsPage = (props) => { new_data2.push(node); if (new_data2.length > 0) - setNew_Getall_Parter_referentiel_padagogique_result(new_data2); + setNew_Getall_Parter_bloc_competence_result(new_data2); } else { - setGetall_Parter_referentiel_padagogique_api("false"); - setGetall_Parter_referentiel_padagogique_message(res.data.message); + setGetall_Parter_bloc_competence_api("false"); + setGetall_Parter_bloc_competence_message(res.data.message); // alert(res.data.message) setdisplay_alert_mysy("1"); setalert_message(res.data.message); @@ -2236,8 +2236,8 @@ const DistplayPartnerTraningsPage = (props) => { }).catch((error) => { setLoading(false); - console.warn('Not good man :( Getall_Parter_referentiel_padagogique = ', error); - setGetall_Parter_referentiel_padagogique_api("false"); + console.warn('Not good man :( Getall_Parter_bloc_competence = ', error); + setGetall_Parter_bloc_competence_api("false"); alert(" Impossible de recuperer la liste des référentiels pédagogiques"); //setmyApimyApiMessage("") }) @@ -3513,7 +3513,7 @@ const DistplayPartnerTraningsPage = (props) => { categorie: New_Get_List_Categorie_result.filter((data) => (data)._id === String(JSON.parse(item).categorie))[0].label, - referentiel_padagogique: New_Getall_Parter_referentiel_padagogique_result.filter((data) => (data)._id === String(JSON.parse(item).referentiel_padagogique_id))[0].label, + referentiel_padagogique: New_Getall_Parter_bloc_competence_result.filter((data) => (data)._id === String(JSON.parse(item).referentiel_padagogique_id))[0].label, url: JSON.parse(item).url, diff --git a/src/components/DisplayPartnerUnite_Enseignement.js b/src/components/DisplayPartnerUnite_Enseignement.js index f06a4f7..3d4f7b6 100644 --- a/src/components/DisplayPartnerUnite_Enseignement.js +++ b/src/components/DisplayPartnerUnite_Enseignement.js @@ -81,7 +81,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { return (