From 1e76baafcf60fccf9bb7be3bbae3f465cd2cee5a Mon Sep 17 00:00:00 2001 From: cherif Date: Wed, 3 Jan 2024 17:19:41 +0100 Subject: [PATCH] 03/01/2024 - 17h30 --- src/components/AddClassManual.js | 351 ++++++++++++++++++++---- src/components/DisplayPartnerSession.js | 21 +- src/components/Fotter.js | 2 +- src/components/GestionAdministrative.js | 7 +- src/components/HebergementLms.js | 12 +- 5 files changed, 327 insertions(+), 66 deletions(-) diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 8ce6106..5fb559a 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -11,7 +11,7 @@ import { Alert } from "@mui/material"; import { AiTwotoneEdit, AiTwotoneSave } from "react-icons/ai"; import profileimg from "../mysy_img/MYSY-profil-2.png"; import Abonnement from "./Abonnement"; -import { PropaneSharp, ResetTvRounded } from "@mui/icons-material"; +import { ContentPasteSearchOutlined, PropaneSharp, ResetTvRounded } from "@mui/icons-material"; import { useHistory } from "react-router-dom"; import CheckOut from "./CheckOut"; @@ -34,13 +34,30 @@ const AddClassManual = (props) => { const history = useHistory(); const url = process.env.REACT_APP_API_URL + "/myclass/api/add_partner_account/"; const [inputs, setInputs] = useState({}); - const [mypresence, setmypresence] = useState(""); - const [mypublished, setmypublished] = useState(""); - const [mydistance, setmydistance] = useState(""); + + const [mypublished, setmypublished] = useState("0"); + const [mypublished_label, setmypublished_label] = useState(""); + const [mytrainingsupport, setmytrainingsupport] = useState("n/a"); - const [mytrainingdurationunit, setmytrainingdurationunit] = useState(""); + const [mytrainingsupport_label, setmytrainingsupport_label] = useState(""); + + const [mytrainingdurationunit, setmytrainingdurationunit] = useState("heure"); + + const [mycpf, setmycpf] = useState(""); + const [mycpf_label, setmycpf_label] = useState(""); + const [mycertif, setmycertif] = useState(""); + const [mycertif_label, setmycertif_label] = useState(""); + + const [mypresence, setmypresence] = useState(""); + const [mypresence_label, setmypresence_label] = useState(""); + + + const [mydistance, setmydistance] = useState(""); + const [mydistance_label, setmydistance_label] = useState(""); + + const [importmessage, setimportmessage] = useState(""); const [myApiResponse, setmyApiResponse] = useState(""); const setText = "coucou"; @@ -165,6 +182,34 @@ const AddClassManual = (props) => { ]; + + const New_support_training_list = [ + { + value: 'video', + label: 'Video', + }, + { + value: 'document', + label: 'Document', + }, + { + value: 'réalité virtuelle', + label: 'Réalité Virtuelle', + }, + { + value: 'mixte', + label: 'Mixte', + }, + { + value: 'autre', + label: 'Autre', + }, + { + value: 'n/a', + label: 'n/a', + }, + + ]; const duration_unit_list = [ { value: 'heure', @@ -190,6 +235,32 @@ const AddClassManual = (props) => { ]; + const New_duration_unit_list = [ + { + value: 'heure', + label: 'Heures', + }, + + { + value: 'jour', + label: 'Jours', + }, + { + value: 'semaine', + label: 'Semaines', + }, + { + value: 'mois', + label: 'Mois', + }, + { + value: 'user_rythme', + label: 'Rythme stagiaire', + } + ]; + + + const publiee = [ { value: '1', @@ -501,27 +572,65 @@ const AddClassManual = (props) => { } + if (mylocaltraining.presentiel.distantiel) { + setmydistance(mylocaltraining.presentiel.distantiel); + var result2 = presentiel.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.presentiel.distantiel))) + if (result2[0]) + setmydistance_label(result2[0].label); + } else { + setmydistance("0"); + setmydistance_label("Non"); + } - setmydistance(mylocaltraining.presentiel.distantiel); - setmypresence(mylocaltraining.presentiel.presentiel); - if (mylocaltraining.published) + if (mylocaltraining.presentiel.presentiel) { + setmypresence(mylocaltraining.presentiel.distantiel); + var result2 = presentiel.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.presentiel.presentiel))) + if (result2[0]) + setmypresence_label(result2[0].label); + } else { + setmypresence("0"); + setmypresence_label("Non"); + } + + + //setmypresence(mylocaltraining.presentiel.presentiel); + + if (mylocaltraining.published) { setmypublished(mylocaltraining.published); - else + var result2 = publiee.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.published))) + if (result2[0]) + setmypublished_label(result2[0].label); + } + else { setmypublished("0"); + setmypublished_label("Non"); + } if (mylocaltraining.cpf) { setmycpf(mylocaltraining.cpf); + var result2 = cpf.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.cpf))) + if (result2[0]) + setmycpf_label(result2[0].label); } - else + else { setmycpf("0"); + setmycpf_label("Non"); + } if (mylocaltraining.support) { setmytrainingsupport(mylocaltraining.support); + + + var result2 = New_support_training_list.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.support))) + if (result2[0]) + setmytrainingsupport_label(result2[0].label); + } else { setmytrainingsupport("n/a"); + setmytrainingsupport_label("Autre"); } if (mylocaltraining.duration_unit) { @@ -529,16 +638,25 @@ const AddClassManual = (props) => { //console.log(" ### duration_unit = ", mylocaltraining.duration_unit); } else { - setmytrainingdurationunit(""); + setmytrainingdurationunit("heure"); } if (mylocaltraining.certif) { setmycertif(mylocaltraining.certif); + var result2 = certif.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.certif))); + + console.log(" CERTIFFF = ",result2 ) + if (result2[0]){ + setmycertif_label(result2[0].label); + console.log(" result2[0].label = ",result2[0].label ) + } } - else + else { setmycertif("0"); + setmycertif_label("Non"); + } if (mylocaltraining.class_level) { setp_class_level(mylocaltraining.class_level); @@ -724,10 +842,10 @@ const AddClassManual = (props) => { } - var presentiel = document.getElementsByName("presentiel")[0].value; - var distentiel = document.getElementsByName("distentiel")[0].value; + var presentiel = mypresence; + var distentiel = mydistance; var domaine = document.getElementsByName("domaine")[0].value; - var mypublier = document.getElementsByName("published")[0].value; + var mypublier = mypublished; var niveau_ftion = p_class_level; var price = document.getElementsByName("price")[0].value; var duree = document.getElementsByName("duree")[0].value; @@ -736,10 +854,10 @@ const AddClassManual = (props) => { var class_inscription_url = document.getElementsByName("class_inscription_url")[0].value; var mymetier = mytrainingmetier; var mynote = document.getElementsByName("note")[0].value; - var mycpf = document.getElementsByName("cpf")[0].value; - var mycertif = document.getElementsByName("certif")[0].value; + var mycpf = mycpf; + var mycertif = mycertif; - var trainingSupport = document.getElementsByName("training_support")[0].value; + var trainingSupport = mytrainingsupport; var banniereImg = document.getElementsByName("class_banner_img_url")[0].value; @@ -1021,7 +1139,7 @@ const AddClassManual = (props) => { if (new_data2.length > 0) { setNew_Get_List_Metiers_result(new_data2); - // console.log(" ### new_data2 ", new_data2); + // console.log(" ### new_data2 ", new_data2); //console.log(" ### setNew_Get_List_Metiers_result ", New_Get_List_Metiers_result); } @@ -1791,7 +1909,29 @@ const AddClassManual = (props) => {
- { + if (value && value.value) { + + setmycpf(value.value); + setmycpf_label(value.label); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + + {/* { {option.label}  
))} -
+
*/}
+ + { + if (value && value.value) { + + setmycertif(value.value); + setmycertif_label(value.label); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + + {/* { ))} + */}
@@ -1858,28 +2022,55 @@ const AddClassManual = (props) => {
- - {publiee.map((option) => ( - - {option.label}  
-
- ))} -
+ options={publiee} + value={mypublished_label} + onChange={(event, value) => { + if (value && value.value) { + console.log(" value = ", value); + setmypublished(value.value); + setmypublished_label(value.label); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + +
- { + if (value && value.value) { + + setmydistance(value.value); + setmydistance_label(value.label); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + + {/* { {option.label}  
))} -
+
*/}
- { + if (value && value.value) { + + setmypresence(value.value); + setmypresence_label(value.label); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + {/* { {option.label}  
))} -
+
**/}
- { + if (value && value.value) { + + setmytrainingsupport(value.value); + setdatamodification("1"); + setmytrainingsupport_label(value.label) + + } + }} + + renderInput={(params) => + } + /> + {/* { {option.label}   ))} - + */}
@@ -1999,9 +2234,9 @@ const AddClassManual = (props) => { options={New_Get_List_Metiers_result} value={mytrainingmetier} onChange={(event, value) => { - + if (value && value.metier) { - + setmytrainingmetier(value.metier); setdatamodification("1"); } @@ -2063,7 +2298,29 @@ const AddClassManual = (props) => {
- { + if (value && value.value) { + + setmytrainingdurationunit(value.value); + setdatamodification("1"); + + } + }} + + renderInput={(params) => + } + /> + + {/* { ))} - + */}
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 1060ccb..0088623 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1813,8 +1813,6 @@ const DisplayPartnerSession = (props) => { } - - //myRef.current.scrollIntoView({ behavior: "smooth" }); var divh = document.getElementById('myRef_add_session').offsetTop; window.scrollTo({ @@ -5949,6 +5947,8 @@ const DisplayPartnerSession = (props) => { const Dialog_2_handleClose_buton = () => { setDialog_2_open(false); + setsession_selected_row_id(''); + setgridline_id(''); }; @@ -6978,6 +6978,7 @@ const DisplayPartnerSession = (props) => { setdisplay_detail_sequence(); setselected_sequence_id(); setupdate_sequence(); + setgridline_id(''); alert(res.data.message) @@ -9481,7 +9482,8 @@ const DisplayPartnerSession = (props) => { Télécharger un fichier modèle
-
 
+
 
+ {selected_code_session && String(selected_code_session).length > 0 &&
@@ -10255,9 +10257,9 @@ const DisplayPartnerSession = (props) => {
- {!fields1desabled &&
Choisir un modèle d'attestation : + {/* {!fields1desabled &&
Choisir un modèle d'attestation : - {GetAttestation_Certif_result && GetAttestation_Certif_result.map((certificat) => ( @@ -10275,7 +10277,8 @@ const DisplayPartnerSession = (props) => {
} - + +*/}
Contenu de la formation (max 800 caractères)
(à afficher sur l'attestation) {!fields1desabled &&
} @@ -10925,7 +10928,7 @@ const DisplayPartnerSession = (props) => {
-
Choisir un modèle d'attestation : + {/*
Choisir un modèle d'attestation : { -
+
*/}
Contenu de la formation (max 800 caractères)
@@ -11894,7 +11897,7 @@ const DisplayPartnerSession = (props) => {
} -
 
+ {String(submenu) === String("inscrit") &&
diff --git a/src/components/Fotter.js b/src/components/Fotter.js index d20f431..9ef4871 100644 --- a/src/components/Fotter.js +++ b/src/components/Fotter.js @@ -116,7 +116,7 @@ const Footer = () => {

- Copyright © 2023 MySy. Tous droits réservés.   + Copyright © 2024 MySy. Tous droits réservés.   | Confidentialité | Cookies | données personnelles   | Conditions d’utilisation   | Mentions légales diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index b0947ad..95501a1 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -6682,7 +6682,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair
-
Choisir un modèle d'attestation : + {/*
Choisir un modèle d'attestation : -
+
*/}
Contenu de la formation (max 800 caractères)
@@ -7454,7 +7454,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair
- {!fields1desabled &&
Choisir un modèle d'attestation : + {/*{!fields1desabled &&
Choisir un modèle d'attestation :
- -
Le modèle d'attestation : + {/* +
Le modèle d'attestation : -
+
*/}