diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 46d267d..521c8a5 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -393,7 +393,13 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - form.append("class_id", props.mytrainingclass['class_id']); + + if (props.mytrainingclass['class_id']) + form.append("class_id", props.mytrainingclass['class_id']); + else + form.append("class_id", selected_class_id); + + form.append("ue_id", local_ue_id); @@ -439,7 +445,15 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - form.append("class_id", props.mytrainingclass['class_id']); + + if (props.mytrainingclass['class_id']) + form.append("class_id", props.mytrainingclass['class_id']); + else if (selected_class_id) + form.append("class_id", selected_class_id); + else + form.append("class_internal_url", props.mytrainingclass['class_internal_url']); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Unite_Enseignement_Of_Given_Class/"; @@ -688,7 +702,11 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - form.append("class_id", props.mytrainingclass['class_id']); + + if (props.mytrainingclass['class_id']) + form.append("class_id", props.mytrainingclass['class_id']); + else + form.append("class_id", selected_class_id); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Class_Evaluation/"; @@ -1760,7 +1778,13 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); formData.append("token", stored_cookie); - formData.append("class_id", props.mytrainingclass['class_id']); + + if (props.mytrainingclass['class_id']) + formData.append("class_id", props.mytrainingclass['class_id']); + else + formData.append("class_id", selected_class_id); + + formData.append('external_code', code); @@ -3217,7 +3241,11 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - form.append("class_id", props.mytrainingclass['class_id']); + if (props.mytrainingclass['class_id']) + form.append("class_id", props.mytrainingclass['class_id']); + else + form.append("class_id", selected_class_id); + form.append("ue_id", selected_ue_id); form.append("credit", selected_ue_credit); form.append("pres_dist_hyp", selected_ue_pres_dist_hyp); @@ -3275,7 +3303,11 @@ const AddClassManual = (props) => { var myurl = ""; if (String(add_ue_evalution) === "1") { - form.append("class_id", props.mytrainingclass['class_id']); + if (props.mytrainingclass['class_id']) + form.append("class_id", props.mytrainingclass['class_id']); + else + form.append("class_id", selected_class_id); + form.append("class_ue_id", selected_ue_id); form.append("type_evaluation_id", selected_eu_evalution_id); diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 14a2242..6d8b9a5 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -407,7 +407,7 @@ const DistplayPartnerTraningsPage = (props) => { { field: 'duration_unit', headerName: 'duration_unit', hide: true, Width: 0, editable: false, }, { field: 'duration_in_hour', headerName: 'duration_in_hour', hide: true, Width: 0, editable: false, }, { field: 'currency', headerName: 'currency', hide: true, Width: 0, editable: false, }, - + { field: 'zone_diffusion', headerName: 'zone_diffusion', hide: true, maxWidth: 1, editable: false, }, @@ -416,9 +416,9 @@ const DistplayPartnerTraningsPage = (props) => { { field: 'title', headerName: 'Titre', minWidth: 300, flex: 1, editable: false, renderCell: (params) => , }, { field: 'domain', headerName: 'Domaine', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, editable: false, renderCell: (params) => , }, { field: 'metier', headerName: 'Métier', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: true, editable: false, renderCell: (params) => , }, - + { field: 'categorie', headerName: 'Catégorie', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: true, editable: false, renderCell: (params) => , }, - + { field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", renderCell: (params) => , }, { field: 'url', headerName: 'lien', minWidth: 20, hideable: true, hide: true, editable: false, }, @@ -1383,6 +1383,7 @@ const DistplayPartnerTraningsPage = (props) => { if (props.class_internal_url && props.class_external_code && String(props.class_internal_url).length > 3 && String(props.class_external_code).length > 3) { + //console.log(" ## props.class_internal_url = ", props.class_internal_url); //console.log(" ## props.class_external_code = ", props.class_external_code); setLoading(true); @@ -1896,7 +1897,7 @@ const DistplayPartnerTraningsPage = (props) => {