From 629693907920dbd2bda3da3524cb34b1e902ed1c Mon Sep 17 00:00:00 2001 From: cherif Date: Wed, 18 Oct 2023 12:48:18 +0200 Subject: [PATCH] 18/10/23 - 12h30 --- src/components/DisplayDetailClass_new_v2.js | 9 +-- src/components/DisplayPartnerSession.js | 10 +++- src/components/Formation.js | 35 +++++++++++- src/components/GestionAdministrative.js | 63 ++++++++++++++++++--- src/components/PartnerClient_Activite.js | 2 +- src/styles/components/_formation.scss | 4 ++ 6 files changed, 104 insertions(+), 19 deletions(-) diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index 3955aed..1a31080 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -900,7 +900,7 @@ const DisplayDetailClass_new_v2 = (props) => { axios.post(myurl, form).then(res => { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); - //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); + console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); if (String(res.data.status) === String("true") ) { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); @@ -1448,7 +1448,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- Les Sessions + Les sessions
@@ -1923,12 +1923,13 @@ const DisplayDetailClass_new_v2 = (props) => { {GetCurrentClass_result && GetCurrentClass_result.length > 0 &&
- Les Sessions + Les sessions +
    - + {GetCurrentClass_result && GetCurrentClass_result.slice(0, 5).map((formation) => ( diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 0a62767..7aeb205 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -2507,10 +2507,12 @@ const DisplayPartnerSession = (props) => { nb_participant = document.getElementById("one_nb_participant").value; } if (nb_participant.trim() == "") { - const response = window.confirm("Le nombre de participants est vide. Continuer ?"); + const response = window.confirm("Le nombre de participants est vide. Par défaut, 1. Continuer ?"); if (!response) { return; } + nb_participant = "1" + } var prix_session = p_one_prix_session @@ -4932,6 +4934,7 @@ const DisplayPartnerSession = (props) => { > Code Session    + Code Formation (code externe)   Titre Formation   @@ -5008,7 +5011,8 @@ const DisplayPartnerSession = (props) => { > Code Session    - Titre Formation   + Code Formation (code externe)   + Titre Formation  
@@ -5061,7 +5065,7 @@ const DisplayPartnerSession = (props) => { {
-
diff --git a/src/components/Formation.js b/src/components/Formation.js index 2684fbf..a921f7c 100644 --- a/src/components/Formation.js +++ b/src/components/Formation.js @@ -29,6 +29,7 @@ import axios from "axios"; //import { Rating } from 'react-simple-star-rating' import Rating from '@mui/material/Rating'; import parse from 'html-react-parser' +import { CiLocationOn } from "react-icons/ci"; const Formation = (props) => { const [userconnected, setuserconnected] = useState("0"); @@ -260,12 +261,12 @@ const Formation = (props) => { {String(ismetiermanaged) === "0" &&
autre - {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
} + {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
}
} {String(ismetiermanaged) === "1" &&
autre - {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
} + {props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
}
} @@ -369,6 +370,36 @@ const Formation = (props) => { {parse(String(props.formation.description).replace(/(<([^>]+)>)/ig, ''))}
+ {GetCurrentClass_result && GetCurrentClass_result.length > 0 && + + } + {!GetCurrentClass_result || GetCurrentClass_result.length <= 0 && + + }
diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index 454bb1f..f16763a 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -973,7 +973,7 @@ function GestionAdministrative(props) { form.append("client_rattachement_id", p_detail_client_rattachement_id); var myurl = process.env.REACT_APP_API_URL + "myclass/api/UpdateStagiairetoClass/"; -setLoading(true); + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In UpdateStagiaireData res.data.status = " + res.data.status); //console.log(" In UpdateStagiaireData res.data.message r_class = " + res.data.message); @@ -1968,6 +1968,13 @@ setLoading(true); const [p_session_etape, setp_session_etape] = useState(); const [p_session_etape_label, setp_session_etape_label] = useState(); + const [p_session_status, setp_session_status] = useState(); + const [p_session_status_label, setp_session_status_label] = useState(); + + const [p_session_code_session, setp_session_code_session] = useState(); + + + const [p_detail_one_presentiel, setp_detail_one_presentiel] = useState(); const [p_detail_presentiel, setp_detail_presentiel] = useState(); const [p_detail_presentiel_label, setp_detail_presentiel_label] = useState(); @@ -2003,10 +2010,11 @@ setLoading(true); nb_participant = document.getElementById("one_nb_participant").value; } if (nb_participant.trim() == "") { - const response = window.confirm("Le nombre de participants est vide. Continuer ?"); + const response = window.confirm("Le nombre de participants est vide. Par defaut, 1. Continuer ?"); if (!response) { return; } + nb_participant = "1" } prix_session = "" @@ -2020,6 +2028,11 @@ setLoading(true); one_session_ondemande = p_detail_one_session_ondemande; } + var one_session_status = "0" + if (p_session_status) { + one_session_status = p_session_status; + } + var presentiel = "0" presentiel = "" @@ -2097,6 +2110,7 @@ setLoading(true); const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("class_internal_url", internal_url); + form.append("session_status", one_session_status); form.append("code_session", code_session); form.append("date_debut", format(one_SessionstartDate, 'dd/MM/yyyy kk:mm:ss')); form.append("date_fin", format(one_SessionendDate, 'dd/MM/yyyy kk:mm:ss')); @@ -2350,7 +2364,7 @@ setLoading(true); document.getElementsByName("formateur")[0].value = mylocaltraining.formateur; } - + if (mylocaltraining.lms_class_code) { setis_lms_class_code(mylocaltraining.lms_class_code); } @@ -2365,8 +2379,6 @@ setLoading(true); else if (String(mylocaltraining.session_status) === "0") setsessionStatus(false); - } else { - alert(" Aucune information recuperée"); } } else if (String(res.data.status) === String("Err_Connexion")) { @@ -2707,12 +2719,17 @@ setLoading(true); if (document.getElementsByName("one_sessiondatefininscription")[0]) document.getElementsByName("one_sessiondatefininscription")[0].value = ""; + if (document.getElementsByName("one_session_status")[0]) + document.getElementsByName("one_session_status")[0].value = ""; + setone_SessionstartDateInscription(); setone_SessionendDateInscription(); setone_SessionendDate(); setone_SessionstartDate(); setone_urlpreview_certif(); setone_field_contenu_ftion(); + setp_session_status(); + setp_session_code_session(); } const [one_SessionstartDateInscription, setone_SessionstartDateInscription] = useState(); @@ -3311,7 +3328,7 @@ setLoading(true); top: divh, behavior: "smooth", }); - // myelement.scrollIntoView({ behavior: 'smooth' }); + // myelement.scrollIntoView({ behavior: 'smooth' }); } } @@ -3773,7 +3790,7 @@ setLoading(true); behavior: "smooth", }); - // myelement.scrollIntoView({ behavior: 'smooth' }); + // myelement.scrollIntoView({ behavior: 'smooth' }); } } @@ -5112,9 +5129,37 @@ setLoading(true); disabled={false} className="disabled_style enable_style" + value={p_session_code_session} + onChange={(e) => { + setp_session_code_session(e.target.value); + } + } + />
+
Statut*
+ { + setp_session_status(e.target.value); + } + } + > + Inactif    + Actif   + +
+
Session à la demande*
- +
Nombre participants *
@@ -5881,7 +5926,7 @@ setLoading(true); />
- +
Nombre participants *
diff --git a/src/components/PartnerClient_Activite.js b/src/components/PartnerClient_Activite.js index c270d1c..ceebc87 100644 --- a/src/components/PartnerClient_Activite.js +++ b/src/components/PartnerClient_Activite.js @@ -935,7 +935,7 @@ const PartnerClientActivite = (props) => {
} - {String(formedit_mode_activite) === "1" &&
Assigné d à (employé)
+ {String(formedit_mode_activite) === "1" &&
Assigné à (employé)