diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 95cb0e4..6fa1224 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -8630,6 +8630,7 @@ const DisplayPartnerSession = (props) => { } + const [Add_One_Sequence_Session_Ressource_Mass_api, setAdd_One_Sequence_Session_Ressource_Mass_api] = useState(); const [Add_One_Sequence_Session_Ressource_Mass_message, setAdd_One_Sequence_Session_Ressource_Mass_message] = useState(); const [Add_One_Sequence_Session_Ressource_Mass_result, setAdd_One_Sequence_Session_Ressource_Mass_result] = useState(); diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index a46d609..f3f0acf 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -53,6 +53,9 @@ import { FcSearch, FcViewDetails, FcOpenedFolder } from "react-icons/fc"; import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; +import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank'; +import CheckBoxIcon from '@mui/icons-material/CheckBox'; +import Checkbox from '@mui/material/Checkbox'; const DisplayPartnerStagiaires = (props) => { const history = useHistory(); @@ -88,6 +91,7 @@ const DisplayPartnerStagiaires = (props) => { { field: '_id', headerName: '_id', hide: true, editable: false, Width: 0 }, { field: 'session_id', headerName: 'session_id', hide: true, editable: false, Width: 0 }, { field: 'id', headerName: 'id', hide: true, Width: 0 }, + { field: 'class_id', headerName: 'class_id', hide: true, Width: 0 }, { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, editable: false, Width: 0 }, { field: 'telephone', headerName: 'Téléphone', hide: true, editable: false, Width: 0 }, @@ -939,6 +943,8 @@ const DisplayPartnerStagiaires = (props) => { const [display_detail_historique, setdisplay_detail_historique] = useState(""); + const [display_detail_ue, setdisplay_detail_ue] = useState(""); + const [selected_id, setselected_id] = useState(""); @@ -1974,6 +1980,7 @@ const DisplayPartnerStagiaires = (props) => { setsubmenu("sessions"); setdisplay_detail_stagiaire(); setdisplay_detail_absence(); + setdisplay_detail_ue(); setdisplay_detail_historique(); desableSessionFields(); } @@ -1982,6 +1989,7 @@ const DisplayPartnerStagiaires = (props) => { setsubmenu("absence"); setdisplay_detail_stagiaire(); setdisplay_detail_historique(); + setdisplay_detail_ue(); setdisplay_detail_absence("1"); desableSessionFields(); } @@ -1990,10 +1998,20 @@ const DisplayPartnerStagiaires = (props) => { setsubmenu("historique"); setdisplay_detail_stagiaire(); setdisplay_detail_absence(); + setdisplay_detail_ue(); setdisplay_detail_historique("1"); desableSessionFields(); } + function submenu_unite_enseignement() { + setsubmenu("ue"); + setdisplay_detail_stagiaire(); + setdisplay_detail_absence(); + setdisplay_detail_historique(""); + setdisplay_detail_ue("1"); + desableSessionFields(); + } + const [SendEvaluationEmail_api, setSendEvaluationEmail_api] = useState(); const [SendEvaluationEmail_message, setSendEvaluationEmail_message] = useState(); @@ -2399,6 +2417,94 @@ const DisplayPartnerStagiaires = (props) => { const [rowss_preinsc, setRows_preinsc] = useState([]); + const [New_Get_List_UE_From_Class_Id_result, setNew_Get_List_UE_From_Class_Id_result] = useState([]); + + const [Get_List_UE_From_Class_Id_api, setGet_List_UE_From_Class_Id_api] = useState(); + const [Get_List_UE_From_Class_Id_message, setGet_List_UE_From_Class_Id_message] = useState(); + const [Get_List_UE_From_Class_Id_result, setGet_List_UE_From_Class_Id_result] = useState(); + function Get_List_UE_From_Class_Id(local_class_id) { + + var form = new FormData(); + + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("class_id", local_class_id); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Unite_Enseignement_Of_Given_Class/"; + + setLoading(true); + + axios.post(myurl, form).then(res => { + + + setLoading(false); + if (String(res.data.status) === String("true")) { + //console.log(" In Get_List_UE_From_Class_Id res.data.status = " + res.data.status); + //console.log(" In Get_List_UE_From_Class_Id res.data.message r_class = " + res.data.message); + setGet_List_UE_From_Class_Id_api("true"); + setGet_List_UE_From_Class_Id_result(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 local_code = JSON.parse(x).code; + var local_titre = JSON.parse(x).titre; + + var local_class_id = JSON.parse(x).class_id; + var local_internal_url = JSON.parse(x).internal_url; + + + + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_code, + "code": local_code, + "titre": local_titre, + "class_id": local_class_id, + "internal_url": local_internal_url, + + }; + new_data2.push(node); + }); + + //--- + var node = { + "_id": "", + "id": "", + "label": "", + "code": "", + "titre": "", + "class_id": "", + "internal_url": "", + + }; + new_data2.push(node); + + if (new_data2.length > 0) + setNew_Get_List_UE_From_Class_Id_result(new_data2); + } + else { + setGet_List_UE_From_Class_Id_api("false"); + setGet_List_UE_From_Class_Id_message(res.data.message); + alert(res.data.message); + } + + }).catch((error) => { + + setLoading(false); + console.warn('Not good man :( Get_List_UE_From_Class_Id = ', error); + setGet_List_UE_From_Class_Id_api("false"); + alert(" Impossible de recuperer la liste des UE de la formation"); + //setmyApimyApiMessage("") + }) + } useEffect(() => { @@ -2407,6 +2513,8 @@ const DisplayPartnerStagiaires = (props) => { Get_List_Partner_Clients(); GetCurrentPartnerClass(); Get_List_Partner_Financeurs(); + + let windowWidth = window.innerWidth; if (windowWidth < 1001) { setdatagrid_columns_size_model2(10); @@ -5641,6 +5749,9 @@ const DisplayPartnerStagiaires = (props) => { { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] + const [p_detail_class_eu_id, setp_detail_class_eu_id] = React.useState(""); + const icon = ; + const checkedIcon = ; return (
@@ -5648,6 +5759,7 @@ const DisplayPartnerStagiaires = (props) => {
} + { /**** Dialog info stagiaire */} { - + { /**** FIN Dialog info stagiaire */} { + { /**** Dialog Tuteur */} { + { /**** FIN Dialog Tuteur */} + + { /**** Dialog Convention */} { + { /**** FIN Dialog Convention */}

Vos stagiaires

Utilisez les filtres !
@@ -7092,6 +7209,7 @@ const DisplayPartnerStagiaires = (props) => { { id: index, _id: JSON.parse(item)._id, + class_id: JSON.parse(item).class_id, class_internal_url: JSON.parse(item).class_internal_url, code_session: JSON.parse(item).code_session, session_id: JSON.parse(item).session_id, @@ -7133,6 +7251,8 @@ const DisplayPartnerStagiaires = (props) => { onRowDoubleClick={(newSelectionModel) => { ///setuserimgclassprofil(""); + Get_List_UE_From_Class_Id(newSelectionModel.row.class_id); // zzzzz + setselected_row_data_json_age(''); setgridline_id(newSelectionModel.row.id); setselected_id_status(newSelectionModel.row.status); @@ -7384,6 +7504,9 @@ const DisplayPartnerStagiaires = (props) => { {/* */} + + {String(props.formation_initiale) === "1" && String(addOneParticipant) !== "1" && } + {String(addOneParticipant) !== "1" && }
} @@ -9676,6 +9799,59 @@ const DisplayPartnerStagiaires = (props) => { write_access={props.write_access} /> } + {String(props.formation_initiale) === "1" && String(submenu) === "ue" && String(addOneParticipant) !== "1" &&
+ +

Gestion des UE d'un inscrit

+ +
Unite D'enseignement
+ {New_Get_List_UE_From_Class_Id_result && New_Get_List_UE_From_Class_Id_result.length > 0 && + + option.label} + + + //className="disabled_style enable_style" + //options={New_Getall_Partner_List_UE_result} + options={New_Get_List_UE_From_Class_Id_result} + // value={New_Getall_Partner_List_UE_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} + defaultValue={[New_Get_List_UE_From_Class_Id_result[0], New_Get_List_UE_From_Class_Id_result[2], ]} + renderOption={(props, option, { selected }) => ( +
  • + + {option.label} +
  • + )} + // style={{ width: 500 }} + + onChange={(event, value) => { + + console.log(" ### value = ", value) + }} + + renderInput={(params) => + } + /> + + } + +
    + +
    } + diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js index 6a6b387..303c160 100644 --- a/src/components/Notes_Evaluation.js +++ b/src/components/Notes_Evaluation.js @@ -355,7 +355,7 @@ const Notes_Evaluation = (props) => {
    @@ -2738,13 +2738,14 @@ const Notes_Evaluation = (props) => { - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Sequence_Affectation_Ressource_Poste/"; + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Note_Evaluation_Ressource_Poste/"; setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Delete_Sequence_Session_Ressource_Data res.data.status = " + res.data.status); //console.log(" In Delete_Sequence_Session_Ressource_Data res.data.message r_class = " + res.data.message); + // zzzzz setLoading(false); if (String(res.data.status) === String("true")) { @@ -2767,7 +2768,7 @@ const Notes_Evaluation = (props) => { setLoading(false); console.warn('Delete_Sequence_Session_Ressource_Data : Not good man :( mysearchtext = ' + error); setDelete_Sequence_Session_Ressource_Data_api("false"); - alert(" Impossible de supprimer la sequence"); + alert(" Impossible de supprimer la ressource"); }) } diff --git a/src/components/Partner.js b/src/components/Partner.js index 9669fc0..2190ab8 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -1526,7 +1526,7 @@ const Partner = (props) => {
    - } style={{ overflow: 'hidden' }}> + } style={{ overflow: 'hidden' }}> {String(menu) !== "affichage" && }> CATALOGUE } {String(menu) === "affichage" && }> CATALOGUE } @@ -1549,16 +1549,16 @@ const Partner = (props) => {
    - {String(menu) !== "mes_sessions" &&    SESSIONS } - {String(menu) === "mes_sessions" &&   SESSIONS } + {String(menu) !== "mes_sessions" &&    SESSIONS } + {String(menu) === "mes_sessions" &&    SESSIONS }
    {String(formation_initiale) === "1" &&
    - {String(menu) !== "note_evaluation" &&    NOTES & EVALUATIONS } - {String(menu) === "note_evaluation" &&   NOTES & EVALUATIONS } + {String(menu) !== "note_evaluation" &&    NOTES & EVALUATIONS } + {String(menu) === "note_evaluation" &&    NOTES & EVALUATIONS }
    } @@ -2080,7 +2080,8 @@ const Partner = (props) => { {String(menu) === "mes_apprenants" &&
    + read_access={check_user_acces_right("stagiaire", "read")} write_access={check_user_acces_right("stagiaire", "write")} + formation_initiale={formation_initiale} />
    } @@ -2721,7 +2722,8 @@ const Partner = (props) => { {String(menu) === "mes_apprenants" &&
    + read_access={check_user_acces_right("stagiaire", "read")} write_access={check_user_acces_right("stagiaire", "write")} + formation_initiale={formation_initiale} />
    }