From 3e6bdb7f4c45ff0ac92835aa0177378302125f66 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 30 Jul 2024 13:28:34 +0200 Subject: [PATCH] 30/07/2024 - 12h --- src/components/DisplayPartnerSession.js | 108 +++--- src/components/DisplayPartnerStagiaires.js | 366 +++++++++++++++++++-- src/components/Module_Email_Management.js | 33 +- src/components/Partner.js | 63 ++++ src/components/Partner_Commande.js | 19 +- src/components/Partner_Config_Technique.js | 4 + src/styles/components/_partner.scss | 2 +- 7 files changed, 486 insertions(+), 109 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 91c44ad..cfd60d8 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -445,7 +445,7 @@ const DisplayPartnerSession = (props) => {
{New_civilite && New_civilite.length > 0 && cellValues.row.civilite && @@ -743,7 +743,7 @@ const DisplayPartnerSession = (props) => {
{New_civilite && New_civilite.length > 0 && cellValues.row.civilite && @@ -806,7 +806,7 @@ const DisplayPartnerSession = (props) => { onClick={(event) => { - if( String(cellValues.row.client_rattachement_id) === String(cellValues.row.client_facture)){ + if (String(cellValues.row.client_rattachement_id) === String(cellValues.row.client_facture)) { alert(" Le client facturé est le même que client. Aucun partage à faire"); return; } @@ -1065,7 +1065,7 @@ const DisplayPartnerSession = (props) => {
- +
@@ -690,8 +704,7 @@ const Module_Email_Management = (props) => { fullWidth value={email_destinataire} onChange={(e) => { - setemail_destinataire(e.target.value); - + setemail_destinataire(String(e.target.value).replaceAll(";", ",")); } } /> @@ -712,7 +725,7 @@ const Module_Email_Management = (props) => { fullWidth value={email_cc} onChange={(e) => { - setemail_cc(e.target.value); + setemail_cc(String(e.target.value).replaceAll(";", ",")); } } @@ -734,7 +747,7 @@ const Module_Email_Management = (props) => { fullWidth value={email_bcc} onChange={(e) => { - setemail_bcc(e.target.value); + setemail_bcc(String(e.target.value).replaceAll(";", ",")); } } diff --git a/src/components/Partner.js b/src/components/Partner.js index 2040d35..4138577 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -114,6 +114,8 @@ import Groupe_Apprenant from "./Groupe_Apprenant"; import Groups2Icon from '@mui/icons-material/Groups2'; import { LiaProductHunt } from "react-icons/lia"; import Partner_Product_Service from "./Partner_Product_Service"; +import Module_Email_Management from "./Module_Email_Management"; +import ForwardToInboxIcon from '@mui/icons-material/ForwardToInbox'; const Partner = (props) => { const { commingmenu, commingpack } = useParams(); @@ -1444,6 +1446,17 @@ const Partner = (props) => { const [selected_menu_header, setselected_menu_header] = React.useState(""); + const [Dialog_SEND_EMAIL_open, setDialog_SEND_EMAIL_open] = React.useState(false); + + + const Dialog_SEND_EMAIL_handleClose = () => { + setDialog_SEND_EMAIL_open(false); + } + + const Clean_Selected_Rows_For_Email = () => { + //setSelectionModel([]) + } + return ( @@ -1483,6 +1496,39 @@ const Partner = (props) => { + { /********* Dialog redaction email */} + null} + > + + + + + {Dialog_1_message} + + + + + + + + + + { /********* Fin Dialog redaction email */} + + {left_menu === true &&
@@ -2373,6 +2427,15 @@ const Partner = (props) => {
+ + +
{ + setDialog_SEND_EMAIL_open(true); + }} >  
+
+
+ + {String(formation_initiale) === "1" && {String(menu) !== "groupe_apprenant" &&
 
} diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index 6697599..66bf2ea 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -4137,8 +4137,10 @@ const Partner_Commande = (props) => { null} > Cloture devis {String(p_detail_header_ref_interne)} @@ -4232,9 +4234,10 @@ const Partner_Commande = (props) => { {/* Dialog pour gerer la signature digitale */} + static + onClose={() => null} > MySy Information @@ -4346,9 +4349,10 @@ const Partner_Commande = (props) => { {/****** Dialog pour la gestion d'un article (formation) */} + static + onClose={() => null} > Edition Détail ligne {String(p_detail_header_type).toLocaleUpperCase()} @@ -4959,9 +4963,10 @@ const Partner_Commande = (props) => { {/********** Dialog pour une entete de commande/devis */} + static + onClose={() => null}> {Dialog_1_message} diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index f41beaf..4080d6d 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -1910,6 +1910,10 @@ const Partner_Configuration_Technique = (props) => { { "id": "session_warning", "label": "session_warning", "value": "session_warning" }, { "id": "session_warning_lead_time", "label": "session_warning_lead_time", "value": "session_warning_lead_time" }, + { "id": "recyclage_warning", "label": "recyclage_warning", "value": "recyclage_warning" }, + { "id": "recyclage_warning_lead_time", "label": "recyclage_warning_lead_time", "value": "recyclage_warning_lead_time" }, + + { "id": "", "label": "", "value": "" }, ] diff --git a/src/styles/components/_partner.scss b/src/styles/components/_partner.scss index a2deea2..7669d7e 100644 --- a/src/styles/components/_partner.scss +++ b/src/styles/components/_partner.scss @@ -2131,7 +2131,7 @@ .ps-menu-button { color: white; - font-weight: bold; + // font-weight: bold; text-transform: uppercase; background-color: #104277 !important; box-sizing: unset !important;