diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 83b1208..203d65e 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -55,6 +55,7 @@ const AddClassManual = (props) => { const value = event.target.value; setmydistance(value); + setdatamodification("1"); } @@ -63,6 +64,7 @@ const AddClassManual = (props) => { const value = event.target.value; setmytrainingsupport(value); + setdatamodification("1"); } @@ -71,6 +73,7 @@ const AddClassManual = (props) => { const value = event.target.value; setmycpf(value); + setdatamodification("1"); } @@ -79,6 +82,7 @@ const AddClassManual = (props) => { const value = event.target.value; setmycertif(value); + setdatamodification("1"); } @@ -86,12 +90,16 @@ const AddClassManual = (props) => { const name = event.target.name; const value = event.target.value; setmypresence(value); + setdatamodification("1"); + } const handleChangePublished = (event) => { const value = event.target.value; setmypublished(value); + setdatamodification("1"); + } @@ -519,10 +527,6 @@ const AddClassManual = (props) => { } - var my_date_lieu = ""; - - - // Verification si il y a plus de 3 mot clés separés par des ";" const words = mots_cle.split(';'); if (words.length > 3) { @@ -582,7 +586,7 @@ const AddClassManual = (props) => { formData.append('zone_diffusion', zone_de_diffusion); formData.append('metier', mymetier); formData.append('note', mynote); - formData.append('date_lieu', my_date_lieu); + formData.append('published', mypublier); formData.append('cpf', mycpf); @@ -848,9 +852,6 @@ const AddClassManual = (props) => { } - function change_date_lieu() { - setfield_datelieu(document.getElementById("datelieu_v2").value) - } function change_zone_diffsion() { setfield_zone_diffusion(document.getElementById("zone_diffusion_v2").value) @@ -920,7 +921,7 @@ const AddClassManual = (props) => { return (
- {String(props.mytrainingclass.ref).trim() !== "" &&
+ {String(props.mytrainingclass.ref).trim() !== "" &&
@@ -955,6 +956,7 @@ const AddClassManual = (props) => {
}
+
{
- - - -
{ />
-
+
+ {String(datamodification) === String("1") &&
+
/!\ Pensez à enregistrer les modifications
+
} + + {String(props.ispending) === String("0") &&
+ + + {(String(datamodification) === String("1") || String(editor_tochange) === String("1")) &&
+ +
+ } + + {/*String(datamodification) === String("0") &&
+ +
+ */ } + + + + {String(datamodification) !== String("1") && String(editor_tochange) !== String("1") &&
+ + +
+ } + + + {(String(datamodification) === String("1") || String(editor_tochange) === String("1")) &&
+ + +
} + +
} + + {String(props.ispending) !== String("0") &&
+ {String(datamodification) === String("1") &&
+ ENREGISTRER +
+ } + + + {String(datamodification) === String("0") &&
+ MODIFICATION +
+ } + + +
+ + +
+ +
} + + + {String(myApiResponse) === String("true") && importmessage && +
+ {importmessage} + +
} + + {String(myApiResponse) === String("false") && +
+ {importmessage} + +
} +
+
diff --git a/src/components/CheckOut.js b/src/components/CheckOut.js index 1e2e899..d4a54c6 100644 --- a/src/components/CheckOut.js +++ b/src/components/CheckOut.js @@ -431,11 +431,11 @@ function CheckOut(props) { function Ordervalidation() { //alert(" confirmation ok"); - if( String(nb_formations) === "0" ){ + if (String(nb_formations) === "0") { alert(" Vous devez choisir un nombre de formation "); - document.getElementById('div_nb_formation').style.color = "red" ; - document.getElementById('div_ttc').style.color = "red" ; - + document.getElementById('div_nb_formation').style.color = "red"; + document.getElementById('div_ttc').style.color = "red"; + return; } @@ -838,11 +838,17 @@ function CheckOut(props) { const change_nb_formations = event => { - let valeur = event.target.value - //console.log(" valeur , ", valeur); - setnb_formations( event.target.value); - document.getElementById('div_nb_formation').style.color = "#104277" ; - document.getElementById('div_ttc').style.color = "#104277" ; + let valeur = event.target.value; + + if (String(props.packs).toLowerCase() === String("decouverte")) { + setnb_formations("1"); + } + else { + + setnb_formations(event.target.value); + } + document.getElementById('div_nb_formation').style.color = "#104277"; + document.getElementById('div_ttc').style.color = "#104277"; } @@ -898,10 +904,11 @@ function CheckOut(props) {
-
+
Nombre de formations :
+ {(String(props.packs).toLowerCase() !== String("decouverte")) &&
+ } + + {(String(props.packs).toLowerCase() === String("decouverte")) && +
+ 1 +
+ }
@@ -937,7 +951,7 @@ function CheckOut(props) {
-
+
Total TTC :
diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index d882c2f..25da55c 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -166,16 +166,21 @@ .bton_suppr2 { background: transparent; color: red; - padding-left: 5px; - padding-right: 5px; + border-radius: 5rem; + font-size: small; + text-align: right; + height: 2.5rem; + width: 80%; } .bton_enreg2 { - background: green; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: right; + height: 2.5rem; + width: 80%; color: white; - - padding-left: 5px; - padding-right: 5px; } .tips_img_class { @@ -512,21 +517,21 @@ .bton_suppr2 { background: transparent; color: red; - padding-left: 10px; - padding-right: 10px; - border-radius: 5px; - padding-top: 5px; - padding-bottom: 5px; + border-radius: 5rem; + font-size: small; + text-align: right; + height: 2.5rem; + width: 80%; } .bton_enreg2 { - background: green; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: right; + height: 2.5rem; + width: 80%; color: white; - padding-left: 10px; - padding-right: 10px; - border-radius: 5px; - padding-top: 5px; - padding-bottom: 5px; } .tips_img_class { @@ -703,6 +708,7 @@ text-align: right; height: 2.5rem; width: 80%; + color: white; } @@ -922,21 +928,21 @@ .bton_suppr2 { background: transparent; color: red; - padding-left: 15px; - padding-right: 15px; - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; + border-radius: 5rem; + font-size: small; + text-align: right; + height: 2.5rem; + width: 60%; } .bton_enreg2 { - background: green; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: right; + height: 2.5rem; + width: 60%; color: white; - padding-left: 15px; - padding-right: 15px; - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; } .tips_img_class { @@ -1114,6 +1120,7 @@ text-align: right; height: 2.5rem; width: 60%; + color: white; } @@ -1335,21 +1342,21 @@ .bton_suppr2 { background: transparent; color: red; - padding-left: 15px; - padding-right: 15px; - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; + border-radius: 5rem; + font-size: small; + text-align: right; + height: 2.5rem; + width: 50%; } .bton_enreg2 { - background: green; + border-radius: 5rem; + font-size: small; + background: #81BC3A !important; + text-align: right; + height: 2.5rem; + width: 50%; color: white; - padding-left: 15px; - padding-right: 15px; - border-radius: 5px; - padding-top: 10px; - padding-bottom: 10px; } .tips_img_class { @@ -1530,6 +1537,7 @@ text-align: right; height: 2.5rem; width: 50%; + color: white; } diff --git a/src/styles/components/_checkout.scss b/src/styles/components/_checkout.scss index 4ad1ffc..612fbd0 100644 --- a/src/styles/components/_checkout.scss +++ b/src/styles/components/_checkout.scss @@ -162,6 +162,15 @@ color: white; width: 90%; } + + .nb_ftion{ + text-align: center; + width: 40%; + } + + .mob_heigh{ + height: 5rem; + } } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -319,6 +328,10 @@ color: white; width: 80%; } + .nb_ftion{ + text-align: center; + width: 40%; + } } @media only screen and (min-width: 992px) and (max-width: 1199px) { @@ -476,6 +489,11 @@ width: 80%; } + .nb_ftion{ + text-align: center; + width: 30%; + } + } @media only screen and (min-width: 1200px) { @@ -649,9 +667,14 @@ scroll-behavior: smooth; } + .nb_ftion{ + text-align: center; + width: 20%; + } } + // End media }