From 5024c8136b1abce22bcae319f4054e8bde58c21f Mon Sep 17 00:00:00 2001 From: cherif Date: Fri, 22 Mar 2024 18:54:57 +0100 Subject: [PATCH] 20/03/2024 - 22h30d --- src/components/ESign.js | 73 ++++--- src/components/Module_Editique.js | 213 +++++++++++++++----- src/styles/components/_module_editique.scss | 6 + 3 files changed, 207 insertions(+), 85 deletions(-) diff --git a/src/components/ESign.js b/src/components/ESign.js index c235a0f..8ad7812 100644 --- a/src/components/ESign.js +++ b/src/components/ESign.js @@ -98,7 +98,7 @@ function ESign() { seterreur_recup_e_doc(); setselected_e_doc_secret(""); setselected_e_doc_email(""); - + } @@ -236,7 +236,7 @@ function ESign() { }; const [Dialog_SIGN_VALIDATION_open, setDialog_SIGN_VALIDATION_open] = React.useState(false); - + const Dialog_SIGN_VALIDATION_handleClose = () => { //alert(" Utiliser le bouton 'fermer' "); @@ -442,43 +442,56 @@ function ESign() {

Signature Electronique

- {is_valide_e_document &&
-
- - - -
-
-   +
+
+ Guide d'utilisation : +
    +
  • Etape 1
  • +
  • Etape 2
  • +
+
+ text d'explication + {is_valide_e_document && +
+
+ -
-
+
+
+   +
-
- -
+
+
-
- -
-
+
+ + + +
+ +
+ +
+
+
+
} + + {!is_valide_e_document &&
+   + +
}
-
} - - {!is_valide_e_document &&
-   - -
} - +
 
diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js index 1fd12b5..e4081ee 100644 --- a/src/components/Module_Editique.js +++ b/src/components/Module_Editique.js @@ -109,10 +109,26 @@ const Module_Editique = (props) => { }; + + const [expanded_nom_traite, setExpanded_nom_traite] = React.useState([]); + const [selected_nom_traite, setSelected_nom_traite] = React.useState([]); + + const handleToggle_nom_traite = (event, nodeIds) => { + setExpanded_nom_traite(nodeIds); + }; + + const handleSelect_nom_traite = (event, nodeIds) => { + setSelected_nom_traite(nodeIds); + }; + + + const [tab_handleExpandClick_id, settab_handleExpandClick_id] = React.useState([]); //settab_handleExpandClick_id(['0', '1', '2', '3', '4', '20']) const handleExpandClick = () => { + setdisplay_audit_data("0"); + setExpanded((oldExpanded) => oldExpanded.length === 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] : [], ); @@ -221,10 +237,10 @@ const Module_Editique = (props) => { form.append("related_collection", props.related_collection); form.append("related_collection_recid", props.related_collection_recid); - + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Action_Server_" + String(api_name) + "/"; - + return; setLoading(true); @@ -259,10 +275,53 @@ const Module_Editique = (props) => { const [is_session_invoiced, setis_session_invoiced] = useState("0"); const [session_date_debut, setsession_date_debut] = useState(date_today_90j.toLocaleDateString('fr-FR')); + + const [Getall_Audit_Document_By_Partner_By_Collection_api, setGetall_Audit_Document_By_Partner_By_Collection_api] = useState(); + const [Getall_Audit_Document_By_Partner_By_Collection_message, setGetall_Audit_Document_By_Partner_By_Collection_message] = useState(); + const [Getall_Audit_Document_By_Partner_By_Collection_result, setGetall_Audit_Document_By_Partner_By_Collection_result] = useState([]); + function Getall_Audit_Document_By_Partner_By_Collection(event) { + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("session_id", props.related_collection_recid); + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Audit_Session_Action_Inscrit/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + + setLoading(false); + + if (String(res.data.status) === String("true")) { + //console.log(" In Getall_Editable_Document_By_Partner_By_Collection res.data.status = " + res.data.status); + //console.log(" In Getall_Editable_Document_By_Partner_By_Collection res.data.message r_class = " + res.data.message); + setGetall_Audit_Document_By_Partner_By_Collection_api("true"); + setGetall_Audit_Document_By_Partner_By_Collection_result(JSON.parse(res.data.message)); + + + + } + else { + setGetall_Audit_Document_By_Partner_By_Collection_api("false"); + setGetall_Audit_Document_By_Partner_By_Collection_message(res.data.message); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( Getall_Editable_Document_By_Partner_By_Collection = ', error); + setGetall_Audit_Document_By_Partner_By_Collection_api("false"); + //setmyApimyApiMessage("") + }) + } + + useEffect(() => { setselected_session_id(props.related_collection_recid); Getall_Editable_Document_By_Partner_By_Collection(); + Getall_Audit_Document_By_Partner_By_Collection(); Get_related_collection_Data(); @@ -802,6 +861,11 @@ const Module_Editique = (props) => { } + + + const [display_audit_data, setdisplay_audit_data] = useState("0"); + + const [Send_Stagiaire_Conventions_By_Email_api, setSend_Stagiaire_Conventions_By_Email_api] = useState(); const [Send_Stagiaire_Conventions_By_Email_message, setSend_Stagiaire_Conventions_By_Email_message] = useState(); const [Send_Stagiaire_Conventions_By_Email_result, setSend_Stagiaire_Conventions_By_Email_result] = useState(); @@ -1031,6 +1095,15 @@ const Module_Editique = (props) => { setDialog_MSG_INFO_open(false); }; + + function handleExpandClick_audit() { + setdisplay_audit_data("1"); + + + setExpanded_nom_traite((oldExpanded_nom_traite) => + oldExpanded_nom_traite.length === 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] : [], + ); + } return (
@@ -1359,7 +1432,7 @@ const Module_Editique = (props) => {
- {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention 1 + {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention {
} - {String(selected_convention_type) === "pdf" &&
Recevoir un pré-envoie + {String(selected_convention_type) === "email" &&
Recevoir un pré-envoie { } - {String(selected_convention_type) === "pdf" && - String(actionmass_ftion_val) !== String("convention") &&
Email destinaitaire - - -
- } - + {String(selected_convention_type) === "email" &&
@@ -1661,7 +1718,7 @@ const Module_Editique = (props) => { } /> - +
@@ -1771,7 +1828,7 @@ const Module_Editique = (props) => {
} - {String(selected_convention_type) === "pdf" &&
Recevoir un pré-envoie + {String(selected_convention_type) === "email" &&
Recevoir un pré-envoie {
} - {String(selected_convention_type) === "pdf" && - String(actionmass_ftion_val) !== String("convention") &&
Email destinaitaire - - -
- } + {String(selected_convention_type) === "email" &&
@@ -2058,17 +2100,17 @@ const Module_Editique = (props) => { else if (String(JSON.parse(document).courrier_template_ref_interne) === "CONVOCATION_STAGIAIRE") { - // Verifier que la date de la session n'est pas passée - var date_eval = new Date(moment(session_date_debut, "DD/MM/YYYY")); - var diff = date_eval.getTime() - Date.now(); - - if (diff <= 0) { - setMSG_INFO_TEXT("Cette session a déjà commencé. Il n'est plus possible d'éditer une convocation") - setDialog_MSG_INFO_open(true); - return; - } + // Verifier que la date de la session n'est pas passée + var date_eval = new Date(moment(session_date_debut, "DD/MM/YYYY")); + var diff = date_eval.getTime() - Date.now(); + + if (diff <= 0) { + setMSG_INFO_TEXT("Cette session a déjà commencé. Il n'est plus possible d'éditer une convocation") + setDialog_MSG_INFO_open(true); + return; + } + - if (String(is_session_invoiced) === "1") { setMSG_INFO_TEXT("Cette session est en cours de facturation. Il n'est plus possible d'éditer une convocation") setDialog_MSG_INFO_open(true); @@ -2135,10 +2177,21 @@ const Module_Editique = (props) => {
- Détail - + + + + + + {String(display_audit_data) == "0" && { ))} - + } + + {String(display_audit_data) == "1" && + + + {Getall_Audit_Document_By_Partner_By_Collection_result && + Getall_Audit_Document_By_Partner_By_Collection_result.map((document) => ( + + + } + defaultExpandIcon={} + expanded_nom_traite={expanded_nom_traite} + selected={selected_nom_traite} + onNodeToggle={handleToggle_nom_traite} + onNodeSelect={handleSelect_nom_traite} + multiSelect + className="test04" + > + + {(document).tab_user_statut && + (document).tab_user_statut.map((history_doc) => ( + + + + ))} + + + + + + + + + ))} + }
-
+
) } diff --git a/src/styles/components/_module_editique.scss b/src/styles/components/_module_editique.scss index 19b988e..ae94a75 100644 --- a/src/styles/components/_module_editique.scss +++ b/src/styles/components/_module_editique.scss @@ -18,6 +18,12 @@ //background-color: #464b5e !important; } + .test04 { + text-align: right !important; + font-size: x-small; + //background-color: #464b5e !important; + } + .css-hytcpw{ max-width: 100% !important; }