From 9e20b33692ee867823c6e1b2b5d2b56e543fb356 Mon Sep 17 00:00:00 2001
From: cherif
Date: Wed, 31 Jan 2024 19:50:55 +0100
Subject: [PATCH] 31/01/2024 - 20h
---
src/components/AccountUserActivated.js | 2 +-
src/components/DisplayPartnerSession.js | 262 ++++++++++++++----
.../DisplayPartnerTrainingsPagination.js | 52 ++--
src/components/Employes.js | 2 +-
src/components/Module_Editique.js | 32 ++-
src/pages/emargementOk.js | 2 +-
.../components/_displaypartnersession.scss | 5 +
7 files changed, 266 insertions(+), 91 deletions(-)
diff --git a/src/components/AccountUserActivated.js b/src/components/AccountUserActivated.js
index 4b6b97a..acef442 100644
--- a/src/components/AccountUserActivated.js
+++ b/src/components/AccountUserActivated.js
@@ -57,7 +57,7 @@ function Account() {
- Vous allez etre redirigé vers le moteur de recherche dans quelques secondes. {tempo}
+ Vous allez être redirigé vers le moteur de recherche dans quelques secondes. {tempo}
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js
index a2ab7bb..22f1ecf 100644
--- a/src/components/DisplayPartnerSession.js
+++ b/src/components/DisplayPartnerSession.js
@@ -163,7 +163,7 @@ const DisplayPartnerSession = (props) => {
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
{ field: 'class_internal_url', headerName: 'class_internal_url', hide: true },
- { field: 'code_session', headerName: 'Code session', hide: false, minWidth: 100, flex: 1, renderCell: (params) =>
, },
+ { field: 'code_session', headerName: 'Code session', hide: false, minWidth: 200, flex: 1, renderCell: (params) =>
, },
{ field: 'session_title', headerName: 'Titre', hide: false, flex: 1, minWidth: 250, renderCell: (params) =>
, },
{
@@ -187,8 +187,8 @@ const DisplayPartnerSession = (props) => {
},
{ field: 'class_external_code', headerName: 'Code Formation', align: "center", hideable: true, flex: 1, hide: true, minWidth: 150, renderCell: (params) =>
, },
- { field: 'date_debut', headerName: 'Debut', hide: false, width: datagrid_columns_size_model2, },
- { field: 'date_fin', headerName: 'Fin', hideable: false, width: datagrid_columns_size_model2, },
+ { field: 'date_debut', headerName: 'Debut', hide: false, minWidth: 150, renderCell: (params) =>
, },
+ { field: 'date_fin', headerName: 'Fin', hideable: false, minWidth: 150, renderCell: (params) =>
, },
{
field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2,
renderCell: (cellValues) => {
@@ -244,7 +244,10 @@ const DisplayPartnerSession = (props) => {
},
{ field: 'nb_inscrit', headerName: 'Inscrits', minWidth: 20, align: "center", hide: true, hideable: true, },
{ field: 'nb_preinscrit', headerName: 'Preinscrits', minWidth: 20, align: "center", hide: true, hideable: true, },
- { field: 'prix_session', headerName: 'Prix', minWidth: 20, align: "center", renderCell: (params) =>
, },
+ {
+ field: 'prix_session', headerName: 'Prix', minWidth: 20, align: "center",
+ renderCell: (params) =>
,
+ },
{ field: 'title', headerName: 'Formation', minWidth: 250, flex: 1, align: "center", hide: true, hideable: true, renderCell: (params) =>
, },
{ field: 'domaine', headerName: 'Domaine', minWidth: datagrid_columns_size_model1, align: "center", hide: true, hideable: true, renderCell: (params) =>
, },
{ field: 'published', headerName: 'publié', minWidth: datagrid_columns_size_model1, align: "center", hide: true, hideable: true, renderCell: (params) =>
, },
@@ -750,20 +753,21 @@ const DisplayPartnerSession = (props) => {
{ field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true },
{ field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false },
- { field: 'statut', headerName: 'Statut', width: 150, hide: false, editable: false ,
- renderCell: (cellValues) => {
- return (
+ {
+ field: 'statut', headerName: 'Statut', width: 150, hide: false, editable: false,
+ renderCell: (cellValues) => {
+ return (
-
- {String(cellValues.row.statut) === "0" && "Init"}
- {String(cellValues.row.statut) === "1" && "Envoyé"}
- {String(cellValues.row.statut) === "2" && "Validé"}
+
+ {String(cellValues.row.statut) === "0" && "Init"}
+ {String(cellValues.row.statut) === "1" && "Envoyé"}
+ {String(cellValues.row.statut) === "2" && "Validé"}
-
+
- );
+ );
+ },
},
- },
{ field: 'date_envoi', headerName: 'Envoyé le', width: 150, hide: false, editable: false },
{
@@ -837,6 +841,10 @@ const DisplayPartnerSession = (props) => {
{ field: 'sequence_start', headerName: 'Debut', minWidth: 200, flex: 1, hide: false, editable: false },
{ field: 'sequence_end', headerName: 'Fin', minWidth: 200, flex: 1, hide: false, editable: false },
+ { field: 'agenda', headerName: 'Agenda', minWidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) =>
, },
+ { field: 'objectif', headerName: 'Objectif', width: 0, flex: 0, hide: true, editable: false, },
+ { field: 'commentaire', headerName: 'Commentaire', width: 0, flex: 0, hide: true, editable: false, },
+
{
field: "Detail", headerName: 'Voir detail', minWidth: 200, flex: 1,
@@ -851,6 +859,10 @@ const DisplayPartnerSession = (props) => {
setselected_sequence_startDate(cellValues.row.sequence_start);
setselected_sequence_endDate(cellValues.row.sequence_end);
+ setp_detail_sequence_agenda(cellValues.row.agenda);
+ setp_detail_sequence_objectif(cellValues.row.objectif);
+ setp_detail_sequence_comment(cellValues.row.commentaire);
+
Getall_List_Sequence_Ressource(cellValues.row._id);
setselected_sequence_id(cellValues.row._id);
@@ -890,6 +902,11 @@ const DisplayPartnerSession = (props) => {
setsequence_startDate(date_du);
setsequence_endDate(date_au);
+
+ setp_detail_sequence_agenda(cellValues.row.agenda);
+ setp_detail_sequence_objectif(cellValues.row.objectif);
+ setp_detail_sequence_comment(cellValues.row.commentaire);
+
setupdate_sequence("1");
submenu_update_sequence();
}}
@@ -1181,6 +1198,7 @@ const DisplayPartnerSession = (props) => {
function handleClick_edit_session_From_Line(selected_row_id) {
setgridline_id(selected_row_id);
+ setsequence_gridline_id("");
setLoading(true);
setaddOneSession("0");
@@ -2069,6 +2087,7 @@ const DisplayPartnerSession = (props) => {
}
setgridline_id('');
+ setsequence_gridline_id("");
//myRef.current.scrollIntoView({ behavior: "smooth" });
var divh = document.getElementById('myRef_add_session').offsetTop;
@@ -2791,7 +2810,10 @@ const DisplayPartnerSession = (props) => {
+ const [sequence_gridline_id, setsequence_gridline_id] = useState("");
+
const [gridline_id, setgridline_id] = useState("");
+
function GetSelectedRows_Sequence_Ids() {
@@ -5931,6 +5953,8 @@ const DisplayPartnerSession = (props) => {
setp_filtre2_value();
setgridline_id('');
+ setsequence_gridline_id("");
+
setnb_stagiaire_Preinscrit("");
setnb_stagiaire_Inscrit("");
setSelectionModel([]);
@@ -6391,6 +6415,7 @@ const DisplayPartnerSession = (props) => {
setDialog_2_open(false);
setsession_selected_row_id('');
setgridline_id('');
+ setsequence_gridline_id("");
};
@@ -7149,6 +7174,9 @@ const DisplayPartnerSession = (props) => {
const [p_detail_sequence_title, setp_detail_sequence_title] = useState();
const [p_detail_sequence_comment, setp_detail_sequence_comment] = useState();
+ const [p_detail_sequence_agenda, setp_detail_sequence_agenda] = useState();
+ const [p_detail_sequence_objectif, setp_detail_sequence_objectif] = useState();
+
const [sequence_startDate, setsequence_startDate] = useState(new Date());
const [sequence_endDate, setsequence_endDate] = useState(new Date());
@@ -7163,6 +7191,7 @@ const DisplayPartnerSession = (props) => {
const [Dialog_seq_1_open, setDialog_seq_1_open] = React.useState(false);
function Close_Dialog_Detail_seq_open() {
+ clearSequence_Data();
setDialog_seq_1_open(false);
}
@@ -7181,11 +7210,27 @@ const DisplayPartnerSession = (props) => {
};
+ function clearSequence_Data() {
+ setupdate_sequence();
+ setp_detail_sequence_title("");
+
+ setp_detail_sequence_comment("");
+ setp_detail_sequence_agenda("");
+ setp_detail_sequence_objectif("");
+
+ setsequence_startDate(new Date());
+ setsequence_endDate(new Date());
+
+ }
+
function submenu_add_one_sequence() {
setupdate_sequence();
- setp_detail_sequence_title();
+ setp_detail_sequence_title("");
+
+ setp_detail_sequence_comment("");
+ setp_detail_sequence_agenda("");
+ setp_detail_sequence_objectif("");
- setp_detail_sequence_comment();
setsequence_startDate(new Date());
setsequence_endDate(new Date());
@@ -7217,6 +7262,11 @@ const DisplayPartnerSession = (props) => {
form.append("sequence_start", new_start_date);
form.append("sequence_end", new_end_date);
+ form.append("agenda", p_detail_sequence_agenda);
+ form.append("objectif", p_detail_sequence_objectif);
+ form.append("commentaire", p_detail_sequence_comment);
+
+
//console.log(" form == ", form);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Session_Sequence/";
@@ -7233,8 +7283,12 @@ const DisplayPartnerSession = (props) => {
Getall_Sequence_Of_Session(selected_session_id);
- setp_detail_sequence_title();
- setp_detail_sequence_comment();
+ setp_detail_sequence_title("");
+ setp_detail_sequence_comment("");
+
+ setp_detail_sequence_agenda("");
+ setp_detail_sequence_objectif("");
+
setsequence_startDate();
setsequence_endDate();
@@ -7294,8 +7348,12 @@ const DisplayPartnerSession = (props) => {
Getall_Sequence_Of_Session(selected_session_id);
- setp_detail_sequence_title();
- setp_detail_sequence_comment();
+ setp_detail_sequence_title("");
+ setp_detail_sequence_comment("");
+
+ setp_detail_sequence_agenda("");
+ setp_detail_sequence_objectif("");
+
setsequence_startDate();
setsequence_endDate();
@@ -7340,6 +7398,10 @@ const DisplayPartnerSession = (props) => {
form.append("sequence_start", new_start_date);
form.append("sequence_end", new_end_date);
+ form.append("agenda", p_detail_sequence_agenda);
+ form.append("objectif", p_detail_sequence_objectif);
+ form.append("commentaire", p_detail_sequence_comment);
+
form.append("_id", selected_sequence_id);
//console.log(" form == ", form);
@@ -7358,8 +7420,12 @@ const DisplayPartnerSession = (props) => {
Getall_Sequence_Of_Session(selected_session_id);
- setp_detail_sequence_title();
- setp_detail_sequence_comment();
+ setp_detail_sequence_title("");
+ setp_detail_sequence_comment("");
+
+ setp_detail_sequence_agenda("");
+ setp_detail_sequence_objectif("");
+
setsequence_startDate();
setsequence_endDate();
@@ -7421,6 +7487,7 @@ const DisplayPartnerSession = (props) => {
setselected_sequence_id();
setupdate_sequence();
setgridline_id('');
+ setsequence_gridline_id("");
alert(res.data.message)
@@ -7771,6 +7838,9 @@ const DisplayPartnerSession = (props) => {
function GetListeEmargement(localsessionid, class_internal_url) {
clean_old_messages();
var form = new FormData();
+
+ setRows_emarg([]);
+ setSelectionModel_emarg([]);
//form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA");
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
@@ -7858,22 +7928,14 @@ const DisplayPartnerSession = (props) => {
async function actionmass_emarge_Traitemet() {
var liste_formation = GetSelectedRows_Emarg_Ids();
- for (var i = 0; i < liste_formation.length; i++) {
- var line = JSON.parse(rowss_emarg[liste_formation[i]]);
- //console.log(" line = ", line);
- var email = line.email;
- //console.log(" Traitement de email = ", email);
- if (String(actionmass_emarg_val) === "demande emargement") {
- ActionMassListEmargement();
- }
- await sleep(20)
+ if (String(actionmass_emarg_val) === "demande emargement") {
+ ActionMassListEmargement();
}
setSelectionModel_emarg([]);
setactionmass_emarg_val();
GetListeEmargement(selected_session_id, selected_internal_url);
- alert(" La demande d'émargement a été envoyée" );
}
@@ -7913,7 +7975,9 @@ const DisplayPartnerSession = (props) => {
setActionMassListEmargement_api("true");
setActionMassListEmargement_result(res.data.message);
-
+ GetListeEmargement(selected_session_id, selected_internal_url);
+ alert(res.data.message);
+
} else if (String(res.data.status) === String("Err_Connexion")) {
alert(res.data.message);
history.push("/Connexion");
@@ -7929,6 +7993,7 @@ const DisplayPartnerSession = (props) => {
setLoading(false);
console.warn('ActionMassListEmargement : Not good man :( mysearchtext = ' + error);
setActionMassListEmargement_api("false");
+ alert(" Impossible d'envoyer les demandes d'émargement");
})
@@ -8099,7 +8164,7 @@ const DisplayPartnerSession = (props) => {
var is_present_val = "";
- console.log(" ### cellValues.row = ", cellValues.row);
+ //console.log(" ### cellValues.row = ", cellValues.row);
var is_present = cellValues.row.is_present;
if (is_present === true) {
@@ -8136,7 +8201,7 @@ const DisplayPartnerSession = (props) => {
setUpdateStagiaireEmargement_api("true");
setUpdateStagiaireEmargement_result(res.data.message);
GetListeEmargement(selected_session_id, selected_internal_url);
- alert(" La mise à jour a été bien faite");
+ alert(res.data.message);
} else if (String(res.data.status) === String("Err_Connexion")) {
alert('Erreur: ' + res.data.message);
history.push("/Connexion");
@@ -8813,7 +8878,13 @@ const DisplayPartnerSession = (props) => {
>
-
Ajout Sequence
+
+
+ {String(update_sequence) !== "1" && "Ajouter une séquence"}
+ {String(update_sequence) === "1" && "Mettre à jour une séquence"}
+
+
+
{Dialog_seq_1_message}
@@ -8890,6 +8961,55 @@ const DisplayPartnerSession = (props) => {
+
+