From 711d132a2495f210fa2be7c4772742bb7c7a3876 Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 10 Mar 2024 21:09:15 +0100 Subject: [PATCH] 10/03/24 - 21h --- src/components/DisplayPartnerSession.js | 1 + src/components/Employes.js | 186 ++++++++++++++---------- 2 files changed, 114 insertions(+), 73 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 01ac0da..417a1ec 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -3078,6 +3078,7 @@ const DisplayPartnerSession = (props) => { { "id": "Mme", "label": "Mme", "value": "Mme" }, { "id": "M", "label": "M", "value": "M" }, { "id": "Neutre", "label": "Neutre", "value": "Neutre" }, + { "id": "", "label": "", "value": "" }, ] const New_type_apprenant = [ diff --git a/src/components/Employes.js b/src/components/Employes.js index 949e2df..1612d10 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -125,6 +125,13 @@ const Employes = (props) => { { field: 'date_naissance', headerName: 'date_naissance', hide: true, Width: 0 }, { field: 'civilite', headerName: 'Civilité', minWidth: 100, flex: 1, maxWidth: 100, hide: false, + valueFormatter: (params) => { + if (params.value) + return String(params.value)[0].toUpperCase() + String(params.value).slice(1); + else + return "" + + }, }, @@ -1073,21 +1080,21 @@ const Employes = (props) => { if (mylocal_employe.date_naissance) { setp_detail_naissance(mylocal_employe.date_naissance); - }else{ + } else { setp_detail_naissance(""); } if (mylocal_employe.telephone_mobile) { setp_detail_tel_mobile(mylocal_employe.telephone_mobile); - }else{ + } else { setp_detail_tel_mobile(""); } if (mylocal_employe.civilite) { setp_detail_civilite(mylocal_employe.civilite); - }else{ + } else { setp_detail_civilite(""); } @@ -1098,60 +1105,60 @@ const Employes = (props) => { if (mylocal_employe.adr_adresse) { setp_detail_adresse(mylocal_employe.adr_adresse); - }else{ + } else { setp_detail_adresse(""); } if (mylocal_employe.adr_code_postal) { setp_detail_code_postal(mylocal_employe.adr_code_postal); - }else{ + } else { setp_detail_code_postal(""); } if (mylocal_employe.adr_ville) { setp_detail_ville(mylocal_employe.adr_ville); - }else{ + } else { setp_detail_ville(""); } if (mylocal_employe.adr_pays) { setp_detail_pays(mylocal_employe.adr_pays); - }else{ + } else { setp_detail_pays(""); } if (mylocal_employe.linkedin) { setp_detail_linkedIn(mylocal_employe.linkedin); - }else{ + } else { setp_detail_linkedIn(""); } if (mylocal_employe.facebook) { setp_detail_facebook(mylocal_employe.facebook); - }else{ + } else { setp_detail_facebook(""); } if (mylocal_employe.twitter) { setp_detail_twitter(mylocal_employe.twitter); - }else{ + } else { setp_detail_twitter(""); } if (mylocal_employe.profil) { setp_detail_profil(mylocal_employe.profil); - }else{ + } else { setp_detail_profil(""); } if (mylocal_employe.fonction) { setp_detail_fonction(mylocal_employe.fonction); - }else{ + } else { setp_detail_fonction(""); } @@ -4713,6 +4720,12 @@ const Employes = (props) => { { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] + const New_civilite = [ + { "id": "mme", "label": "Mme", "value": "mme" }, + { "id": "m", "label": "M", "value": "m" }, + { "id": "neutre", "label": "Neutre", "value": "neutre" }, + { "id": "", "label": "", "value": "" }, + ] return (
@@ -4748,7 +4761,8 @@ const Employes = (props) => {
{String(gridline_id) !== "" && Getall_Training_Employee_No_Filter_result && selected_id && String(selected_id).length > 0 &&
- {JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite} + {String(JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite).length <= 0 && JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite} + {String(JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite).length > 0 && String(JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite)[0].toUpperCase() + String(JSON.parse(Getall_Training_Employee_No_Filter_result[gridline_id]).civilite).slice(1)}
} @@ -5336,27 +5350,27 @@ const Employes = (props) => {
- {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre1))[0].label} - options={New_Option_Filter} - onChange={(event, value) => { - if (value && value.value) { - setp_filtre1(value.value); + {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre1))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1(value.value); - } - - }} - - renderInput={(params) => } - />} + + }} + + renderInput={(params) => + } + />} {/* { {p_filtre2 &&
- - {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre2))[0].label} - options={New_Option_Filter} - onChange={(event, value) => { - if (value && value.value) { - setp_filtre2(value.value); - } + {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre2))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2(value.value); - }} - - renderInput={(params) => } - />} + + }} + + renderInput={(params) => + } + />} {/* {
- {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre3))[0].label} - options={New_Option_Filter} - onChange={(event, value) => { - if (value && value.value) { - setp_filtre3(value.value); + {New_Option_Filter && New_Option_Filter.length > 0 && (data).value === String(p_filtre3))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre3(value.value); - } - - }} - - renderInput={(params) => } - />} - {/* + } + />} + + {/* { />
} {String(employee_data_edit_mode) === "1" &&
Civilité
- (data).value === String(p_detail_civilite))[0].label} + + onChange={(event, value) => { + if (value && value.value) { + setp_detail_civilite(value.value); + setEmployee_data_changed("1"); + } else { + setp_detail_civilite(""); + setEmployee_data_changed("1"); + } + }} + renderInput={(params) => + } + /> + + {/* { Mme.   Neutre   - + */}
}
Nom