From 667ffccb499310fccd25ff1a6b81773973dc78ff Mon Sep 17 00:00:00 2001 From: Cherif Date: Sat, 21 Jun 2025 15:57:40 +0200 Subject: [PATCH] sss --- .../DisplayDetailClass_new_Action.js | 3 +- src/components/Inscription_Information.js | 292 ++++++++++++++---- .../new_detail_formation_2025.js | 27 +- src/styles/components/_inscription.scss | 232 +++++++++++++- 4 files changed, 474 insertions(+), 80 deletions(-) diff --git a/src/components/DisplayDetailClass_new_Action.js b/src/components/DisplayDetailClass_new_Action.js index 5daef23..beae546 100644 --- a/src/components/DisplayDetailClass_new_Action.js +++ b/src/components/DisplayDetailClass_new_Action.js @@ -614,14 +614,13 @@ const DisplayDetailClassAction = (props) => { } - {(String(action).toLocaleLowerCase() === "inscription" || String(action).toLocaleLowerCase() === "information") && String(action).toLocaleLowerCase() !== "evaluation" &&
} - + {String(action).toLocaleLowerCase() !== "inscription" && String(action).toLocaleLowerCase() !== "information" && String(tokenEval_api) === "true" &&
Zone evaluation : diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js index 6463450..e8d17d5 100644 --- a/src/components/Inscription_Information.js +++ b/src/components/Inscription_Information.js @@ -1,20 +1,20 @@ import React, { useState, useEffect, useRef } from "react"; -import { useForm } from "react-hook-form"; + import { getCookie, setCookie } from 'react-use-cookie'; import Box from '@mui/material/Box'; -import InputLabel from '@mui/material/InputLabel'; + import InputAdornment from '@mui/material/InputAdornment'; -import FormControl from '@mui/material/FormControl'; + import TextField from '@mui/material/TextField'; import AccountCircle from '@mui/icons-material/AccountCircle'; import PhoneIcon from '@mui/icons-material/Phone' import AddReactionIcon from '@mui/icons-material/AddReaction'; - +import Autocomplete from '@mui/material/Autocomplete'; import HomeWorkIcon from '@mui/icons-material/HomeWork'; import AssignmentSharpIcon from '@mui/icons-material/AssignmentSharp'; import EmailIcon from '@mui/icons-material/Email' -import HomeIcon from '@mui/icons-material/Home' -import { Button, Form, FormGroup, Label } from "reactstrap"; + +import { Button } from "reactstrap"; import axios from "axios"; import MenuItem from '@mui/material/MenuItem'; @@ -23,8 +23,6 @@ import { Editor } from '@tinymce/tinymce-react'; import SendIcon from '@mui/icons-material/Send'; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; import Rating from '@mui/material/Rating'; -import parse from 'html-react-parser' -import Autocomplete from '@mui/material/Autocomplete'; import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; function Inscription_Information(props) { @@ -261,6 +259,8 @@ function Inscription_Information(props) { }; + const [New_GetListOpco_result, setNew_GetListOpco_result] = useState([]); + const [GetListOpco_api, setGetListOpco_api] = useState(); const [GetListOpco_message, setGetListOpco_message] = useState(); const [GetListOpco_result, setGetListOpco_result] = useState(); @@ -278,18 +278,43 @@ function Inscription_Information(props) { }) .then((data) => data.json()) .then((data) => { - //console.log(' GetListOpco Success:', data['message'], "data['status'] = ", data['status']); + // console.log(' GetListOpco Success:', data['message'], "data['status'] = ", data['status']); - if (String(data['status']) === String("false")) { + if (String(data['status']) === String("true")) { //console.log("erreur rrrr:" + data['status']) - setGetListOpco_api("false"); - setGetListOpco_message(data['message']) - - } - else { setGetListOpco_api("true"); setGetListOpco_result(data['message']); + var new_data2 = []; + const new_data = data['message'].map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_id_code = JSON.parse(x).id_code; + var local_idcc = JSON.parse(x).idcc; + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_id_code, + "id_code": local_id_code, + "idcc": local_idcc, + + }; + new_data2.push(node); + }); + + + if (new_data2.length > 0) + setNew_GetListOpco_result(new_data2); + + } + else { + setGetListOpco_api("false"); + setGetListOpco_message(data['message']) + } }).catch((error) => { @@ -306,6 +331,7 @@ function Inscription_Information(props) { window.location.reload(); } + const [New_GetCurrentClass_result, setNew_GetCurrentClass_result] = useState([]); const [GetCurrentClass_api, setGetCurrentClass_api] = useState(); const [GetCurrentClass_message, setGetCurrentClass_message] = useState(); @@ -317,6 +343,8 @@ function Inscription_Information(props) { const stored_cookie = getCookie('tokenmysych'); form.append("class_internal_url", props.internal_url); form.append("token", stored_cookie); + form.append("archive", "0"); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetActiveSessionFormation_List/"; axios.post(myurl, form).then(res => { @@ -326,6 +354,58 @@ function Inscription_Information(props) { //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); setGetCurrentClass_api("true"); setGetCurrentClass_result(res.data.message); + + var new_data2 = []; + const new_data = res.data.message.map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_code_session = JSON.parse(x).code_session; + var local_titre = JSON.parse(x).titre; + var local_mode_animation = JSON.parse(x).mode_animation; + var local_date_debut = JSON.parse(x).date_debut; + var local_date_fin = JSON.parse(x).date_fin; + + var local_ville = JSON.parse(x).ville; + var local_code_postal = JSON.parse(x).code_postal; + + var text_label = ""; + + if (local_date_debut == local_date_fin) { + text_label = "Le " + local_date_debut + } else { + text_label = local_date_debut + " au " + local_date_fin + } + + if (local_mode_animation == "0") { + text_label = text_label + " - Présentiel à " + local_ville + ", " + local_code_postal + } + else if (local_mode_animation == "1") { + text_label = text_label + " - Distanciel" + } else if (local_mode_animation == "2") { + text_label = text_label + " - Hybrid" + } + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": text_label, + "titre": local_titre, + "code_session": local_code_session, + "mode_animation": local_mode_animation, + "date_debut": local_date_debut, + "date_fin": local_date_fin, + + }; + new_data2.push(node); + }); + + + if (new_data2.length > 0) + setNew_GetCurrentClass_result(new_data2); + } else { setGetCurrentClass_api("false"); @@ -338,6 +418,8 @@ function Inscription_Information(props) { //setmyApimyApiMessage("") }) } + + const [class_sales_price, setclass_sales_price] = useState("0"); useEffect(() => { @@ -964,7 +1046,7 @@ function Inscription_Information(props) { String(RecordData_status).length === 0) && String(action).toLocaleLowerCase() === "inscription" && String(AnnulerFction_status) !== "1" &&
- +   :not(style)': { m: 1 }, width: '100%', }}> {String(RecordData_status) === "false" &&
@@ -973,14 +1055,36 @@ function Inscription_Information(props) {
}
Je m'inscris
-
- Choisir une session   -
+
+
+ Choisir une session   +
-
+
+ {New_GetCurrentClass_result && New_GetCurrentClass_result.length > 0 && + (data).label === String(p_client_invoice_paiement_condition_code))[0].label} + options={New_GetCurrentClass_result} + className="disabled_style" + onChange={(event, value) => { + if (value && value._id) { + setmysession(value._id) + } - {GetCurrentClass_result && GetCurrentClass_result.map((formation) => ( @@ -994,7 +1098,7 @@ function Inscription_Information(props) { {(!JSON.parse(formation).session_ondemande || JSON.parse(formation).session_ondemande === "0") && (JSON.parse(formation).date_debut).substring(0, 10) + " au " + (JSON.parse(formation).date_fin).substring(0, 10)} - {/*(JSON.parse(formation).date_debut).substring(0, 10)} au {(JSON.parse(formation).date_fin).substring(0, 10)*/} - + {/* (JSON.parse(formation).date_debut).substring(0, 10)} au {(JSON.parse(formation).date_fin).substring(0, 10)* /} - {(JSON.parse(formation).distantiel) === "1" && " A Distance - "} {(JSON.parse(formation).presentiel) === "1" && (JSON.parse(formation).adresse) && " En Présentiel - " + (JSON.parse(formation).adresse)} {(JSON.parse(formation).presentiel) === "1" && (!JSON.parse(formation).adresse) && " En Présentiel - "} @@ -1004,18 +1108,12 @@ function Inscription_Information(props) { ))} - + */} - {/* {GetCurrentClass_result && } */} + +
-
@@ -1053,22 +1151,8 @@ function Inscription_Information(props) { /> - {/* - Mme.;  - M.   - Neutre   - */} -
- {modefinancement.map((option) => ( ))} - + */}
@@ -1236,12 +1343,36 @@ function Inscription_Information(props) { Choisir votre centre de rattachement
- {GetListOpco_result.map((option) => ( ))} - + */}
*Laisser "Choisir" si vous ne le connaissez pas.
@@ -1253,8 +1384,26 @@ function Inscription_Information(props) { } + +
+ +
+ +
+ +
+ + +
+ +
+ +
- {
+
+ {/*
@@ -1264,7 +1413,7 @@ function Inscription_Information(props) { onClick={AnnulerFction_info}>Fermer    {}
} -
+
*/ }
@@ -1382,7 +1531,7 @@ function Inscription_Information(props) { {/* Gestion des demandes d'information */}
- {New_Option_is_cpany && New_Option_is_cpany.length > 0 && 0 &&  
- {
+
+ +
+ +
+ +
+ + +
+ +
+ + + {/*
} -
+
*/ } @@ -1833,7 +1998,22 @@ function Inscription_Information(props) {
 
- {
+
+ +
+ +
+ +
+ + +
+ +
+ + {/*
- } + */}
diff --git a/src/components/detail_formation_automatic_files/new_detail_formation_2025.js b/src/components/detail_formation_automatic_files/new_detail_formation_2025.js index 3c39c38..7bf1455 100644 --- a/src/components/detail_formation_automatic_files/new_detail_formation_2025.js +++ b/src/components/detail_formation_automatic_files/new_detail_formation_2025.js @@ -60,7 +60,7 @@ import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import DialogTitle from '@mui/material/DialogTitle'; - + const New_C_Detail_Formation_2025 = (props) => { const { classId, action } = useParams(); const [result, setResult] = useState(""); @@ -983,7 +983,9 @@ const New_C_Detail_Formation_2025 = (props) => { function Close_info_form() { - setinscritpion(); + setinscritpion(""); + + {/* document.getElementById('mob_block_cross_sell_cat').style.display = "flex"; if (window.screen.width < 601) { var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top; @@ -1033,6 +1035,7 @@ const New_C_Detail_Formation_2025 = (props) => { } + */} window.scrollTo({ top: 0, behavior: "smooth", @@ -1042,7 +1045,7 @@ const New_C_Detail_Formation_2025 = (props) => { function Close_inscrip_form() { setinscritpion(); - document.getElementById('mob_block_cross_sell_cat').style.display = "flex"; + {/* document.getElementById('mob_block_cross_sell_cat').style.display = "flex"; if (window.screen.width < 601) { var meme_orga_top = document.getElementById('mob_block_cross_sell_cat').style.top; @@ -1088,7 +1091,7 @@ const New_C_Detail_Formation_2025 = (props) => { } - +*/} window.scrollTo({ top: 0, behavior: "smooth", @@ -1465,7 +1468,7 @@ const New_C_Detail_Formation_2025 = (props) => {
} -
} +
}
@@ -1663,13 +1666,13 @@ const New_C_Detail_Formation_2025 = (props) => { {String(inscritpion) === "2" &&
+ Close_info_form={Close_info_form} trainig_price={class_sales_price} inscritpion={inscritpion} />
} {String(inscritpion) === "1" &&
+ Close_info_form={Close_inscrip_form} trainig_price={class_sales_price} inscritpion={inscritpion}/>
@@ -2077,14 +2080,14 @@ const New_C_Detail_Formation_2025 = (props) => { {String(inscritpion) === "1" &&
+ Close_info_form={Close_info_form} trainig_price={class_sales_price} inscritpion={inscritpion}/>
} {String(inscritpion) === "2" &&
+ Close_info_form={Close_inscrip_form} trainig_price={class_sales_price} inscritpion={inscritpion}/>
@@ -2094,7 +2097,7 @@ const New_C_Detail_Formation_2025 = (props) => { && String(action).toLocaleLowerCase() !== "evaluation" &&
- +
} @@ -2102,11 +2105,11 @@ const New_C_Detail_Formation_2025 = (props) => { &&
- +
} - +
diff --git a/src/styles/components/_inscription.scss b/src/styles/components/_inscription.scss index 4d86248..638fdfb 100644 --- a/src/styles/components/_inscription.scss +++ b/src/styles/components/_inscription.scss @@ -63,7 +63,7 @@ color: white; cursor: normal; font-style: italic; - background-color: #107758; + background-color: #043a32; font-weight: normal; padding-top: 5px; border-radius: 5px; @@ -117,7 +117,7 @@ padding: 0.3rem; width: 90%; background-color: white; - color: #107758 !important; + color: #043a32 !important; height: 2rem; } @@ -128,6 +128,56 @@ .champs_specifique { width: 100%; } + + .bton_suppr { + background: transparent; + color: red; + border-radius: 5rem; + font-size: small; + text-align: center; + height: 2.5rem; + width: 100%; + margin-left: 10px; + margin-right: 10px; + margin-bottom: 1rem !important; + } + + .bton_enreg { + font-family: DM sans; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: center; + height: 2rem; + width: 100%; + color: white; + margin-bottom: 1rem !important; + width: auto; + } + + .bton_edit { + border-radius: 5rem; + font-size: small; + background: black !important; + text-align: right; + height: 2.5rem; + width: 100%; + color: white; + margin-bottom: 1rem !important; + } + + .bton_annule { + border-radius: 5rem; + font-size: small; + background: lightgray !important; + text-align: right; + height: 2rem; + width: 100%; + color: black; + margin-bottom: 1rem !important; + width: auto; + } + } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -181,9 +231,9 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: normal; + cursor: normal; font-style: italic; - background-color: #107758; + background-color: #043a32; font-weight: normal; height: 2rem; padding-top: 5px; @@ -237,7 +287,7 @@ padding: 0.3rem; width: 80%; background-color: white; - color: #107758 !important; + color: #043a32 !important; } .block_spec_fields { @@ -247,6 +297,62 @@ .champs_specifique { width: 90%; } + + .bton_suppr { + background: transparent; + color: red; + border-radius: 5rem; + font-size: small; + text-align: center; + height: 2.5rem; + width: 40%; + margin-left: 10px; + margin-right: 10px; + min-width: 15rem; + } + + .bton_enreg { + font-family: DM sans; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: center; + height: 2rem; + width: auto; + color: white; + margin-left: 10px; + margin-right: 10px; + font-family: 'DM Sans'; + border: none; + min-width: 10rem; + } + + .bton_edit { + border-radius: 5rem; + font-size: small; + background: black !important; + text-align: right; + height: 2.5rem; + width: 40%; + color: white; + margin-left: 10px; + margin-right: 10px; + } + + .bton_annule { + border-radius: 5rem; + font-size: small; + background: lightgray !important; + text-align: right; + height: 2rem; + width: auto; + color: black; + margin-left: 10px; + margin-right: 10px; + font-family: 'DM Sans'; + border: none; + min-width: 10rem; + } } @media only screen and (min-width: 992px) and (max-width: 1199px) { @@ -300,9 +406,9 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: normal; + cursor: normal; font-style: italic; - background-color: #107758; + background-color: #043a32; font-weight: normal; height: 2rem; padding-top: 5px; @@ -357,7 +463,7 @@ padding: 0.3rem; width: 50%; background-color: white; - color: #107758 !important; + color: #043a32 !important; height: 2rem; } @@ -368,6 +474,59 @@ .champs_specifique { width: 50%; } + + .bton_suppr { + background: transparent; + color: red; + border-radius: 5rem; + font-size: small; + text-align: center; + height: 2.5rem; + width: 65%; + margin-left: 10px; + margin-right: 10px; + } + + .bton_enreg { + font-family: DM sans; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: center; + height: 2rem; + width: auto; + color: white; + margin-left: 10px; + margin-right: 10px; + font-family: 'DM Sans'; + border: none; + min-width: 12rem; + } + + .bton_edit { + border-radius: 5rem; + font-size: small; + background: black !important; + text-align: right; + height: 2.5rem; + width: 65%; + color: white; + margin-left: 10px; + margin-right: 10px; + } + + .bton_annule { + border-radius: 5rem; + font-size: small; + background: lightgray !important; + text-align: right; + height: 2.5rem; + width: 65%; + color: black; + margin-left: 10px; + margin-right: 10px; + min-width: 12rem; + } } @media only screen and (min-width: 1200px) { @@ -423,7 +582,7 @@ color: white; cursor: normal; font-style: italic; - background-color: #107758; + background-color: #043a32; font-weight: normal; height: 2rem; padding-top: 5px; @@ -481,7 +640,7 @@ padding: 0.3rem; width: 50%; background-color: white; - color: #107758 !important; + color: #043a32 !important; height: 2rem; } @@ -522,6 +681,59 @@ width: 50%; } + .bton_suppr { + background: transparent; + color: red; + border-radius: 5rem; + font-size: small; + text-align: center; + height: 2.5rem; + width: 40%; + margin-left: 10px; + margin-right: 10px; + } + + .bton_enreg { + font-family: DM sans; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: center; + height: 2rem; + width: 50%; + color: white; + margin-left: 10px; + margin-right: 10px; + font-family: 'DM Sans'; + border: none; + } + + .bton_edit { + border-radius: 5rem; + font-size: small; + background: black !important; + text-align: right; + height: 2.5rem; + width: 40%; + color: white; + margin-left: 10px; + margin-right: 10px; + } + + .bton_annule { + border-radius: 5rem; + font-size: small; + background: lightgray !important; + text-align: right; + height: 2rem; + width: 50%; + color: black; + margin-left: 10px; + margin-right: 10px; + font-family: 'DM Sans'; + border: none; + } + }