From ade87579c6372a23a90350f969e79625f29f67f6 Mon Sep 17 00:00:00 2001 From: Cherif Date: Sun, 5 Apr 2026 10:45:10 +0200 Subject: [PATCH] 04/04/26 - 14h --- .env | 1 + package-lock.json | 12 +- src/components/AddClassManual.js | 2 +- src/components/Apprenant.js | 50 +- src/components/Apprenant_ARG.js | 10 +- src/components/Article_Help.js | 2 +- src/components/Autre_RH.js | 16 +- src/components/Config_Champs_Personnalise.js | 2 +- src/components/Config_Document.js | 2 +- src/components/Conseil_Classe.js | 12 +- src/components/Crm_Opportunite.js | 2 +- src/components/DisplayPartnerPromotion.js | 101 +- src/components/DisplayPartnerPromotion_ARG.js | 52 +- src/components/DisplayPartnerSession.js | 289 +- src/components/DisplayPartnerSession_ARG.js | 52 +- src/components/DisplayPartnerStagiaires.js | 1159 +- ...splayPartnerStagiaires_ARG_Before_Light.js | 12 +- .../DisplayPartnerTrainingsPagination.js | 10 +- .../DisplayPartnerUnite_Enseignement.js | 6 +- src/components/Document_Affichage_Grid.js | 2 +- src/components/Document_ENT_Affichage_Grid.js | 2 +- src/components/Employes.js | 732 +- src/components/Employes_ARG.js | 16 +- src/components/Groupe_Apprenant.js | 6 +- src/components/Intranet_Mes_Stagiaires.js | 4 +- ...on_Partner_Catalog_Special_JMJFormation.js | 17 +- src/components/Module_Absence.js | 63 +- src/components/Module_ENT_Absence.js | 2 +- .../Module_Session_Planification.js | 21 +- src/components/Mon_Catalogue_Public.js | 1 - src/components/Mon_Tableau_De_Bord.js | 3 +- src/components/New_C_Article_Help_2025.js | 162 +- src/components/New_C_Formation_2025.js | 9 +- src/components/New_C_Sign_In_2025.js | 86 +- src/components/PROD_100326/AddClassManual.js | 10653 ---------------- .../PROD_100326/Inscription_Information.js | 2295 ---- .../new_detail_formation_2025.js | 2990 ----- ...play_Partner_Catalog_DetailClass_new_v2.js | 3106 ----- src/components/Partner.js | 54 +- src/components/Partner_Client.js | 3 +- .../new_detail_formation_2025.js | 4 +- .../new_detail_formation_2025.js | 18 +- .../header_automatic_files/Header.jsx | 3 + .../components/_displaypartnersession.scss | 3 +- 44 files changed, 2074 insertions(+), 19973 deletions(-) delete mode 100644 src/components/PROD_100326/AddClassManual.js delete mode 100644 src/components/PROD_100326/Inscription_Information.js delete mode 100644 src/components/PROD_100326/detail_formation_automatic_files/new_detail_formation_2025.js delete mode 100644 src/components/PROD_230326/Display_Partner_Catalog_DetailClass_new_v2.js diff --git a/.env b/.env index b90a83e..1e0de4f 100644 --- a/.env +++ b/.env @@ -11,6 +11,7 @@ REACT_APP_FRONT_URL_CANONICAL=localhost:3009/ REACT_APP_PART_PUB_CATALOG_DOMAIN=localhost:3009/ + # EN DEMO #REACT_APP_PART_PUB_CATALOG_DOMAIN=demomysy-hosting.online/ diff --git a/package-lock.json b/package-lock.json index cb025ee..fdd39c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32548,9 +32548,9 @@ } }, "node_modules/react-calendar-timeline": { - "version": "0.30.0-beta.4", - "resolved": "https://registry.npmjs.org/react-calendar-timeline/-/react-calendar-timeline-0.30.0-beta.4.tgz", - "integrity": "sha512-N58m+0jAt0pACe7cJghceNLjBzqoDmJ4QvJrPsDWRBdIrf6VE4u59r2U9J2DclZdWY404O+9rcTBAuGy3Q4U0A==", + "version": "0.30.0-beta.2", + "resolved": "https://registry.npmjs.org/react-calendar-timeline/-/react-calendar-timeline-0.30.0-beta.2.tgz", + "integrity": "sha512-WD+c7crXxOxbwOxg1+YOcjwNhkvjhuiCvzCKl+1Xd4HDG9EY8IqxUwUSd0veHlVhvgAM+PW/z4s0BJA3UJ/lQw==", "license": "MIT", "dependencies": { "classnames": "^2.5.1", @@ -32559,10 +32559,10 @@ "memoize-one": "^6.0.0" }, "peerDependencies": { - "dayjs": "^1.11.10", + "dayjs": ">=1.10.0", "interactjs": "1.10.27", - "react": "^18 || ^19.0.0-rc-66855b96-20241106", - "react-dom": "^18 || ^19.0.0-rc-66855b96-20241106" + "react": ">=18", + "react-dom": ">=18" } }, "node_modules/react-canvas-js": { diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index f2789ec..dec3631 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -7409,7 +7409,7 @@ const AddClassManual = (props) => {
- + {/**/} diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index c8f551a..bd9bd46 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -6729,10 +6729,7 @@ const Apprenant = (props) => { const New_Option_Filter = [ - { "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": "nom", "label": "Nom / Prénom / Email / Matricule / Tél ", "value": "nom" }, { "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. @@ -6960,7 +6957,7 @@ const Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7078,7 +7075,7 @@ const Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7237,7 +7234,7 @@ const Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7672,7 +7669,7 @@ const Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7833,7 +7830,7 @@ const Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7944,22 +7941,7 @@ const Apprenant = (props) => { /> } />} - {/* { - setp_filtre1(e.target.value) - }} - > - - Email    - Nom   - Prénom   - - */} +
@@ -8068,23 +8050,7 @@ const Apprenant = (props) => { />} - {/* { - setp_filtre2(e.target.value) - }} - > - - Email    - Nom   - Prénom   - - */} +
diff --git a/src/components/Apprenant_ARG.js b/src/components/Apprenant_ARG.js index e23ae7f..c453c33 100644 --- a/src/components/Apprenant_ARG.js +++ b/src/components/Apprenant_ARG.js @@ -6221,7 +6221,7 @@ const Apprenant_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6339,7 +6339,7 @@ const Apprenant_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6498,7 +6498,7 @@ const Apprenant_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6933,7 +6933,7 @@ const Apprenant_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7096,7 +7096,7 @@ const Apprenant_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Article_Help.js b/src/components/Article_Help.js index 651624f..8ef545e 100644 --- a/src/components/Article_Help.js +++ b/src/components/Article_Help.js @@ -1065,7 +1065,7 @@ const Article_Help = (props) => { }}> En savoir plus ›
- + {props.connected_user_article_avis_droit_modif === "1" &&
{ e.preventDefault(); diff --git a/src/components/Autre_RH.js b/src/components/Autre_RH.js index 626725a..a0e90fa 100644 --- a/src/components/Autre_RH.js +++ b/src/components/Autre_RH.js @@ -7292,7 +7292,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7509,7 +7509,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7608,7 +7608,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7747,7 +7747,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7910,7 +7910,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7962,7 +7962,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8015,7 +8015,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8163,7 +8163,7 @@ const Autre_RH = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Config_Champs_Personnalise.js b/src/components/Config_Champs_Personnalise.js index 0ef46e9..8f47245 100644 --- a/src/components/Config_Champs_Personnalise.js +++ b/src/components/Config_Champs_Personnalise.js @@ -1266,7 +1266,7 @@ const Config_Champs_Personnalise = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index bfc0c34..9058f39 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -2283,7 +2283,7 @@ const Config_Documents = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index a60208a..ea43cf9 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -6217,7 +6217,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6785,7 +6785,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6883,7 +6883,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7026,7 +7026,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7347,7 +7347,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7904,7 +7904,7 @@ const Conseil_Classe = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js index 58a26d5..cfccd7b 100644 --- a/src/components/Crm_Opportunite.js +++ b/src/components/Crm_Opportunite.js @@ -1690,7 +1690,7 @@ const CRM_Opportunite = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 25de4f1..c1c980d 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -503,7 +503,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", @@ -582,7 +582,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -925,7 +925,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -992,7 +992,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1065,7 +1065,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1497,7 +1497,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1571,7 +1571,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -2133,8 +2133,10 @@ const DisplayPartnerPromotion = (props) => { const columns_list_unite_enseignement = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, + { field: 'formateur_id', headerName: 'formateur_id', hide: true }, { 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: "delete", headerName: 'Supprimer', @@ -3309,7 +3311,7 @@ const DisplayPartnerPromotion = (props) => { setkanban_colonne_width(tmp_val); } - // console.log(" 222 local_opport_chanel = ", local_opport_chanel); + // console.log(" 222 local_opport_chanel = ", local_opport_chanel); } else { setNew_Getall_Parter_Session_Steps_result([]); @@ -3415,6 +3417,7 @@ const DisplayPartnerPromotion = (props) => { "id": local_session_step_name, "label": local_session_step_name[0].toUpperCase() + local_session_step_name.slice(1), "value": local_session_step_name, + "session_step_color": local_session_step_code_color, }; local_new_option.push(node_for_status); @@ -6908,6 +6911,7 @@ const DisplayPartnerPromotion = (props) => { if (document.getElementById("one_nb_participant") && document.getElementById("one_nb_participant").value != "") { nb_participant = document.getElementById("one_nb_participant").value; } + if (nb_participant.trim() == "") { const response = window.confirm("Le nombre de participants est vide. Par défaut, 1. Continuer ?"); if (!response) { @@ -7840,6 +7844,7 @@ const DisplayPartnerPromotion = (props) => { form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "1"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class/"; @@ -15559,6 +15564,8 @@ const DisplayPartnerPromotion = (props) => { var local_id = JSON.parse(x)._id; var local_code = JSON.parse(x).code; var local_titre = JSON.parse(x).titre; + var local_formateur_id = JSON.parse(x).formateur_id; + var local_formateur_prenom_nom = JSON.parse(x).formateur_prenom_nom; @@ -15569,6 +15576,9 @@ const DisplayPartnerPromotion = (props) => { "label": local_code, "code": local_code, "titre": local_titre, + "formateur_id": local_formateur_id, + "formateur_prenom_nom": local_formateur_prenom_nom, + }; new_data2.push(node); @@ -15581,6 +15591,8 @@ const DisplayPartnerPromotion = (props) => { "label": "", "code": "", "titre": "", + "formateur_id": "", + "formateur_prenom_nom": "", }; new_data2.push(node); @@ -15740,6 +15752,8 @@ const DisplayPartnerPromotion = (props) => { const [selected_ue_coefficient, setselected_ue_coefficient] = useState(""); const [selected_ue_seuil_validation, setselected_ue_seuil_validation] = useState(""); + const [selected_ue_formateur_id, setselected_ue_formateur_id] = useState(""); + const [selected_ue_changed, setselected_ue_changed] = useState(""); const New_Option_Is_Noted = [ @@ -15762,6 +15776,8 @@ const DisplayPartnerPromotion = (props) => { form.append("session_id", selected_session_id); form.append("ue_id", selected_ue_id); + form.append("formateur_id", selected_ue_formateur_id); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_UE_To_Session/"; @@ -15961,7 +15977,33 @@ const DisplayPartnerPromotion = (props) => {
} + {New_Getall_Training_Employee_No_Filter_result && New_Getall_Training_Employee_No_Filter_result.length > 0 &&
Formateur
+ (data)._id === String(selected_ue_formateur_id))[0].label} + fullWidth + onChange={(event, value) => { + setselected_ue_changed("1"); + if (value && value._id) { + setselected_ue_formateur_id(value._id); + + } else { + setselected_ue_formateur_id(""); + } + }} + + renderInput={(params) => + } + /> +
}
Crédits @@ -16111,7 +16153,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16857,7 +16899,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17043,7 +17085,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17168,7 +17210,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17509,7 +17551,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17823,7 +17865,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18027,7 +18069,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18341,7 +18383,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18670,7 +18712,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18959,7 +19001,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19072,7 +19114,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19208,7 +19250,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19366,7 +19408,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19692,7 +19734,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19748,7 +19790,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19961,7 +20003,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20184,7 +20226,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20350,7 +20392,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20419,7 +20461,7 @@ const DisplayPartnerPromotion = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -28571,6 +28613,8 @@ const DisplayPartnerPromotion = (props) => { _id: JSON.parse(item)._id, code: JSON.parse(item).code, titre: JSON.parse(item).titre, + formateur_id: JSON.parse(item).formateur_id, + formateur_prenom_nom: JSON.parse(item).formateur_prenom_nom, } ))} @@ -28579,10 +28623,13 @@ const DisplayPartnerPromotion = (props) => { className="datagridclass" onRowDoubleClick={(newSelectionModel) => { + setselected_ue_formateur_id(newSelectionModel.row.formateur_id); setselected_ue_is_noted(New_Getall_Class_List_UE_result.filter((data) => (data)._id === String(newSelectionModel.row._id))[0].is_noted) 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); + + setDialog_Unite_Enseignement_open(true); }} diff --git a/src/components/DisplayPartnerPromotion_ARG.js b/src/components/DisplayPartnerPromotion_ARG.js index 2a60b79..00ab7ad 100644 --- a/src/components/DisplayPartnerPromotion_ARG.js +++ b/src/components/DisplayPartnerPromotion_ARG.js @@ -521,7 +521,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", @@ -600,7 +600,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -943,7 +943,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1010,7 +1010,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1083,7 +1083,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1515,7 +1515,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1589,7 +1589,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -16101,7 +16101,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16847,7 +16847,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17033,7 +17033,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17158,7 +17158,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17499,7 +17499,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17813,7 +17813,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18075,7 +18075,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18389,7 +18389,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18718,7 +18718,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19007,7 +19007,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19120,7 +19120,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19256,7 +19256,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19414,7 +19414,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19740,7 +19740,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19796,7 +19796,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20009,7 +20009,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20232,7 +20232,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20398,7 +20398,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20467,7 +20467,7 @@ const DisplayPartnerPromotion_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 3813641..9a11f6f 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -10,6 +10,7 @@ import { useHistory } from "react-router-dom"; import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import { Editor } from '@tinymce/tinymce-react'; +import { FcMultipleDevices, FcVideoProjector, FcTodoList } from "react-icons/fc"; import { FcViewDetails, FcDisapprove, FcInfo, FcExpired, FcTimeline } from "react-icons/fc"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' @@ -573,7 +574,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -651,7 +652,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -1028,7 +1029,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1098,7 +1099,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1171,7 +1172,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1642,7 +1643,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1716,7 +1717,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -6507,6 +6508,7 @@ const DisplayPartnerSession = (props) => { setp_session_ondemande(); setp_session_mode_animation(""); + setp_session_mode_animation_detail_organisation(""); } @@ -6941,6 +6943,93 @@ const DisplayPartnerSession = (props) => { } + const [Update_Session_Distanciel_Organisation_Detail_api, setUpdate_Session_Distanciel_Organisation_Detail_api] = useState(); + const [Update_Session_Distanciel_Organisation_Detail_message, setUpdate_Session_Distanciel_Organisation_Detail_message] = useState(); + const [Update_Session_Distanciel_Organisation_Detail_result, setUpdate_Session_Distanciel_Organisation_Detail_result] = useState(); + function Update_Session_Distanciel_Organisation_Detail() { + clean_old_messages(); + var form = new FormData(); + var nb_participant = "0"; + var prix_session; + + + if (selected_internal_url.trim() == "") { + // alert(" Vous devez choisir une formation "); + setdisplay_alert_mysy("1"); + setalert_message("Vous devez choisir une formation"); + setalert_type("error"); + return; + } + + + + if (selected_code_session.length <= 0) { + // alert(" Vous devez choisir une session"); + setdisplay_alert_mysy("1"); + setalert_message("Vous devez choisir une session"); + setalert_type("error"); + return; + } + + + //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("_id", GetCurrentSession_id); + form.append("mode_animation_detail_organisation", p_session_mode_animation_detail_organisation); + + + + setLoading(true); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Update_SessionFormation_From_Id/"; + + //console.log(" ### form = ", form); + //return; + + axios.post(myurl, form).then(res => { + //console.log(" In Update_Session_Distanciel_Organisation_Detail res.data.status = " + res.data.status); + //console.log(" In Update_Session_Distanciel_Organisation_Detail res.data.message r_class = " + res.data.message); + setLoading(false); + if (String(res.data.status) === String("true")) { + setUpdate_Session_Distanciel_Organisation_Detail_api("true"); + setUpdate_Session_Distanciel_Organisation_Detail_result(res.data.message); + + GetCurrentSession(selected_session_id, selected_internal_url); + // alert(String(res.data.message)); + Dialog_Distanciel_Orga_handleClose_buton(); + + setdisplay_alert_mysy("1"); + setalert_message(String(res.data.message)); + setalert_type("success"); + + + + } else if (String(res.data.status) === String("Err_Connexion")) { + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + else { + setUpdate_Session_Distanciel_Organisation_Detail_api("false"); + setUpdate_Session_Distanciel_Organisation_Detail_message(res.data.message); + //alert(String(res.data.message)); + + setdisplay_alert_mysy("1"); + setalert_message(String(res.data.message)); + setalert_type("error"); + + } + + }).catch((error) => { + setLoading(false); + console.warn('Update_Session_Distanciel_Organisation_Detail : Not good man :( mysearchtext = ' + error); + setUpdate_Session_Distanciel_Organisation_Detail_api("false"); + alert(" Impossible de mettre à jour la session"); + + }) + } + + const [one_CreateSessionFormation_api, setone_CreateSessionFormation_api] = useState(); const [one_CreateSessionFormation_message, setone_CreateSessionFormation_message] = useState(); const [one_CreateSessionFormation_result, setone_CreateSessionFormation_result] = useState(); @@ -7279,6 +7368,9 @@ const DisplayPartnerSession = (props) => { const [p_session_mode_animation, setp_session_mode_animation] = useState("0"); + const [p_session_mode_animation_detail_organisation, setp_session_mode_animation_detail_organisation] = useState(""); + + const [p_session_status, setp_session_status] = useState(); const [p_session_status_label, setp_session_status_label] = useState(); @@ -7488,6 +7580,13 @@ const DisplayPartnerSession = (props) => { setp_session_mode_animation("0"); } + + if (mylocaltraining.mode_animation_detail_organisation) { + setp_session_mode_animation_detail_organisation(mylocaltraining.mode_animation_detail_organisation); + } else { + setp_session_mode_animation_detail_organisation(""); + } + if (mylocaltraining.presentiel) { setp_session_presentiel(mylocaltraining.presentiel); if (String(mylocaltraining.presentiel) === "1") @@ -7919,6 +8018,7 @@ const DisplayPartnerSession = (props) => { form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "0"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class/"; @@ -15936,6 +16036,12 @@ const DisplayPartnerSession = (props) => { } ]; + const [Dialog_Distanciel_Orga_open, setDialog_Distanciel_Orga_open] = React.useState(false); + const Dialog_Distanciel_Orga_handleClose_buton = () => { + setDialog_Distanciel_Orga_open(false); + + }; + return (
@@ -15955,6 +16061,113 @@ const DisplayPartnerSession = (props) => { {/*** FIN Affichage des messages d'alerte*/} + {/* Dialog pour gerer les Distanciel_Orga */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '10rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + + > + + Modalités d'organisation + + + {Dialog_1_message} + + +
+ + Détails organisation   + +
+ + { + setp_session_mode_animation_detail_organisation(e.target.value); + + }} + + /> + +
+ + + + + + + + + + +
+
+ {selected_inscription_invoice_status !== "1" && } + +
+ + +
+ +
+
+ + + + + {/* FIN Dialog pour gerer les Distanciel_Orga */} + + + + {/********** Dialog pour recherche Apprenant puis facture */} { display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', width: '100%', paddingLeft: '10px', flexWrap: 'wrap', background: '#e0e0de' }}> - ----------------- +
@@ -16115,7 +16328,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16863,7 +17076,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17049,7 +17262,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17174,7 +17387,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17566,7 +17779,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17944,7 +18157,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18143,7 +18356,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18457,7 +18670,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18786,7 +18999,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19075,7 +19288,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19188,7 +19401,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19325,7 +19538,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19483,7 +19696,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19809,7 +20022,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19865,7 +20078,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20078,7 +20291,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20301,7 +20514,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20465,7 +20678,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20534,7 +20747,7 @@ const DisplayPartnerSession = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -22895,6 +23108,7 @@ const DisplayPartnerSession = (props) => { +
Code Session
{ shrink: true, }} disabled={!edit_session_form} - className="disabled_style" + className="disabled_style enable_style disabled_style_left_text_with_visualiser_icone" value={New_Option_pres_dist_hyp.filter((data) => (data).id === String(p_session_mode_animation))[0].label} /> + + +
{ + + if (selected_internal_url && String(selected_internal_url).length > 2) { + setDialog_Distanciel_Orga_open(true) + } + } + } + > +
+ + +
+
+
} + + + {!edit_session_form &&
Inclus au BPF
{ style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -612,7 +612,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -989,7 +989,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1059,7 +1059,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1132,7 +1132,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -1596,7 +1596,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -1670,7 +1670,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", }, @@ -15795,7 +15795,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16543,7 +16543,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16729,7 +16729,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -16854,7 +16854,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17246,7 +17246,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17624,7 +17624,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -17882,7 +17882,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18196,7 +18196,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18525,7 +18525,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18814,7 +18814,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -18927,7 +18927,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19064,7 +19064,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19222,7 +19222,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19548,7 +19548,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19604,7 +19604,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -19817,7 +19817,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20040,7 +20040,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20204,7 +20204,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -20273,7 +20273,7 @@ const DisplayPartnerSession_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index cdf7ddc..9bee3db 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1223,7 +1223,7 @@ const DisplayPartnerStagiaires = (props) => { setLoading(false); console.warn('Not good man :( Getall_TrainingParticipant = ', error); setGetall_TrainingParticipant_api("false"); - alert(" Impossible de recuperer la liste des stagiaires") + // alert(" Impossible de recuperer la liste des stagiaires") //setmyApimyApiMessage("") }) } @@ -2300,13 +2300,13 @@ const DisplayPartnerStagiaires = (props) => { * Si l'inscription est deja validé, alors il devient impossible de modifier les données de l'inscrit depuis cet écran * Il faut aller dans les apprenants pour modifier l'apprenant. */ - if (selected_id_status && String(selected_id_status) === "1") { + /*if (selected_id_status && String(selected_id_status) === "1") { var message = "Cette inscription a déjà été validée. Pour modifier les données de l'apprenant, merci de passer par le menu 'mes apprenants' "; setDialog_1_message(message); setDialog_1_open(true); return; - } + }*/ setparticipant_data_edit_mode("1"); @@ -2314,7 +2314,9 @@ const DisplayPartnerStagiaires = (props) => { const list_menu_header_names = ['detail_session_class', 'detail_client_rattachement', 'detail_facture_client_rattachement', 'detail_financeur_rattachement', 'detail_nom', 'detail_status_inscript', 'detail_opco', 'detail_prenom', 'detail_mode_financement', 'detail_mail', 'detail_naissance', 'detail_tel', 'detail_adresse', 'detail_code_postal', 'detail_ville', 'detail_pays', 'certif_date', 'detail_cout', 'detail_mode_fin', 'detail_employeur', 'date_evaluation', 'certif_date', - 'note_eval', 'detail_type_apprenant', 'date_evaluation', 'detail_incr_date', 'detail_comment', 'detail_memo'] + 'note_eval', 'detail_type_apprenant', 'date_evaluation', 'detail_incr_date', 'detail_comment', 'detail_memo', + 'detail_naissance', 'detail_mail', 'detail_prenom', 'detail_nom', 'detail_civilite', 'detail_tel', 'detail_adresse', 'detail_code_postal', 'detail_ville', + 'detail_pays'] @@ -2347,14 +2349,14 @@ const DisplayPartnerStagiaires = (props) => { * Si l'inscription est deja validé, alors il devient impossible de modifier les données de l'inscrit depuis cet écran * Il faut aller dans les apprenants pour modifier l'apprenant. */ - if (selected_id_status && String(selected_id_status) === "1") { - - var message = "Cette inscription a déjà été validée. Seuls quelques données sont modifiable. \ - Pour modifier les données personnelles de l'apprenant, merci de passer par le menu 'mes apprenants'. "; - setDialog_1_message(message); - setDialog_1_open(true); - // return; - } + /* if (selected_id_status && String(selected_id_status) === "1") { + + var message = "Cette inscription a déjà été validée. Seuls quelques données sont modifiable. \ + Pour modifier les données personnelles de l'apprenant, merci de passer par le menu 'mes apprenants'. "; + setDialog_1_message(message); + setDialog_1_open(true); + // return; + }*/ setparticipant_data_edit_mode("1"); @@ -2409,6 +2411,61 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_memo")[0].style.backgroundColor = "#FFFFFF"; } + /******* */ + + if (document.getElementsByName("detail_naissance")[0]) { + document.getElementsByName("detail_naissance")[0].disabled = false; + document.getElementsByName("detail_naissance")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_mail")[0]) { + document.getElementsByName("detail_mail")[0].disabled = false; + document.getElementsByName("detail_mail")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_prenom")[0]) { + document.getElementsByName("detail_prenom")[0].disabled = false; + document.getElementsByName("detail_prenom")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_nom")[0]) { + document.getElementsByName("detail_nom")[0].disabled = false; + document.getElementsByName("detail_nom")[0].style.backgroundColor = "#FFFFFF"; + } + + + if (document.getElementsByName("detail_civilite")[0]) { + document.getElementsByName("detail_civilite")[0].disabled = false; + document.getElementsByName("detail_civilite")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_tel")[0]) { + document.getElementsByName("detail_tel")[0].disabled = false; + document.getElementsByName("detail_tel")[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"; + } + + if (document.getElementsByName("detail_code_postal")[0]) { + document.getElementsByName("detail_code_postal")[0].disabled = false; + document.getElementsByName("detail_code_postal")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_ville")[0]) { + document.getElementsByName("detail_ville")[0].disabled = false; + document.getElementsByName("detail_ville")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_pays")[0]) { + document.getElementsByName("detail_pays")[0].disabled = false; + document.getElementsByName("detail_pays")[0].style.backgroundColor = "#FFFFFF"; + } + + + } @@ -2487,7 +2544,7 @@ const DisplayPartnerStagiaires = (props) => { desableSessionFields(); } - const [loading_datagrid, setloading_datagrid] = useState(true); + const [loading_datagrid, setloading_datagrid] = useState(false); const [SendEvaluationEmail_api, setSendEvaluationEmail_api] = useState(); const [SendEvaluationEmail_message, setSendEvaluationEmail_message] = useState(); @@ -2839,6 +2896,15 @@ const DisplayPartnerStagiaires = (props) => { } + const [Filter_New_Getall_TrainingSession_result, setFilter_New_Getall_TrainingSession_result] = useState([{ + "_id": "", + "id": "", + "label": "", + "class_internal_url": "", + "titre": "", + "code_session": "", + }]); + const [New_Getall_TrainingSession_result, setNew_Getall_TrainingSession_result] = useState([]); const [Getall_TrainingSession_api, setGetall_TrainingSession_api] = useState(); @@ -2894,6 +2960,27 @@ const DisplayPartnerStagiaires = (props) => { if (new_data2.length > 0) { setNew_Getall_TrainingSession_result(new_data2); + + var new_data2_bis = new_data2 + var node = { + "_id": "", + "id": "", + "label": "", + "class_internal_url": "", + "titre": "", + "code_session": "", + }; + new_data2_bis.push(node); + setFilter_New_Getall_TrainingSession_result(new_data2_bis); + } else { + setFilter_New_Getall_TrainingSession_result([{ + "_id": "", + "id": "", + "label": "", + "class_internal_url": "", + "titre": "", + "code_session": "", + }]) } @@ -3132,7 +3219,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); @@ -3140,39 +3227,40 @@ const DisplayPartnerStagiaires = (props) => { var tab_tmp = [] var tab_tmp_V2 = [] - const new_data = res.data.message.map((x) => { + if (Array.isArray(res.data.message)) { + const new_data = res.data.message.map((x) => { - //--- - var localid = JSON.parse(x).id; - var local_id = JSON.parse(x)._id; - var local_class_id = JSON.parse(x).class_id; - var local_class_eu_id = JSON.parse(x).class_eu_id; - var local_class_eu_code = JSON.parse(x).class_eu_code; - var local_type_eval__id = JSON.parse(x).type_eval__id; - var local_type_eval_code = JSON.parse(x).type_eval_code; - var local_type_eval_nom = JSON.parse(x).type_eval_nom; + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_class_id = JSON.parse(x).class_id; + var local_class_eu_id = JSON.parse(x).class_eu_id; + var local_class_eu_code = JSON.parse(x).class_eu_code; + var local_type_eval__id = JSON.parse(x).type_eval__id; + var local_type_eval_code = JSON.parse(x).type_eval_code; + var local_type_eval_nom = JSON.parse(x).type_eval_nom; - tab_tmp.push(local_type_eval__id); + tab_tmp.push(local_type_eval__id); - //--- - var node = { - "_id": local_id, - "id": localid, - "label": local_class_eu_code + " - " + local_type_eval_code, - "class_id": local_class_id, - "class_eu_id": local_class_eu_id, - "class_eu_code": local_class_eu_code, - "type_eval__id": local_type_eval__id, - "type_eval_code": local_type_eval_code, - "type_eval_nom": local_type_eval_nom, - }; - new_data2.push(node); + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_class_eu_code + " - " + local_type_eval_code, + "class_id": local_class_id, + "class_eu_id": local_class_eu_id, + "class_eu_code": local_class_eu_code, + "type_eval__id": local_type_eval__id, + "type_eval_code": local_type_eval_code, + "type_eval_nom": local_type_eval_nom, + }; + new_data2.push(node); - }); - + }); + } //--- var node = { "_id": "", @@ -3519,11 +3607,12 @@ const DisplayPartnerStagiaires = (props) => { useEffect(() => { + sethistory_securite_read(props.check_user_acces_right("historique", "read")) - Getall_TrainingParticipant(); + // Getall_TrainingParticipant(); - //Getall_TrainingParticipant_Light(); + //---Getall_TrainingParticipant_Light(); Getall_TrainingSession(); Get_List_Partner_Clients(); @@ -3545,6 +3634,8 @@ const DisplayPartnerStagiaires = (props) => { GetAttendee_Data_from_props(props.subdata, props.object_key); } else { + + setDialog_Filtre_Ouverture_open(true); window.scrollTo({ top: 0, behavior: "smooth", @@ -3576,11 +3667,23 @@ const DisplayPartnerStagiaires = (props) => { ]; + + const [p_detail_civilite_changed, setp_detail_civilite_changed] = useState(); + const [p_detail_nom_changed, setp_detail_nom_changed] = useState(); + const [p_detail_prenom_changed, setp_detail_prenom_changed] = useState(); + const [p_detail_mail_changed, setp_detail_mail_changed] = useState(); + const [p_detail_naissance_changed, setp_detail_naissance_changed] = useState(); + const [p_detail_tel_changed, setp_detail_tel_changed] = useState(); + const [p_detail_adresse_changed, setp_detail_adresse_changed] = useState(""); + const [p_detail_code_postal_changed, setp_detail_code_postal_changed] = useState(""); + const [p_detail_ville_changed, setp_detail_ville_changed] = useState(""); + const [p_detail_pays_changed, setp_detail_pays_changed] = useState(""); + + const [p_detail_civilite, setp_detail_civilite] = useState(); const [p_detail_nom, setp_detail_nom] = useState(); const [p_detail_prenom, setp_detail_prenom] = useState(); const [p_detail_mail, setp_detail_mail] = useState(); - const [p_detail_naissance, setp_detail_naissance] = useState(); @@ -4644,10 +4747,12 @@ const DisplayPartnerStagiaires = (props) => { const myRef_head = useRef(null) + const [update_dossier_apprenant, setupdate_dossier_apprenant] = useState(""); + const [UpdateStagiaireData_api, setUpdateStagiaireData_api] = useState(); const [UpdateStagiaireData_message, setUpdateStagiaireData_message] = useState(); const [UpdateStagiaireData_result, setUpdateStagiaireData_result] = useState(); - function Update_One_StagiaireData() { + function Update_One_StagiaireData(local_option_dossier) { var form = new FormData(); //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); @@ -4661,6 +4766,7 @@ const DisplayPartnerStagiaires = (props) => { return; } + const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("class_internal_url", selected_internal_url); @@ -4672,6 +4778,11 @@ const DisplayPartnerStagiaires = (props) => { form.append("telephone", p_detail_tel); form.append("date_naissance", p_detail_naissance); + if (local_option_dossier && local_option_dossier === "1") + form.append("update_dossier_apprenant", "1"); + else + form.append("update_dossier_apprenant", ""); + if (!p_detail_nom || String(p_detail_nom).trim().length < 2) { // alert("Le nom est invalide."); setdisplay_alert_mysy("1"); @@ -7401,10 +7512,9 @@ const DisplayPartnerStagiaires = (props) => { { "id": "4", "label": "Rech. Emploi", "value": "4" }, ] - const New_Option_Filter = [ - { "id": "email", "label": "Email ", "value": "email" }, - { "id": "nom", "label": "Nom ", "value": "nom" }, - { "id": "code_session", "label": "Code Session/Promo", "value": "code_session" }, + const New_Option_Filter = [ + { "id": "nom", "label": "Nom / Prénom / Tél / Mail ", "value": "nom" }, + { "id": "session_id", "label": "Session/Promo", "value": "session_id" }, { "id": "class_title", "label": "Titre Formation", "value": "class_title" }, { "id": "client_nom", "label": "Lié au Client (nom client) ", "value": "client_nom" }, { "id": "archive", "label": "Archivé", "value": "archive" }, @@ -8618,6 +8728,14 @@ const DisplayPartnerStagiaires = (props) => { }) } + const [Dialog_Filtre_Ouverture_open, setDialog_Filtre_Ouverture_open] = React.useState(false); + + const Dialog_Filtre_Ouverture_handleClose_buton = () => { + setDialog_Filtre_Ouverture_open(false); + + }; + + return (
{isLoading &&
@@ -8636,6 +8754,398 @@ const DisplayPartnerStagiaires = (props) => { + {/*** GESTION Filtre Ouverture zzzz */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: "20rem", + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > + + Filtre + + + +
+ +
+ {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre1))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + setp_filtre1_value(""); + if (value && value.value) { + setp_filtre1(value.value); + } + + }} + + renderInput={(params) => + } + />} + + +
+ + + + {String(p_filtre1) !== "archive" && String(p_filtre1) !== "invoiced" && String(p_filtre1) !== "session_id" && +
+ {p_filtre1 && + { setp_filtre1_value(e.target.value); }} + InputProps={{ + endAdornment: ( + + { + setp_filtre1_value(""); + }} /> + + ), + }} + + /> + + } +
} + + {String(p_filtre1) === "archive" &&
+ {p_filtre1 && + (data).id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={New_Option_Is_archive} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1_value(value.value); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + + {String(p_filtre1) === "invoiced" &&
+ {p_filtre1 && + (data).id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={New_Option_Is_Invoiced} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1_value(value.value); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + + {String(p_filtre1) === "session_id" &&
+ {p_filtre1 && + (data)._id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Filter_New_Getall_TrainingSession_result} + onChange={(event, value) => { + if (value && value._id) { + + setp_filtre1_value(value._id); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + + {p_filtre1 && } + {p_filtre1 && } + + +
+ + {p_filtre2 && +
+
+ {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre2))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2(value.value); + + } + + }} + + renderInput={(params) => + } + />} + + + +
+
+ {String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && String(p_filtre2) !== "invoiced" && String(p_filtre1) !== "session_id" && + setp_filtre2_value(e.target.value)} + InputProps={{ + endAdornment: ( + + { + setp_filtre2_value(""); + }} /> + + ), + }} + + />} + + {String(p_filtre2).length > 2 && String(p_filtre2) === "archive" && + (data).id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={New_Option_Is_archive} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2_value(value.value); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />} + + {String(p_filtre2).length > 2 && String(p_filtre2) === "invoiced" && + (data).id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={New_Option_Is_Invoiced} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2_value(value.value); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />} + + {String(p_filtre2).length > 2 && String(p_filtre2) === "session_id" && + (data)._id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Filter_New_Getall_TrainingSession_result} + onChange={(event, value) => { + if (value && value._id) { + setp_filtre2_value(value._id); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />} +
+ + {String(p_filtre2).length > 2 && } + + {String(p_filtre2).length > 2 && } + +
+ } + + + + + + + + + + + +
+ + +
+   + +
+
+ +
+
+ + + + + + {/*** FIN GESTION Filtre Ouverture */} + {/*** GESTION TUTORAT */} { onChange={(event, value) => { if (value && value.value) { setp_filtre1(value.value); - } }} @@ -10360,37 +10869,38 @@ const DisplayPartnerStagiaires = (props) => { - {String(p_filtre1) !== "archive" && String(p_filtre1) !== "invoiced" &&
- {p_filtre1 && - + {p_filtre1 && + { setp_filtre1_value(e.target.value); }} - InputProps={{ - endAdornment: ( - - { - setp_filtre1_value(""); - }} /> - - ), - }} + InputLabelProps={{ + shrink: true, + }} + disabled={false} + className="disabled_style" + value={p_filtre1_value} + onChange={(e) => { setp_filtre1_value(e.target.value); }} + InputProps={{ + endAdornment: ( + + { + setp_filtre1_value(""); + }} /> + + ), + }} - /> + /> - } -
} + } +
} {String(p_filtre1) === "archive" &&
{p_filtre1 && @@ -10446,6 +10956,33 @@ const DisplayPartnerStagiaires = (props) => { }
} + {String(p_filtre1) === "session_id" &&
+ {p_filtre1 && + (data)._id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Filter_New_Getall_TrainingSession_result} + onChange={(event, value) => { + if (value && value._id) { + setp_filtre1_value(value._id); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + {p_filtre1 &&
@@ -10498,7 +11035,7 @@ const DisplayPartnerStagiaires = (props) => {
- {String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && String(p_filtre2) !== "invoiced" && + {String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && String(p_filtre2) !== "invoiced" && String(p_filtre1) !== "session_id" && { />} />} - {String(p_filtre2).length > 2 && String(p_filtre2) === "invoiced" && + {String(p_filtre2).length > 2 && String(p_filtre2) === "invoiced" && { />} />} + + {String(p_filtre2).length > 2 && String(p_filtre2) === "session_id" && + (data)._id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Filter_New_Getall_TrainingSession_result} + onChange={(event, value) => { + if (value && value._id) { + setp_filtre2_value(value._id); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />}
{String(p_filtre2).length > 2 &&
@@ -10631,7 +11191,7 @@ const DisplayPartnerStagiaires = (props) => {
- {String(p_filtre3).length > 2 && String(p_filtre3) !== "archive" && String(p_filtre3) !== "invoiced" && + {String(p_filtre3).length > 2 && String(p_filtre3) !== "archive" && String(p_filtre3) !== "invoiced" && String(p_filtre1) !== "session_id" && { /> } + {String(p_filtre3).length > 3 && String(p_filtre3) === "session_id" && + (data)._id === String(p_filtre3_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Filter_New_Getall_TrainingSession_result} + onChange={(event, value) => { + if (value && value._id) { + setp_filtre3_value(value._id); + } else { + setp_filtre3_value(""); + } + }} + renderInput={(params) => } + /> + } +
{String(p_filtre2).length > 2 &&
@@ -10864,12 +11448,12 @@ const DisplayPartnerStagiaires = (props) => { // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -10881,11 +11465,11 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, /*"& .MuiDataGrid-virtualScrollerRenderZone": { @@ -11095,12 +11679,12 @@ const DisplayPartnerStagiaires = (props) => { // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -11112,11 +11696,11 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, /*"& .MuiDataGrid-virtualScrollerRenderZone": { @@ -12482,6 +13066,7 @@ const DisplayPartnerStagiaires = (props) => { value={New_civilite.filter((val) => val.value === String(p_detail_civilite))[0].label} options={New_civilite} onChange={(event, value) => { + setp_detail_civilite_changed("1") if (value && value.value) { setp_detail_civilite(value.value); @@ -12539,6 +13124,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_nom(e.target.value); setparticipant_data_changed("1"); + setp_detail_nom_changed("1") } } @@ -12561,6 +13147,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_prenom(e.target.value); setparticipant_data_changed("1"); + setp_detail_prenom_changed("1"); }} />
@@ -12581,13 +13168,14 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_mail(e.target.value); setparticipant_data_changed("1"); + setp_detail_mail_changed("1"); } } />
-
Date Naissance
+
Date Naissance
{ onChange={(date) => { setp_detail_naissance(format(date, 'd/MM/yyyy')); setparticipant_data_changed("1"); + setp_detail_naissance_changed("1"); } } showTimeSelect={false} @@ -12622,6 +13211,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_tel(e.target.value); setparticipant_data_changed("1"); + setp_detail_tel_changed("1"); } } /> @@ -12644,6 +13234,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_adresse(e.target.value); setparticipant_data_changed("1"); + setp_detail_adresse_changed("1"); }} />
@@ -12664,6 +13255,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_code_postal(e.target.value); setparticipant_data_changed("1"); + setp_detail_code_postal_changed("1"); }} />
@@ -12684,6 +13276,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_ville(e.target.value); setparticipant_data_changed("1"); + setp_detail_ville_changed("1"); }} />
@@ -12704,6 +13297,7 @@ const DisplayPartnerStagiaires = (props) => { onChange={(e) => { setp_detail_pays(e.target.value); setparticipant_data_changed("1"); + setp_detail_pays_changed("1"); }} /> @@ -13418,8 +14012,61 @@ const DisplayPartnerStagiaires = (props) => { {String(participant_data_edit_mode) === "1" &&
- + {/**/} + + {Enregistrer + } + modal + nested + position="center center"> + {close => ( +
+ +
MySy Information
+
+ {' '} + Souhaitez vous appliquer les mises à jour au dossier apprenant ? + + +
+
+
+ + +
+
+ +
+
+
+ )} + + + + }
} @@ -13433,7 +14080,7 @@ const DisplayPartnerStagiaires = (props) => { {String(props.check_user_acces_right("stagiaire", "write")) === "1" && String(participant_data_edit_mode) !== "1" && String(inscription_invoiced) !== "1" && p_detail_apprenant_id && String(p_detail_apprenant_id).trim().length > 3 &&
-
} @@ -13442,8 +14089,8 @@ const DisplayPartnerStagiaires = (props) => { {String(participant_data_edit_mode) !== "1" &&
- {String(props.check_user_acces_right("stagiaire", "write")) === "1" && String(selected_id_status) !== "1" && (!p_detail_apprenant_id || String(p_detail_apprenant_id).trim().length <= 3) && - } @@ -13520,293 +14167,7 @@ const DisplayPartnerStagiaires = (props) => { - {/*
-
-
-
- -
- Tuteurs - -
-
-
Tuteur 1
- -
Civilité
- - - {p_detail_tuteur1_civilite && } - - {!p_detail_tuteur1_civilite && } - - - -
- -
Nom
- { - setp_detail_tuteur1_nom(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Prénom
- { - setp_detail_tuteur1_prenom(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Email
- { - setp_detail_tuteur1_email(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Téléphone
- { - setp_detail_tuteur1_telephone(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- - {String(p_detail_apprenant_id).trim().length <= 0 &&
{ - setquel_tuteur("1"); - setDialog_tuteur_1_open(true); - }}> Voir plus - -
} - - - - - -
-
- -
Tuteur 2
- -
Civilité
- - - {p_detail_tuteur2_civilite && } - - {!p_detail_tuteur2_civilite && } - - -
- -
Nom
- { - setp_detail_tuteur2_nom(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Prénom
- { - setp_detail_tuteur2_prenom(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Email
- { - setp_detail_tuteur2_email(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- -
Téléphone
- { - setp_detail_tuteur2_telephone(e.target.value); - setparticipant_data_changed("1"); - }} - /> - - -
- - {String(p_detail_apprenant_id).trim().length <= 0 &&
{ - setquel_tuteur("2"); - setDialog_tuteur_1_open(true); - }}> Voir plus - -
} -
-
-
-
*/} +
@@ -13832,12 +14193,12 @@ const DisplayPartnerStagiaires = (props) => { // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -13849,11 +14210,11 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, /*"& .MuiDataGrid-virtualScrollerRenderZone": { @@ -13870,15 +14231,15 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--pair': { backgroundColor: 'rgba(235, 235, 235, .7)', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--impair': { backgroundColor: '#FFFFFF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--selected': { backgroundColor: '#e9f7f1', - color: "#0a2a4d", + color: "#0a2a4d", }, }} @@ -14629,7 +14990,7 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--pair': { backgroundColor: 'rgba(235, 235, 235, .7)', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -14639,13 +15000,13 @@ const DisplayPartnerStagiaires = (props) => { '& .line--positionnement_envoye': { backgroundColor: '#F9E79F', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--positionnement_repondu': { backgroundColor: '#ABEBC6', - color: "#0a2a4d", + color: "#0a2a4d", fontWeight: '600', }, @@ -15031,15 +15392,15 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--pair': { backgroundColor: 'rgba(235, 235, 235, .7)', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--impair': { backgroundColor: '#FFFFFF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--selected': { backgroundColor: '#e9f7f1', - color: "#0a2a4d", + color: "#0a2a4d", }, }} @@ -15175,15 +15536,15 @@ const DisplayPartnerStagiaires = (props) => { '& .line--statut--pair': { backgroundColor: 'rgba(235, 235, 235, .7)', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--impair': { backgroundColor: '#FFFFFF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--selected': { backgroundColor: '#e9f7f1', - color: "#0a2a4d", + color: "#0a2a4d", }, }} @@ -15395,5 +15756,9 @@ width: 100%; padding: 10px; border: unset; border-radius: 10px; + } + + .react-datepicker-wrapper{ + width: 100%; } `; diff --git a/src/components/DisplayPartnerStagiaires_ARG_Before_Light.js b/src/components/DisplayPartnerStagiaires_ARG_Before_Light.js index 7fead5e..42d2cf4 100644 --- a/src/components/DisplayPartnerStagiaires_ARG_Before_Light.js +++ b/src/components/DisplayPartnerStagiaires_ARG_Before_Light.js @@ -440,7 +440,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -8839,7 +8839,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", maxWidth: '800px' }, @@ -9103,7 +9103,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", maxWidth: '800px' }, @@ -9165,7 +9165,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -9385,7 +9385,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -9824,7 +9824,7 @@ const DisplayPartnerStagiaires_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 9f1818d..58d176f 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -932,7 +932,7 @@ const DistplayPartnerTraningsPage = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", @@ -1011,7 +1011,7 @@ const DistplayPartnerTraningsPage = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -1084,7 +1084,7 @@ const DistplayPartnerTraningsPage = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -1240,7 +1240,7 @@ const DistplayPartnerTraningsPage = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -1313,7 +1313,7 @@ const DistplayPartnerTraningsPage = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", diff --git a/src/components/DisplayPartnerUnite_Enseignement.js b/src/components/DisplayPartnerUnite_Enseignement.js index eeaeffb..ae53905 100644 --- a/src/components/DisplayPartnerUnite_Enseignement.js +++ b/src/components/DisplayPartnerUnite_Enseignement.js @@ -156,7 +156,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { { - field: 'domain_id', headerName: 'Domaine', flex: 1, hide: false, editable: false, renderCell: (cellValues) => { + field: 'domain_id', headerName: 'Domaine', hide: true, editable: false, renderCell: (cellValues) => { return (
{New_Get_List_Domaines_result && New_Get_List_Domaines_result.length > 0 &&   -
+ +
+
+ +
+
+ +
+ Infos Générales +
+ +
+ +
Civilité
+ { + 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"); + } + } + + /> +
+ +
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'} + + /> + + +
+ +
CRM Email Diffusion
+ { + setp_one_detail_list_diffusion_mail(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
+
+
+ +
+
+ +
+ Adresse & Contact +
+ +
+ +
Téléphone Mobile
+ { + setp_one_detail_tel_mobile(e.target.value); + setEmployee_data_changed("1"); + } + } + /> +
+ +
Téléphone
+ { + setp_one_detail_tel(e.target.value); + setEmployee_data_changed("1"); + } + } + /> +
+ +
Adresse
+ { + setp_one_detail_adresse(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
Code postal
+ { + setp_one_detail_code_postal(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
Ville
+ { + setp_one_detail_ville(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
Pays
+ { + setp_one_detail_pays(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
Linkedin
+ { + setp_one_detail_linkedIn(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
Facebook
+ { + setp_one_detail_facebook(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
X (Twitter)
+ { + setp_one_detail_twitter(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ +
+
+
+ + + +
+
+ +
+
+ +
+
+ +
+ Management +
+ +
+ +
Profil
+ + { + + setp_one_detail_profil(value.nom); + setEmployee_data_changed("1"); + + }} + + renderInput={(params) => + } + /> + + +
+ +
Fonction
+ { + setp_one_detail_fonction(e.target.value); + setEmployee_data_changed("1"); + }} + /> +
+ + +
Manager
+ + { + if (value && value.value) { + setp_one_detail_ismanager(value.value); + setEmployee_data_changed("1"); + + } + }} + + renderInput={(params) => + } + /> + +
+ +
Responsable (n+1)
+ { + if (value && value._id) { + + setp_one_detail_resp_hierarchie_id(value._id); + setEmployee_data_changed("1"); + + } + }} + + renderInput={(params) => + } + /> + +
+ +
+
+
+ +
+
+ +
+ Champs specifiques +
+ +
+ + {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); + setEmployee_data_changed("1"); + }} + //onChange={change_champs_spec_handle} + + + />} + + {String(JSON.parse(champ_spec).field_type) === "string" && { + change_champs_spec_handle(e.target.value); + setEmployee_data_changed("1"); + }} + //onChange={change_champs_spec_handle} + + + />} + +
+ ))} + +
+
+
+ + + +
+
+ + ----------------- + {/*
@@ -11434,28 +11974,7 @@ const Employes = (props) => { } /> - {/* { - setp_one_detail_civilite(e.target.value); - setEmployee_data_changed("1"); - }} - > - M.    - Mme.   - Neutre   - */}
Nom
@@ -11620,6 +12139,7 @@ const Employes = (props) => { }} />
+
Code postal
{ }} />
+
Ville
{
- {/* -- début champs specifiques **/} + {/* -- début champs specifiques ** /}  
@@ -11921,7 +12442,7 @@ const Employes = (props) => {
- {/* -- end champs specifiques **/} + {/* -- end champs specifiques ** /}  
+
*/}
@@ -12507,7 +13028,8 @@ const Employes = (props) => {
Profil utilisateur
- {acces_right_data_edit_mode === "1" && { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7856,7 +7856,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -7955,7 +7955,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8096,7 +8096,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8259,7 +8259,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8311,7 +8311,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8364,7 +8364,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -8512,7 +8512,7 @@ const Employes_ARG = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Groupe_Apprenant.js b/src/components/Groupe_Apprenant.js index 9d20122..95f99b9 100644 --- a/src/components/Groupe_Apprenant.js +++ b/src/components/Groupe_Apprenant.js @@ -530,7 +530,7 @@ const Groupe_Apprenant = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", @@ -609,7 +609,7 @@ const Groupe_Apprenant = (props) => { style: { overflowY: 'unset', // position: 'absolute', - top: '7rem', + top: '10rem', border: '1px solid #F1F1F1', margin: "2px", boxShadow: "-3px 4px 0px -30px #000000", @@ -2782,7 +2782,7 @@ const Groupe_Apprenant = (props) => { style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Intranet_Mes_Stagiaires.js b/src/components/Intranet_Mes_Stagiaires.js index 15467c7..bca0dac 100644 --- a/src/components/Intranet_Mes_Stagiaires.js +++ b/src/components/Intranet_Mes_Stagiaires.js @@ -6488,7 +6488,7 @@ registerLocale('fr', fr); style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} @@ -6709,7 +6709,7 @@ registerLocale('fr', fr); style: { overflowY: 'unset', position: 'absolute', - top: '7rem', + top: '10rem', margin: "2px", }, }} diff --git a/src/components/Jmj_Theme/Formation_Partner_Catalog_Special_JMJFormation.js b/src/components/Jmj_Theme/Formation_Partner_Catalog_Special_JMJFormation.js index 28cabf5..d45e480 100644 --- a/src/components/Jmj_Theme/Formation_Partner_Catalog_Special_JMJFormation.js +++ b/src/components/Jmj_Theme/Formation_Partner_Catalog_Special_JMJFormation.js @@ -438,13 +438,18 @@ const Formation_Partner_Catalog_Special_JMJFormation = (props) => {

} - {props.formation.business_prices && props.formation.business_prices.length <= 0 - &&

{props.formation.price} € - {parseFloat(String(props.formation.partnaire_tva)) > 0 && <> HT  } - {parseFloat(String(props.formation.partnaire_tva)) <= 0 && <> TTC  } -

} + {props.formation.business_prices && props.formation.business_prices.length <= 0 && props.formation.inscription_direct !== "1" - {props.formation.business_prices && props.formation.business_prices.length > 0 && + &&

+ + {parseFloat(String(props.formation.price)) <= 0 && <> Gratuit } + {parseFloat(String(props.formation.price)) > 0 && <> {props.formation.price} € } + + {parseFloat(String(props.formation.partnaire_tva)) > 0 && parseFloat(String(props.formation.price)) > 0 && <> HT  } + {parseFloat(String(props.formation.partnaire_tva)) <= 0 && parseFloat(String(props.formation.price)) > 0 && <> TTC  } +

} + + {props.formation.business_prices && props.formation.business_prices.length > 0 && props.formation.inscription_direct !== "1" &&

{props.formation.business_prices[0].discounted_price}€ diff --git a/src/components/Module_Absence.js b/src/components/Module_Absence.js index 3a60786..4577d68 100644 --- a/src/components/Module_Absence.js +++ b/src/components/Module_Absence.js @@ -268,7 +268,7 @@ const Module_Absence = (props) => { axios.post(myurl, form).then(res => { //console.log(" In Get_Connected_User_List_Agenda_Events res.data.status = " + res.data.status); - //console.log(" In Get_Connected_User_List_Agenda_Events res.data.message r_class = " + res.data.message); + console.log(" In Get_Connected_User_List_Agenda_Events res.data.message r_class = " + res.data.message); setLoading(false); if (String(res.data.status) === String("true")) { @@ -575,8 +575,8 @@ const Module_Absence = (props) => { //console.log(eventInfo); return ( <> - {eventInfo.timeText}
- {eventInfo.event.extendedProps.code_session && {eventInfo.event.extendedProps.code_session}} + {eventInfo.timeText}
+ {eventInfo.event.extendedProps.code_session && {eventInfo.event.extendedProps.code_session}} ) }; @@ -869,12 +869,62 @@ const Module_Absence = (props) => { Get_Connected_User_List_Agenda_Events(); Get_Partner_Debut_Fin_Journee(); Getall_Partner_Session_Reduice_Fields(); + Get_ENT_Apprenant_Total_Heure(); //Getall_Training_Employee_No_Filter(); //Getall_Training_Materiel_No_Filter(); }, [attendee_email]) + const [Get_ENT_Apprenant_Total_Heure_api, setGet_ENT_Apprenant_Total_Heure_api] = useState(); + const [Get_ENT_Apprenant_Total_Heure_message, setGet_ENT_Apprenant_Total_Heure_message] = useState(); + const [Get_ENT_Apprenant_Total_Heure_result, setGet_ENT_Apprenant_Total_Heure_result] = useState(); + function Get_ENT_Apprenant_Total_Heure(event) { + + var form = new FormData(); + const stored_cookie = getCookie('tokenmysypart'); + + form.append("token", stored_cookie); + form.append("related_collection", props.related_collection); + form.append("related_collection_email", attendee_email); + + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_Agenda_Event_List_Stagiaire_Total_Nb_Heure/"; + + setLoading(true); + + axios.post(myurl, form).then(res => { + //console.log(" In Get_ENT_Apprenant_Total_Heure res.data.status = " + res.data.status); + console.log(" In Get_ENT_Apprenant_Total_Heure res.data.message r_class = " + res.data.message); + + setLoading(false); + if (String(res.data.status) === String("true")) { + setGet_ENT_Apprenant_Total_Heure_api("true"); + setGet_ENT_Apprenant_Total_Heure_result(res.data.message); + + + } + else if (String(res.data.status) === String("Err_Connexion")) { + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + else { + setGet_ENT_Apprenant_Total_Heure_api("false"); + setGet_ENT_Apprenant_Total_Heure_message(res.data.message); + } + + }).catch((error) => { + + setLoading(false); + console.warn('Not good man :( Get_ENT_Apprenant_Total_Heure = ', error); + setGet_ENT_Apprenant_Total_Heure_api("false"); + //setmyApimyApiMessage("") + }) + } + + + const [p_detail_data_changed, setp_detail_data_changed] = useState(""); const [p_detail_event_id, setp_detail_event_id] = useState(); @@ -1376,7 +1426,7 @@ const Module_Absence = (props) => {

{p_detail_event_id && String(p_detail_event_id) !== "" && p_detail_data_changed === "1" &&
-
/!\ Pensez à enregistrer les modifications
+
/!\ Pensez à enregistrer les modifications
} {String(props.write_access) === "1" &&
@@ -1422,7 +1472,8 @@ const Module_Absence = (props) => { -

Absences

+

Absences - {Get_ENT_Apprenant_Total_Heure_result && + {JSON.parse(Get_ENT_Apprenant_Total_Heure_result).total_heure} heure(s) }

Affichage : @@ -1430,6 +1481,7 @@ const Module_Absence = (props) => {
+ {String(display_view) === "planning" &&
  @@ -1469,7 +1521,6 @@ const Module_Absence = (props) => { {String(display_view) === "list" &&
  -
diff --git a/src/components/Module_ENT_Absence.js b/src/components/Module_ENT_Absence.js index d55898b..a115732 100644 --- a/src/components/Module_ENT_Absence.js +++ b/src/components/Module_ENT_Absence.js @@ -1425,7 +1425,7 @@ const Module_ENT_Absence = (props) => { } - +

Absences - {Get_ENT_Apprenant_Total_Heure_Absence_result && {JSON.parse(Get_ENT_Apprenant_Total_Heure_Absence_result).total_heure_absence} heure(s) } diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index 8806a72..af30684 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -1612,7 +1612,7 @@ const Module_Session_Planification = (props) => { var local_obligatoire = JSON.parse(x).obligatoire; - + // 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") { @@ -4326,6 +4326,8 @@ const Module_Session_Planification = (props) => { } + + {String(selected_sequence_id).length > 3 && } @@ -6206,11 +6208,11 @@ const Module_Session_Planification = (props) => { {Getall_List_Sequence_Ressource_result && Getall_List_Sequence_Ressource_result.length > 0 &&
-
+
  { +
} @@ -6622,7 +6625,13 @@ const Module_Session_Planification = (props) => {
-
Agenda +
+ + Agenda & Détail organisation   + +
+ + { {display_view && String(display_view) === "planning" && Getall_Sequence_Of_Session_result_planning_view &&
- +  
@@ -7280,7 +7289,7 @@ const Module_Session_Planification = (props) => { {display_view && String(display_view) === "planning" &&
  - +
{
} -
diff --git a/src/components/Mon_Tableau_De_Bord.js b/src/components/Mon_Tableau_De_Bord.js index 0c541a7..54bc86e 100644 --- a/src/components/Mon_Tableau_De_Bord.js +++ b/src/components/Mon_Tableau_De_Bord.js @@ -82,8 +82,9 @@ const Mon_Tableau_De_Bord = (props) => { { field: 'fonction', headerName: 'Fonction', hide: true, minWidth: 200, flex: 1, maxWidth: 150, renderCell: (params) => }, { field: 'agenda_event_title', headerName: 'Titre Event', hide: false, minWidth: 250, flex: 1, renderCell: (params) => }, + { field: 'agenda_event_type', headerName: 'Type Event', hide: false, minWidth: 150, flex: 1, maxWidth: 100, renderCell: (params) => }, + { field: 'agenda_event_code_session', headerName: 'Code session', hide: false, minWidth: 250, flex: 1, renderCell: (params) => }, - { field: 'agenda_event_type', headerName: 'Type Event', hide: false, minWidth: 150, flex: 1, maxWidth: 100, renderCell: (params) => }, { field: 'event_duration_hour', headerName: 'Durée (h)', hide: false, minWidth: 100, flex: 1, maxWidth: 100, renderCell: (params) => }, { field: 'agenda_date_jour', headerName: 'Date', hide: false, minWidth: 150, flex: 1, maxWidth: 150, renderCell: (params) => }, { field: 'agenda_event_start', headerName: 'Début', hide: false, minWidth: 150, flex: 1, maxWidth: 200, renderCell: (params) => }, diff --git a/src/components/New_C_Article_Help_2025.js b/src/components/New_C_Article_Help_2025.js index 28a3db9..5eb148c 100644 --- a/src/components/New_C_Article_Help_2025.js +++ b/src/components/New_C_Article_Help_2025.js @@ -356,48 +356,28 @@ function New_C_Article_Help_2025() { ← Retour au support - Guide support + -

La signature électronique et les organismes de formation

+

{DetailArticleAvis.title_formation}

- Publié le 18 nov. 2024 + Publié {(String(DetailArticleAvis.date_avis)).substring(0, 16)} • Lecture 6 min • Administratif
-

- La signature électronique permet de sécuriser les validations, - fluidifier les échanges documentaires et accélérer la gestion - administrative des organismes de formation, tout en renforçant la - conformité et la traçabilité. -

+
-
- Définition -

Pourquoi la signature électronique est devenue incontournable

- -

- La signature électronique est une méthode de validation - numérique qui garantit l’identité de la personne qui signe un - document ou un contrat en ligne. Elle a la même valeur légale - qu’une signature manuscrite, dès lors que son cadre - d’utilisation respecte les exigences applicables. -

- -

- Pour les organismes de formation, elle apporte un gain concret - de fluidité : moins d’allers-retours, moins de délais, moins - de documents dispersés, et une meilleure lisibilité des étapes - de validation. -

+
+ + {DetailArticleAvis && DetailArticleAvis.avis &&<> {parse(DetailArticleAvis.avis)} }
À retenir : la signature électronique ne sert @@ -409,19 +389,12 @@ function New_C_Article_Help_2025() {
-
- Vidéo -

Présentation rapide

-

- Ajoute ici une vidéo tutorielle, une démo produit ou une - explication métier. -

-
+
{false ? (