diff --git a/src/App.js b/src/App.js
index fce20b7..3ada2bb 100644
--- a/src/App.js
+++ b/src/App.js
@@ -98,6 +98,7 @@ function App() {
+
diff --git a/src/components/ButtonHilight.js b/src/components/ButtonHilight.js
index 7241db0..7fc7d4b 100644
--- a/src/components/ButtonHilight.js
+++ b/src/components/ButtonHilight.js
@@ -233,20 +233,28 @@ const ButtonHilight = () => {
const handleClassCategorie = (e) => {
setCategorieMenu(null);
+ const pieces = window.location.href.split("/")
+ const last = pieces[pieces.length - 1]
+
+
var mymetier = "";
mymetier = e.target.id
- //alert(" cours de : " + mymetier);
- history.push("/Recherche_new/0/" + mymetier);
+ if (last === mymetier) {
+ //console.log(" ## RELAOD");
+ window.location.reload(true);
+ } else {
+ history.push("/Recherche_new_v2/0/" + mymetier);
+ }
};
function publiecatalogue() {
history.push("/Partner", { mysy_arg: 'partner' });
}
-
- const handleBlogMenu = (event) => {
- history.push("/Recherche-Article-formation")
-};
+
+ const handleBlogMenu = (event) => {
+ history.push("/Recherche-Article-formation")
+ };
return (
@@ -311,9 +319,9 @@ const ButtonHilight = () => {
anchorEl={CategorieMenu}
onClose={CategorieMenu_Close}
open={Boolean(CategorieMenu)}
- style={{ "top": "2rem" }}
- className = "ButtonHilight"
- >
+ style={{ "top": "2rem" }}
+ className="ButtonHilight"
+ >
@@ -383,8 +391,8 @@ const ButtonHilight = () => {
diff --git a/src/components/Header.js b/src/components/Header.js
index ce63a73..c16b4a1 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -84,7 +84,7 @@ const Header = () => {
var mymetier = "";
mymetier = e.target.id
//alert(" cours de : " + mymetier);
- history.push("/Recherche_new/0/" + mymetier);
+ history.push("/Recherche_new_v2/0/" + mymetier);
};
diff --git a/src/components/Recherche_new_v2.js b/src/components/Recherche_new_v2.js
index dd994e6..d69ce12 100644
--- a/src/components/Recherche_new_v2.js
+++ b/src/components/Recherche_new_v2.js
@@ -1053,7 +1053,7 @@ const Recherche_new_v2 = () => {
var form = new FormData();
fetch(
- process.env.REACT_APP_API_URL + "myclass/api/get_List_domaine_metier/",
+ process.env.REACT_APP_API_URL + "myclass/api/get_List_domaine_metier/",
{
method: 'POST',
@@ -1138,6 +1138,16 @@ const Recherche_new_v2 = () => {
whosisconnected();
+ if (categorie) {
+ //console.log(" ### categorie = ", categorie);
+ setmymetier(categorie);
+ } else {
+ setmymetier();
+ }
+
+ //document.getElementById("_1234").checked = true;
+
+
}, [initAllfiter, categorie]);
@@ -1473,6 +1483,7 @@ const Recherche_new_v2 = () => {
setResult([]);
+
//Get Criterias
var crit_SearchText = "";
var myurl = "";
@@ -1555,10 +1566,11 @@ const Recherche_new_v2 = () => {
form.append("user_latitude", latitude);
form.append("user_longitude", longitude);
form.append("user_state", state);
+ // alert(" rrtt ");
}
- //alert("myurl = "+myurl);
+ //alert("myurl = " + myurl);
axios.post(myurl, form).then(res => {
if (String(res.data.status) != String("false")) {
//console.log(" In test res.data.status = " + res.data.status);
@@ -1782,6 +1794,8 @@ const Recherche_new_v2 = () => {
annulefiltrecpf();
}
+ const [mymetier, setmymetier] = useState("");
+
function getClassByMetier(my_liste_metier) {
@@ -1797,14 +1811,32 @@ const Recherche_new_v2 = () => {
check_metier = document.querySelector('input[name="metier_radio"]:checked').value;
}
-
+ setmymetier(check_metier);
ReinitFilters();
if (check_metier === "tout") {
+ // Nettoyage du resultat precedent.
+ setResult([]);
+ setnewresult("");
//alert(" tout et sortir");
+
setdomaine_v11(domaine_v11_orig);
DisplayXfirstClas();
+ //setResult([]);
+ /*const pieces = window.location.href.split("/")
+ const last = pieces[pieces.length - 1]
+ const last2 = pieces[pieces.length - 2]
+
+ if (last === "Recherche_new_v2" || last2 === "Recherche_new_v2") {
+ console.log(" ## RELAOD");
+ window.location.reload(true);
+ } else {
+
+
+ history.push("/Recherche_new_v2");
+ }
+ */
if (myelement) {
// 👇 Will scroll smoothly to the top of the next section
myelement.scrollIntoView({ behavior: 'smooth' });
@@ -3230,7 +3262,7 @@ const Recherche_new_v2 = () => {
- Tous les metiers
+ Tous les métiers
@@ -3239,9 +3271,18 @@ const Recherche_new_v2 = () => {
+