diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 7ded1c9..fb9cac8 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -14980,26 +14980,7 @@ const DisplayPartnerSession = (props) => { } /> - {/* setp_one_civilite_part(e.target.value)} - - > - Mme.   - M.   - Neutre   - - - */} +
Nom
@@ -15737,7 +15718,7 @@ const DisplayPartnerSession = (props) => {
} {String(addOneParticipant) === "1" &&
-
Ajout d'un nouveau participant a la session {selected_code_session} de la formation {selected_class_title}
+
Ajout d'un nouveau participant à la session {selected_code_session} de la formation {selected_class_title}
Civilité
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index e4c504f..1771a66 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -10,7 +10,6 @@ import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import { Editor } from '@tinymce/tinymce-react'; -import { FcDisapprove } from "react-icons/fc"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import add_plus from "../mysy_img/plus.png"; @@ -21,7 +20,7 @@ import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; import { FcCancel, FcApproval, FcAcceptDatabase, - FcPrint, FcDataConfiguration, FcDownload + FcPrint, } from "react-icons/fc"; import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; @@ -50,8 +49,7 @@ import Module_Historique_Action from "./Module_Historique_Action"; import ToggleSwitch from "./ToggleSwitch"; import Autocomplete from '@mui/material/Autocomplete'; -import { FcDownRight, FcRight, FcSearch, FcViewDetails, FcOpenedFolder } from "react-icons/fc"; -import { MdOutlineVisibility } from "react-icons/md"; +import { FcSearch, FcViewDetails, FcOpenedFolder } from "react-icons/fc"; import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; @@ -7251,35 +7249,7 @@ const DisplayPartnerStagiaires = (props) => { {String(addOneParticipant) === "1" &&
- {/*
Formation
- { - handle_change_p_one_formation(e); - - } - } - - > - {GetCurrentPartnerClass_result && - GetCurrentPartnerClass_result.map((myclass) => ( - - {JSON.parse(myclass).title} - - - ))} - -
*/} +
Formation
{
- {GetCurrentClass_result && GetCurrentClass_result.length > 0 && -
- -
- Les sessions -
- -
-
    - - - {GetCurrentClass_result && GetCurrentClass_result.slice(0, 5).map((formation) => ( -
  • - {(JSON.parse(formation).session_ondemande) && (JSON.parse(formation).session_ondemande) === "1" && } - - {(!(JSON.parse(formation).session_ondemande) || (JSON.parse(formation).session_ondemande) === "0") && } -
  • - - ))} - -
-
- - -
} -
@@ -1634,81 +1560,7 @@ const Display_Action_And_Class = (props) => {
- {GetCurrentClass_result && GetCurrentClass_result.length > 0 && -
-
- Les sessions - - -
-
-
    - - {GetCurrentClass_result && GetCurrentClass_result.slice(0, 5).map((formation) => ( - - -
  • - - {(JSON.parse(formation).session_ondemande) && (JSON.parse(formation).session_ondemande) === "1" && } - - {(!(JSON.parse(formation).session_ondemande) || (JSON.parse(formation).session_ondemande) === "0") && } -
  • - - ))} - -
-
- -
- } +
Objectif diff --git a/src/components/Partner.js b/src/components/Partner.js index 4b64790..5229656 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -1435,8 +1435,8 @@ const Partner = (props) => {
- {String(menu) !== "mes_sessions" &&    MES SESSIONS } - {String(menu) === "mes_sessions" &&     MES SESSIONS } + {String(menu) !== "mes_sessions" &&    MES SESSIONS } + {String(menu) === "mes_sessions" &&    MES SESSIONS } @@ -1484,8 +1484,8 @@ const Partner = (props) => {
- {String(menu) !== "module_agenda" &&     PLANNING } - {String(menu) === "module_agenda" &&     PLANNING } + {String(menu) !== "module_agenda" &&    PLANNING } + {String(menu) === "module_agenda" &&    PLANNING } @@ -1601,8 +1601,8 @@ const Partner = (props) => {
- {String(menu) !== "prix_achat" &&     PRIX ACHAT } - {String(menu) === "prix_achat" &&     PRIX ACHAT } + {String(menu) !== "prix_achat" &&    PRIX ACHAT } + {String(menu) === "prix_achat" &&    PRIX ACHAT } diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index 7c08606..3bf21bc 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -185,7 +185,11 @@ const Partner_Commande = (props) => { { field: '_id', headerName: '_id', hide: true, editable: false }, { field: 'id', headerName: 'id', hide: true, editable: false }, { field: 'order_line_formation', headerName: 'intenal_url', width: 0, hide: true, editable: false }, + { field: 'order_line_session_id', headerName: 'session_id', width: 0, hide: true, editable: false }, + { field: 'order_line_formation_title', headerName: 'Titre', width: 250, hide: false, editable: false, flex: 1 }, + { field: 'order_line_session_code', headerName: 'Code Session', width: 250, hide: false, editable: false, flex: 1 }, + { field: 'order_line_formation_external_code', headerName: 'Code Formation', width: 150, hide: false, editable: false }, { field: 'order_line_formation_duration', headerName: 'Durée', width: 80, hide: false, editable: false }, @@ -385,6 +389,8 @@ const Partner_Commande = (props) => { setp_add_line_item_type(String(cellValues.row.order_line_type)); setp_add_line_item_comment(String(cellValues.row.order_line_comment)); + setp_add_line_session_id(String(cellValues.row.order_line_session_id)); + setp_add_line_session_code(String(cellValues.row.order_line_session_code)); Get_Given_Line_Of_Partner_Order_Line_Data(order_line_id, order_internal_ref); @@ -554,8 +560,9 @@ const Partner_Commande = (props) => { }; new_data2.push(node); - if (new_data2.length > 0) + if (new_data2.length > 0) { setNew_GetCurrentPartnerClass_result(new_data2); + } } else if (String(res.data.status) === String("Err_Connexion")) { @@ -585,6 +592,7 @@ const Partner_Commande = (props) => { GetCurrentPartnerClass(); Get_Given_Partner_Config_Point_Taux_TVA(); Getall_Partner_Paiement_Condition(); + Getall_TrainingSession(); if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; @@ -1194,7 +1202,89 @@ const Partner_Commande = (props) => { } + const [New_Getall_TrainingSession_result, setNew_Getall_TrainingSession_result] = useState([]); + const [Getall_TrainingSession_api, setGetall_TrainingSession_api] = useState(); + const [Getall_TrainingSession_message, setGetall_TrainingSession_message] = useState(); + const [Getall_TrainingSession_result, setGetall_TrainingSession_result] = useState(); + function Getall_TrainingSession(event) { + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; + + setLoading(true); + + axios.post(myurl, form).then(res => { + + setLoading(false); + + if (String(res.data.status) === String("true")) { + //console.log(" In Getall_TrainingSession res.data.status = " + res.data.status); + //console.log(" In Getall_TrainingSession res.data.message r_class = " + res.data.message); + setGetall_TrainingSession_api("true"); + setGetall_TrainingSession_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_internal_url = JSON.parse(x).class_internal_url; + var local_title_session = JSON.parse(x).titre; + var local_code_session = JSON.parse(x).code_session; + + + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_code_session, + "class_internal_url": local_internal_url, + "titre": local_title_session, + "code_session": local_code_session, + }; + new_data2.push(node); + + // return {"_id": " + str(local_id) + ", "label": " + local_courrier_template_ref_interne + '" , "courrier_template_ref_interne": "' + local_courrier_template_ref_interne + '", "nom_champ_technique": "' + local_nom_champ_technique + '", "nom_champ_fonctionel": "' + local_nom_champ_fonctionel + '","valide": "1" }; + + }); + + //--- + var node = { + "_id": "", + "id": "", + "label": "", + "class_internal_url": "", + "titre": "", + "code_session": "", + }; + new_data2.push(node); + + if (new_data2.length > 0) { + setNew_Getall_TrainingSession_result(new_data2); + + console.log(" ### new_data2 = ", new_data2); + } + + + } + else { + setGetall_TrainingSession_api("false"); + setGetall_TrainingSession_message(res.data.message); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( Getall_TrainingSession = ', error); + setGetall_TrainingSession_api("false"); + //setmyApimyApiMessage("") + }) + } const [partner_taux_tva, setpartner_taux_tva] = useState("20"); @@ -1369,6 +1459,19 @@ const Partner_Commande = (props) => { } + if (mylocal_order.order_line_session_id) { + setp_add_line_session_id(mylocal_order.order_line_session_id); + } else { + setp_add_line_session_id(""); + } + + if (mylocal_order.order_line_session_code_session) { + setp_add_line_session_code(mylocal_order.order_line_session_code_session); + } else { + setp_add_line_session_code(""); + } + + if (mylocal_order.order_line_qty) { setp_add_line_item_qty(mylocal_order.order_line_qty); } @@ -2187,14 +2290,17 @@ const Partner_Commande = (props) => { form.append("order_line_tax_amount", p_add_line_item_taxe_amount); form.append("order_line_montant_toutes_taxes", p_add_line_item_total_amount_ttc); + if (p_add_line_session_id && String(p_add_line_session_id).length > 2) + form.append("order_line_session_id", p_add_line_session_id); + else + form.append("order_line_session_id", ""); // Controle des champs obligatoires if (!p_add_line_item || String(p_add_line_item).length < 2) { - alert(" Vous devez choisir un article "); + alert(" Vous devez choisir une formation "); return; } - console.log(" ### p_add_line_item = ", p_add_line_item); if (!p_add_line_item_qty || parseFloat(String(p_add_line_item_qty)) <= 0) { alert(" La quantité choisie est incorrecte "); @@ -2265,7 +2371,11 @@ const Partner_Commande = (props) => { }; - const [p_add_line_item, setp_add_line_item] = useState(); + + const [p_add_line_session_id, setp_add_line_session_id] = useState(""); + const [p_add_line_session_code, setp_add_line_session_code] = useState(""); + + const [p_add_line_item, setp_add_line_item] = useState(""); const [p_add_line_item_internal_url, setp_add_line_item_internal_url] = useState(""); const [p_add_line_item_title, setp_add_line_item_title] = useState(); const [p_add_line_item_qty, setp_add_line_item_qty] = useState(); @@ -2284,10 +2394,17 @@ const Partner_Commande = (props) => { setp_add_line_item_comment(); setp_add_line_item_status(); setp_add_line_item_type(); + setp_add_line_session_id(""); + setp_add_line_session_code(""); } - function Ajouter_une_ligne_article() { + + // Recuperation des session de formation + Getall_TrainingSession(); + + setp_add_line_session_id(""); + setp_add_line_session_code(""); setp_add_line_item(""); setp_add_line_item_qty(""); setp_add_line_item_price(""); @@ -2300,7 +2417,7 @@ const Partner_Commande = (props) => { setp_add_line_item_taxe_amount(""); setp_add_line_item_total_amount_ttc(""); - + setselected_order_line_id(""); setp_add_line_item_status(p_detail_header_statut); setp_add_line_item_type(p_detail_header_type); @@ -3211,72 +3328,80 @@ const Partner_Commande = (props) => { {/*p_add_line_item = {p_add_line_item}
*/} - {(p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Article + {New_GetCurrentPartnerClass_result && New_GetCurrentPartnerClass_result.length > 0 && + (p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Formation + (data).internal_url === String(p_add_line_item))[0].label} + + onChange={(event, value) => { + // setp_champ_table(value.nom_champ_technique); + if (value && value.internal_url) { + setp_add_line_item(value.internal_url); + setp_add_line_item_internal_url(value.internal_url); + Get_Class_Data(value.internal_url); + setp_add_line_item_title(value.title); + } else { + setp_add_line_item(""); + setp_add_line_item_internal_url(""); + setp_add_line_item_title(""); + + } + }} - (data).internal_url === String(p_add_line_item))[0].label} - - onChange={(event, value) => { - // setp_champ_table(value.nom_champ_technique); - setp_add_line_item(value.internal_url); - setp_add_line_item_internal_url(value.internal_url); - Get_Class_Data(value.internal_url); - setp_add_line_item_title(value.title); - }} - - - renderInput={(params) => + } /> - } - /> - {/* { - setp_add_line_item(e.target.value); - setp_add_line_item_internal_url(e.target.value); - Get_Class_Data(e.target.value); - const div1 = document.getElementById("mysy_item_class"); - const mysy_item_class_title = div1.getAttribute('mysy_item_class_title'); - setp_add_line_item_title(mysy_item_class_title); +
} - //console.log(" Selected title = ", mysy_item_class_title); - } - } - > - {GetCurrentPartnerClass_result && - GetCurrentPartnerClass_result.map((myclass) => ( - - {JSON.parse(myclass).title} - {JSON.parse(myclass).price}€ - - ))} - */} + {(p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé" + && New_Getall_TrainingSession_result && New_Getall_TrainingSession_result.length > 0 &&
Session + (data).class_internal_url === String(p_add_line_item_internal_url)) + } -
} + value={New_Getall_TrainingSession_result.filter((data) => (data)._id === String(p_add_line_session_id))[0].label} + onChange={(event, value) => { + + if (value._id) { + setp_add_line_session_id(value._id); + setp_add_line_session_code(value.code_session); + } else { + setp_add_line_session_id(""); + setp_add_line_session_code(""); + } + }} + + + renderInput={(params) => + } + /> + + + +
} + + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Article { fullWidth //variant="standard" value={partner_taux_tva} - + onChange={(e) => { setpartner_taux_tva(e.target.value); - + } } @@ -5481,6 +5606,8 @@ const Partner_Commande = (props) => { order_line_status: JSON.parse(item).order_line_status, order_line_prix_unitaire: JSON.parse(item).order_line_prix_unitaire, order_header_id: JSON.parse(item).order_header_id, + order_line_session_id: JSON.parse(item).order_line_session_id, + order_line_session_code: JSON.parse(item).order_line_session_code_session, order_header_ref_interne: JSON.parse(item).order_header_ref_interne, order_line_type: JSON.parse(item).order_line_type, order_line_formation_title: JSON.parse(item).title, diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js index ba5f11f..4d74be5 100644 --- a/src/components/UpdatePartnerInfo.js +++ b/src/components/UpdatePartnerInfo.js @@ -586,11 +586,18 @@ function UpdateParnterInfo(props) { document.getElementsByName("contact_mail")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("email")[0]) { + document.getElementsByName("email")[0].disabled = true; + document.getElementsByName("email")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("website")[0]) { document.getElementsByName("website")[0].disabled = true; document.getElementsByName("website")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("isdatadock")[0]) { document.getElementsByName("isdatadock")[0].disabled = true; document.getElementsByName("isdatadock")[0].style.backgroundColor = "#ECEFF1"; diff --git a/src/styles/components/_displayactionandclass.scss b/src/styles/components/_displayactionandclass.scss index b92aa1f..639c994 100644 --- a/src/styles/components/_displayactionandclass.scss +++ b/src/styles/components/_displayactionandclass.scss @@ -464,7 +464,7 @@ order: 0; flex-grow: 0; margin-left: auto; - margin-right: auto; + margin-right: auto; } .mob_block_content_title { @@ -1497,6 +1497,7 @@ height: 100px; border-radius: 15px; } + .discounted_price { font-weight: 600; font-size: 20px; @@ -1518,7 +1519,7 @@ font-size: medium; } - .css-wdmfcx{ + .css-wdmfcx { width: 100% !important; } } @@ -2532,6 +2533,14 @@ min-height: 10rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .description_block { @@ -2539,6 +2548,14 @@ min-height: 8rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .objectif_block { @@ -2546,6 +2563,14 @@ min-height: 5rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .session_block { @@ -2561,6 +2586,14 @@ min-height: 5rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } @@ -4585,6 +4618,14 @@ min-height: 10rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .description_block { @@ -4592,6 +4633,14 @@ min-height: 8rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .objectif_block { @@ -4599,6 +4648,14 @@ min-height: 5rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .session_block { @@ -4614,6 +4671,14 @@ min-height: 5rem; overflow: auto; padding: 10px; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } @@ -6661,6 +6726,16 @@ min-height: 8rem; overflow: auto; padding: 10px; + font-size: 12px; + font-weight: 400; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } .objectif_block { @@ -6668,6 +6743,17 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-size: 12px; + font-weight: 400; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; + } .session_block { @@ -6683,6 +6769,16 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-size: 12px; + font-weight: 400; + + font-family: "Albert Sans"; + font-style: normal; + font-weight: 500; + font-size: 16px; + line-height: 24px; + font-feature-settings: "liga" off; + color: #4B4B4B; } diff --git a/src/styles/components/_partner.scss b/src/styles/components/_partner.scss index e018d7e..93e6e52 100644 --- a/src/styles/components/_partner.scss +++ b/src/styles/components/_partner.scss @@ -1686,7 +1686,7 @@ text-align: left; color: #c0c0c0; cursor: pointer; - max-height: 3rem; + max-height: 2.5rem; background-color: #104277 !important; } @@ -1697,7 +1697,7 @@ color: #ffffff; cursor: pointer; font-weight: 600; - max-height: 3rem; + max-height: 2.5rem; background-color: #104277 !important; //letter-spacing: 1px; @@ -2034,11 +2034,34 @@ list-style-type: none !important; } - } + // end media + .bck_menu_seul_selected{ + padding-left: 20px; + padding-top: 5px; + padding-bottom: 5px; + cursor: pointer; + font-weight: 700; + font-size: 14px; + } + + .bck_menu_seul{ + padding: 20px; + padding-top: 5px; + padding-bottom: 5px; + cursor: pointer; + font-weight: 400; + font-size: 14px; + } + + .ps-menu-button{ + height: 35px !important; + } + + .css-18unl23{ overflow: hidden !important; } @@ -2065,6 +2088,7 @@ background-color: #104277 !important; overflow: hidden !important; box-sizing: unset !important; + } .my_chart, @@ -2073,6 +2097,7 @@ overflow: hidden !important; box-sizing: unset !important; font-size: 14px !important; + } ul { @@ -2202,7 +2227,7 @@ .separator::after { content: ''; flex: 1; - border-bottom: 1px solid #e0e0e0; + border-bottom: 1px solid #F4F6F629; } .separator:not(:empty)::before {