25/09/2023 - 16h40

recette2
cherif 2023-09-25 16:41:38 +02:00
parent c4f170ec00
commit 9692ca5cca
9 changed files with 138 additions and 58 deletions

View File

@ -2587,11 +2587,11 @@ const AddParnerClient = (props) => {
</div>}
{String(addcontact) === "1" && <div className="div_row" style={{ "marginLeft": "5px", "marginRight": "5px" }} onChange={DataUpdated_Contact_Data}>
<div className="training_caract">
<div className="training_caract"> Email <br />
<TextField
required
name="contact_email"
label="Email"
//label="Email"
InputLabelProps={{
shrink: true,
}}
@ -2604,10 +2604,11 @@ const AddParnerClient = (props) => {
</div>
{String(formedit_mode_contact) === "1" && <div className="training_caract">
Civilité <br />
<TextField
required
name="contact_civilite"
label="Civilité"
//label="Civilité"
InputLabelProps={{
shrink: true,
}}
@ -2627,6 +2628,7 @@ const AddParnerClient = (props) => {
</div>}
{String(formedit_mode_contact) !== "1" && <div className="training_caract">
Civilité <br />
<TextField
required
name="contact_civilite"
@ -2646,10 +2648,11 @@ const AddParnerClient = (props) => {
<div className="training_caract">
Nom <br />
<TextField
required
name="contact_nom"
label="Nom"
//label="Nom"
InputLabelProps={{
shrink: true,
}}
@ -2663,10 +2666,11 @@ const AddParnerClient = (props) => {
<div className="training_caract">
Prenom <br />
<TextField
required
name="contact_prenom"
label="Prenom"
//label="Prenom"
InputLabelProps={{
shrink: true,
}}
@ -2679,10 +2683,11 @@ const AddParnerClient = (props) => {
<div className="training_caract">
Fonction <br />
<TextField
required
name="contact_fonction"
label="Fonction"
//label="Fonction"
InputLabelProps={{
shrink: true,
}}
@ -2696,10 +2701,11 @@ const AddParnerClient = (props) => {
<div className="training_caract">
N° Siret <br />
<TextField
required
name="contact_siret"
label="N° Siret"
//label="N° Siret"
InputLabelProps={{
shrink: true,
}}
@ -2711,10 +2717,11 @@ const AddParnerClient = (props) => {
</div>
<div className="training_caract">
N° TVA <br />
<TextField
required
name="contact_tva"
label="N° TVA"
//label="N° TVA"
InputLabelProps={{
shrink: true,
}}
@ -2726,10 +2733,11 @@ const AddParnerClient = (props) => {
</div>
<div className="training_caract">
Adresse <br />
<TextField
required
name="contact_adresse"
label="Adresse"
//label="Adresse"
InputLabelProps={{
shrink: true,
}}
@ -2740,10 +2748,11 @@ const AddParnerClient = (props) => {
/>
</div>
<div className="training_caract">
ville <br />
<TextField
required
name="contact_ville"
label="ville"
//label="ville"
InputLabelProps={{
shrink: true,
}}
@ -2754,10 +2763,11 @@ const AddParnerClient = (props) => {
/>
</div>
<div className="training_caract">
Code Postal <br />
<TextField
required
name="contact_code_postal"
label="Code Postal"
//label="Code Postal"
InputLabelProps={{
shrink: true,
}}
@ -2768,10 +2778,11 @@ const AddParnerClient = (props) => {
/>
</div>
<div className="training_caract">
Pays <br />
<TextField
required
name="contact_pays"
label="Pays"
//label="Pays"
InputLabelProps={{
shrink: true,
}}
@ -2783,10 +2794,11 @@ const AddParnerClient = (props) => {
</div>
<div className="training_caract">
Telephone <br />
<TextField
required
name="contact_telephone"
label="Telephone"
//label="Telephone"
InputLabelProps={{
shrink: true,
}}
@ -2798,10 +2810,11 @@ const AddParnerClient = (props) => {
</div>
<div className="training_caract">
Téléphone Mobile <br />
<TextField
required
name="contact_telephone_mobile"
label="Téléphone Mobile"
// label="Téléphone Mobile"
InputLabelProps={{
shrink: true,
}}

View File

@ -1226,6 +1226,7 @@ const Employes = (props) => {
setUpdate_One_Employee_Data_api("true");
setUpdate_One_Employee_Data_result(res.data.message);
Get_List_Managers();
Getall_Training_Employee();
disable_Employee_DetailFields();

View File

@ -731,12 +731,12 @@ const PartnerClientActivite = (props) => {
</div>
</div>}
{String(showactivite_detail) === "1" && <div className="div_row" style={{ "marginLeft": "5px", "marginRight": "5px" }} onChange={DataUpdated_Activite_Data}>
<div className="training_caract">
<nav style={{ "fontSize": "11px" }}> &nbsp;</nav>
<div className="training_caract"> Description <br />
<TextField
required
name="activite_description"
label="Description "
//label="Description"
InputLabelProps={{
shrink: true,
}}
@ -751,7 +751,7 @@ const PartnerClientActivite = (props) => {
{String(formedit_mode_activite) === "1" && <div className="training_caract">
<nav style={{ "fontSize": "11px" }}> Date souhaitée</nav>
Date souhaitée <br />
<DatePicker
name="activite_deadline"
id="activite_deadline"
@ -772,11 +772,11 @@ const PartnerClientActivite = (props) => {
{String(formedit_mode_activite) === "0" && <div className="training_caract">
<nav style={{ "fontSize": "11px" }}> &nbsp;</nav>
Date souhaitée <br />
<TextField
required
name="activite_deadline"
label="Date souhaitée"
//label="Date souhaitée"
InputLabelProps={{
shrink: true,
}}
@ -788,11 +788,12 @@ const PartnerClientActivite = (props) => {
</div>}
{String(formedit_mode_activite) === "1" && <div className="training_caract">
Type d'activité <br />
<TextField
required
select
name="activite_type"
label="Type d'activité"
//label="Type d'activité"
InputLabelProps={{
shrink: true,
}}
@ -810,10 +811,11 @@ const PartnerClientActivite = (props) => {
</div>}
{String(formedit_mode_activite) === "0" && <div className="training_caract">
Type d'activité <br />
<TextField
required
name="activite_type"
label="Type d'activité"
//label="Type d'activité"
InputLabelProps={{
shrink: true,
}}
@ -827,11 +829,12 @@ const PartnerClientActivite = (props) => {
</div>}
{String(formedit_mode_activite) === "1" && <div className="training_caract">
Statut <br />
<TextField
required
select
name="activite_status"
label="Statut"
//label="Statut"
InputLabelProps={{
shrink: true,
}}
@ -848,10 +851,11 @@ const PartnerClientActivite = (props) => {
</div>}
{String(formedit_mode_activite) === "0" && <div className="training_caract">
Statut <br />
<TextField
required
name="activite_status"
label="Statut"
//label="Statut"
InputLabelProps={{
shrink: true,
}}
@ -863,17 +867,18 @@ const PartnerClientActivite = (props) => {
</div>}
<div className="training_caract" style={{ "width": "105%" }}>
Détail <br />
<TextField
required
name="activite_detail"
label="Détail"
// label="Détail"
multiline
rows={3}
InputLabelProps={{
shrink: true,
}}
disabled={false}
className="disabled_style"
className="disabled_style_no_border"
value={p_activite_detail}
onChange={(e) => setp_activite_detail(e.target.value)}
@ -911,16 +916,16 @@ const PartnerClientActivite = (props) => {
</div>}
{String(add_one_activite) === "1" && <div className="div_row" style={{ "marginLeft": "5px", "marginRight": "5px" }} >
<div className="training_caract">
<div className="training_caract"> Description <br />
<TextField
required
name="activite_description"
label="Description "
//label="Description b "
InputLabelProps={{
shrink: true,
}}
disabled={false}
className="disabled_style"
className="disabled_style enable_style"
value={one_activite_description}
onChange={(e) => setone_activite_description(e.target.value)}
@ -930,7 +935,7 @@ const PartnerClientActivite = (props) => {
<div className="training_caract">
<nav style={{ "fontSize": "11px" }}> Date souhaitée </nav>
Date souhaitée <br />
<DatePicker
name="activite_deadline"
id="activite_deadline"
@ -952,12 +957,12 @@ const PartnerClientActivite = (props) => {
</div>
<div className="training_caract">
<div className="training_caract"> Type d'activité <br />
<TextField
required
select
name="activite_type"
label="Type d'activité"
//label="Type d'activité"
InputLabelProps={{
shrink: true,
}}
@ -974,12 +979,12 @@ const PartnerClientActivite = (props) => {
</div>
<div className="training_caract">
<div className="training_caract"> Statut <br />
<TextField
required
select
name="activite_status"
label="Statut"
//label="Statut"
InputLabelProps={{
shrink: true,
}}
@ -995,18 +1000,18 @@ const PartnerClientActivite = (props) => {
</TextField>
</div>
<div className="training_caract" style={{ "width": "105%" }}>
<div className="training_caract" style={{ "width": "105%" }}> Détail <br />
<TextField
required
name="activite_detail"
label="Détail"
//label="Détail"
multiline
rows={3}
InputLabelProps={{
shrink: true,
}}
disabled={false}
className="disabled_style"
className="disabled_style_no_border"
value={one_activite_detail}
onChange={(e) => setone_activite_detail(e.target.value)}

View File

@ -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" });
}
}
}

View File

@ -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 (
<div className="partner_commande">
{isLoading && <div className="loader-container">
<div className="mysy_spinner"> <img src={img_loading_spin} /> </div>
</div>}
<Dialog
open={Dialog_1_open}
@ -3787,7 +3801,7 @@ const Partner_Commande = (props) => {
{Getall_Training_Employee_No_Filter_result &&
Getall_Training_Employee_No_Filter_result.map((myclient) => (
<MenuItem key={JSON.parse(myclient)._id} value={JSON.parse(myclient)._id}
style={{ "paddingLeft": "5px", "textAlign": "left","height":"2rem" }}>
style={{ "paddingLeft": "5px", "textAlign": "left", "height": "2rem" }}>
{JSON.parse(myclient).nom}&nbsp; {JSON.parse(myclient).prenom}
</MenuItem>
@ -4301,7 +4315,7 @@ const Partner_Commande = (props) => {
<div className="session_data" >
<div style={{ "border": "None" }}>
<nav onClick={Ajouter_une_ligne_article} style={{ "fontSize": "18px", "fontWeight": '600', "marginLeft": "10px", "marginTop": "10px" }}> <Button> Ajouter une ligne
<nav onClick={Ajouter_une_ligne_article} style={{ "fontSize": "18px", "fontWeight": '600', "marginLeft": "10px", "marginTop": "10px", "cursor":"pointer" }}> <Button> Ajouter une ligne
&nbsp;
</Button> <img src={add_plus} alt="ajout commande" className="icon_plus_line" /> </nav>
<div style={{ height: 550, width: '100%', paddingRight: '1px' }}>

View File

@ -726,13 +726,13 @@
.contact_grid>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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {