diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index 4f1acda..5abd231 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -6412,7 +6412,7 @@ const Conseil_Classe = (props) => { "border": "None", "fontSize": "18px", "fontWeight": "600", "padding": "5px", fontFamily: 'DM Sans' }}> - Pièces jointes Convention + Pièces jointes @@ -7221,7 +7221,7 @@ const Conseil_Classe = (props) => { "border": "None", "fontSize": "18px", "fontWeight": "600", "padding": "5px", fontFamily: 'DM Sans' }}> - Pièces jointes Convention + Pièces jointes @@ -7542,7 +7542,7 @@ const Conseil_Classe = (props) => { "border": "None", "fontSize": "18px", "fontWeight": "600", "padding": "5px", fontFamily: 'DM Sans' }}> - Pièces jointes Convention + Pièces jointes diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 5a0e11c..baf34c2 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -11536,14 +11536,14 @@ const DisplayPartnerPromotion = (props) => { const New_Option_Emargement_Masse = [ - { "id": "demande emargement", "label": "Envoyer demande émargement", "value": "demande emargement" }, + { "id": "demande emargement", "label": "Envoyer demande émargement (email)", "value": "demande emargement" }, { "id": "emarg_qr_code", "label": "Emargement QR CODE", "value": "emarg_qr_code" }, { "id": "emarg_delete", "label": "Supprimer", "value": "emarg_delete" }, ] const New_Option_Evaluation_Masse = [ - { "id": "demande evaluation", "label": "Envoyer demande Evaluation", "value": "demande evaluation" }, + { "id": "demande evaluation", "label": "Envoyer demande Evaluation (email)", "value": "demande evaluation" }, ] const [actionmass_emarg_val, setactionmass_emarg_val] = useState(); @@ -16488,7 +16488,7 @@ const DisplayPartnerPromotion = (props) => {
- Pièces jointes Convention + Pièces jointes
@@ -16803,7 +16803,7 @@ const DisplayPartnerPromotion = (props) => {
- Pièces jointes Convention + Pièces jointes
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 0be2eca..a2249ea 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1644,7 +1644,7 @@ const DisplayPartnerSession = (props) => { }, }, ] - + const columns_list_emargement = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, @@ -1672,7 +1672,7 @@ const DisplayPartnerSession = (props) => { ); }, }, - { field: 'mode_envoi', headerName: 'Mode Envoi', minwidth: 200, flex: 1, hide: true, editable: false, renderCell: (params) => , }, + { field: 'mode_envoi', headerName: 'Mode Envoi', minwidth: 200, flex: 1, hide: true, editable: false, renderCell: (params) => , }, { field: 'time_in_hour', headerName: 'Nb Heure', minWidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { @@ -9435,7 +9435,7 @@ const DisplayPartnerSession = (props) => { }, ]; - const status_tab = [ + const status_tab = [ { value: '1', label: 'Actif', @@ -9445,12 +9445,12 @@ const DisplayPartnerSession = (props) => { label: 'Inactif', }, - { + { value: '2', label: 'Clôturer', }, - { + { value: '-1', label: 'Annulé', }, @@ -11562,7 +11562,7 @@ const DisplayPartnerSession = (props) => { .then((data) => data.json()) .then((data) => { setLoading(false); - // console.log('Success:', data['message'], "data['status'] = ", data['status']); + // console.log('Success:', data['message'], "data['status'] = ", data['status']); setGetListePreinscrit_emarg_result(data['message']); setRows_emarg(data['message']); @@ -11591,14 +11591,14 @@ const DisplayPartnerSession = (props) => { const New_Option_Emargement_Masse = [ - { "id": "demande emargement", "label": "Envoyer demande émargement", "value": "demande emargement" }, + { "id": "demande emargement", "label": "Envoyer demande émargement (email)", "value": "demande emargement" }, { "id": "emarg_qr_code", "label": "Emargement QR CODE", "value": "emarg_qr_code" }, { "id": "emarg_delete", "label": "Supprimer", "value": "emarg_delete" }, ] const New_Option_Evaluation_Masse = [ - { "id": "demande evaluation", "label": "Envoyer demande Evaluation", "value": "demande evaluation" }, + { "id": "demande evaluation", "label": "Envoyer demande Evaluation (email)", "value": "demande evaluation" }, ] const [actionmass_emarg_val, setactionmass_emarg_val] = useState(); @@ -12237,6 +12237,10 @@ const DisplayPartnerSession = (props) => { const [Dialog_convention_message, setDialog_convention_message] = React.useState(false); const [Dialog_convention_open, setDialog_convention_open] = React.useState(false); + + + + function Dialog_convention_handle_change_participant_session(message) { setDialog_convention_message(message); setDialog_convention_open(true); @@ -12474,8 +12478,8 @@ const DisplayPartnerSession = (props) => { } var url = process.env.REACT_APP_API_URL + "myclass/api/Prepare_and_Send_Convention_From_Session_For_Selected_Inscrit_By_PDF/" + stored_cookie + "/" + selected_session_id + "/" + selected_convention_id + "/" + tab_my_inscription_ids; - // console.log(" ### tab_my_inscription_ids = ", tab_my_inscription_ids); - // console.log(" ### url = ", url); + // console.log(" ### tab_my_inscription_ids = ", tab_my_inscription_ids); + // console.log(" ### url = ", url); @@ -13180,7 +13184,7 @@ const DisplayPartnerSession = (props) => { if (String(res.data.status) === String("true")) { // console.log(" In Getall_Survey_hot_evaluation_By_Session res.data.status = " + res.data.status); - // console.log(" In Getall_Survey_hot_evaluation_By_Session res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Survey_hot_evaluation_By_Session res.data.message r_class = " + res.data.message); setGetall_Survey_hot_evaluation_By_Session_api("true"); setGetall_Survey_hot_evaluation_By_Session_result(res.data.message); setRows_evaluation(res.data.message); @@ -14549,7 +14553,7 @@ const DisplayPartnerSession = (props) => { tab_my_inscription_ids.push(myid['_id']); } - if (String(selected_convention_id).trim() === "") { + if (!selected_convention_id || String(selected_convention_id).trim() === "") { // alert(" Vous devez choisir un document"); setdisplay_alert_mysy("1"); setalert_message("Vous devez choisir un document"); @@ -14557,6 +14561,8 @@ const DisplayPartnerSession = (props) => { return; } + + form.append("class_internal_url", selected_internal_url); const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); @@ -14567,6 +14573,8 @@ const DisplayPartnerSession = (props) => { form.append("tab_ids", tab_my_inscription_ids); + console.log(" ### form = ", form); + // pièce jointe form.append("file_business_object", ""); var list_files = new FormData(); @@ -16301,7 +16309,7 @@ const DisplayPartnerSession = (props) => { - {/* Dialog pour gerer les CONVENTIONS ENTREPRISE*/} + {/* Dialog pour gerer les CONVENTIONS ENTREPRISE & INDIVIDUELLE*/} { -
Type Document
+
Type Document
{
} - {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention + {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention {
- Pièces jointes Convention + Pièces jointes
@@ -16608,6 +16616,20 @@ const DisplayPartnerSession = (props) => {
{String(selected_convention_type) === "email" &&
- {/* FIN Dialog pour gerer les CONVENTIONS ENTREPRISE*/} + {/* FIN Dialog pour gerer les CONVENTIONS ENTREPRISE & INDIVIDUELLE*/} {/* Dialog pour gerer les CONVENTIONS INDIVIDUELLE*/} - { -
Type Document
+
Type Document
{
} - {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention + {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention {
- Pièces jointes Convention + Pièces jointes
@@ -16952,6 +16987,21 @@ const DisplayPartnerSession = (props) => { {String(selected_convention_type) === "email" &&
+ */} {/* FIN Dialog pour gerer les CONVENTIONS INDIVIDUELLE*/} @@ -17025,7 +17075,7 @@ const DisplayPartnerSession = (props) => { -
Type Document
+
Type Document
{
- {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convocation + {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convocation {
- Pièces jointes Convention + Pièces jointes
@@ -17265,9 +17315,22 @@ const DisplayPartnerSession = (props) => {
{String(selected_convention_type) === "email" &&
- Pièces jointes Convention + Pièces jointes
diff --git a/src/components/Intranet_Mes_Stagiaires.js b/src/components/Intranet_Mes_Stagiaires.js index e13709f..308490b 100644 --- a/src/components/Intranet_Mes_Stagiaires.js +++ b/src/components/Intranet_Mes_Stagiaires.js @@ -7330,7 +7330,7 @@ registerLocale('fr', fr);
- Pièces jointes Convention + Pièces jointes
diff --git a/src/components/Jurys.js b/src/components/Jurys.js index ba3ad03..c7ab95c 100644 --- a/src/components/Jurys.js +++ b/src/components/Jurys.js @@ -4784,7 +4784,7 @@ const Jury = (props) => {
- Pièces jointes Convention + Pièces jointes
@@ -5102,7 +5102,7 @@ const Jury = (props) => {
- Pièces jointes Convention + Pièces jointes
diff --git a/src/components/Module_Attestation_Formation.js b/src/components/Module_Attestation_Formation.js index 76cc331..c7fdeb8 100644 --- a/src/components/Module_Attestation_Formation.js +++ b/src/components/Module_Attestation_Formation.js @@ -173,7 +173,7 @@ const Module_Attestation_Formation = (props) => { ] const New_Option_attestation_Masse = [ - { "id": "resend", "label": "(R)envoyer", "value": "resend" }, + { "id": "resend", "label": "(R)envoyer par Email", "value": "resend" }, { "id": "download", "label": "Télécharger", "value": "download" }, ] const [gridline_id, setgridline_id] = useState(""); diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js index 0c6fa04..edf5428 100644 --- a/src/components/Module_Editique.js +++ b/src/components/Module_Editique.js @@ -109,9 +109,9 @@ const useStyles = makeStyles((theme) => ({ color: 'gray', }, })); - + const Module_Editique = (props) => { -registerLocale('fr', fr); + registerLocale('fr', fr); const classes = useStyles(); const myconntected_employee_id = props.conntected_employee_id; @@ -202,7 +202,7 @@ registerLocale('fr', fr); setLoading(false); if (String(res.data.status) === String("true")) { - + //console.log(" In Invoice_Session_Formation res.data.status = " + res.data.status); //console.log(" In Invoice_Session_Formation res.data.message r_class = " + res.data.message); setInvoice_Session_Formation_api("true"); @@ -2294,7 +2294,7 @@ registerLocale('fr', fr); -
Type Document
+
Type Document
{(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") && -
Choisir une convocation +
Choisir une convocation } - {String(selected_convention_type) === "email" &&
Type Document
+ {String(selected_convention_type) === "email" &&
Type Document
} - {String(selected_convention_type) === "pdf" &&
Type Document
+ {String(selected_convention_type) === "pdf" &&
Type Document
- Pièces jointes Convention + Pièces jointes
@@ -2548,8 +2548,23 @@ registerLocale('fr', fr); {String(selected_convention_type) === "email" && +
+ +
+ + +
+ +
} + +
+ +
+ + + +
+ ) +} + + +export default Module_Internal_Email_Management; + + diff --git a/src/components/Module_Session_Evaluation.js b/src/components/Module_Session_Evaluation.js index 58a46c1..bdb7688 100644 --- a/src/components/Module_Session_Evaluation.js +++ b/src/components/Module_Session_Evaluation.js @@ -1151,7 +1151,7 @@ const Module_Session_Evaluation = (props) => { if (String(res.data.status) === String("true")) { // console.log(" In Getall_Survey_specific_evaluation_By_Session res.data.status = " + res.data.status); - // console.log(" In Getall_Survey_specific_evaluation_By_Session res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Survey_specific_evaluation_By_Session res.data.message r_class = " + res.data.message); setGetall_Survey_specific_evaluation_By_Session_api("true"); setGetall_Survey_specific_evaluation_By_Session_result(res.data.message); @@ -1576,6 +1576,11 @@ const Module_Session_Evaluation = (props) => { Getall_Survey_specific_evaluation_By_Session(); } + setactionmass_eval_specific_00(""); + setselectionModel_evaluation_specific_00([]); + Getall_Survey_specific_evaluation_By_Session(); + + } @@ -1603,6 +1608,10 @@ const Module_Session_Evaluation = (props) => { Getall_Survey_specific_evaluation_By_Session(); } + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + Getall_Survey_specific_evaluation_By_Session(); + } async function actionmass_Specific_02_Traitemet() { @@ -1629,6 +1638,10 @@ const Module_Session_Evaluation = (props) => { Getall_Survey_specific_evaluation_By_Session(); } + setactionmass_eval_specific_02(""); + setselectionModel_evaluation_specific_02([]); + Getall_Survey_specific_evaluation_By_Session(); + } @@ -1728,6 +1741,7 @@ const Module_Session_Evaluation = (props) => { Getall_Survey_formateur_evaluation_By_Session(); + setSelectionModel_evaluation([]); setSelectionModel_evaluation_cold([]); setselectionModel_evaluation_formateur([]); @@ -1736,6 +1750,18 @@ const Module_Session_Evaluation = (props) => { setactionmass_eval_froid(""); setactionmass_eval_formateur(""); + // pour les spécifiques + setactionmass_eval_specific_00(""); + setselectionModel_evaluation_specific_00([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + Getall_Survey_specific_evaluation_By_Session(); + // alert(res.data.message); setdisplay_alert_mysy("1"); @@ -1789,7 +1815,7 @@ const Module_Session_Evaluation = (props) => { const New_Option_Evaluation_Masse = [ - { "id": "demande evaluation", "label": "Envoyer demande Evaluation", "value": "demande evaluation" }, + { "id": "demande evaluation", "label": "Envoyer demande Evaluation (email)", "value": "demande evaluation" }, { "id": "cold_eval_qr_code", "label": "Générer un QR Code", "value": "cold_eval_qr_code" }, { "id": "export_evaluation", "label": "Export Evaluation (PDF) ", "value": "export_evaluation" }, ] @@ -2010,7 +2036,7 @@ const Module_Session_Evaluation = (props) => { alert("Impossible de générer le QR code (2) "); } else { fileDownload(res.data, nom_fichier_cmd); - Getall_Survey_hot_evaluation_By_Session(); + Getall_Survey_hot_evaluation_By_Session(); } }).catch((error) => { @@ -2051,7 +2077,7 @@ const Module_Session_Evaluation = (props) => { alert("Impossible de générer le QR code (2) "); } else { fileDownload(res.data, nom_fichier_cmd); - Getall_Survey_cold_evaluation_By_Session(); + Getall_Survey_cold_evaluation_By_Session(); } }).catch((error) => { @@ -2093,7 +2119,20 @@ const Module_Session_Evaluation = (props) => { alert("Impossible de générer le QR code (2) "); } else { fileDownload(res.data, nom_fichier_cmd); - Getall_Survey_formateur_evaluation_By_Session(); + Getall_Survey_formateur_evaluation_By_Session(); + + // pour les spécifiques + setactionmass_eval_specific_00(""); + setselectionModel_evaluation_specific_00([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + Getall_Survey_specific_evaluation_By_Session(); + } }).catch((error) => { @@ -2111,8 +2150,6 @@ const Module_Session_Evaluation = (props) => { function Export_Selected_Survey_PDF(tab_ids_survey, type_export, used_datagrid) { const stored_cookie = getCookie('tokenmysypart'); - - if (tab_ids_survey.length <= 0) { // alert(" Aucune ligne selectionnée "); setdisplay_alert_mysy("1"); @@ -2149,6 +2186,20 @@ const Module_Session_Evaluation = (props) => { setSelectionModel_evaluation_cold([]); } + Getall_Survey_specific_evaluation_By_Session(); + + // pour les spécifiques + setactionmass_eval_specific_00(""); + setselectionModel_evaluation_specific_00([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + setactionmass_eval_specific_01(""); + setselectionModel_evaluation_specific_01([]); + + Getall_Survey_specific_evaluation_By_Session(); + } }).catch((error) => { setLoading(false); @@ -2814,7 +2865,7 @@ const Module_Session_Evaluation = (props) => { if (selectionModel_evaluation.length <= 0) { setactionmass_eval_val(""); } - + }} selectionModel={selectionModel_evaluation} diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js index f79643d..aca1c8f 100644 --- a/src/components/Notes_Evaluation.js +++ b/src/components/Notes_Evaluation.js @@ -3744,7 +3744,7 @@ const Notes_Evaluation = (props) => {
- Pièces jointes Convention + Pièces jointes
diff --git a/src/components/Partner.js b/src/components/Partner.js index 8b64d22..6154ad8 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -65,6 +65,8 @@ import Partner_Config_Formulaires from "./Partner_Config_Formulaires"; import PartnerClientActivite from "./PartnerClient_Activite"; import Jury from "./Jurys"; import Conseil_Classe from "./Conseil_Classe"; +import Module_Internal_Email_Management from "./Module_Internal_Email_Management"; + import Mon_Tableau_De_Bord from "./Mon_Tableau_De_Bord"; import Dashbord_Formation from "./Dashbord_Formation"; import Partner_Prix_Achat from "./Partner_Prix_Achat"; @@ -111,6 +113,7 @@ import Badge from '@mui/material/Badge'; import { styled } from '@mui/material/styles'; import Modules_Mes_Documents from "./Modules_Mes_Documents"; import FolderZipIcon from '@mui/icons-material/FolderZip'; +import MailIcon from '@mui/icons-material/Mail'; import ReduceCapacityIcon from '@mui/icons-material/ReduceCapacity'; import { FcPodiumWithAudience } from "react-icons/fc"; import { FcConferenceCall } from "react-icons/fc"; @@ -498,7 +501,7 @@ const Partner = (props) => { const list_menu_header_names = ['my_account', 'my_class', 'my_session', 'my_apprenant', 'my_ressource', 'my_planning', 'my_partners', 'my_invoices', 'my_prix_achat', 'my_e_learning', 'my_configuration', 'my_tbd', 'my_ue', 'domaine_categorie_metier', 'config_formation_initiale', 'note_evaluation', 'groupe_apprenant', 'part_produit_service', 'monactivite', 'mon_tableau_de_bord', - 'tous_mes_document', 'equipe_team', 'conseil_class', 'autre_rh', 'jury', 'conseil_classe'] + 'tous_mes_document', 'equipe_team', 'conseil_class', 'autre_rh', 'jury', 'conseil_classe', 'internal_email'] for (let i = 0; i < list_menu_header_names.length; i++) { if (document.getElementsByName(String(list_menu_header_names[i])) && document.getElementsByName(String(list_menu_header_names[i]))[0]) { document.getElementsByName(String(list_menu_header_names[i]))[0].style.fontWeight = "400"; @@ -515,7 +518,7 @@ const Partner = (props) => { const list_menu_header_names = ['my_account', 'my_class', 'my_session', 'my_apprenant', 'my_ressource', 'my_planning', 'my_partners', 'my_invoices', 'my_prix_achat', 'my_e_learning', 'my_configuration', 'my_tbd', 'my_ue', 'domaine_categorie_metier', 'config_formation_initiale', 'note_evaluation', 'groupe_apprenant', 'part_produit_service', 'monactivite', 'mon_tableau_de_bord', - 'tous_mes_document', 'equipe_team', 'conseil_class', 'autre_rh', 'jury', 'conseil_classe'] + 'tous_mes_document', 'equipe_team', 'conseil_class', 'autre_rh', 'jury', 'conseil_classe', 'internal_email'] for (let i = 0; i < list_menu_header_names.length; i++) { if (document.getElementsByName(String(list_menu_header_names[i])) && document.getElementsByName(String(list_menu_header_names[i]))[0]) { document.getElementsByName(String(list_menu_header_names[i]))[0].style.fontWeight = "400"; @@ -573,6 +576,17 @@ const Partner = (props) => { } + function Display_Internal_Boite_Email(event) { + setmenu("internal_email"); + setapiexcelimportmessage(); + setformation_file_name(); + history.push("/Partner/internal_email"); + document.body.style.backgroundColor = "#ffffff"; + inactive_active_menu_header("internal_email"); + } + + + function config_document_func(event) { var security_retval = check_user_acces_right("config_document", "read"); if (security_retval === 1) { @@ -1848,12 +1862,12 @@ const Partner = (props) => { {left_menu === true &&