diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index 88cd2c9..8af12ad 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -40,20 +40,34 @@ const Config_Documents = (props) => { const [selectionModel, setSelectionModel] = React.useState([]); const editorRef_programme = useRef(null); const [editorRef_programme_limite, seteditorRef_programme] = useState(1000); - const [field_programme, setfield_programme] = useState(""); + + const [editor_tochange, seteditor_tochange] = useState(""); const one_editorRef_programme = useRef(null); const [one_editorRef_programme_limite, setone_editorRef_programme_limite] = useState(1000); + + + const [field_programme, setfield_programme] = useState(""); + const [field_programme_initial_value, setfield_programme_initial_value] = useState(""); + const [one_field_programme, setone_field_programme] = useState(""); + const [one_field_programme_initial_value, setone_field_programme_initial_value] = useState(""); + + const [one_editor_tochange, setone_editor_tochange] = useState(""); + const one_editorRef_corp_mail = useRef(null); const [one_editorRef_corp_mail_limite, setone_editorRef_corp_mail_limite] = useState(1000); - const [one_field_corp_mail, setone_field_corp_mail] = useState(""); + const [field_corp_mail, set_field_corp_mail] = useState(""); + const [field_corp_mail_initial_value, set_field_corp_mail_initial_value] = useState(""); + + const [one_field_corp_mail, setone_field_corp_mail] = useState(""); + const [one_field_corp_mail_initial_value, setone_field_corp_mail_initial_value] = useState(""); var date_today_90j = new Date(); date_today_90j.setDate(date_today_90j.getDate() + 90); @@ -355,6 +369,7 @@ const Config_Documents = (props) => { const [p_detail_joint_pdf, setp_detail_joint_pdf] = useState(false); const [p_detail_default_version, setp_detail_default_version] = useState(false); + const [p_detail_edition_par_client, setp_detail_edition_par_client] = useState(false); @@ -390,7 +405,7 @@ const Config_Documents = (props) => { setone_field_corp_mail(); setp_detail_joint_pdf(false); setp_detail_default_version(false); - + setpartner_document_data_changed(false); } @@ -454,15 +469,23 @@ const Config_Documents = (props) => { setp_detail_joint_pdf(true); } - p_detail_default_version(false); + setp_detail_default_version(false); if (mylocal_document.default_version) { if (String(mylocal_document.default_version) === "1") - p_detail_default_version(true); + setp_detail_default_version(true); } - setone_field_corp_mail(""); + + setp_detail_edition_par_client(false); + if (mylocal_document.edit_by_client) { + if (String(mylocal_document.edit_by_client) === "1") + setp_detail_edition_par_client(true); + } + + set_field_corp_mail(""); if (mylocal_document.corps_mail) { - setone_field_corp_mail(mylocal_document.corps_mail); + set_field_corp_mail(mylocal_document.corps_mail); + set_field_corp_mail_initial_value(mylocal_document.corps_mail); } @@ -472,8 +495,8 @@ const Config_Documents = (props) => { setfield_programme(""); if (mylocal_document.contenu_doc) { - setp_detail_contenu_doc(mylocal_document.contenu_doc); setfield_programme(mylocal_document.contenu_doc); + setfield_programme_initial_value(mylocal_document.contenu_doc); } disable_Partner_DocumentFields(); @@ -486,6 +509,9 @@ const Config_Documents = (props) => { }); } + if (document.getElementsByName('detail_document_principal') && document.getElementsByName('detail_document_principal')[0]) + document.getElementsByName('detail_document_principal')[0].focus(); + } else { alert(" Aucun document recuperé"); } @@ -568,12 +594,25 @@ const Config_Documents = (props) => { setp_detail_sujet(mylocal_document.sujet); } - setfield_programme(""); + setone_field_programme(""); if (mylocal_document.contenu_doc) { - setp_detail_contenu_doc(String(mylocal_document.contenu_doc)); - setfield_programme(String(mylocal_document.contenu_doc)); + setone_field_programme(String(mylocal_document.contenu_doc)); + setone_field_programme_initial_value(String(mylocal_document.contenu_doc)); } + setone_field_corp_mail(""); + if (mylocal_document.corps_mail) { + setone_field_programme(String(mylocal_document.corps_mail)); + setone_field_programme_initial_value(String(mylocal_document.corps_mail)); + } + + setp_detail_joint_pdf(false); + if (mylocal_document.joint_pdf) { + if (String(mylocal_document.joint_pdf) === "1") + setp_detail_joint_pdf(true); + } + + disable_Partner_DocumentFields(); if (document.getElementById('myRef')) { //myRef.current.scrollIntoView({ behavior: "smooth" }); @@ -674,10 +713,17 @@ const Config_Documents = (props) => { else { setp_one_detail_duplicate("0"); } + setfield_programme(""); if (mylocal_document.contenu_doc) { - setp_one_detail_contenu_doc(String(mylocal_document.contenu_doc)); setone_field_programme(String(mylocal_document.contenu_doc)); + setone_field_programme_initial_value(String(mylocal_document.contenu_doc)); + } + + set_field_corp_mail(""); + if (mylocal_document.corps_mail) { + set_field_corp_mail(String(mylocal_document.corps_mail)); + set_field_corp_mail_initial_value(String(mylocal_document.corps_mail)); } @@ -762,6 +808,9 @@ const Config_Documents = (props) => { function Edit_Document_Data_Fields() { Enable_Partner_DocumentFields(); Get_Given_Personnalisable_Collection_and_Fields(selected_template_ref_interne); + + if (document.getElementsByName('one_detail_document_principal') && document.getElementsByName('one_detail_document_principal')[0]) + document.getElementsByName('one_detail_document_principal')[0].focus(); } function Enable_Partner_DocumentFields() { @@ -952,7 +1001,7 @@ const Config_Documents = (props) => { form.append("cible", p_one_detail_cible); else { form.append("cible", ""); - return; + } @@ -960,7 +1009,7 @@ const Config_Documents = (props) => { form.append("duplicate", p_one_detail_duplicate); else { form.append("duplicate", "0"); - return; + } //----- @@ -969,15 +1018,32 @@ const Config_Documents = (props) => { form.append("default_version", "1"); else { form.append("default_version", "0"); - return; + } if (p_detail_joint_pdf) form.append("joint_pdf", "1"); else { form.append("joint_pdf", "0"); - return; + } + + + if (p_detail_edition_par_client) + form.append("edit_by_client", "1"); + else { + form.append("joint_pdf", "0"); + } + + + if (p_detail_default_version) + form.append("default_version", "1"); + else { + form.append("default_version", "0"); + + } + + // ------- @@ -998,8 +1064,8 @@ const Config_Documents = (props) => { - if (one_editorRef_programme) { - var programme = one_editorRef_programme.current.getContent(); + if (one_field_programme) { + var programme = one_field_programme; programme = programme.replace('<', '<'); programme = programme.replace('>', '>'); programme = programme.replace('≤', '<='); @@ -1010,8 +1076,8 @@ const Config_Documents = (props) => { form.append("contenu_doc", ""); } - if (one_editorRef_corp_mail) { - var corps_mail = one_editorRef_corp_mail.current.getContent(); + if (one_field_corp_mail) { + var corps_mail = one_field_corp_mail; corps_mail = corps_mail.replace('<', '<'); corps_mail = corps_mail.replace('>', '>'); corps_mail = corps_mail.replace('≤', '<='); @@ -1235,8 +1301,45 @@ const Config_Documents = (props) => { } - if (editorRef_programme) { - var programme = editorRef_programme.current.getContent(); + //----- + + if (p_detail_default_version) + form.append("default_version", "1"); + else { + form.append("default_version", "0"); + + } + + if (p_detail_joint_pdf) + form.append("joint_pdf", "1"); + else { + form.append("joint_pdf", "0"); + + } + + if (p_detail_edition_par_client) + form.append("edit_by_client", "1"); + else { + form.append("joint_pdf", "0"); + + } + + + if (p_detail_default_version) + form.append("default_version", "1"); + else { + form.append("default_version", "0"); + + } + + + // ------- + + + + + if (field_programme) { + var programme = field_programme; programme = programme.replace('<', '<'); programme = programme.replace('>', '>'); @@ -1253,6 +1356,23 @@ const Config_Documents = (props) => { } + if (field_corp_mail) { + var corps_mail = field_corp_mail; + + corps_mail = corps_mail.replace('<', '<'); + corps_mail = corps_mail.replace('>', '>'); + corps_mail = corps_mail.replace('≤', '<='); + corps_mail = corps_mail.replace('≥', '>='); + + + form.append("corps_mail", corps_mail); + setp_detail_contenu_doc(corps_mail); + } + else { + form.append("corps_mail", ""); + + } + //console.log(" Update_one_Partner_Document affectation form == ", form); @@ -1436,6 +1556,8 @@ const Config_Documents = (props) => { setdisplay_partner_document(); setdisplay_detail_document(); + setgridline_id(""); + Get_List_Personnalisable_Default_Document(); setadd_one_document("1"); @@ -1745,7 +1867,7 @@ const Config_Documents = (props) => { // end gestion pièces jointes - + const [gridline_id, setgridline_id] = useState(""); return (
@@ -2158,36 +2280,30 @@ const Config_Documents = (props) => { }, - // gestion couleur des lignes avec le statut d'inscription - '& .line--statut--annule': { - backgroundColor: '#D8D8D8', - color: 'white', - }, - - '& .line--statut--inscrit': { - backgroundColor: '#CEF6D8', - color: 'black', - }, - '& .line--statut--preinscrit': { - backgroundColor: '#F7F2E0', - color: 'black', - }, - - /*"& .MuiDataGrid-virtualScrollerRenderZone": { - "& .MuiDataGrid-row": { - "&:nth-child(2n)": { backgroundColor: "rgba(235, 235, 235, .7)" } - } - },*/ "& .MuiDataGrid-columnHeaders": { backgroundColor: "#c8cfd5", color: "black", fontSize: 14 }, + '& .line--statut--selected': { + backgroundColor: '#FBF2EF', + color: 'black', + }, + '& .line--statut--pair': { + backgroundColor: 'rgba(235, 235, 235, .7)', + color: 'black', + }, + '& .line--statut--impair': { + backgroundColor: '#FFFFFF', + color: 'black', + }, + }} > { setSelectionModel(newSelectionModel); /* if (newSelectionModel.length === 1) @@ -2223,6 +2339,7 @@ const Config_Documents = (props) => { className="datagridclass" onRowDoubleClick={(newSelectionModel) => { + setgridline_id(newSelectionModel.row.id); handleClick_display_partner_document(newSelectionModel.row.id); @@ -2260,15 +2377,17 @@ const Config_Documents = (props) => { }} getRowClassName={(params) => { - if (String(params.row.status) === "-1") { - return 'line--statut--annule'; + // Pour la gestion de la couleur de zone double cliquée + if (String(params.row.id) === String(gridline_id)) { + return 'line--statut--selected'; } - if (String(params.row.status) === "0") { - return 'line--statut--preinscrit'; + else if (parseInt(String(params.row.id)) % 2 === 0) { + return 'line--statut--pair'; } - if (String(params.row.status) === "1") { - return 'line--statut--inscrit'; + else if (parseInt(String(params.row.id)) % 2 !== 0) { + return 'line--statut--impair'; } + }} @@ -2315,7 +2434,7 @@ const Config_Documents = (props) => {
- Type de document 2
+ Type de document
{
-
- Joindre en PDF aaaa
+ {String(partner_document_data_edit_mode) !== "1" &&
+ Joindre en PDF
{ checked={p_detail_joint_pdf} /> -
+
} + + {String(partner_document_data_edit_mode) !== "1" &&
+ Version par defaut
+ + + +
} + + {String(partner_document_data_edit_mode) !== "1" &&
+ Edition par client
+ + + +
} + + + + {String(partner_document_data_edit_mode) === "1" &&
+ Joindre en PDF
+ + { + setp_detail_joint_pdf(e.target.checked); + setpartner_document_data_changed("1"); + }} + /> + +
} + + {String(partner_document_data_edit_mode) === "1" &&
+ Version par defaut
+ + { + setp_detail_default_version(e.target.checked); + setpartner_document_data_changed("1"); + }} + /> + +
} + + {String(partner_document_data_edit_mode) === "1" &&
+ Edition par client
+ + { + setp_detail_edition_par_client(e.target.checked); + setpartner_document_data_changed("1"); + }} + /> + +
} +
@@ -2421,7 +2610,7 @@ const Config_Documents = (props) => { -
+ {String(partner_document_data_edit_mode) === "1" &&
+
} {file_1_name && file_1_name.name &&
@@ -2541,77 +2730,184 @@ const Config_Documents = (props) => {
}
+ {String(partner_document_data_edit_mode) !== "1" &&
+ + {p_detail_joint_pdf === true &&
+ + +
} + + + {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && +
+ +
Coprs du mail
+ one_editorRef_corp_mail.current = editor} + initialValue={field_corp_mail_initial_value} + disabled={true} + init={{ + resize: false, + height: 700, + menubar: true, + plugins: [ + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', + + ], + toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + + 'alignleft aligncenter alignright alignjustify | ' + + 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', + + content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' + }} + /> + +
+ } + + {String(document_principal_ou_corp_mail) !== "2" &&
+
+
Votre document
+ editorRef_programme.current = editor} + initialValue={field_programme_initial_value} + + disabled={true} + init={{ + resize: false, + height: 700, + menubar: true, + readonly: 1, + plugins: [ + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', + + ], + toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + + 'alignleft aligncenter alignright alignjustify | ' + + 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', + + content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' + }} + /> + +
+
} +
} + + + {String(partner_document_data_edit_mode) === "1" &&
-
-
Modifier le contenu du document
- editorRef_programme.current = editor} - initialValue={field_programme} - onKeyUp={editor_keyup} - onEditorChange={(newValue, editor) => { - if (String(editor_tochange) === "1") { - //alert(" change"); - seteditor_tochange(""); - setpartner_document_data_changed("1"); - } - }} - init={{ - resize: false, - height: 700, - menubar: true, - plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', - 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', +
- ], - toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + - 'alignleft aligncenter alignright alignjustify | ' + - 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', + {p_detail_joint_pdf === true &&
+ + +
} - content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' - }} - /> + + {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && +
+ +
Modifier le Coprs du mail
+ one_editorRef_corp_mail.current = editor} + //initialValue={field_corp_mail} + value={field_corp_mail} + onKeyUp={editor_keyup} + onEditorChange={(newValue, editor) => { + set_field_corp_mail(one_editorRef_corp_mail.current.getContent()); + setpartner_document_data_changed("1"); + }} + init={{ + resize: false, + height: 700, + menubar: true, + plugins: [ + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', + + ], + toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + + 'alignleft aligncenter alignright alignjustify | ' + + 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', + + content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' + }} + /> + +
+ } + + + {String(document_principal_ou_corp_mail) !== "2" && +
+
Modifier le contenu du document
+ one_editorRef_programme.current = editor} + //initialValue={field_programme_initial_value} + + onKeyUp={editor_keyup} + value={field_programme} + onEditorChange={(newValue, editor) => { + setfield_programme(one_editorRef_programme.current.getContent()); + setpartner_document_data_changed("1"); + + }} + init={{ + resize: false, + height: 700, + menubar: true, + plugins: [ + 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', + 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', + 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', + + ], + toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + + 'alignleft aligncenter alignright alignjustify | ' + + 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', + + content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' + }} + /> + +
}
-
} - {String(partner_document_data_edit_mode) !== "1" &&
-
-
Votre document
- editorRef_programme.current = editor} - initialValue={field_programme} - disabled={true} - init={{ - resize: false, - height: 700, - menubar: true, - readonly: 1, - plugins: [ - 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', - 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', - 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks', - - ], - toolbar: 'undo redo | casechange blocks | bold italic backcolor | ' + - 'alignleft aligncenter alignright alignjustify | ' + - 'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help', - - content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; }' - }} - /> - -
-
}
  @@ -2740,7 +3036,7 @@ const Config_Documents = (props) => {
- {String(display_add_one_document) === "1" &&
+ {String(display_add_one_document) === "1" &&
@@ -2786,7 +3082,7 @@ const Config_Documents = (props) => {
- Sujet
+ Sujet 1
{
- Version par defaut
+ Version par defaut bbb
{ - p_detail_default_version(e.target.checked); + setp_detail_default_version(e.target.checked); + setpartner_document_data_changed("1"); + }} + + /> + +
+ +
+ Edition par client bbb
+ + { + setp_detail_edition_par_client(e.target.checked); setpartner_document_data_changed("1"); }} @@ -2877,15 +3189,16 @@ const Config_Documents = (props) => {
-
+
+ {p_detail_joint_pdf === true &&
+ className="detail_class_submenu" id='one_detail_document_principal' name='one_detail_document_principal'>Document principal
@@ -2988,11 +3315,8 @@ const Config_Documents = (props) => {
- - - -
} +
}
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 1b9b594..6eff613 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -8496,8 +8496,11 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair } - {String(selected_convention_type) === "email" &&
Recevoir un pré-envoie - Adresse email de test + + + +
} @@ -8942,6 +8946,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair > { setSelectionModel(newSelectionModel); /*if (newSelectionModel.length === 1) @@ -8953,7 +8958,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair setsubmenu(); } }} - selectionModel={selectionModel} + selectionModel={selectionModel} localeText={frFR.components.MuiDataGrid.defaultProps.localeText} rows={rowss.map((item, index) => ( diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 4dbde60..3405206 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -5092,8 +5092,11 @@ const DisplayPartnerStagiaires = (props) => { } - {String(selected_convention_type) === "email" &&
Recevoir un pré-envoie - Adresse email de test + + + + { } } /> +
} @@ -5685,6 +5689,7 @@ const DisplayPartnerStagiaires = (props) => { > { setSelectionModel(newSelectionModel); /*if (newSelectionModel.length === 1) diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 01cb27b..fd6ff5c 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -1509,6 +1509,7 @@ const DistplayPartnerTraningsPage = (props) => { > { setSelectionModel(newSelectionModel); //console.log("ch selected--" + newSelectionModel); @@ -1534,8 +1535,6 @@ const DistplayPartnerTraningsPage = (props) => { } ))} - - columns={columns} pageSize={10} className="datagridclass" @@ -1552,7 +1551,7 @@ const DistplayPartnerTraningsPage = (props) => { } rowsPerPageOptions={[10]} - //disableSelectionOnClick + disableSelectionOnClick components={{ Toolbar: GridToolbar, }} diff --git a/src/styles/components/_config_document.scss b/src/styles/components/_config_document.scss index d6f9d20..d9f6111 100644 --- a/src/styles/components/_config_document.scss +++ b/src/styles/components/_config_document.scss @@ -656,6 +656,7 @@ font-size: small; letter-spacing: 0.1rem; font-weight: normal; + width: auto; } .detail_class_submenu:hover:active, @@ -1265,6 +1266,7 @@ font-size: small; letter-spacing: 0.1rem; font-weight: normal; + width: auto; } .detail_class_submenu:hover:active, @@ -1730,6 +1732,7 @@ font-size: small; letter-spacing: 0.1rem; font-weight: normal; + width: auto; } .detail_class_submenu:hover:active,