From f113fc12bf9c6ea86dd1188fe31c4ad57b05ecb0 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 28 Feb 2023 17:45:48 +0100 Subject: [PATCH] 28/02/23 - 17h45 --- public/sitemap.xml | 150 +++++++++++------ src/App.js | 2 +- src/components/AideRecherche.js | 2 +- src/components/DisplayDetailClass_new_v2.js | 58 +++++-- src/components/Formation.js | 10 +- src/components/Inscription_Information.js | 2 +- src/components/Partner.js | 1 + src/components/Pricing.js | 153 ++++++++++++++++-- src/components/Recherche_new_v2.js | 82 +++++++++- .../_displaydetailclass_new_v2.scss | 20 +++ src/styles/components/_formation.scss | 78 ++++----- 11 files changed, 439 insertions(+), 119 deletions(-) diff --git a/public/sitemap.xml b/public/sitemap.xml index f4d4633..eb88160 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -7,14 +7,14 @@ https://www.mysy-training.com/ - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/qualite-la-norme-itl-dans-entreprise-532 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -22,28 +22,28 @@ https://www.mysy-training.com/Display-Detail-Article/6281eae593f66d1a10ac2248 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/626fca8d62477b7b15a04b27 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/626fcada62477b7b15a04d97 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Recherche-Article-formation - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -51,7 +51,7 @@ https://www.mysy-training.com/Display-Detail-Article/avis-aux-perfectionnistes-des-styles-css-aa1 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -59,28 +59,28 @@ https://www.mysy-training.com/Display-Detail-formation/analysez-vos-donnees-textuelles-98b - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation-Coeur/analysez-vos-donnees-textuelles-98b - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/comment-reussir-ses-premiers-pas-en-tant-que-manager-866 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/create_account - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -88,28 +88,28 @@ https://www.mysy-training.com/Connexion - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/ContactezNous - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/QuiSommesNous - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/supply-chain-lessons-from-the-pandemic-11d - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -117,35 +117,35 @@ https://www.mysy-training.com/Display-Detail-Article/planification-de-projets--methode-pert-et-gantt-19f - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/techniques--methodes-pour-bien-negocier--bd6 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/reussir-vos-photos-de-vacances-comment---343 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Produits-Services - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/les-metiers-d-avenir-959 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -154,14 +154,14 @@ https://www.mysy-training.com/Display-Detail-formation/actualite-sociale-10f - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/pratique-de-la-paie--initiation-b10 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -169,7 +169,7 @@ https://www.mysy-training.com/Display-Detail-formation/comptabilite-generale--initiation-56e - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -178,14 +178,14 @@ https://www.mysy-training.com/Display-Detail-formation/contrat-de-travail-de-a-a-z-809 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/droit-du-travail-928 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -193,21 +193,21 @@ https://www.mysy-training.com/Display-Detail-formation/droit-social-pour-managers-45b - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/la-duree-du-travail-et-gestion-des-absences-471 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/la-gestion-des-cdd-59b - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -215,7 +215,7 @@ https://www.mysy-training.com/Display-Detail-formation/entretien-professionnel-802 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -223,14 +223,14 @@ https://www.mysy-training.com/Display-Detail-formation/missions-rh-6e2 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/reglementation-rh--l-essentiel-eaf - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -238,21 +238,21 @@ https://www.mysy-training.com/Display-Detail-formation/reussir-ses-entretiens-de-recrutement-c40 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/cloturer-votre-annee-sociale-en-toute-securite-8 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/controle-urssaf-4b2 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -260,7 +260,7 @@ https://www.mysy-training.com/Display-Detail-formation/dads--declaration-annuelle-de-donnees-sociales-1 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -268,14 +268,14 @@ https://www.mysy-training.com/Display-Detail-formation/la-mise-en-oeuvre-de-la-dsn-3a0 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/les-outils-de-la-remuneration-9f5 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -283,7 +283,7 @@ https://www.mysy-training.com/Display-Detail-formation/pilotage-de-la-masse-salariale-301 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -291,7 +291,7 @@ https://www.mysy-training.com/Display-Detail-formation/pratique-de-la-paie--perfectionnement-d6c - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -299,14 +299,14 @@ https://www.mysy-training.com/Display-Detail-formation/digital-learning-et-developpement-manager-ec5 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/devenir-formateur-occasionnel-559 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 @@ -314,24 +314,84 @@ https://www.mysy-training.com/Display-Detail-formation/formation-de-tuteur-fc7 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/loi-sapin-7a9 - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/prise-de-parole-en-public-6be - 2023-01-15T11:35:41+00:00 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + https://www.mysy-training.com/Display-Detail-formation/praticien-en-aromatherapie-integrative-c66 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/praticien-en-aromatherapie-integrative-8c1 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/praticien-en-olfactotherapie-628 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/se-mettre-a-niveau-en-orthographe--formule-en-e-learning--10-heures-de-tutorat-69c + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/se-mettre-a-niveau-en-orthographe-dans-un-contexte-professionnel--certificat-voltaire-ab9 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + https://www.mysy-training.com/Display-Detail-formation/technique-de-vente-2b3 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/rediger-avec-methode-et-efficacite-ses-courriers-et-ses-courriels-professionnels-664 + 2023-02-26T11:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-formation/les-fondamentaux-du-management-b47 + 2023-02-26T11:35:41+00:00 daily 1.0000 - \ No newline at end of file diff --git a/src/App.js b/src/App.js index 65f6a8f..5406c52 100644 --- a/src/App.js +++ b/src/App.js @@ -66,7 +66,7 @@ function App() { - + diff --git a/src/components/AideRecherche.js b/src/components/AideRecherche.js index 99ddbc9..b04c5b9 100644 --- a/src/components/AideRecherche.js +++ b/src/components/AideRecherche.js @@ -116,7 +116,7 @@ const AideRecherche = (props) => {
{Result && String(myApiResponse) === String("True") && Result.map((formation) => ( - +
"{(formation)}" diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index 25e78ca..7fdf9f2 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -287,7 +287,36 @@ const DisplayDetailClass_new_v2 = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_class/"; var form = new FormData(); form.append("internal_url", classId); - form.append("token", ""); + + var my_local_user_connect; + var my_local_part_connect; + if (typeof (stored_user) === "undefined" || String(stored_user) === '') { + my_local_user_connect = 0; + } else { + my_local_user_connect = 1; + } + + if (typeof (stored_partner) === "undefined" || String(stored_partner) === '') { + my_local_part_connect = 0; + } else { + my_local_part_connect = 1; + } + + + + if( String(my_local_user_connect) === "1"){ + form.append("token", stored_user); + form.append("connection_type", "user"); + } + else if ( String(my_local_part_connect) === "1"){ + form.append("token", stored_partner); + form.append("connection_type", "partner"); + } + else{ + form.append("token", ""); + form.append("connection_type", ""); + } + // Ajout des info IP user form.append("user_ip", IPv4); form.append("user_country_code", country_code); @@ -1385,7 +1414,7 @@ const DisplayDetailClass_new_v2 = (props) => { {(JSON.parse(formation).distantiel) === "1" && (JSON.parse(formation).presentiel) === "1" && (JSON.parse(formation).date_debut).substring(0, 10) !== (JSON.parse(formation).date_fin).substring(0, 10) && } @@ -1403,7 +1432,7 @@ const DisplayDetailClass_new_v2 = (props) => { {(JSON.parse(formation).distantiel) === "1" && ((JSON.parse(formation).presentiel) === "0" || !(JSON.parse(formation).presentiel)) && (JSON.parse(formation).date_debut).substring(0, 10) !== (JSON.parse(formation).date_fin).substring(0, 10) && } @@ -1604,7 +1633,7 @@ const DisplayDetailClass_new_v2 = (props) => {
{JSON.parse(formation).price &&
- {(String(JSON.parse(formation).price))} €HT + {(String(JSON.parse(formation).price))} € HT
} @@ -1862,7 +1891,7 @@ const DisplayDetailClass_new_v2 = (props) => { {(JSON.parse(formation).distantiel) === "1" && (JSON.parse(formation).presentiel) === "1" && (JSON.parse(formation).date_debut).substring(0, 10) !== (JSON.parse(formation).date_fin).substring(0, 10) && } @@ -1971,7 +2000,18 @@ const DisplayDetailClass_new_v2 = (props) => {
- {DetailTraining["price"] &&
{String(DetailTraining["price"])} HT
} + {DetailTraining["price"] && (!DetailTraining.business_prices || Object.keys(DetailTraining.business_prices).length <= 0) + &&
{String(DetailTraining["price"])} HT
} + + {DetailTraining["price"] && DetailTraining.business_prices && Object.keys(DetailTraining.business_prices).length > 0 + &&
+ + + + +
} + + {String(ismetiermanaged) !== "0" && String(ismetiermanaged) !== "1" &&
{(!DetailTraining.img_url || String(DetailTraining.img_url).length <= 0) && @@ -2023,8 +2063,8 @@ const DisplayDetailClass_new_v2 = (props) => {
} - {String(ismetiermanaged) === "1" &&
- autre + {String(ismetiermanaged) === "1" &&
+ autre
} @@ -2348,7 +2388,7 @@ const DisplayDetailClass_new_v2 = (props) => {
{JSON.parse(formation).price &&
- {(String(JSON.parse(formation).price))} €HT + {(String(JSON.parse(formation).price))} € HT
} diff --git a/src/components/Formation.js b/src/components/Formation.js index 167efa2..da22341 100644 --- a/src/components/Formation.js +++ b/src/components/Formation.js @@ -291,8 +291,10 @@ const Formation = (props) => { {props.formation.note && String(props.formation.note).length === 1 && parseInt(String(props.formation.note)) <= 5 && - + + } +
@@ -340,13 +342,15 @@ const Formation = (props) => {
} - {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && !props.formation.business_prices && + {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && ( !props.formation.business_prices || + Object.keys(props.formation.business_prices).length <= 0) &&
{props.formation.price} € HT 
} - {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && props.formation.business_prices && + {String(props.formation.price).length != 9 && String(props.formation.price) !== String("0") && + props.formation.business_prices && Object.keys(props.formation.business_prices).length > 0 &&