diff --git a/src/components/AddPartnerClient_ARG.js b/src/components/AddPartnerClient_ARG.js index 8f10165..7b8edb7 100644 --- a/src/components/AddPartnerClient_ARG.js +++ b/src/components/AddPartnerClient_ARG.js @@ -2820,7 +2820,6 @@ const AddPartnerClient_ARG = (props) => { const New_Option_Facturation_Automatique = [ { "id": "mois", "label": "Mensuelle", "value": "mois" }, { "id": "0", "label": "Facturation Manuelle", "value": "0" }, - { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/Dashbord_Ressources_Humaines.js b/src/components/Dashbord_Ressources_Humaines.js index 9521b9c..42dbd85 100644 --- a/src/components/Dashbord_Ressources_Humaines.js +++ b/src/components/Dashbord_Ressources_Humaines.js @@ -474,8 +474,10 @@ const Dashbord_Ressources_Humaines = (props) => { const New_option_type_planing = [ - { "id": "absence", "label": "Absence", "value": "absence" }, - { "id": "planning", "label": "Planning", "value": "planning" }, + { "id": "absence", "label": "Absence", "value": "absence" }, + { "id": "planning", "label": "Planning/Animation ", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "autre", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js index 8635bc2..c642eea 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js @@ -369,8 +369,10 @@ registerLocale('fr', fr); const New_option_type_planing = [ - { "id": "absence", "label": "Absence", "value": "absence" }, - { "id": "planning", "label": "Planning", "value": "planning" }, + { "id": "absence", "label": "Absence", "value": "absence" }, + { "id": "planning", "label": "Planning/Animation ", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "autre", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js index 1bbc3b5..bf489f1 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js @@ -343,12 +343,14 @@ registerLocale('fr', fr); }); - } + } const New_option_type_planing = [ - { "id": "absence", "label": "Absence", "value": "absence" }, - { "id": "planning", "label": "Planning", "value": "planning" }, + { "id": "absence", "label": "Absence", "value": "absence" }, + { "id": "planning", "label": "Planning/Animation ", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "autre", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 58dafb4..25de4f1 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -13559,6 +13559,9 @@ const DisplayPartnerPromotion = (props) => { const New_Option_Type_Event = [ { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/DisplayPartnerPromotion_ARG.js b/src/components/DisplayPartnerPromotion_ARG.js index 341fbb7..2a60b79 100644 --- a/src/components/DisplayPartnerPromotion_ARG.js +++ b/src/components/DisplayPartnerPromotion_ARG.js @@ -13549,6 +13549,9 @@ const DisplayPartnerPromotion_ARG = (props) => { const New_Option_Type_Event = [ { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 1888aac..3813641 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -13848,6 +13848,9 @@ const DisplayPartnerSession = (props) => { const New_Option_Type_Event = [ { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/DisplayPartnerSession_ARG.js b/src/components/DisplayPartnerSession_ARG.js index 79f4643..2502cb1 100644 --- a/src/components/DisplayPartnerSession_ARG.js +++ b/src/components/DisplayPartnerSession_ARG.js @@ -13794,6 +13794,9 @@ const DisplayPartnerSession_ARG = (props) => { const New_Option_Type_Event = [ { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/Employes.js b/src/components/Employes.js index 3e7f5c6..1c12999 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -4713,7 +4713,7 @@ const Employes = (props) => { }; - + const [p_new_login, setp_new_login] = React.useState(""); const [p_new_pwd, setp_new_pwd] = React.useState(""); const [p_conf_new_login, setp_conf_new_login] = React.useState(""); @@ -5397,6 +5397,15 @@ const Employes = (props) => { setp_employe_contrat_date_fin(date_today_90j.toLocaleDateString('fr-FR')); setselected_contrat_id(""); + setp_employe_contrat_specific_cout_animation(""); + setp_employe_contrat_specific_cout_preparation(""); + setp_employe_contrat_specific_cout_suivi_correction(""); + setp_employe_contrat_specific_cout_autre(""); + setp_employe_contrat_specific_cout_animation_periodicite("heure"); + setp_employe_contrat_specific_cout_preparation_periodicite("heure"); + setp_employe_contrat_specific_cout_suivi_correction_periodicite("heure"); + setp_employe_contrat_specific_cout_autre_periodicite("heure"); + setDialog_employe_contrat_open(false); }; @@ -5548,6 +5557,17 @@ const Employes = (props) => { setp_employe_contrat_periodicite(line.periodicite); + //** */ + setp_employe_contrat_specific_cout_animation(line.cout_animation); + setp_employe_contrat_specific_cout_preparation(line.cout_preparation); + setp_employe_contrat_specific_cout_suivi_correction(line.cout_suivi_correction); + setp_employe_contrat_specific_cout_autre(line.cout_autre); + setp_employe_contrat_specific_cout_animation_periodicite(line.cout_animation_periodicite); + setp_employe_contrat_specific_cout_preparation_periodicite(line.cout_preparation_periodicite); + setp_employe_contrat_specific_cout_suivi_correction_periodicite(line.suivi_correction_periodicite); + setp_employe_contrat_specific_cout_autre_periodicite(line.cout_autre_periodicite); + //** */ + setp_employe_contrat_groupe_prix_achat_id(line.groupe_prix_achat_id); @@ -5651,6 +5671,16 @@ const Employes = (props) => { form.append("class_id", p_employe_contrat_formation); form.append("session_id", p_employe_contrat_session); + form.append("cout_animation", p_employe_contrat_specific_cout_animation); + form.append("cout_animation_periodicite", p_employe_contrat_specific_cout_animation_periodicite); + form.append("cout_preparation", p_employe_contrat_specific_cout_preparation); + form.append("cout_preparation_periodicite", p_employe_contrat_specific_cout_preparation_periodicite); + form.append("cout_suivi_correction", p_employe_contrat_specific_cout_suivi_correction); + form.append("suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); + form.append("cout_autre", p_employe_contrat_specific_cout_autre); + form.append("cout_autre_periodicite", p_employe_contrat_specific_cout_autre_periodicite); + + } else { @@ -5671,6 +5701,15 @@ const Employes = (props) => { form.append("class_id", p_employe_contrat_formation); form.append("session_id", p_employe_contrat_session); + form.append("cout_animation", p_employe_contrat_specific_cout_animation); + form.append("cout_animation_periodicite", p_employe_contrat_specific_cout_animation_periodicite); + form.append("cout_preparation", p_employe_contrat_specific_cout_preparation); + form.append("cout_preparation_periodicite", p_employe_contrat_specific_cout_preparation_periodicite); + form.append("cout_suivi_correction", p_employe_contrat_specific_cout_suivi_correction); + form.append("suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); + form.append("cout_autre", p_employe_contrat_specific_cout_autre); + form.append("cout_autre_periodicite", p_employe_contrat_specific_cout_autre_periodicite); + } @@ -7600,6 +7639,41 @@ const Employes = (props) => { { "id": "", "label": "", "value": "" }, ] + + const New_option_type_planing = [ + { "id": "absence", "label": "Absence", "value": "absence" }, + { "id": "planning", "label": "Planning/Animation ", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, + { "id": "autre", "label": "Autre", "value": "autre" }, + { "id": "", "label": "", "value": "" }, + ] + + const [Dialog_tarif_specific_open, setDialog_tarif_specific_open] = React.useState(false); + + const Dialog_tarif_specific_handleClose_buton = () => { + setDialog_tarif_specific_open(false); + }; + + const [p_employe_contrat_specific_cout_animation, setp_employe_contrat_specific_cout_animation] = useState(""); + const [p_employe_contrat_specific_cout_preparation, setp_employe_contrat_specific_cout_preparation] = useState(""); + const [p_employe_contrat_specific_cout_suivi_correction, setp_employe_contrat_specific_cout_suivi_correction] = useState(""); + const [p_employe_contrat_specific_cout_autre, setp_employe_contrat_specific_cout_autre] = useState(""); + + + const [p_employe_contrat_specific_cout_animation_periodicite, setp_employe_contrat_specific_cout_animation_periodicite] = useState("heure"); + const [p_employe_contrat_specific_cout_preparation_periodicite, setp_employe_contrat_specific_cout_preparation_periodicite] = useState("heure"); + const [p_employe_contrat_specific_cout_suivi_correction_periodicite, setp_employe_contrat_specific_cout_suivi_correction_periodicite] = useState("heure"); + const [p_employe_contrat_specific_cout_autre_periodicite, setp_employe_contrat_specific_cout_autre_periodicite] = useState("heure"); + + + const New_Option_contrat_cout_type = [ + { "id": "heure", "label": "Par heure", "value": "heure" }, + { "id": "fixe", "label": "Fixe", "value": "fixe" }, + { "id": "", "label": "", "value": "" }, + ] + return (
@@ -7620,6 +7694,282 @@ const Employes = (props) => { + {/* Dialog pour gerer les tarifs spécifics */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: mouse_y, + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > + + Tarif spécifiques + + + +
+
Animation (HT)
+ + { + setp_employe_contrat_specific_cout_animation(e.target.value); + setdialog_contrat_data_changed("1"); + } + } + /> + +
+ + {New_Option_contrat_cout_type && New_Option_contrat_cout_type.length > 0 &&
+ Périodicité
+ (data).value === String(p_employe_contrat_specific_cout_animation_periodicite))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_employe_contrat_specific_cout_animation_periodicite(value.value) + } + + }} + renderInput={(params) => + } + /> + +
} + +
+ +
+
Préparation (HT)
+ + { + setp_employe_contrat_specific_cout_preparation(e.target.value); + setdialog_contrat_data_changed("1"); + } + } + /> + +
+ + {New_Option_contrat_cout_type && New_Option_contrat_cout_type.length > 0 &&
+ Périodicité
+ (data).value === String(p_employe_contrat_specific_cout_preparation_periodicite))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_employe_contrat_specific_cout_preparation_periodicite(value.value) + } + }} + renderInput={(params) => + } + /> + +
} + +
+ + +
+
Suivi/Correction (HT)
+ + { + setp_employe_contrat_specific_cout_suivi_correction(e.target.value); + setdialog_contrat_data_changed("1"); + } + } + /> + +
+ + {New_Option_contrat_cout_type && New_Option_contrat_cout_type.length > 0 &&
+ Périodicité
+ (data).value === String(p_employe_contrat_specific_cout_suivi_correction_periodicite))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_employe_contrat_specific_cout_suivi_correction_periodicite(value.value) + } + + }} + renderInput={(params) => + } + /> + +
} + +
+ +
+
Autre
+ + { + setp_employe_contrat_specific_cout_autre(e.target.value); + setdialog_contrat_data_changed("1"); + } + } + /> + +
+ + {New_Option_contrat_cout_type && New_Option_contrat_cout_type.length > 0 &&
+ Fréquence
+ (data).value === String(p_employe_contrat_specific_cout_autre_periodicite))[0].label} + options={New_Option_contrat_cout_type} + onChange={(event, value) => { + if (value && value.value) { + setp_employe_contrat_specific_cout_autre_periodicite(value.value) + } + + }} + renderInput={(params) => + } + /> + +
} + +
+ + + + + + + + + + {selected_contrat_type && String(selected_contrat_type) === "email" &&
+
+ + + +
+ + +
} + + {selected_contrat_type && String(selected_contrat_type) === "pdf" &&
+
+ {EMPLOYEE_CONTRACT_modele_id && String(EMPLOYEE_CONTRACT_modele_id).length > 5 && + } +
+ + +
} + + + + + {/* FIN Dialog pour gerer les tarifs spécifics */} + {/* Dialog pour gerer la signature digitale et ajouter une pièce jointe*/} { {String(p_employe_contrat_groupe_prix_achat_id) === "" &&
Taux Horaire Brut (HT) + @@ -12566,8 +12920,6 @@ const Employes = (props) => { session_id: JSON.parse(item).session_id, session_code: JSON.parse(item).session_code, - - } ))} @@ -12612,6 +12964,15 @@ const Employes = (props) => { setp_employe_contrat_date_fin(date_today_90j.toLocaleDateString('fr-FR')); setselected_contrat_id(""); + setp_employe_contrat_specific_cout_animation(""); + setp_employe_contrat_specific_cout_preparation(""); + setp_employe_contrat_specific_cout_suivi_correction(""); + setp_employe_contrat_specific_cout_autre(""); + setp_employe_contrat_specific_cout_animation_periodicite("heure"); + setp_employe_contrat_specific_cout_preparation_periodicite("heure"); + setp_employe_contrat_specific_cout_suivi_correction_periodicite("heure"); + setp_employe_contrat_specific_cout_autre_periodicite("heure"); + Getall_Employee_Type_Contrat(); setDialog_employe_contrat_open(true); @@ -13472,7 +13833,7 @@ const Employes = (props) => { menubar: false, editable_root: false, plugins: [ - 'advlist autolink lists link image charmap preview anchor', + 'advlist autolink lists link image charmap preview anchor', ], content_style: 'body { font-family:DM Sans,sans-serif; font-size:14px; }' @@ -13498,7 +13859,7 @@ const Employes = (props) => { editable_root: false, plugins: [ 'advlist autolink lists link image charmap preview anchor', - + ], content_style: 'body { font-family:DM Sans,sans-serif; font-size:14px; }' @@ -13641,7 +14002,7 @@ const Employes = (props) => { editable_root: true, plugins: [ 'advlist autolink lists link image charmap preview anchor', - + ], content_style: 'body { font-family:DM Sans,sans-serif; font-size:14px; }' @@ -13667,7 +14028,7 @@ const Employes = (props) => { editable_root: true, plugins: [ 'advlist autolink lists link image charmap preview anchor', - + ], content_style: 'body { font-family:DM Sans,sans-serif; font-size:14px; }' diff --git a/src/components/Materiel_Salle.js b/src/components/Materiel_Salle.js index 3f182e2..14ff563 100644 --- a/src/components/Materiel_Salle.js +++ b/src/components/Materiel_Salle.js @@ -2791,6 +2791,9 @@ registerLocale('fr', fr); { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, ] diff --git a/src/components/Materiels.js b/src/components/Materiels.js index 9eeea77..95cc72b 100644 --- a/src/components/Materiels.js +++ b/src/components/Materiels.js @@ -2657,6 +2657,9 @@ const Materiels = (props) => { { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, ] diff --git a/src/components/Module_Agenda.js b/src/components/Module_Agenda.js index 095d464..dc1d8f0 100644 --- a/src/components/Module_Agenda.js +++ b/src/components/Module_Agenda.js @@ -1233,9 +1233,11 @@ const Module_Agenda = (props) => { } const New_Option_Type_Event = [ - { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, ] diff --git a/src/components/Module_Ent_Mes_Formations.js b/src/components/Module_Ent_Mes_Formations.js index 8dacbf5..f96fbe8 100644 --- a/src/components/Module_Ent_Mes_Formations.js +++ b/src/components/Module_Ent_Mes_Formations.js @@ -882,6 +882,9 @@ const Module_Ent_Mes_Formations = (props) => { const New_Option_Type_Event = [ { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index f194240..8806a72 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -2132,6 +2132,9 @@ const Module_Session_Planification = (props) => { { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, + { "id": "preparation", "label": "Préparation", "value": "preparation" }, + { "id": "suivi", "label": "Suivi/Correction", "value": "suivi" }, + { "id": "eval", "label": "Evaluation", "value": "eval" }, { "id": "2", "label": "Autre", "value": "autre" }, { "id": "", "label": "", "value": "" }, ] diff --git a/src/components/PROD_230326/Display_Partner_Catalog_DetailClass_new_v2.js b/src/components/PROD_230326/Display_Partner_Catalog_DetailClass_new_v2.js index 307d602..0bf6745 100644 --- a/src/components/PROD_230326/Display_Partner_Catalog_DetailClass_new_v2.js +++ b/src/components/PROD_230326/Display_Partner_Catalog_DetailClass_new_v2.js @@ -3078,8 +3078,6 @@ const Display_Partner_Catalog_DetailClass_new_v2 = (props) => { "/Display-Partner-Catalog-Detail-formation/" + JSON.parse(formation).internal_url, '_self' ); - - }}>
Voir les détails diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index 73c44e3..c57c5fc 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -113,7 +113,7 @@ const Partner_Configuration_Technique = (props) => { const columns = [ { field: '_id', headerName: '_id', hide: true }, { field: 'id', headerName: 'id', hide: true }, - { field: 'config_name', headerName: 'Configuration', hide: true, editable: false }, + { field: 'config_name', headerName: 'Configuration', hide: false, flex: 1, editable: false }, { field: 'config_desc', headerName: 'Description', flex: 1, hide: false, editable: false }, { field: 'config_value', headerName: 'Valeur Config.', flex: 1, hide: false, editable: false }, ] diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index 98b9072..b716ffb 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -903,7 +903,7 @@ border: solid 1px; height: 2rem; width: auto; - color: black; + color: #0e2b4c; } @@ -1414,7 +1414,7 @@ border: solid 1px; height: 2rem; width: auto; - color: black; + color: #0e2b4c; } @@ -1939,7 +1939,7 @@ border: solid 1px; height: 2rem; width: auto; - color: black; + color: #0e2b4c; }