diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index 318d2d5..d1f4240 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -2587,11 +2587,11 @@ const AddParnerClient = (props) => { } {String(addcontact) === "1" &&
-
+
Email
{
{String(formedit_mode_contact) === "1" &&
+ Civilité
{
} {String(formedit_mode_contact) !== "1" &&
+ Civilité
{
+ Nom
{
+ Prenom
{
+ Fonction
{
+ N° Siret
{
+ N° TVA
{
+ Adresse
{ />
+ ville
{ />
+ Code Postal
{ />
+ Pays
{
+ Telephone
{
+ Téléphone Mobile
{ setUpdate_One_Employee_Data_api("true"); setUpdate_One_Employee_Data_result(res.data.message); + Get_List_Managers(); Getall_Training_Employee(); disable_Employee_DetailFields(); diff --git a/src/components/PartnerClient_Activite.js b/src/components/PartnerClient_Activite.js index 322f352..a36a907 100644 --- a/src/components/PartnerClient_Activite.js +++ b/src/components/PartnerClient_Activite.js @@ -731,12 +731,12 @@ const PartnerClientActivite = (props) => {
} {String(showactivite_detail) === "1" &&
-
- +
Description
+ { {String(formedit_mode_activite) === "1" &&
- + Date souhaitée
{ {String(formedit_mode_activite) === "0" &&
- + Date souhaitée
{
} {String(formedit_mode_activite) === "1" &&
+ Type d'activité
{
} {String(formedit_mode_activite) === "0" &&
+ Type d'activité
{
} {String(formedit_mode_activite) === "1" &&
+ Statut
{
} {String(formedit_mode_activite) === "0" &&
+ Statut
{
}
+ Détail
setp_activite_detail(e.target.value)} @@ -911,16 +916,16 @@ const PartnerClientActivite = (props) => {
} {String(add_one_activite) === "1" &&
-
+
Description
setone_activite_description(e.target.value)} @@ -930,7 +935,7 @@ const PartnerClientActivite = (props) => {
- + Date souhaitée
{
-
+
Type d'activité
{
-
+
Statut
{
-
+
Détail
setone_activite_detail(e.target.value)} diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index 8ad9842..2e0f558 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -395,13 +395,18 @@ const Partner_Client = (props) => { function handleClick_edit_session_From_Line(selected_row_id) { if (rows_list_clients[selected_row_id]) { + window.scrollTo({ + top: 600, + left: 0, + behavior: "smooth", + }); + var line = JSON.parse(rows_list_clients[selected_row_id]); var clientmail = String(line.email); setClient_email(clientmail); setEdite_Client("1"); - if (myRef_detail_client.current) { - myRef_detail_client.current.scrollIntoView({ behavior: "smooth" }); - } + + } } diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index 748cd01..a2668d5 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -38,7 +38,7 @@ import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import DialogTitle from '@mui/material/DialogTitle'; import { TransitionProps } from '@mui/material/transitions'; - +import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; const Partner_Commande = (props) => { @@ -2211,6 +2211,7 @@ const Partner_Commande = (props) => { Get_Order_Data(selected_id); Get_Partner_Orders_Lines_from_header_id(selected_id); + } const [Compute_Partner_Order_api, setCompute_Partner_Order_api] = useState(); @@ -2227,13 +2228,17 @@ const Partner_Commande = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Compute_Order_Header/"; + setLoading(true); + axios.post(myurl, form).then(res => { //console.log(" In Compute_Partner_Order res.data.status = " + res.data.status); //console.log(" In Compute_Partner_Order res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setCompute_Partner_Order_api("true"); setCompute_Partner_Order_result(res.data.message); + alert(res.data.message); } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); @@ -2242,13 +2247,14 @@ const Partner_Commande = (props) => { else { setCompute_Partner_Order_api("false"); setCompute_Partner_Order_message(res.data.message); - alert('Erreur: ' + res.data.message); + alert(res.data.message); } }).catch((error) => { + setLoading(false); console.warn('Not good man :( Compute_Partner_Order = ', error); setCompute_Partner_Order_api("false"); - alert('Erreur: Impossible de faire la mise à jour'); + alert('Erreur: Impossible de mettre à jour les prix'); //setmyApimyApiMessage("") }) } @@ -2437,11 +2443,12 @@ const Partner_Commande = (props) => { //console.log("### form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Convert_Quotation_to_Order/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_One_Order_Line_Data res.data.status = " + res.data.status); //console.log(" In Add_Update_One_Order_Line_Data res.data.message r_class = " + res.data.message); + setLoading(false); if (String(res.data.status) === String("true")) { setConvert_Quotation_To_Order_Data_api("true"); setConvert_Quotation_To_Order_Data_message(res.data.message); @@ -2452,6 +2459,7 @@ const Partner_Commande = (props) => { if (myRef_head) myRef_head.current.scrollIntoView({ behavior: "smooth" }); + alert(res.data.message); } else { @@ -2462,6 +2470,7 @@ const Partner_Commande = (props) => { } }).catch((error) => { + setLoading(false); console.warn('Convert_Quotation_To_Order_Data : Not good man :( Convert_Quotation_To_Order_Data = ' + error); setConvert_Quotation_To_Order_Data_api("false"); @@ -2475,9 +2484,14 @@ const Partner_Commande = (props) => { } + const [isLoading, setLoading] = useState(); + return (
+ {isLoading &&
+
+
} { {Getall_Training_Employee_No_Filter_result && Getall_Training_Employee_No_Filter_result.map((myclient) => ( + style={{ "paddingLeft": "5px", "textAlign": "left", "height": "2rem" }}> {JSON.parse(myclient).nom}  {JSON.parse(myclient).prenom} @@ -4301,9 +4315,9 @@ const Partner_Commande = (props) => {
- +
  div { display: inline-block; border: 1px solid #CCC; - background: #1976d2; + background: none; box-shadow: 1px 1px 10px 1px rgb(0 0 0 / 15%); cursor: pointer; vertical-align: middle; padding: 10px; text-align: left; - color: #fff; + color: black; border-radius: 10px; font-size: small; } @@ -740,7 +740,9 @@ .grid_title { font-weight: bold; font-size: small; - letter-spacing: 2px; + letter-spacing: 1.5px; + color: blue; + } .contact_grid>div:hover { diff --git a/src/styles/components/_employes.scss b/src/styles/components/_employes.scss index 297c588..6e9aed6 100644 --- a/src/styles/components/_employes.scss +++ b/src/styles/components/_employes.scss @@ -226,6 +226,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -786,6 +787,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -1390,6 +1392,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -1960,6 +1963,7 @@ .css-1x5jdmq { padding: 6px !important; height: 3rem ! important; + padding-bottom: 0px !important; } .css-qiwgdb { diff --git a/src/styles/components/_partner_client_activite.scss b/src/styles/components/_partner_client_activite.scss index 9a503fd..182cda8 100644 --- a/src/styles/components/_partner_client_activite.scss +++ b/src/styles/components/_partner_client_activite.scss @@ -99,7 +99,7 @@ font-size: small !important; color: black; width: 90% !important; - height: 3rem !important; + height: 3.5rem !important; margin: 5px !important; margin-bottom: 1rem !important; } @@ -348,7 +348,7 @@ font-size: small !important; color: black; width: 90% !important; - height: 3rem !important; + height: 3.5rem !important; margin: 5px !important; margin-bottom: 1rem !important; } @@ -584,7 +584,7 @@ } .training_caract { - width: 50%; + width: 30%; padding: 5px; float: left; } @@ -617,7 +617,7 @@ font-size: small !important; color: black; width: 90% !important; - height: 3rem !important; + height: 3.5rem !important; margin: 5px !important; margin-bottom: 1rem !important; } @@ -869,11 +869,20 @@ } .training_caract { - width: 50%; + width: 30%; padding: 5px; float: left; } + .session_caract_comment_2_lines_no_border { + width: 33%; + padding: 5px; + float: left; + text-align: left; + font-size: small; + margin-bottom: 1rem !important; + } + .training_text { width: 50%; padding: 5px; @@ -902,11 +911,22 @@ font-size: small !important; color: black; width: 90% !important; - height: 3rem !important; + height: 3.5rem !important; margin: 5px !important; margin-bottom: 1rem !important; } + .disabled_style_no_border { + //background-color: #ECEFF1; + font-size: small !important; + color: black; + width: 90% !important; + height: 3.5rem !important; + margin: 5px !important; + margin-bottom: 1rem !important; + border: none !important; + } + .bton_suppr { background: transparent; color: red; diff --git a/src/styles/components/_partner_commande.scss b/src/styles/components/_partner_commande.scss index 4eeb98b..ed948a7 100644 --- a/src/styles/components/_partner_commande.scss +++ b/src/styles/components/_partner_commande.scss @@ -222,6 +222,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -786,6 +787,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -1322,6 +1324,9 @@ padding-left: 5x !important; } + + + .css-11u53oe-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input { padding: 1px !important; } @@ -1380,6 +1385,7 @@ .css-1x5jdmq { padding: 6px !important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -2018,6 +2024,7 @@ .css-1x5jdmq { padding: 6px !important; height: 3rem ! important; + padding-bottom: 0px !important; } .css-qiwgdb { @@ -2254,6 +2261,15 @@ // end media + + .css-md26zr-MuiInputBase-root-MuiOutlinedInput-root{ + height: 3.5rem !important; + } + + .css-1bp1ao6{ + height: 3.5rem !important; + } + .session_caract_Dialog { width: 100%; padding: 5px; @@ -2275,7 +2291,7 @@ .css-1v4ccyo { - height: 4rem !important; + height: 3.5rem !important; } option {