diff --git a/public/sample/template_import_session_formation.csv b/public/sample/template_import_session_formation.csv index d1fd302..f2b57b0 100644 --- a/public/sample/template_import_session_formation.csv +++ b/public/sample/template_import_session_formation.csv @@ -1,3 +1,3 @@ -formation_code_externe;code_session;date_debut;date_fin;nb_participant;adresse;code_postal;ville;pays;date_debut_inscription;date_fin_inscription;distanciel;presentiel;prix_session;session_status;lms_class_code;session_etape;formateur_email;titre;location_type;is_bpf -MYSY_Demo_AP_v2;SESS_01_DEMO_AP_V2;05/07/2024;15/07/2024;10;2 passage de la Providence 01;75001;Paris 1;France;03/01/2024;05/07/2024;1;0;1550;1;;0;;Session Fev;intra;1 -MYSY_Demo_AP_v2;SESS_02_DEMO_AP_V2;20/08/2024;30/08/2024;15;3 passage de la Providence 03;75001;Paris 2;France;04/01/2024;20/08/2024;0;1;1550;1;;0;;Session Avril;extra;1 +formation_code_externe;code_session;date_debut;date_fin;nb_participant;adresse;code_postal;ville;pays;date_debut_inscription;date_fin_inscription;distanciel;presentiel;prix_session;session_status;lms_class_code;session_etape;formateur_email;titre;location_type;is_bpf;type_session +MYSY_Demo_AP_v2;SESS_01_DEMO_AP_V2;05/07/2024;15/07/2024;10;2 passage de la Providence 01;75001;Paris 1;France;03/01/2024;05/07/2024;1;0;1550;1;;0;;Session Fev;intra;1;0 +MYSY_Demo_AP_v2;SESS_02_DEMO_AP_V2;20/08/2024;30/08/2024;15;3 passage de la Providence 03;75001;Paris 2;France;04/01/2024;20/08/2024;0;1;1550;1;;0;;Session Avril;extra;1;0 diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index ee7c04f..078e07d 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -51,7 +51,7 @@ import AutoAwesomeOutlinedIcon from '@mui/icons-material/AutoAwesomeOutlined'; import AutoFixHighOutlinedIcon from '@mui/icons-material/AutoFixHighOutlined'; import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; import MySyIA from "./Module_IA"; - +import { FcInfo } from "react-icons/fc"; import { makeStyles } from "@material-ui/core/styles"; import Paper from '@material-ui/core/Paper'; import Draggable from 'react-draggable'; @@ -182,8 +182,8 @@ const AddClassManual = (props) => { { field: '_id', headerName: '_id', hide: true }, { field: 'code', headerName: 'Code', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'titre', headerName: 'Titre', minWidth: 150, flex: 1, renderCell: (params) => , }, - { field: 'credit', headerName: 'Credit', minWidth: 150, flex: 1, renderCell: (params) => , }, - { field: 'coefficient', headerName: 'Coef.', minWidth: 150, flex: 1, renderCell: (params) => , }, + { field: 'credit', headerName: 'Credit', minWidth: 100, flex: 1, renderCell: (params) => , }, + { field: 'coefficient', headerName: 'Coef.', minWidth: 100, flex: 1, renderCell: (params) => , }, { field: 'pres_dist_hyp', headerName: 'Animation', minWidth: 150, flex: 1, renderCell: (cellValues) => { @@ -407,6 +407,7 @@ const AddClassManual = (props) => { ); } }, + { field: 'ponderation_type_eval', headerName: 'Poids. Type Eval.', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'max_note', headerName: 'max_note', minWidth: 150, flex: 1, renderCell: (params) => , }, @@ -506,7 +507,8 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_eu_evalution_id(""); setsetgridline_evaluation_ue_id(""); - setp_detail_max_node(""); + setp_detail_max_note(""); + setp_detail_ponderation_type_eval(""); setclass_unite_enseignement_type_evaluation_id(""); } @@ -1199,6 +1201,7 @@ const AddClassManual = (props) => { var local_class_ue_id = JSON.parse(x).class_ue_id; var local_type_evaluation_id = JSON.parse(x).type_evaluation_id; var local_max_note = JSON.parse(x).max_note; + var local_ponderation_type_eval = JSON.parse(x).ponderation_type_eval; //--- @@ -1210,7 +1213,7 @@ const AddClassManual = (props) => { "class_ue_id": local_class_ue_id, "type_evaluation_id": local_type_evaluation_id, "max_note": local_max_note, - + "ponderation_type_eval": local_ponderation_type_eval, }; new_data2.push(node); @@ -1225,6 +1228,7 @@ const AddClassManual = (props) => { "class_ue_id": "", "type_evaluation_id": "", "max_note": "", + "ponderation_type_eval": "" }; new_data2.push(node); @@ -1247,7 +1251,7 @@ const AddClassManual = (props) => { setLoading(false); console.warn('Not good man :( Getall_Class_List_Evalution = ', error); setGetall_Class_List_Evalution_api("false"); - alert(" Impossible de recuperer la liste des évaluations de la formatio"); + alert(" Impossible de recuperer la liste des évaluations de la formation"); //setmyApimyApiMessage("") }) } @@ -4283,8 +4287,8 @@ const AddClassManual = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - - form.append("max_note", p_detail_max_node); + form.append("max_note", p_detail_max_note); + form.append("ponderation_type_eval", p_detail_ponderation_type_eval); var myurl = ""; @@ -4316,7 +4320,8 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_eu_evalution_id(""); setsetgridline_evaluation_ue_id(""); - setp_detail_max_node(""); + setp_detail_max_note(""); + setp_detail_ponderation_type_eval(""); setclass_unite_enseignement_type_evaluation_id(""); Getall_Class_List_Evalution(); @@ -4397,7 +4402,9 @@ const AddClassManual = (props) => { const [class_unite_enseignement_type_evaluation_id, setclass_unite_enseignement_type_evaluation_id] = React.useState(""); - const [p_detail_max_node, setp_detail_max_node] = React.useState(""); + const [p_detail_max_note, setp_detail_max_note] = React.useState(""); + + const [p_detail_ponderation_type_eval, setp_detail_ponderation_type_eval] = React.useState(""); const [add_ue_evalution, setadd_ue_evalution] = React.useState(""); @@ -5406,6 +5413,23 @@ const AddClassManual = (props) => { /> } +
Ponderation Type Eval + { + setp_detail_ponderation_type_eval(e.target.value); + } + } + /> +
+ +
Max Note { id="event_dialog_credit" type="number" fullWidth - value={p_detail_max_node} + value={p_detail_max_note} onChange={(e) => { - setp_detail_max_node(e.target.value); + setp_detail_max_note(e.target.value); } } @@ -5756,8 +5780,7 @@ const AddClassManual = (props) => { class_ue_id: JSON.parse(item).class_ue_id, type_evaluation_id: JSON.parse(item).type_evaluation_id, max_note: JSON.parse(item).max_note, - - + ponderation_type_eval: JSON.parse(item).ponderation_type_eval, } ))} @@ -5771,7 +5794,8 @@ const AddClassManual = (props) => { setsetgridline_evaluation_ue_id(newSelectionModel.row.id); setselected_eu_evalution_id(newSelectionModel.row.type_evaluation_id) setselected_ue_id(newSelectionModel.row.class_ue_id); - setp_detail_max_node(newSelectionModel.row.max_note); + setp_detail_max_note(newSelectionModel.row.max_note); + setp_detail_ponderation_type_eval(newSelectionModel.row.ponderation_type_eval); setclass_unite_enseignement_type_evaluation_id(newSelectionModel.row._id); Getall_Partner_Type_Evalution_List(); @@ -5840,12 +5864,18 @@ const AddClassManual = (props) => {
-

Regle de calcul note finale

+
- }
@@ -6094,7 +6123,7 @@ const AddClassManual = (props) => { } - + } @@ -6801,23 +6830,23 @@ const AddClassManual = (props) => { rows_champs_specifics.map((champ_spec) => (
- {String(JSON.parse(champ_spec).field_type) === "float" && - { - change_champs_spec_handle(e.target.value); - //setEmployee_data_changed("1"); - }} - />} + {String(JSON.parse(champ_spec).field_type) === "float" && + { + change_champs_spec_handle(e.target.value); + //setEmployee_data_changed("1"); + }} + />} {String(JSON.parse(champ_spec).field_type) === "string" && { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); + form.append("type_session", "1"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; @@ -2372,6 +2373,7 @@ const DisplayPartnerPromotion = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("type_session", "1"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; @@ -2384,7 +2386,7 @@ const DisplayPartnerPromotion = (props) => { setGetall_TrainingSession_result(res.data.message); setRows(res.data.message); - + var new_data2 = []; var timeline_item = []; @@ -2664,6 +2666,7 @@ const DisplayPartnerPromotion = (props) => { form.append(filtre1, filtre1_value); form.append("archive", "0"); + form.append("type_session", "1"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List_filter_like/"; @@ -6418,7 +6421,7 @@ const DisplayPartnerPromotion = (props) => { if (new_code_session.trim() == "") { // alert(" Le Code Promoest obligatoire"); setdisplay_alert_mysy("1"); - setalert_message("Le Code Promoest obligatoire"); + setalert_message("Le Code Promo est obligatoire"); setalert_type("error"); return; } @@ -6571,23 +6574,9 @@ const DisplayPartnerPromotion = (props) => { form.append("session_status", p_session_status); form.append("session_etape", p_session_etape); + form.append("type_session", "1"); - /* - var contenu_ftion = ""; - if (editorRef_contenu_ftion.current) { - contenu_ftion = editorRef_contenu_ftion.current.getContent(); - - if (parse(contenu_ftion.replace(/(<([^>]+)>)/ig, '')).length > editorRef_contenu_ftion_limite) { - setdisplay_alert_mysy("1"); - setalert_message("Champ 'Contenu de la formation', limite depassée !"); - setalert_type("error"); - // alert(" Champ 'Contenu de la formation', limite depassée !") - return; - } - } - form.append("contenu_ftion", contenu_ftion); - */ /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -6653,13 +6642,6 @@ const DisplayPartnerPromotion = (props) => { setalert_type("success"); - window.scrollTo({ - top: 0, - behavior: "smooth", - }); - - - } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); history.push("/Connexion"); @@ -6853,22 +6835,9 @@ const DisplayPartnerPromotion = (props) => { form.append("attestation_certif", ""); + form.append("type_session", "1"); - /* - var contenu_ftion = ""; - if (one_editorRef_contenu_ftion.current) { - contenu_ftion = one_editorRef_contenu_ftion.current.getContent(); - if (parse(contenu_ftion.replace(/(<([^>]+)>)/ig, '')).length > one_editorRef_contenu_ftion_limite) { - // alert(" Champ 'Contenu de la formation', limite depassée !") - setdisplay_alert_mysy("1"); - setalert_message("Champ 'Contenu de la formation', limite depassée !"); - setalert_type("error"); - return; - } - } - form.append("contenu_ftion", contenu_ftion); -*/ /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -6940,7 +6909,7 @@ const DisplayPartnerPromotion = (props) => { setalert_type("success"); - if (document.getElementById('myRef_head')) { + if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; window.scrollTo({ @@ -18080,7 +18049,7 @@ const DisplayPartnerPromotion = (props) => {
- Code session + Code Promo
{rowss && String(session_selected_row_id).length > 0 &&
{JSON.parse(rowss[session_selected_row_id]).code_session} @@ -18733,13 +18702,13 @@ const DisplayPartnerPromotion = (props) => {
- En confirmation cette action, toute la session de formation sera facturée. + En confirmation cette action, toute la promotion de formation sera facturée. Verifier les informations
    -
  • Prix de session
  • +
  • Prix
  • Données client
  • etc
@@ -20999,8 +20968,8 @@ const DisplayPartnerPromotion = (props) => { {selected_code_session && String(selected_code_session).length > 0 &&
+ {String(info_affiche_date_debut)} au {String(info_affiche_date_fin)} +     Pl. disponible(s) : {String(info_affiche_place_disponible)}
}
@@ -21577,7 +21546,7 @@ const DisplayPartnerPromotion = (props) => { } } } - readOnly={!edit_session_form} + readOnly={!edit_session_form} showTimeSelect={false} filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" @@ -21602,7 +21571,7 @@ const DisplayPartnerPromotion = (props) => { } } } - readOnly={!edit_session_form} + readOnly={!edit_session_form} showTimeSelect={false} filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" @@ -21689,7 +21658,7 @@ const DisplayPartnerPromotion = (props) => { -
Prix session
+
Prix Inscription
{ {String(addOneParticipant) === "1" &&
-
Ajout d'un nouveau participant à la session {selected_code_session} de la formation {selected_class_title}
+
Ajout d'un nouveau participant à {selected_code_session} de la formation {selected_class_title}
Civilité
@@ -23744,9 +23713,9 @@ const DisplayPartnerPromotion = (props) => {
} {String(addOneParticipant) === "1" &&
-
Ajout d'un nouveau participant à la session {selected_code_session} de la formation {selected_class_title}
+
Ajout d'un nouveau participant à {selected_code_session} de la formation {selected_class_title}
Civilité
@@ -24604,12 +24573,12 @@ const DisplayPartnerPromotion = (props) => { {String(actionmass_insc_val) === "confirmation" && } {String(actionmass_insc_val) === "annule inscription" && } {String(actionmass_insc_val) === "facturer" && @@ -24668,9 +24637,9 @@ const DisplayPartnerPromotion = (props) => { onClick={(event) => { if (String(selected_session_invoiced_statut) === "1") { - alert(" La session est en cours de facturation ") + alert(" La promo est en cours de facturation ") } else if (String(selected_session_invoiced_statut) === "2") { - alert(" La session est déjà facturée ") + alert(" La promo est déjà facturée ") } else { submenu_import_participant() diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 48e9b9d..581cb1a 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -174,7 +174,7 @@ const DisplayPartnerSession = (props) => { const [one_field_contenu_ftion, setone_field_contenu_ftion] = useState(""); const filters = [ - { value: 'code_session', label: 'Code Promotion' }, + { value: 'code_session', label: 'Code Session' }, { value: 'class_title', label: 'Titre Formation' }, { value: 'certif', label: 'Certification' } ] @@ -318,7 +318,7 @@ const DisplayPartnerSession = (props) => { }, - { field: 'code_session', headerName: 'Code Promo', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, + { field: 'code_session', headerName: 'Code Session', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'session_title', headerName: 'Titre', hide: false, flex: 1, minWidth: 250, renderCell: (params) => , }, { @@ -2191,6 +2191,7 @@ const DisplayPartnerSession = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); + form.append("type_session", "0"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; @@ -2372,6 +2373,8 @@ const DisplayPartnerSession = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("type_session", "0"); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; @@ -2664,6 +2667,7 @@ const DisplayPartnerSession = (props) => { form.append(filtre1, filtre1_value); form.append("archive", "0"); + form.append("type_session", "0"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List_filter_like/"; @@ -6418,7 +6422,7 @@ const DisplayPartnerSession = (props) => { if (new_code_session.trim() == "") { // alert(" Le Code Promoest obligatoire"); setdisplay_alert_mysy("1"); - setalert_message("Le Code Promoest obligatoire"); + setalert_message("Le Code Session est obligatoire"); setalert_type("error"); return; } @@ -6572,6 +6576,8 @@ const DisplayPartnerSession = (props) => { form.append("session_status", p_session_status); form.append("session_etape", p_session_etape); + form.append("type_session", "0"); + /* var contenu_ftion = ""; @@ -6653,12 +6659,6 @@ const DisplayPartnerSession = (props) => { setalert_type("success"); - window.scrollTo({ - top: 0, - behavior: "smooth", - }); - - } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); @@ -6853,22 +6853,9 @@ const DisplayPartnerSession = (props) => { form.append("attestation_certif", ""); + form.append("type_session", "0"); - /* - var contenu_ftion = ""; - if (one_editorRef_contenu_ftion.current) { - contenu_ftion = one_editorRef_contenu_ftion.current.getContent(); - - if (parse(contenu_ftion.replace(/(<([^>]+)>)/ig, '')).length > one_editorRef_contenu_ftion_limite) { - // alert(" Champ 'Contenu de la formation', limite depassée !") - setdisplay_alert_mysy("1"); - setalert_message("Champ 'Contenu de la formation', limite depassée !"); - setalert_type("error"); - return; - } - } - form.append("contenu_ftion", contenu_ftion); -*/ + /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -12716,13 +12703,13 @@ const DisplayPartnerSession = (props) => { ] const New_Price_by = [ - { "id": "persession", "label": "Par Promotion", "value": "persession" }, + { "id": "persession", "label": "Par Session", "value": "persession" }, { "id": "perstagiaire", "label": "Par Stagiaire", "value": "perstagiaire" }, { "id": "", "label": "", "value": "" }, ] const New_Option_Filter = [ - { "id": "code_session", "label": "Code Promotion", "value": "code_session" }, + { "id": "code_session", "label": "Code Session", "value": "code_session" }, { "id": "class_external_code", "label": "Ref. Interne", "value": "class_external_code" }, { "id": "class_title", "label": "Titre Formation", "value": "class_title" }, { "id": "session_start_date", "label": "Date début session", "value": "session_start_date" }, @@ -15227,7 +15214,7 @@ const DisplayPartnerSession = (props) => { />
} -
Date Promotion
+
Date Session
{ {/* FIN Dialog pour gerer les FACTURATION_FORMATION */} -

Les promotions

+

Les sessions de formation

Utilisez les filtres !
@@ -19785,7 +19772,7 @@ const DisplayPartnerSession = (props) => { {({ getRootProps }) => { - return
Date/
Code Promo
+ return
Date/
Code Session
}}
{ {({ getRootProps }) => { - return
Date/
Code Promo
+ return
Date/
Code Session
}}
{ @@ -20947,7 +20934,7 @@ const DisplayPartnerSession = (props) => { }} className="detail_class_submenu bton_add_session" - id='menu_import_participant' name='menu_import_participant'>Ajout 1 Promo   + id='menu_import_participant' name='menu_import_participant'>Ajout 1 Session   @@ -20998,9 +20985,9 @@ const DisplayPartnerSession = (props) => {
} {selected_code_session && String(selected_code_session).length > 0 &&
- +
}
@@ -21061,7 +21048,7 @@ const DisplayPartnerSession = (props) => {
-
Code Promo
+
Code Session
{ />
-
Titre Promo
+
Titre
{
-
Code Promotion
+
Code Session
{ />
-
Titre Promo
+
Titre
{
- {String(participant_data_edit_mode) !== "1" &&
Promotion
+ {String(participant_data_edit_mode) !== "1" &&
Session
{
} - {String(participant_data_edit_mode) === "1" &&
Promotion
+ {String(participant_data_edit_mode) === "1" &&
Session
{ if (local_ue.niveau_competence) { setp_detail_tab_competence(local_ue.niveau_competence); var tab_tmp = String(local_ue.niveau_competence).split(","); - // setVal(tab_tmp); + // setVal(tab_tmp); } else { setp_detail_tab_competence([]); - // setVal([]); + // setVal([]); } if (local_ue.list_competence_code) { @@ -790,7 +790,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { } - if (local_ue.tab_competence_JSON) { + if (local_ue.tab_competence_JSON) { setVal(local_ue.tab_competence_JSON); } else { @@ -1003,7 +1003,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { form.append("niveau_competence", tab_competence_id); - // console.log(" ### val = ", val); + // console.log(" ### val = ", val); //console.log(" ### tab_competence_id = ", tab_competence_id); @@ -1166,6 +1166,8 @@ const DisplayPartnerUnite_Enseignement = (props) => { setdisplay_ue("0"); setue_data_edit_mode(""); setadd_one_ue("1"); + setVal([]); + if (document.getElementById('myRef')) { var divh = document.getElementById('myRef').offsetTop; @@ -1295,6 +1297,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { setdisplay_ue("0"); setue_data_edit_mode(""); setadd_one_ue(""); + setVal([]); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } const New_Option_Filter = [ @@ -2617,7 +2624,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { onRowDoubleClick={(newSelectionModel) => { // handleClick_edit_config_From_Line(newSelectionModel.row.id); - + setVal([]); setselected_id(newSelectionModel.row._id); handleClick_edit_ue_From_Line(newSelectionModel.row.id); setsession_file_name(""); @@ -2878,7 +2885,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { /> -
} +
} {ue_data_edit_mode && String(ue_data_edit_mode) === "1" &&
Compétences
@@ -2889,7 +2896,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { ...fixedVal, ...newValue.filter((i) => fixedVal.indexOf(i) === -1), ]); - + }} value={val} options={New_Getall_Partner_Competence_List_result} @@ -2902,7 +2909,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { /> )} - + />
@@ -2931,7 +2938,14 @@ const DisplayPartnerUnite_Enseignement = (props) => {
} {ue_data_edit_mode && String(ue_data_edit_mode) === "1" && New_Get_List_Regle_Calcul_Note_UE_result && New_Get_List_Regle_Calcul_Note_UE_result.length > 0 && -
Règle de calcul note
+
Règle de calcul note   + + (data)._id === String(p_detail_note_ue_calculation_rule_id))[0].calcul_rule}> + + + + +
{ {ue_data_edit_mode && String(ue_data_edit_mode) !== "1" && New_Get_List_Regle_Calcul_Note_UE_result && New_Get_List_Regle_Calcul_Note_UE_result.length > 0 && -
Règle de calcul note
+ + + +
Règle de calcul note   + + (data)._id === String(p_detail_note_ue_calculation_rule_id))[0].calcul_rule}> + + +
{ InputLabelProps={{ shrink: true, }} - //disabled={true} - + disabled={true} value={New_Get_List_Regle_Calcul_Note_UE_result.filter((data) => (data)._id === String(p_detail_note_ue_calculation_rule_id))[0].label} @@ -4053,7 +4074,7 @@ const DisplayPartnerUnite_Enseignement = (props) => {
} -
Compétence
+
Compétence
{ @@ -4098,7 +4119,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } />} diff --git a/src/components/Employes.js b/src/components/Employes.js index 86969ba..fe53dd4 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -9288,8 +9288,6 @@ const Employes = (props) => { {String(employee_data_edit_mode) === "1" && New_Get_List_RH_Profils_result && New_Get_List_RH_Profils_result.length > 0 &&
Profil
- - { var line_json = line; - console.log(" line_json = ", line_json); + // console.log(" line_json = ", line_json); //console.log(" line_json['_id'] = ", line_json['_id']); tab_mongo_preins_ids.push(line_json._id) diff --git a/src/components/New_C_Formation_2025.js b/src/components/New_C_Formation_2025.js index 9658d45..f9857b9 100644 --- a/src/components/New_C_Formation_2025.js +++ b/src/components/New_C_Formation_2025.js @@ -23,7 +23,7 @@ import axios from "axios"; import Rating from '@mui/material/Rating'; import parse from 'html-react-parser' import { CiLocationOn } from "react-icons/ci"; - + const New_C_Formation_2025 = (props) => { const [userconnected, setuserconnected] = useState("0"); const [partnerconnected, setpartnerconnected] = useState("0"); @@ -420,7 +420,7 @@ const New_C_Formation_2025 = (props) => { {/*props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
*/}
} - +
@@ -472,473 +472,7 @@ const New_C_Formation_2025 = (props) => {
- {/* -
- - {class_img_stored_in_bdd && String(class_img_stored_in_bdd).length > 50 &&
- informatique -
- } - - - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) !== "0" && String(ismetiermanaged) !== "1" && -
- {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("it") && - String(isclassimage) === "False" && informatique} - - {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("graphisme") && - String(isclassimage) === "False" && graphisme} - - {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("management") && - String(isclassimage) === "False" && management} - - {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("digital") && - String(isclassimage) === "False" && digital} - - {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("office") && - String(isclassimage) === "False" && office} - - {!props.formation.img_url || String(props.formation.img_url).length <= 0 && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("rh") && - String(isclassimage) === "False" && ressources humaines} - - {!props.formation.img_url || String(props.formation.img_url).length <= 0 && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("vente") && - String(isclassimage) === "False" && vente} - - {!props.formation.img_url || String(props.formation.img_url).length <= 0 && - props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("dev_perso") && - String(isclassimage) === "False" && developpement personnel} - - {String(isclassimage) === "True" && developpement personnel} - - -
- } - - - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length > 100 &&
- autre - {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
} -
} - - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length <= 100 &&
- autre - {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
} -
} - - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "1" &&
- autre - {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
} -
} - - -
{ - e.preventDefault(); - if (props.formation.url && props.formation.url.length > 5) { - - window.open( - props.formation.url, - '_blank' - ); - } else { - window.open( - "/Display-Detail-formation/" + props.formation.internal_url, - '_blank' - ); - } - }}> -
-
- -
- {props.formation.note && String(props.formation.note).length === 1 && - parseInt(String(props.formation.note)) <= 5 && - - - - } - -
-
-
-
- - - {props.formation.cpf && String(props.formation.cpf) === String("1") && -
- OUI Éligible au CPF   -
} - - {props.formation.cpf && String(props.formation.cpf) !== String("1") && -
- NON Éligible au CPF   -
} - - {!props.formation.cpf && -
- NON Éligible au CPF   -
} - -
-
-
-
- -
-

- - {String(parse(String(props.formation.title).replace(/(<([^>]+)>)/ig, ''))).substring(0, 100)} - - -

-
-
- - {String(props.formation.price).length == 9 && -
Prix : Non communiqué   -
- } - - - {String(props.formation.price).length != 9 && String(props.formation.price) === String("0") && -
Gratuit   -
- } - - {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && (!props.formation.business_prices || - Object.keys(props.formation.business_prices).length <= 0) && -
{props.formation.price} € HT  - -
- } - - {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && - props.formation.business_prices && Object.keys(props.formation.business_prices).length > 0 && -
- - - - -
- } - -
- -
- {parse(String(props.formation.description).replace(/(<([^>]+)>)/ig, ''))} - -
- {GetCurrentClass_trainingsession_cities_result && GetCurrentClass_trainingsession_cities_result.length > 0 && - - } - {!GetCurrentClass_result || GetCurrentClass_result.length <= 0 && - - } - -
-
-
- -
- -
-
- {!props.formation.extented_search && -
- - - {props.formation.duration_unit && -
-
Durée -
- - {String(props.formation.duration_unit) === "heure" && -
- {props.formation.duration} hr(s)   -
} - - {String(props.formation.duration_unit) === "heures" && -
- {props.formation.duration} hr(s)   -
} - - - {String(props.formation.duration_unit) === "jour" && -
- {props.formation.duration} jr(s)   -
} - - {String(props.formation.duration_unit) === "mois" && -
- {props.formation.duration} mois(s) -
} - - {String(props.formation.duration_unit) === "semaine" && -
- {props.formation.duration} Sem (s) -
} - - {String(props.formation.duration_unit) === "user_rythme" && -
- A votre rythme -
} - -
- } - - - {!props.formation.duration_unit && -
-
Durée -
- - {props.formation.duration &&
- {props.formation.duration} jr(s)   -
} - - {!props.formation.duration &&
- En traitement   -
} - - -
- - } -
-
- Certification -
- -
- {props.formation.certif && String(props.formation.certif) === String("1") && -
- Oui   -
} - - {props.formation.certif && String(props.formation.certif) !== String("1") && -
- Non   -
} - - {!props.formation.certif && -
- NC   -
} - - -
-
- -
- - - -   - - - - - -   - - - - -
- - - - -
} - - -
- {String(props.formation.coeur) === String("1") &&
- coup de coeur -
} - - - - - -
-
- Sur site -
- {props.formation.presentiel && props.formation.presentiel.presentiel && - String(props.formation.presentiel.presentiel) === String("1") &&
- Oui -
} - - {props.formation.presentiel && props.formation.presentiel.presentiel && - String(props.formation.presentiel.presentiel) !== String("1") &&
- Non -
} - - {!props.formation.presentiel || !props.formation.presentiel.presentiel && -
- NC -
} -
- -
-
- A distance -
- {props.formation.presentiel && props.formation.presentiel.distantiel && - String(props.formation.presentiel.distantiel) === String("1") &&
- Oui -
} - - {props.formation.presentiel && props.formation.presentiel.distantiel && - String(props.formation.presentiel.distantiel) !== String("1") &&
- Non -
} - - {!props.formation.presentiel || !props.formation.presentiel.distantiel && -
- NC -
} -
- -
-
- Support -
- {props.formation.support && -
- {props.formation.support} -
} - - {!props.formation.support && -
- NC -
} -
- - - -
- -
-
-
- {!props.formation.extented_search && props.formation.coeur != "1" && -
- - - - - - - {GetCurrentClass_result && GetCurrentClass_result.length > 0 && - - } - -
} - -
-
-
- */} +
) diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js index 018cd1e..1bf3bc6 100644 --- a/src/components/Notes_Evaluation.js +++ b/src/components/Notes_Evaluation.js @@ -2353,8 +2353,8 @@ const Notes_Evaluation = (props) => { setLoading(true); axios.post(myurl, form).then(res => { - console.log(" In Record_Evaluation_Participants_Notes res.data.status = " + res.data.status); - console.log(" In Record_Evaluation_Participants_Notes res.data.message r_class = " + res.data.message); + // console.log(" In Record_Evaluation_Participants_Notes res.data.status = " + res.data.status); + // console.log(" In Record_Evaluation_Participants_Notes res.data.message r_class = " + res.data.message); setLoading(false); if (String(res.data.status) === String("true")) { @@ -3959,7 +3959,7 @@ const Notes_Evaluation = (props) => { {/*** Fin ajout ressource */} -

Les Evaluations

+

Notes & évaluations

Utilisez les filtres !
@@ -4344,17 +4344,13 @@ const Notes_Evaluation = (props) => { onRowDoubleClick={(newSelectionModel) => { - Getall_Evaluation_Participant_List(newSelectionModel.row._id); - - setselected_id(newSelectionModel.row._id); - - setgridline_id(newSelectionModel.row.id); + Getall_Evaluation_Participant_List(newSelectionModel.row._id); handleClick_edit_evaluation_From_Line(newSelectionModel.row.id); setselectionModel_evalutions_participant([]); settab_convention_pieces_jointes_result([]); - - + setselected_id(newSelectionModel.row._id); + setgridline_id(newSelectionModel.row.id); }} rowsPerPageOptions={[10]} @@ -4427,7 +4423,7 @@ const Notes_Evaluation = (props) => { {selected_id && String(selected_id).length > 5 && p_detail_type_eval_id && New_Getall_Partner_Type_Evalution_List_result.length > 0 &&
} @@ -5234,7 +5230,7 @@ const Notes_Evaluation = (props) => {
-
titre
+
Titre
{
} -
} +
}
diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index 6a2a8b5..e7b1e68 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -1,5 +1,12 @@ .addclassmanual { + .tooltip_css { + background: #81BC3A; + z-index: 9999; + font-family: "DM Sans", "sans-serif"; + font-size: "10px" !important; + } + .block_archive { background-color: #774a10; width: calc(100% - 20px); @@ -15,7 +22,7 @@ font-weight: 600; font-size: 14px; } - + .loader-container { width: 100%; height: 100vh; diff --git a/src/styles/components/_displayPartnerunite_enseignement.scss b/src/styles/components/_displayPartnerunite_enseignement.scss index 8c4aa79..4252195 100644 --- a/src/styles/components/_displayPartnerunite_enseignement.scss +++ b/src/styles/components/_displayPartnerunite_enseignement.scss @@ -5,7 +5,7 @@ z-index: 9999; } - + .css-1bp1ao6 { height: 3.5rem !important; }