From 39496af6ddf9362477d9ac6a90e2f104615b4038 Mon Sep 17 00:00:00 2001 From: cherif Date: Sat, 4 May 2024 20:37:08 +0200 Subject: [PATCH] 04/05/2024 - 20h30 --- src/components/Apprenant.js | 1 + src/components/DisplayPartnerSession.js | 302 +++++++++++++++++++----- 2 files changed, 244 insertions(+), 59 deletions(-) diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 046f38f..f47009b 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -48,6 +48,7 @@ import { RiMoreFill } from "react-icons/ri"; import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; import moment from "moment"; +import 'moment/locale/fr'; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; const Apprenant = (props) => { diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 004b392..ba1f5e9 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -25,6 +25,8 @@ import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; import { format } from 'date-fns' import moment from "moment"; +import 'moment/locale/fr'; + import InputAdornment from '@mui/material/InputAdornment'; import { AiFillCloseCircle, AiOutlineConsoleSql } from "react-icons/ai"; import Box from '@mui/material/Box'; @@ -8006,6 +8008,74 @@ const DisplayPartnerSession = (props) => { } + const [Add_Automatic_Sequence_Session_From_Week_Model_api, setAdd_Automatic_Sequence_Session_From_Week_Model_api] = useState(); + const [Add_Automatic_Sequence_Session_From_Week_Model_message, setAdd_Automatic_Sequence_Session_From_Week_Model_message] = useState(); + const [Add_Automatic_Sequence_Session_From_Week_Model_result, setAdd_Automatic_Sequence_Session_From_Week_Model_result] = useState([]); + const Add_Automatic_Sequence_Session_From_Week_Model = event => { + + var new_title = p_detail_sequence_title; + var new_start_date = moment(SessionstartDate).format("DD/MM/YYYY HH:mm"); + var new_end_date = moment(SessionendDate).format("DD/MM/YYYY HH:mm"); + + var form = new FormData(); + + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("session_id", selected_session_id); + form.append("date_debut", new_start_date); + form.append("date_fin", new_end_date); + + var json_str = JSON.stringify(semaine_type_event) + form.append("semaine_tab_event", json_str); + + //console.log(" form == ", form); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Create_Automatic_Sequence_From_Week_Model/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + //console.log(" In Add_Automatic_Sequence_Session_From_Week_Model res.data.status = " + res.data.status); + //console.log(" In Add_Automatic_Sequence_Session_From_Week_Model res.data.message r_class = " + res.data.message); + + setLoading(false); + if (String(res.data.status) === String("true")) { + setAdd_Automatic_Sequence_Session_From_Week_Model_api("true"); + setAdd_Automatic_Sequence_Session_From_Week_Model_result(res.data.message); + + Getall_Sequence_Of_Session(selected_session_id); + + setp_detail_sequence_title(""); + setp_detail_sequence_comment(""); + + setp_detail_sequence_agenda(""); + setp_detail_sequence_objectif(""); + + setsequence_startDate(); + setsequence_endDate(); + + setDialog_seq_choix_model_emargement_open(false); + + alert(res.data.message); + Close_Dialog_Detail_seq_open(); + + } + else { + setAdd_Automatic_Sequence_Session_From_Week_Model_api("false"); + setAdd_Automatic_Sequence_Session_From_Week_Model_message(res.data.message); + alert(res.data.message); + } + + }).catch((error) => { + + + setLoading(false); + console.warn('UpdateStagiaireData : Not good man :( Add_Automatic_Sequence_Session_From_Week_Model = ' + error); + setAdd_Automatic_Sequence_Session_From_Week_Model_api("false"); + alert(" Impossible de créer automatiquement les séquences"); + }) + } + const [Update_One_Sequence_Session_api, setUpdate_One_Sequence_Session_api] = useState(); const [Update_One_Sequence_Session_message, setUpdate_One_Sequence_Session_message] = useState(); @@ -10168,7 +10238,8 @@ const DisplayPartnerSession = (props) => { "end": "2024-05-02 12:30:00", "agenda": "ddd", "objectif": "ff", - "comment": "sdfds" + "comment": "sdfds", + "day_week": "jeudi" }, { "id": "1714820397818", @@ -10177,7 +10248,8 @@ const DisplayPartnerSession = (props) => { "end": "2024-04-30 16:00:00", "agenda": "ddfd", "objectif": "fff", - "comment": "qqsdsq" + "comment": "qqsdsq", + "day_week": "mardi" } ]); @@ -10195,16 +10267,25 @@ const DisplayPartnerSession = (props) => { }; const Dialog_EVENT_SEMAINE_TYPE_handleClose_buton = () => { + setp_detail_sequence_event_type_semaine_id(""); + setp_detail_sequence_event_type_semaine_title(""); + setp_detail_sequence_event_type_semaine_comment(""); + setp_detail_sequence_event_type_semaine_agenda(""); + setp_detail_sequence_event_type_semaine_objectif(""); + + setsequence_event_type_semaine_startDate(new Date()); + setsequence_event_type_semaine_endDate(new Date()); + setDialog_EVENT_SEMAINE_TYPE_open(false); }; - const [p_detail_sequence_event_type_semaine_id, setp_detail_sequence_event_type_semaine_id] = useState(); + const [p_detail_sequence_event_type_semaine_id, setp_detail_sequence_event_type_semaine_id] = useState(""); - const [p_detail_sequence_event_type_semaine_title, setp_detail_sequence_event_type_semaine_title] = useState(); - const [p_detail_sequence_event_type_semaine_comment, setp_detail_sequence_event_type_semaine_comment] = useState(); - const [p_detail_sequence_event_type_semaine_agenda, setp_detail_sequence_event_type_semaine_agenda] = useState(); - const [p_detail_sequence_event_type_semaine_objectif, setp_detail_sequence_event_type_semaine_objectif] = useState(); + const [p_detail_sequence_event_type_semaine_title, setp_detail_sequence_event_type_semaine_title] = useState(""); + const [p_detail_sequence_event_type_semaine_comment, setp_detail_sequence_event_type_semaine_comment] = useState(""); + const [p_detail_sequence_event_type_semaine_agenda, setp_detail_sequence_event_type_semaine_agenda] = useState(""); + const [p_detail_sequence_event_type_semaine_objectif, setp_detail_sequence_event_type_semaine_objectif] = useState(""); const [sequence_event_type_semaine_startDate, setsequence_event_type_semaine_startDate] = useState(new Date()); @@ -10213,6 +10294,7 @@ const DisplayPartnerSession = (props) => { const handleSelect_event_type_semaine = (info) => { + setDialog_seq_CREATION_SEMAINE_TYPE_open(false); @@ -10240,7 +10322,6 @@ const DisplayPartnerSession = (props) => { const handleEventClick_event_type_semaine = (arg) => { - console.log(" arg = ", arg); setp_detail_sequence_event_type_semaine_title(arg.event.title) @@ -10274,7 +10355,7 @@ const DisplayPartnerSession = (props) => { setp_detail_sequence_event_type_semaine_agenda(""); - + setDialog_seq_CREATION_SEMAINE_TYPE_open(false) setDialog_EVENT_SEMAINE_TYPE_open(true); } @@ -10282,6 +10363,8 @@ const DisplayPartnerSession = (props) => { const Add_event_type_semaine = event => { + setDialog_seq_CREATION_SEMAINE_TYPE_open(false); + var new_title = p_detail_sequence_event_type_semaine_title; var new_agenda = p_detail_sequence_event_type_semaine_agenda; var new_objectif = p_detail_sequence_event_type_semaine_objectif; @@ -10293,7 +10376,10 @@ const DisplayPartnerSession = (props) => { var local_tab = semaine_type_event; - console.log(" local_tab = ", local_tab); + moment.locale('fr'); + var local_getDay = moment(sequence_event_type_semaine_startDate).format('dddd') + + var node = { "id": local_id, @@ -10303,15 +10389,17 @@ const DisplayPartnerSession = (props) => { "agenda": new_agenda, "objectif": new_objectif, "comment": new_comment, + "day_week": local_getDay, }; local_tab.push(node); setsemaine_type_event(local_tab); Dialog_EVENT_SEMAINE_TYPE_handleClose_buton(); - console.log(" semaine_type_event = ", semaine_type_event); + //console.log(" semaine_type_event = ", semaine_type_event); setDialog_seq_CREATION_SEMAINE_TYPE_open(true); + setp_detail_sequence_event_type_semaine_id(""); setp_detail_sequence_event_type_semaine_title(""); setp_detail_sequence_event_type_semaine_agenda(""); setp_detail_sequence_event_type_semaine_objectif(""); @@ -10320,10 +10408,103 @@ const DisplayPartnerSession = (props) => { setsequence_event_type_semaine_startDate(new Date()); + setDialog_EVENT_SEMAINE_TYPE_open(true); + } + const Update_event_type_semaine = event => { + + var new_title = p_detail_sequence_event_type_semaine_title; + var new_agenda = p_detail_sequence_event_type_semaine_agenda; + var new_objectif = p_detail_sequence_event_type_semaine_objectif; + var new_comment = p_detail_sequence_event_type_semaine_comment; + var new_start_date = moment(sequence_event_type_semaine_startDate).format("YYYY-MM-DD HH:mm:ss"); + var new_end_date = moment(sequence_event_type_semaine_endDate).format("YYYY-MM-DD HH:mm:ss"); + var local_id = p_detail_sequence_event_type_semaine_id + + var local_tab = semaine_type_event; + + moment.locale('fr'); + var local_getDay = moment(sequence_event_type_semaine_startDate).format('dddd') + + + + var node = { + "id": local_id, + "title": new_title, + "start": new_start_date, + "end": new_end_date, + "agenda": new_agenda, + "objectif": new_objectif, + "comment": new_comment, + "day_week": local_getDay, + }; + + + for (let i = 0; i < local_tab.length; i++) { + var local_node = local_tab[i] + + + if (String(local_node['id']) === String(p_detail_sequence_event_type_semaine_id)) { + local_node['title'] = new_title; + local_node['start'] = new_start_date; + local_node['end'] = new_end_date; + local_node['agenda'] = new_agenda; + local_node['objectif'] = new_objectif; + local_node['comment'] = new_comment; + local_node['day_week'] = local_getDay; + } + } + + + setsemaine_type_event(local_tab); + + Dialog_EVENT_SEMAINE_TYPE_handleClose_buton(); + //console.log(" semaine_type_event = ", semaine_type_event); + + + setp_detail_sequence_event_type_semaine_id(""); + setp_detail_sequence_event_type_semaine_title(""); + setp_detail_sequence_event_type_semaine_agenda(""); + setp_detail_sequence_event_type_semaine_objectif(""); + setp_detail_sequence_event_type_semaine_comment(""); + setsequence_event_type_semaine_endDate(new Date()); + setsequence_event_type_semaine_startDate(new Date()); + + setDialog_seq_CREATION_SEMAINE_TYPE_open(true); + } + + + const Remove_event_type_semaine = event => { + + var local_id = p_detail_sequence_event_type_semaine_id + + var local_tab = semaine_type_event; + + + + const result = local_tab.filter(element => element.id !== local_id); + + setsemaine_type_event(result); + + Dialog_EVENT_SEMAINE_TYPE_handleClose_buton(); + //console.log(" semaine_type_event = ", semaine_type_event); + + + setp_detail_sequence_event_type_semaine_id(""); + setp_detail_sequence_event_type_semaine_title(""); + setp_detail_sequence_event_type_semaine_agenda(""); + setp_detail_sequence_event_type_semaine_objectif(""); + setp_detail_sequence_event_type_semaine_comment(""); + setsequence_event_type_semaine_endDate(new Date()); + setsequence_event_type_semaine_startDate(new Date()); + + setDialog_seq_CREATION_SEMAINE_TYPE_open(true); + } + + return (
@@ -10350,6 +10531,7 @@ const DisplayPartnerSession = (props) => {
+ @@ -10536,8 +10718,9 @@ const DisplayPartnerSession = (props) => {
{String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" &&
- {p_detail_event_id && String(p_detail_event_id) !== "" && } - {(!p_detail_event_id || String(p_detail_event_id) === "") && } + {p_detail_sequence_event_type_semaine_id && String(p_detail_sequence_event_type_semaine_id) !== "" && } + + {(!p_detail_sequence_event_type_semaine_id || String(p_detail_sequence_event_type_semaine_id) === "") && } @@ -10552,7 +10735,7 @@ const DisplayPartnerSession = (props) => { - {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && + {p_detail_sequence_event_type_semaine_id && String(p_detail_sequence_event_type_semaine_id) !== "" &&
@@ -10589,7 +10772,7 @@ const DisplayPartnerSession = (props) => {
@@ -10669,54 +10852,54 @@ const DisplayPartnerSession = (props) => {
- - {SessionstartDate && SessionendDate && - -
- Dupliquer Du (date du ): - { - if (edit_session_form) { - setSessionstartDate(date); - + {SessionstartDate && SessionendDate && + +
+ + Dupliquer Du (date du ): + { + if (edit_session_form) { + setSessionstartDate(date); + + } } - } - } - showTimeSelect={false} - filterTime={filterPassedTime_start} - dateFormat="dd/MM/yyyy" - className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' - - /> - -
- Dupliquer Au (date au ): - { - if (edit_session_form) { - SessionendDate(date); - } - } - } - showTimeSelect={false} - filterTime={filterPassedTime_start} - dateFormat="dd/MM/yyyy" - className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + showTimeSelect={false} + filterTime={filterPassedTime_start} + dateFormat="dd/MM/yyyy" + className="disabled_style session_caract_Dialog_DatePicker" + locale='fr-FR' - /> -
+ /> -
} +
+ Dupliquer Au (date au ): + { + if (edit_session_form) { + SessionendDate(date); + + } + } + } + showTimeSelect={false} + filterTime={filterPassedTime_start} + dateFormat="dd/MM/yyyy" + className="disabled_style session_caract_Dialog_DatePicker" + locale='fr-FR' + + /> +
+ +
} @@ -10725,7 +10908,7 @@ const DisplayPartnerSession = (props) => {
- +
@@ -10965,6 +11148,7 @@ const DisplayPartnerSession = (props) => { {Dialog_seq_choix_model_emargement && String(Dialog_seq_choix_model_emargement) === "3" &&