From 67832de1754e087e73c16e7d106a661cf69fe3fa Mon Sep 17 00:00:00 2001 From: Cherif Date: Mon, 27 Apr 2026 19:44:30 +0200 Subject: [PATCH] 27/04/26 - 19h --- src/components/AddPartnerClient.js | 153 +- src/components/Materiel_Salle.js | 1987 +++++++++++------ src/components/Materiels.js | 1028 ++++++++- .../Module_Session_Planification.js | 174 +- src/components/Partner_Client.js | 181 +- 5 files changed, 2534 insertions(+), 989 deletions(-) diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index 604e01e..8834489 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -1071,7 +1071,7 @@ const AddParnerClient = (props) => { else setclient_invoice_ville(""); - if (mylocalclient.comment) + if (mylocalclient.comment) setp_client_comment(mylocalclient.comment); else setp_client_comment(""); @@ -1167,7 +1167,7 @@ const AddParnerClient = (props) => { else setclient_pays(""); - if (mylocalclient.comment) + if (mylocalclient.comment) setp_client_comment(mylocalclient.comment); else setp_client_comment(""); @@ -1334,7 +1334,7 @@ const AddParnerClient = (props) => { document.getElementsByName("client_code_postal")[0].value = ""; } - if (document.getElementsByName("client_comment")) { + if (document.getElementsByName("client_comment")) { document.getElementsByName("client_comment")[0].value = ""; } @@ -1423,7 +1423,7 @@ const AddParnerClient = (props) => { document.getElementsByName("client_code_postal")[0].style.backgroundColor = "#ECEFF1"; } - + if (document.getElementsByName("client_comment") && document.getElementsByName("client_comment")[0]) { document.getElementsByName("client_comment")[0].disabled = true; document.getElementsByName("client_comment")[0].style.backgroundColor = "#ECEFF1"; @@ -1518,7 +1518,7 @@ const AddParnerClient = (props) => { document.getElementsByName("client_code_postal")[0].style.backgroundColor = "#FFFFFF"; } - if (document.getElementsByName("client_comment")) { + if (document.getElementsByName("client_comment")) { document.getElementsByName("client_comment")[0].disabled = false; document.getElementsByName("client_comment")[0].style.backgroundColor = "#FFFFFF"; } @@ -1743,7 +1743,7 @@ const AddParnerClient = (props) => { } form.append("adr_code_postal", client_code_postal); - + form.append("comment", p_client_comment); @@ -3679,7 +3679,7 @@ const AddParnerClient = (props) => {
- Infos Générales + Infos générales
{
- Infos Générales + Typologie
{
- Infos Générales + Infos générales
{
 
-
Commentaire
+
Commentaire
{
+
 
+ {String(formedit_mode) !== "1" &&
Type client
+ +
} + + {New_Get_List_Client_Type_result && New_Get_List_Client_Type_result.length > 1 && + String(formedit_mode) === "1" &&
Type client
+ (data)._id === String(p_client_type_id))[0].label} + + onChange={(event, value) => { + if (value && value._id) { + setp_client_type_id(value._id); + DataUpdated(); + } else { + setp_client_type_id(""); + DataUpdated(); + } + }} + + + renderInput={(params) => + } + /> + +
} + + + + + + {String(formedit_mode) !== "1" &&
Groupe client
+ +
} + + {New_Get_List_Client_Groupe_result && New_Get_List_Client_Groupe_result.length > 0 && + String(formedit_mode) === "1" &&
Groupe client
+ (data)._id === String(p_client_goupe_client_id))[0].label} + + onChange={(event, value) => { + if (value && value._id) { + setp_client_goupe_client_id(value._id); + setp_client_goupe_client_id_label(New_Get_List_Client_Groupe_result.filter((data) => (data)._id === String(p_client_goupe_client_id))[0].label) + DataUpdated(); + + } else { + setp_client_goupe_client_id(""); + DataUpdated(); + setp_client_goupe_client_id_label(""); + } + }} + + + renderInput={(params) => + } + /> + +
} + + + + {p_client_is_financeur === true &&
Type Financeur
+ + { + if (value && value._id) { + setp_client_type_financeur(value._id); + + } else { + + setp_client_type_financeur(""); + + } + }} + //value={p_one_detail_client_rattachement_nom} + + renderInput={(params) => + } + /> + + +
} +
@@ -5089,7 +5220,7 @@ const AddParnerClient = (props) => {
- Infos Générales + typologie
{ const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); const [selectionModel, setSelectionModel] = React.useState([]); -registerLocale('fr', fr); + registerLocale('fr', fr); const classes = useStyles(); const [rows_affectations, setrows_affectations] = useState([]); const [selectionModel_affectations, setSelectionModel_affectations] = React.useState([]); @@ -124,6 +124,9 @@ registerLocale('fr', fr); { field: 'type', headerName: 'Type', width: 0, hide: true, }, { field: 'code_site', headerName: 'Site', width: 150, flex: 1, hide: false, }, + { field: 'adresse', headerName: 'Adresse', minwidth: 150, flex: 1, hide: false, }, + { field: 'ville', headerName: 'Ville', width: 150, flex: 1, hide: false, }, + { field: 'acces_handicape', headerName: 'Handicape', width: 150, hide: false, renderCell: (cellValues) => { @@ -437,6 +440,7 @@ registerLocale('fr', fr); const [add_One_Materiel, setadd_One_Materiel] = useState(); function submenu_add_one_materiel() { + setselected_id(""); Getall_Type_Materiel(); Getall_Partner_Site_Formation(); Getall_Categorie_Materiel(); @@ -513,6 +517,13 @@ registerLocale('fr', fr); setp_detail_acces_handicape(false); setgridline_id(""); setgridline_affectation_id(""); + + setp_detail_adresse(""); + setp_detail_code_postal(""); + setp_detail_ville(""); + setp_detail_pays(""); + + } function clean_affectation_fields() { @@ -855,6 +866,26 @@ registerLocale('fr', fr); else form.append("acces_handicape", "0"); + if (p_one_detail_adresse) + form.append("adresse", p_one_detail_adresse); + else + form.append("adresse", ""); + + if (p_one_detail_code_postal) + form.append("code_postal", p_one_detail_code_postal); + else + form.append("code_postal", ""); + + if (p_one_detail_ville) + form.append("ville", p_one_detail_ville); + else + form.append("ville", ""); + + if (p_one_detail_pays) + form.append("pays", p_one_detail_pays); + else + form.append("pays", ""); + //console.log(" form == ", form); @@ -877,8 +908,13 @@ registerLocale('fr', fr); setmateriel_data_edit_mode(""); clean_detail_fields(); setadd_One_Materiel(""); + setselected_id(""); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; @@ -892,14 +928,22 @@ registerLocale('fr', fr); else { setAdd_One_Materiel_Data_api("false"); setAdd_One_Materiel_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { setLoading(false); console.warn('UpdateStagiaireData : Not good man :( Add_One_Materiel_Data = ' + error); setAdd_One_Materiel_Data_api("false"); - alert(" Impossible d'ajouter le materiel"); + //alert(" Impossible d'ajouter le materiel"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible d'ajouter le materiel"); + setalert_type("error"); }) } @@ -933,14 +977,22 @@ registerLocale('fr', fr); else { setGetall_Training_Materiel_Salle_api("false"); setGetall_Training_Materiel_Salle_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { console.warn('Not good man :( Getall_Training_Materiel_Salle = ', error); setGetall_Training_Materiel_Salle_api("false"); - alert(" Impossible de recuperer la liste du materiel"); + // alert(" Impossible de recuperer la liste du materiel"); //setmyApimyApiMessage("") + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer la liste du materiel"); + setalert_type("error"); }) } @@ -1009,14 +1061,23 @@ registerLocale('fr', fr); else { setGetall_Type_Materiel_api("false"); setGetall_Type_Materiel_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } + + }).catch((error) => { setLoading(false); console.warn('Not good man :( Getall_Type_Materiel = ', error); setGetall_Type_Materiel_api("false"); - alert(" Impossible de recuperer les types de materiel"); + // alert(" Impossible de recuperer les types de materiel"); + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer les types de materiel"); + setalert_type("error"); //setmyApimyApiMessage("") }) } @@ -1085,14 +1146,22 @@ registerLocale('fr', fr); else { setGetall_Categorie_Materiel_api("false"); setGetall_Categorie_Materiel_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { setLoading(false); console.warn('Not good man :( Getall_Categorie_Materiel = ', error); setGetall_Categorie_Materiel_api("false"); - alert(" Impossible de recuperer les catégoeirs de materiel"); + // alert(" Impossible de recuperer les catégoeirs de materiel"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer les catégoeirs de materiel"); + setalert_type("error"); //setmyApimyApiMessage("") }) } @@ -1205,6 +1274,26 @@ registerLocale('fr', fr); document.getElementsByName("detail_complement_adr")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("detail_adresse")[0]) { + document.getElementsByName("detail_adresse")[0].disabled = true; + document.getElementsByName("detail_adresse")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_ville")[0]) { + document.getElementsByName("detail_ville")[0].disabled = true; + document.getElementsByName("detail_ville")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_cp")[0]) { + document.getElementsByName("detail_cp")[0].disabled = true; + document.getElementsByName("detail_cp")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_pays")[0]) { + document.getElementsByName("detail_pays")[0].disabled = true; + document.getElementsByName("detail_pays")[0].style.backgroundColor = "#ECEFF1"; + } + } @@ -1292,6 +1381,28 @@ registerLocale('fr', fr); document.getElementsByName("detail_complement_adr")[0].style.backgroundColor = "#FFFFFF"; } + if (document.getElementsByName("detail_adresse")[0]) { + document.getElementsByName("detail_adresse")[0].disabled = false; + document.getElementsByName("detail_adresse")[0].style.backgroundColor = "#FFFFFF"; + } + + + if (document.getElementsByName("detail_ville")[0]) { + document.getElementsByName("detail_ville")[0].disabled = false; + document.getElementsByName("detail_ville")[0].style.backgroundColor = "#FFFFFF"; + } + + + if (document.getElementsByName("detail_cp")[0]) { + document.getElementsByName("detail_cp")[0].disabled = false; + document.getElementsByName("detail_cp")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_pays")[0]) { + document.getElementsByName("detail_pays")[0].disabled = false; + document.getElementsByName("detail_pays")[0].style.backgroundColor = "#FFFFFF"; + } + } @@ -1757,7 +1868,11 @@ registerLocale('fr', fr); .catch((error) => { console.error('Error:', error); setrecord_materiel_Image_api("false"); - alert(" Erreur : Impossible d'enregistrer l'image "); + // alert(" Erreur : Impossible d'enregistrer l'image "); + + setdisplay_alert_mysy("1"); + setalert_message(" Erreur : Impossible d'enregistrer l'image "); + setalert_type("error"); }); @@ -1858,7 +1973,11 @@ registerLocale('fr', fr); form.append("capacite_max", ""); if (local_capacite_max < local_capacite_ideale) { - alert(" La capacité maximale doit être supérieure ou égale à à la capacité idéale"); + // alert(" La capacité maximale doit être supérieure ou égale à à la capacité idéale"); + + setdisplay_alert_mysy("1"); + setalert_message(" La capacité maximale doit être supérieure ou égale à à la capacité idéale"); + setalert_type("error"); return; } @@ -1875,6 +1994,27 @@ registerLocale('fr', fr); else form.append("acces_handicape", "0"); + //--- + + if (p_detail_adresse) + form.append("adresse", p_detail_adresse); + else + form.append("adresse", ""); + + if (p_detail_code_postal) + form.append("code_postal", p_detail_code_postal); + else + form.append("code_postal", ""); + + if (p_detail_ville) + form.append("ville", p_detail_ville); + else + form.append("ville", ""); + + if (p_detail_pays) + form.append("pays", p_detail_pays); + else + form.append("pays", ""); form.append("_id", selected_id); @@ -1914,13 +2054,21 @@ registerLocale('fr', fr); }); } - alert(" La mise à jour a été correctement faite."); + // alert(" La mise à jour a été correctement faite."); + + setdisplay_alert_mysy("1"); + setalert_message(" La mise à jour a été correctement faite."); + setalert_type("success"); } else { setUpdate_One_Materiel_Data_api("false"); setUpdate_One_Materiel_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1929,6 +2077,10 @@ registerLocale('fr', fr); setUpdate_One_Materiel_Data_api("false"); alert(" Impossible de mettre à jour le materiel"); + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de mettre à jour de la salle"); + setalert_type("error"); + }) } @@ -1968,14 +2120,18 @@ registerLocale('fr', fr); } else if (String(res.data.status) === String("Err_Connexion")) { - alert('Erreur: ' + res.data.message); + alert(res.data.message); history.push("/Connexion"); return; } else { setget_Materiel_Images_api("false"); get_Materiel_Images_message(res.data.message) - alert(res.data.message); + //alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2019,6 +2175,12 @@ registerLocale('fr', fr); const [p_detail_qty_stock, setp_detail_qty_stock] = useState("1"); const [p_detail_site_formation, setp_detail_site_formation] = useState(""); + const [p_detail_adresse, setp_detail_adresse] = useState(""); + const [p_detail_code_postal, setp_detail_code_postal] = useState(""); + const [p_detail_ville, setp_detail_ville] = useState(""); + const [p_detail_pays, setp_detail_pays] = useState(""); + + // ------------ @@ -2042,6 +2204,11 @@ registerLocale('fr', fr); const [p_one_site_formation_id, setp_one_site_formation_id] = useState(""); + const [p_one_detail_adresse, setp_one_detail_adresse] = useState(""); + const [p_one_detail_code_postal, setp_one_detail_code_postal] = useState(""); + const [p_one_detail_ville, setp_one_detail_ville] = useState(""); + const [p_one_detail_pays, setp_one_detail_pays] = useState(""); + const [p_one_affect_poste, setp_one_affect_poste] = useState(); const [p_one_affect_date_du, setp_one_affect_date_du] = useState(new Date().toLocaleDateString('fr-FR')); @@ -2356,7 +2523,10 @@ registerLocale('fr', fr); } else { - alert(" Aucune donnée recuperée"); + // alert(" Aucune donnée recuperée"); + setdisplay_alert_mysy("1"); + setalert_message(" Aucune donnée recuperée"); + setalert_type("warning"); } Disable_Detail_Affectation_Fields(); @@ -2364,13 +2534,20 @@ registerLocale('fr', fr); else { setGet_Given_Materiel_Affectation_api("false"); setGet_Given_Materiel_Affectation_message(res.data.message); - alert(res.data.message) + //alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { console.warn('Not good man :( Get_Given_Materiel_Affectation = ', error); setGet_Given_Materiel_Affectation_api("false"); - alert(" Impossible de recuperer l'affectation de l'employé"); + // alert(" Impossible de recuperer l'affectation de l'employé"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer l'affectation de l'employé"); + setalert_type("error"); //setmyApimyApiMessage("") }) } @@ -2447,7 +2624,11 @@ registerLocale('fr', fr); setSelectionModel_affectations([]); setgridline_affectation_id(''); - alert(" L'affectation a été ajoutée."); + // alert(" L'affectation a été ajoutée."); + + setdisplay_alert_mysy("1"); + setalert_message(" L'affectation a été ajoutée."); + setalert_type("success"); if (document.getElementById('myRef_new_affectation')) { var divh = document.getElementById('myRef_new_affectation').offsetTop; @@ -2461,14 +2642,22 @@ registerLocale('fr', fr); else { setAdd_one_affectation_api("false"); setAdd_one_affectation_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { console.log('UpdateStagiaireData : Not good man :( Add_one_affectation = ' + error); setAdd_one_affectation_api("false"); - alert(" Impossible d'ajouter l'affectation"); + // alert(" Impossible d'ajouter l'affectation"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible d'ajouter l'affectation"); + setalert_type("error"); }) } @@ -2535,12 +2724,20 @@ registerLocale('fr', fr); setdisplay_affectation(); Getall_Materiel_Affectation(local_rh_id); Getall_Materiel_Rattachement(local_rh_id); - alert(" La fonction a été correctement supprimée.") + // alert(" La fonction a été correctement supprimée.") + + setdisplay_alert_mysy("1"); + setalert_message(" La fonction a été correctement supprimée."); + setalert_type("success"); } else { setDelete_affection_api("false"); setDelete_affection_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -2548,7 +2745,11 @@ registerLocale('fr', fr); console.log('Delete_affection : Not good man :( Delete_affection = ' + error); setDelete_affection_api("false"); - alert(" Impossible de supprimer la fonction"); + // alert(" Impossible de supprimer la fonction"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de supprimer la fonction"); + setalert_type("error"); }) } @@ -2576,12 +2777,20 @@ registerLocale('fr', fr); setDelete_Materiel_api("true"); setDelete_Materiel_result(res.data.message); clean_all_filters(); - alert(" Le materiel a été correctement supprimé.") + // alert(" Le materiel a été correctement supprimé.") + + setdisplay_alert_mysy("1"); + setalert_message(" La salle a été correctement supprimée."); + setalert_type("success"); } else { setDelete_Materiel_api("false"); setDelete_Materiel_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -2589,7 +2798,11 @@ registerLocale('fr', fr); console.log('Delete_Materiel : Not good man :( Delete_Materiel = ' + error); setDelete_Materiel_api("false"); - alert(" Impossible de supprimer le materiel"); + // alert(" Impossible de supprimer le materiel"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de supprimer la salle"); + setalert_type("error"); }) } @@ -3147,60 +3360,63 @@ registerLocale('fr', fr); {Dialog_1_message} -
+
+
- + -
+ + + {String(p_detail_event_type) !== "planning" &&
+ + + +
} - -
- - {String(p_detail_event_type) !== "planning" &&
- - - -
} -
Titre -
Debut - { - if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") - return setStartDate(date); - } - } +
-
Fin - Fin
+ { - if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") - return setendDate(date); - } - } + onChange={(date) => { + if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") + return setendDate(date); + } + } - className="disabled_style session_caract_Dialog_DatePicker" - locale={'fr'} - showTimeSelect - timeFormat="HH:mm" - timeIntervals={15} - dateFormat="dd/MM/yyyy HH:mm" - is24Hour + className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} + showTimeSelect + timeFormat="HH:mm" + timeIntervals={15} + dateFormat="dd/MM/yyyy HH:mm" + is24Hour - /> + /> -
+
+
Commentaire -
- {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) === "") && } - -
} -
- -
-
- - {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_event_id || String(p_detail_event_id) === "") && } + +
+ + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) !== "" &&
+ +
} + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && String(p_detail_event_id) === "" &&
+ +
} + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && +
+ -
+ } className="bton_supprime_dialog" style={{ width: '40%', float: 'left' }}>Supprimer +
} - - } +
{/*** FIn Dialog detail eventement */} @@ -3559,12 +3783,12 @@ registerLocale('fr', fr); // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -3576,11 +3800,11 @@ registerLocale('fr', fr); '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, /*"& .MuiDataGrid-virtualScrollerRenderZone": { @@ -3589,13 +3813,13 @@ registerLocale('fr', fr); } },*/ "& .MuiDataGrid-columnHeaders": { - backgroundColor: "#dfe8f2", - color: "#0a2a4d", - fontSize: '14px', - fontFamily:'DM Sans', + backgroundColor: "#dfe8f2", + color: "#0a2a4d", + fontSize: '14px', + fontFamily: 'DM Sans', }, '& .line--statut--selected': { - backgroundColor: '#e9f7f1', + backgroundColor: '#e9f7f1', color: '#0a2a4d', }, '& .line--statut--pair': { @@ -3640,6 +3864,10 @@ registerLocale('fr', fr); capacite_max: JSON.parse(item).capacite_max, capacite_ideale: JSON.parse(item).capacite_ideale, + adresse: JSON.parse(item).adresse, + code_postal: JSON.parse(item).code_postal, + ville: JSON.parse(item).ville, + vilpaysle: JSON.parse(item).pays, } ))} @@ -3763,11 +3991,11 @@ registerLocale('fr', fr); {String(history_securite_read) === "1" && }
} - + {selected_id && String(selected_id).length > "5" && } {String(submenu) === "detail_materiel" && String(add_One_Materiel) !== "1" &&
-
@@ -3822,306 +4050,438 @@ registerLocale('fr', fr);
-
Ref. Interne
- { - setp_detail_ref_interne(e.target.value); - setmateriel_data_changed("1"); - } - } - /> -
+
+
-
Nom
- +
- InputLabelProps={{ - shrink: true, - }} - disabled={Boolean(String(props.check_user_acces_right("materiel", "write")))} - className="disabled_style" - value={p_detail_nom} - onChange={(e) => { - setp_detail_nom(e.target.value); - setmateriel_data_changed("1"); - } - } +
+ Infos Générales +
- /> -
+
-
Description
- Ref. Interne
+ { - setp_detail_description(e.target.value); - setmateriel_data_changed("1"); - } - } + InputLabelProps={{ + shrink: true, + }} - /> + className="disabled_style" + value={p_detail_ref_interne} + disabled={!Boolean(parseInt(materiel_data_edit_mode))} + onChange={(e) => { + setp_detail_ref_interne(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Nom
+ { + setp_detail_nom(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Description
+ { + setp_detail_description(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
+
+
+ Adresse +
+ +
+
+ + {String(materiel_data_edit_mode) === "1" && +
Site de formation 02
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + + (data)._id === String(p_detail_site_formation))[0].label} + + onChange={(event, value) => { + if (value && value._id) { + setp_detail_site_formation(value._id); + setmateriel_data_changed("1"); + + setp_detail_adresse(value.adr_site); + setp_detail_code_postal(value.cp_site); + setp_detail_ville(value.ville_site); + setp_detail_pays(value.pays_site); + } + }} + renderInput={(params) => + } + />} + + +
} + + {String(materiel_data_edit_mode) !== "1" && +
Site de formation
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + (data)._id === String(p_detail_site_formation))[0].label} + /> + } + + +
} + + + + +
Adresse
+ { + setp_detail_adresse(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ + +
Ville
+ { + setp_detail_ville(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ +
Code postal
+ { + setp_detail_code_postal(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ + +
Pays
+ { + setp_detail_pays(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ +
+ +
+
+ + +
+
+ +
+ Caracteristiques +
+ +
+ + + +
Capacité Idéale
+ { + setp_detail_capacite_ideale(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Capacité Maximale
+ { + setp_detail_capacite_max(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + +
Accès handicapé ?
+ + +
+ +
 
+ + +
Coût (estimé)
+ { + setp_detail_prix_achat(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> + + {String(materiel_data_edit_mode) !== "1" && (data).value === String(p_detail_prix_achat_by))[0].label} + + />} + {String(materiel_data_edit_mode) === "1" && (data).value === String(p_detail_prix_achat_by))[0].label} + // disabled={Boolean(String(props.check_user_acces_right("materiel", "write")))} + options={New_Price_by} + onChange={(event, value) => { + if (value && value.value) { + + setp_detail_prix_achat_by(value.value); + setmateriel_data_changed("1"); + + } + + }} + + renderInput={(params) => + } + />} +
+ +
 
+ +
Commentaire + { + setp_detail_detail(e.target.value); + setmateriel_data_changed("1"); + + }} + + /> + +
+ + + + +
+
+
+
- - {String(materiel_data_edit_mode) === "1" && -
Site de formation
- {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && - - (data)._id === String(p_detail_site_formation))[0].label} - disabled={Boolean(String(props.check_user_acces_right("materiel", "write")))} - onChange={(event, value) => { - if (value && value._id) { - setp_detail_site_formation(value._id); - setmateriel_data_changed("1"); - } - }} - renderInput={(params) => - } - />} - - -
} - - {String(materiel_data_edit_mode) !== "1" && -
Site de formation
- {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && - (data)._id === String(p_detail_site_formation))[0].label} - /> - } - - -
} - - - -
Coût (estimé)
- { - setp_detail_prix_achat(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> - - {String(materiel_data_edit_mode) !== "1" && (data).value === String(p_detail_prix_achat_by))[0].label} - - />} - {String(materiel_data_edit_mode) === "1" && (data).value === String(p_detail_prix_achat_by))[0].label} - disabled={Boolean(String(props.check_user_acces_right("materiel", "write")))} - options={New_Price_by} - onChange={(event, value) => { - if (value && value.value) { - - setp_detail_prix_achat_by(value.value); - setmateriel_data_changed("1"); - - } - - }} - - renderInput={(params) => - } - />} -
- - - - -
Complement Adresse
- { - setp_detail_complement_adresse(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- -
Capacité Idéale
- { - setp_detail_capacite_ideale(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- -
Capacité Maximale
- { - setp_detail_capacite_max(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- - -
- Accès handicapé ?
- - -
- -
Commentaire
- { - setp_detail_detail(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
-
 
@@ -4168,295 +4528,388 @@ registerLocale('fr', fr); */}
- +
-
Ref. Interne
- { - setp_one_detail_ref_interne(e.target.value); - setmateriel_data_changed("1"); - } - } - /> -
+
+
-
Nom
- +
- InputLabelProps={{ - shrink: true, - }} - disabled={false} - className="disabled_style" - value={p_one_detail_nom} - onChange={(e) => { - setp_one_detail_nom(e.target.value); - setmateriel_data_changed("1"); - } - } +
+ Infos Générales +
- /> -
+
-
Description
- Ref. Interne
+ { - setp_one_detail_description(e.target.value); - setmateriel_data_changed("1"); - } - } + InputLabelProps={{ + shrink: true, + }} + disabled={false} + className="disabled_style" + value={p_one_detail_ref_interne} + onChange={(e) => { + setp_one_detail_ref_interne(e.target.value); + setmateriel_data_changed("1"); + } + } - /> -
+ /> +
+ +
Nom
+ { + setp_one_detail_nom(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Description
+ { + setp_one_detail_description(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + +
+ +
+
+ Adresse +
+ +
+
+ +
Site de formation
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + + { + if (value && value._id) { + setp_one_site_formation_id(value._id) + + setp_one_detail_adresse(value.adr_site); + setp_one_detail_code_postal(value.cp_site); + setp_one_detail_ville(value.ville_site); + setp_one_detail_pays(value.pays_site); + + } + }} + renderInput={(params) => + } + />} + + +
+
Adresse
+ { + setp_one_detail_adresse(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ + +
Ville
+ { + setp_one_detail_ville(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ +
Code postal
+ { + setp_one_detail_code_postal(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ + +
Pays
+ { + setp_one_detail_pays(e.target.value); + setmateriel_data_changed("1"); + } + } + /> + +
+ +
+ +
+
+ +
+
+ +
+ Caracteristiques +
+ +
+ +
Capacité Idéale
+ { + setp_one_detail_capacite_ideale(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Capacité Maximale
+ { + setp_one_detail_capacite_max(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
+ Accès handicapé ?
+ + +
+ +
 
+ + +
Coût (estimé)
+ { + setp_one_detail_prix_achat(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> + + + (data).value === String(p_one_detail_prix_achat_by))[0].label} + + options={New_Price_by} + onChange={(event, value) => { + if (value && value.value) { + setp_one_detail_prix_achat_by(value.value); + + } + + }} + + renderInput={(params) => + } + /> +
+ +
 
+ + +
Commentaire + { + setp_one_detail_detail(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> + + +
+ + +
+
+
- -
Type
- { - if (value && value.code) { - setp_one_detail_type(value.code); - setmateriel_data_changed("1"); - - } - }} - - renderInput={(params) => - } - /> - - - -
- - -
Site de formation
- {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && - - { - if (value && value._id) { - setp_one_site_formation_id(value._id) - - } - }} - renderInput={(params) => - } - />} - - -
- - - -
Coût(estimé)
- { - setp_one_detail_prix_achat(e.target.value); - setmateriel_data_changed("1"); - } - } - /> - - (data).value === String(p_one_detail_prix_achat_by))[0].label} - - options={New_Price_by} - onChange={(event, value) => { - if (value && value.value) { - - setp_one_detail_prix_achat_by(value.value); - - - } - - }} - - renderInput={(params) => - } - /> - -
- - -
Complement Adresse
- { - setp_one_detail_complement_adresse(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- -
Capacité Idéale
- { - setp_one_detail_capacite_ideale(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- -
Capacité Maximale
- { - setp_one_detail_capacite_max(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
- -
- Accès handicapé ?
- - -
- - -
Commentaire
- { - setp_one_detail_detail(e.target.value); - setmateriel_data_changed("1"); - } - } - - /> -
-
-   +
@@ -4483,7 +4936,7 @@ registerLocale('fr', fr); {String(submenu) === "affectation" &&
- +
@@ -4495,14 +4948,14 @@ registerLocale('fr', fr); width: '100%', paddingRight: '1px', "& .MuiDataGrid-columnHeaders": { - backgroundColor: "#dfe8f2", - color: "#0a2a4d", - fontSize: '14px', - fontFamily:'DM Sans', + backgroundColor: "#dfe8f2", + color: "#0a2a4d", + fontSize: '14px', + fontFamily: 'DM Sans', }, '& .line--statut--selected': { - backgroundColor: '#e9f7f1', + backgroundColor: '#e9f7f1', color: '#0a2a4d', }, '& .line--statut--pair': { @@ -4611,7 +5064,7 @@ registerLocale('fr', fr); {String(display_affectation) === "1" &&
- +
Usage du Matériel
@@ -5142,7 +5595,7 @@ registerLocale('fr', fr); {String(submenu) === "ressource_associe" &&
- +
@@ -5154,14 +5607,14 @@ registerLocale('fr', fr); width: '100%', paddingRight: '1px', "& .MuiDataGrid-columnHeaders": { - backgroundColor: "#dfe8f2", - color: "#0a2a4d", - fontSize: '14px', - fontFamily:'DM Sans', + backgroundColor: "#dfe8f2", + color: "#0a2a4d", + fontSize: '14px', + fontFamily: 'DM Sans', }, '& .line--statut--selected': { - backgroundColor: '#e9f7f1', + backgroundColor: '#e9f7f1', color: '#0a2a4d', }, '& .line--statut--pair': { @@ -5256,7 +5709,7 @@ registerLocale('fr', fr);
} {String(submenu) === "reservation" &&
- +
  @@ -5299,9 +5752,115 @@ registerLocale('fr', fr); read_access={props.read_access} write_access={props.write_access} />
} - +
); } export default Materiel_Salle; + + +const local_css = ` + +:root { + --bg: #f6f8fb; + --card: #ffffff; + --text: #0f172a; + --muted: #64748b; + --border: #e5e7eb; + --shadow: 0 10px 25px rgba(2, 6, 23, .06); + --green-700: #0f6b53; + --green-600: #167a5e; + --green-100: #e9f7f1; + --blue-600: #2563eb; + --radius: 14px; + --radius-sm: 10px; +} + .Grid_2_col{ + margin-top: 12px; + display:grid; + grid-template-columns: 1.2fr 1fr; + gap: 14px; + padding:5px; +} + .Grid_1_col{ + margin-top: 12px; + display:grid; + grid-template-columns: 1fr; + gap: 14px; + padding:5px; +} + +.Grid_2_col_sub_colone { + background: #fff; + border: 1px solid #e5e7eb; + border-radius: 14px; + box-shadow: 0 6px 18px rgba(2,6,23,.04); + padding: 0px; + display: flex; + flex-direction: column; + gap: 14px; +} + + +.Grid_2_col_sub_colone_header { + background: #dbeafe; + border-top-right-radius: 10px; + border-top-left-radius: 10px; + text-align: center; + font-family: DM Sans; + font-weight: 700; + height: 2rem; + padding-top: 5px; + font-size: 15px; +} + +.Grid_2_col_sub_colone_bottom_menu{ + +} + +.card__header{ +background: #e2e8f0; + font-size: small; + text-align: center; +} + +.card__title{ + display:flex; + align-items:center; + gap: 10px; +} + +.card__icon{ + width: 34px; + height: 34px; + display:grid; + place-items:center; + border-radius: 12px; + background:#eff6ff; + border:1px solid #dbeafe; +} + +.card__header h2{ + margin:0; + font-size: 15px; + letter-spacing: -0.01em; +} + +.card__actions{ display:flex; align-items:center; gap:8px; } + +.block_detail_action{ +width: 100%; + float: left; + background: #fafafa; + padding: 10px; + border: unset; + border-radius: 10px; + } + + +.react-datepicker-wrapper{ +width: 100%; + + } +`; \ No newline at end of file diff --git a/src/components/Materiels.js b/src/components/Materiels.js index 95cc72b..a2cf249 100644 --- a/src/components/Materiels.js +++ b/src/components/Materiels.js @@ -1,12 +1,12 @@ import React, { useRef, useState, useEffect } from "react"; import TextField from '@mui/material/TextField'; - +import TextareaAutosize from '@mui/material/TextareaAutosize'; import 'react-confirm-alert/src/react-confirm-alert.css'; // Import css import Button from '@mui/material/Button'; import axios from "axios"; import { getCookie, setCookie } from 'react-use-cookie'; import { useHistory } from "react-router-dom"; - +import ToggleSwitch_v2_mysy from "./ToggleSwitch_v2_mysy"; import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; @@ -1798,8 +1798,6 @@ const Materiels = (props) => { const [p_detail_site_formation, setp_detail_site_formation] = useState(""); - // ------------ - const [p_one_detail_ref_interne, setp_one_detail_ref_interne] = useState(); const [p_one_detail_nom, setp_one_detail_nom] = useState(); @@ -2956,60 +2954,63 @@ const Materiels = (props) => { {Dialog_1_message} -
+
+
- + -
+ + + {String(p_detail_event_type) !== "planning" &&
+ + + +
} - -
- - {String(p_detail_event_type) !== "planning" &&
- - - -
} -
Titre {
-
Debut - { - if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") - return setStartDate(date); - } - } +
-
Fin - Fin
+ { - if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") - return setendDate(date); - } - } + onChange={(date) => { + if (String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "") + return setendDate(date); + } + } - className="disabled_style session_caract_Dialog_DatePicker" - locale={'fr'} - showTimeSelect - timeFormat="HH:mm" - timeIntervals={15} - dateFormat="dd/MM/yyyy HH:mm" - is24Hour + className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} + showTimeSelect + timeFormat="HH:mm" + timeIntervals={15} + dateFormat="dd/MM/yyyy HH:mm" + is24Hour - /> - -
+ /> +
+
Commentaire { -
+ { /*
{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) === "") && } @@ -3132,14 +3134,14 @@ const Materiels = (props) => {
}
- +
-
+
*/} - {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && + {/*String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" &&
- } + */} + + +
+ {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) === "") && } +
} + + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) !== "" &&
+ +
} + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && String(p_detail_event_id) === "" && +
+ +
} + + + {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && +
+ + + +
} + + +
{/*** FIn Dialog detail eventement */} @@ -3399,12 +3436,12 @@ const Materiels = (props) => { // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -3416,11 +3453,11 @@ const Materiels = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, /*"& .MuiDataGrid-virtualScrollerRenderZone": { @@ -3615,9 +3652,11 @@ const Materiels = (props) => {
} - {String(submenu) === "detail_materiel" && String(add_One_Materiel) !== "1" &&
+ {selected_id && String(selected_id).length > "5" && } - + {String(submenu) === "detail_materiel" && String(add_One_Materiel) !== "1" &&
+
@@ -3672,6 +3711,362 @@ const Materiels = (props) => {
+ + +
+
+ +
+
+ +
+ Infos Générales +
+ +
+ +
Ref. Interne
+ { + setp_detail_ref_interne(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Nom
+ { + setp_detail_nom(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Description
+ { + setp_detail_description(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + {String(materiel_data_edit_mode) === "1" && +
Site de formation
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + + (data)._id === String(p_detail_site_formation))[0].label} + + onChange={(event, value) => { + if (value && value._id) { + setp_detail_site_formation(value._id); + setmateriel_data_changed("1"); + } + }} + renderInput={(params) => + } + />} + + +
} + + {String(materiel_data_edit_mode) !== "1" && +
Site de formation
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + (data)._id === String(p_detail_site_formation))[0].label} + /> + } + + +
} + + +
Detail
+ + { + setp_detail_detail(e.target.value); + setmateriel_data_changed("1"); + + }} + + /> + + +
+ + + +
+
+
+ +
+
+ +
+ Caracteristiques +
+ +
+ +
Famille
+ { + setp_detail_famille(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Marque
+ { + setp_detail_marque(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + {String(materiel_data_edit_mode) !== "1" &&
Type
+ + +
} + + {String(materiel_data_edit_mode) === "1" &&
Type
+ + (data).code === String(p_detail_type))[0].label} + + onChange={(event, value) => { + if (value && value.code) { + setp_detail_type(value.code); + setmateriel_data_changed("1"); + + } + }} + + renderInput={(params) => + + } + /> + +
} + +
Prix d'achat (estimé)
+ { + setp_detail_prix_achat(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Fournisseur
+ { + setp_detail_fournisseur(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Qté en stock
+ { + setp_detail_qty_stock(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + +
+
+
+ + + +
+
+ + + + +{/*<>
Ref. Interne
{ />
- + */}
 
@@ -4016,8 +4411,311 @@ const Materiels = (props) => {
- +
+ + +
+
+ +
+
+ +
+ Infos Générales +
+ +
+ +
Ref. Interne
+ { + setp_one_detail_ref_interne(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Nom
+ { + setp_one_detail_nom(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Description
+ { + setp_one_detail_description(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Site de formation
+ {New_Getall_Partner_Site_Formation_result && New_Getall_Partner_Site_Formation_result.length > 0 && + + { + if (value && value._id) { + setp_one_site_formation_id(value._id) + + } + }} + renderInput={(params) => + } + />} + + +
+ +
Detail
+ + { + setp_one_detail_detail(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> + +
+ +
+
+
+ +
+
+ +
+ Caracteristiques +
+ +
+ +
Famille
+ { + setp_one_detail_famille(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Marque
+ { + setp_one_detail_marque(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + +
Type
+ { + if (value && value.code) { + setp_one_detail_type(value.code); + setmateriel_data_changed("1"); + + } + }} + + renderInput={(params) => + } + /> + +
+ +
Prix d'achat (estimé)
+ { + setp_one_detail_prix_achat(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Fournisseur
+ { + setp_one_detail_fournisseur(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ +
Qté en stock
+ { + setp_one_detail_qty_stock(e.target.value); + setmateriel_data_changed("1"); + } + } + + /> +
+ + +
+
+
+ + + +
+
+ + +{/*<> +
Ref. Interne
{ /> - {/* { - setp_one_detail_type(e.target.value); - setmateriel_data_changed("1"); - } - } - - />*/} +
@@ -4293,7 +4973,7 @@ const Materiels = (props) => { />
- +*/}
 
@@ -4322,7 +5002,7 @@ const Materiels = (props) => { {String(submenu) === "affectation" &&
- +
@@ -4451,7 +5131,7 @@ const Materiels = (props) => { {String(display_affectation) === "1" &&
- +
Usage du Matériel
@@ -4982,7 +5662,7 @@ const Materiels = (props) => { {String(submenu) === "ressource_associe" &&
- +
@@ -5097,7 +5777,7 @@ const Materiels = (props) => {
} {String(submenu) === "reservation" &&
- +
  @@ -5142,9 +5822,115 @@ const Materiels = (props) => {
} - +
); } export default Materiels; + + +const local_css = ` + +:root { + --bg: #f6f8fb; + --card: #ffffff; + --text: #0f172a; + --muted: #64748b; + --border: #e5e7eb; + --shadow: 0 10px 25px rgba(2, 6, 23, .06); + --green-700: #0f6b53; + --green-600: #167a5e; + --green-100: #e9f7f1; + --blue-600: #2563eb; + --radius: 14px; + --radius-sm: 10px; +} + .Grid_2_col{ + margin-top: 12px; + display:grid; + grid-template-columns: 1.2fr 1fr; + gap: 14px; + padding:5px; +} + .Grid_1_col{ + margin-top: 12px; + display:grid; + grid-template-columns: 1fr; + gap: 14px; + padding:5px; +} + +.Grid_2_col_sub_colone { + background: #fff; + border: 1px solid #e5e7eb; + border-radius: 14px; + box-shadow: 0 6px 18px rgba(2,6,23,.04); + padding: 0px; + display: flex; + flex-direction: column; + gap: 14px; +} + + +.Grid_2_col_sub_colone_header { + background: #dbeafe; + border-top-right-radius: 10px; + border-top-left-radius: 10px; + text-align: center; + font-family: DM Sans; + font-weight: 700; + height: 2rem; + padding-top: 5px; + font-size: 15px; +} + +.Grid_2_col_sub_colone_bottom_menu{ + +} + +.card__header{ +background: #e2e8f0; + font-size: small; + text-align: center; +} + +.card__title{ + display:flex; + align-items:center; + gap: 10px; +} + +.card__icon{ + width: 34px; + height: 34px; + display:grid; + place-items:center; + border-radius: 12px; + background:#eff6ff; + border:1px solid #dbeafe; +} + +.card__header h2{ + margin:0; + font-size: 15px; + letter-spacing: -0.01em; +} + +.card__actions{ display:flex; align-items:center; gap:8px; } + +.block_detail_action{ +width: 100%; + float: left; + background: #fafafa; + padding: 10px; + border: unset; + border-radius: 10px; + } + + +.react-datepicker-wrapper{ +width: 100%; + + } +`; \ No newline at end of file diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index 4d16ede..b2c5e2f 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -6742,7 +6742,7 @@ const Module_Session_Planification = (props) => { ...newValue.filter((i) => fixedVal_grp_apprenant.indexOf(i) === -1), ]); - // console.log(" ### val_grp_apprenant = ", val_grp_apprenant) + // console.log(" ### val_grp_apprenant = ", val_grp_apprenant) }} value={val_grp_apprenant} @@ -6909,56 +6909,6 @@ const Module_Session_Planification = (props) => { />
- - {/*
Objectif - { - - setp_detail_sequence_objectif(e.target.value); - } - } - multiline - minRows={2} - maxRows={2} - rows={2} - - /> - -
*/} - - {/*
Commentaire - { - - setp_detail_sequence_comment(e.target.value); - } - } - multiline - minRows={2} - maxRows={2} - rows={2} - - /> - -
*/} - -
} @@ -6967,19 +6917,7 @@ const Module_Session_Planification = (props) => { {String(submenu_seq_dialog) !== "dialog_ressource" && - -
- {String(p_detail_sequence_session_id) === "" &&
- {p_detail_event_id && String(p_detail_event_id) !== "" && } - {(!p_detail_event_id || String(p_detail_event_id) === "") && } - - - -
} -
- -
-
+ { } - {String(submenu_seq_dialog) !== "dialog_ressource" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && - -
+ - +
- } + {(!p_detail_event_id || String(p_detail_event_id) === "") && } - onClick={(event) => { +
+ + {String(submenu_seq_dialog) !== "dialog_ressource" && String(p_detail_sequence_session_id) === "" && String(p_detail_event_id) === "" && +
+ +
} - }} - > - Supprimer + {String(submenu_seq_dialog) !== "dialog_ressource" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && +
+ + + -
MySy Information
-
- {' '} + - En confirmant cette opération, la séquence sera définitivement supprimée.
+ } + modal + nested + position="center center" + > + {close => ( +
+ +
MySy Information
+
+ {' '} + + En confirmant cette opération, la séquence sera définitivement supprimée.
+ +
+
+
+
-
-
- - -
-
- -
+ }} + > + Annuler +
- )} - -
- - - } +
+ )} + +
} +
{String(submenu_seq_dialog) === "dialog_ressource" && { }; const New_Option_Filter = [ - { "id": "nom", "label": "Nom / Raison Sociale / Tél / mail ", "value": "nom" }, + { "id": "nom", "label": "Nom / Raison Sociale / Tél / mail ", "value": "nom" }, + { "id": "groupe_client", "label": "Groupe Client ", "value": "groupe_client" }, + { "id": "type_client", "label": "Type Client", "value": "type_client" }, + { "id": "typologie", "label": "Typologie", "value": "typologie" }, + { "id": "caracteristique", "label": "Caracteristiques", "value": "caracteristique" }, { "id": "archive", "label": "Archive", "value": "archive" }, { "id": "", "label": "", "value": "" }, { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. @@ -820,6 +824,21 @@ const Partner_Client = (props) => { ] + const Type_Client_Option = [ + { "id": "entreprise", "label": "Société ", "value": "entreprise" }, + { "id": "particulier", "label": "Particulier", "value": "particulier" }, + { "id": "ppublic", "label": "P. Public", "value": "ppublic" }, + { "id": "", "label": "", "value": "" }, + ] + + + const Type_Client_Typologie = [ + { "id": "financeur", "label": "Financeur", "value": "financeur" }, + { "id": "fournisseur ", "label": "Fournisseur", "value": "fournisseur " }, + { "id": "client", "label": "Client ", "value": "client" }, + { "id": "", "label": "", "value": "" }, + ] + // Action en mass const [actionmass_ftion_val, setactionmass_ftion_val] = useState(""); @@ -1189,37 +1208,39 @@ const Partner_Client = (props) => { - {String(p_filtre1) !== "archive" &&
- {p_filtre1 && - { setp_filtre1_value(e.target.value); }} - InputProps={{ - endAdornment: ( - - { - setp_filtre1_value(""); - }} /> - - ), - }} +
+ {p_filtre1 && + + InputLabelProps={{ + shrink: true, + }} + disabled={false} + className="disabled_style" + value={p_filtre1_value} + onChange={(e) => { setp_filtre1_value(e.target.value); }} + InputProps={{ + endAdornment: ( + + { + setp_filtre1_value(""); + }} /> + + ), + }} - } -
} + /> + + } +
} {String(p_filtre1) === "archive" &&
{p_filtre1 && @@ -1248,6 +1269,60 @@ const Partner_Client = (props) => { }
} + {String(p_filtre1) === "type_client" &&
+ {p_filtre1 && + (data).id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Type_Client_Option} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1_value(value.value); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + + {String(p_filtre1) === "typologie" &&
+ {p_filtre1 && + (data).id === String(p_filtre1_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Type_Client_Typologie} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1_value(value.value); + } else { + setp_filtre1_value(""); + } + }} + renderInput={(params) => } + /> + + } +
} + {p_filtre1 &&
@@ -1297,7 +1372,7 @@ const Partner_Client = (props) => {
- {String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && + {String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && String(p_filtre2) !== "type_client" && String(p_filtre2) !== "typologie" && { />} />} + {String(p_filtre2).length > 3 && String(p_filtre2) === "type_client" && + (data).id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Type_Client_Option} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2_value(value.value); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />} + + {String(p_filtre2).length > 3 && String(p_filtre2) === "typologie" && + (data).id === String(p_filtre2_value))[0].label} + sx={{ float: "right" }} + className="disabled_style" + + options={Type_Client_Typologie} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2_value(value.value); + } else { + setp_filtre2_value(""); + } + }} + renderInput={(params) => } + />} +