From b23d5b75d4d78556113f6011c2cc0e42d053c7f5 Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 15 Jan 2023 22:10:47 +0100 Subject: [PATCH] 15/01/2023 - 22h --- public/sitemap.xml | 88 +++--- src/components/DisplayDetailClass_new_v2.js | 270 ++++++++++++++++-- src/components/Formation.js | 4 +- src/components/Fotter.js | 2 +- src/components/GestionAdministrative.js | 3 + src/components/Inscription_Information.js | 48 ++-- src/components/Partner.js | 3 +- src/components/Recherche_new_v2.js | 70 +++-- src/styles/components/_addclassmanual.scss | 31 ++ .../_displaydetailclass_new_v2.scss | 14 +- 10 files changed, 408 insertions(+), 125 deletions(-) diff --git a/public/sitemap.xml b/public/sitemap.xml index 09b7ecd..f4d4633 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -7,14 +7,14 @@ https://www.mysy-training.com/ - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/qualite-la-norme-itl-dans-entreprise-532 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -22,28 +22,28 @@ https://www.mysy-training.com/Display-Detail-Article/6281eae593f66d1a10ac2248 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/626fca8d62477b7b15a04b27 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/626fcada62477b7b15a04d97 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Recherche-Article-formation - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation-Coeur/analysez-vos-donnees-textuelles-98b - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/create_account - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -88,28 +88,28 @@ https://www.mysy-training.com/Connexion - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/ContactezNous - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/QuiSommesNous - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/supply-chain-lessons-from-the-pandemic-11d - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/techniques--methodes-pour-bien-negocier--bd6 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/reussir-vos-photos-de-vacances-comment---343 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Produits-Services - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/les-metiers-d-avenir-959 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -154,14 +154,14 @@ https://www.mysy-training.com/Display-Detail-formation/actualite-sociale-10f - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/pratique-de-la-paie--initiation-b10 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/droit-du-travail-928 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/la-gestion-des-cdd-59b - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -215,7 +215,7 @@ https://www.mysy-training.com/Display-Detail-formation/entretien-professionnel-802 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -223,14 +223,14 @@ https://www.mysy-training.com/Display-Detail-formation/missions-rh-6e2 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/reglementation-rh--l-essentiel-eaf - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/controle-urssaf-4b2 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/les-outils-de-la-remuneration-9f5 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11: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-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/devenir-formateur-occasionnel-559 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 @@ -314,21 +314,21 @@ https://www.mysy-training.com/Display-Detail-formation/formation-de-tuteur-fc7 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-Article/loi-sapin-7a9 - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 https://www.mysy-training.com/Display-Detail-formation/prise-de-parole-en-public-6be - 2023-01-01T11:35:41+00:00 + 2023-01-15T11:35:41+00:00 daily 1.0000 diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index 7760786..d83aff8 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -45,6 +45,7 @@ import Inscription from "./Inscription_Information"; import mysy_logo2 from "../mysy_img2/Logo_MySy.png" import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa'; +import { areOptionsEqual } from "@mui/base"; const DisplayDetailClass_new_v2 = (props) => { const { classId, action } = useParams(); @@ -123,7 +124,9 @@ const DisplayDetailClass_new_v2 = (props) => { async function funclocaltoken() { - if (String(props.action).toLocaleLowerCase() !== "inscription" && + + + if (props.action && String(props.action).toLocaleLowerCase() !== "inscription" && String(props.action).toLocaleLowerCase() !== "information") { CheckEvaluationToken(); @@ -372,8 +375,8 @@ const DisplayDetailClass_new_v2 = (props) => { console.log(" local_tmp = ", local_tmp, " main_h = ", main_h); if (local_tmp > 2700) { - val = "3000px"; - main_h_px = "4700px"; + val = "3200px"; + main_h_px = "4900px"; } else { /* gestions des mini */ @@ -414,7 +417,7 @@ const DisplayDetailClass_new_v2 = (props) => { main_h_px = main_h + "px" } - console.log(" changemenr foo val = ", val, " main_h = ", main_h); + console.log("local_tmp = ", local_tmp, " changemenr foo val = ", val, " main_h = ", main_h); var val2 = document.getElementById('block_info_page').style.height; console.log(" block_info_page height = ", val2); @@ -446,7 +449,7 @@ const DisplayDetailClass_new_v2 = (props) => { main_h_px = main_h + "px" } - console.log(" changemenr foo val = ", val, " main_h = ", main_h); + console.log("local_tmp = ", local_tmp, " changemenr foo val = ", val, " main_h = ", main_h); var val2 = document.getElementById('block_info_page').style.height; console.log(" block_info_page height = ", val2); @@ -478,7 +481,7 @@ const DisplayDetailClass_new_v2 = (props) => { main_h_px = main_h + "px" } - console.log(" changemenr foo val = ", val, " main_h = ", main_h); + console.log(" local_tmp = ", local_tmp, " changemenr foo val = ", val, " main_h = ", main_h); var val2 = document.getElementById('block_info_page').style.height; console.log(" block_info_page height = ", val2); @@ -651,7 +654,33 @@ const DisplayDetailClass_new_v2 = (props) => { document.getElementById('mob_block_cross_sell_cat').style.display = "none"; window.scrollTo(0, 500); } - else { + else if (window.screen.width >= 601 && window.screen.width <= 991) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 900; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 900; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + window.scrollTo(0, 0); + + } + else if (window.screen.width >= 992 && window.screen.width <= 1199) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 500; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + window.scrollTo(0, 0); + } + else if (window.screen.width >= 1200) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 500; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + window.scrollTo(0, 0); } @@ -664,6 +693,33 @@ const DisplayDetailClass_new_v2 = (props) => { if (window.screen.width < 601) { document.getElementById('mob_block_cross_sell_cat').style.display = "none"; window.scrollTo(0, 500); + } + else if (window.screen.width >= 601 && window.screen.width <= 991) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 900; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 900; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + } + else if (window.screen.width >= 992 && window.screen.width <= 1199) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 500; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + } + else if (window.screen.width >= 1200) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) + 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 500; + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + } else { window.scrollTo(0, 0); @@ -688,7 +744,7 @@ const DisplayDetailClass_new_v2 = (props) => { if (String(res.data.status) !== "false") { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); - console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); + //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); setGetCurrentClass_api("true"); setGetCurrentClass_result(res.data.message); } @@ -779,6 +835,39 @@ const DisplayDetailClass_new_v2 = (props) => { function Close_info_form() { setinscritpion(); document.getElementById('mob_block_cross_sell_cat').style.display = "flex"; + if (window.screen.width < 601) { + + } + else if (window.screen.width >= 601 && window.screen.width <= 991) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 900; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 900; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + } + else if (window.screen.width >= 992 && window.screen.width <= 1199) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 500; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + } + else if (window.screen.width >= 1200) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 500; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + + } window.scrollTo(0, 0); } @@ -786,6 +875,42 @@ const DisplayDetailClass_new_v2 = (props) => { function Close_inscrip_form() { setinscritpion(); document.getElementById('mob_block_cross_sell_cat').style.display = "flex"; + + if (window.screen.width < 601) { + + } + else if (window.screen.width >= 601 && window.screen.width <= 991) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 900; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 900; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + } + else if (window.screen.width >= 992 && window.screen.width <= 1199) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 500; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + } + else if (window.screen.width >= 1200) { + var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; + var displaydetailclass_new_v2_hei = document.getElementById('desktop').style.height; + var new_meme_orga_top = parseInt(meme_orga_top) - 500; + var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) - 500; + + document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; + document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; + + + } + + window.scrollTo(0, 0); } @@ -908,7 +1033,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- M’inscrire + M'inscrire
@@ -916,7 +1041,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- M’informer sur la formation + M'informer sur la formation
@@ -1089,10 +1214,10 @@ const DisplayDetailClass_new_v2 = (props) => { } - {DetailTraining["Description"] &&
+
Description
- } +
{parse(String(DetailTraining["description"]))} @@ -1119,10 +1244,52 @@ const DisplayDetailClass_new_v2 = (props) => { {GetCurrentClass_result && GetCurrentClass_result.slice(0, 5).map((formation) => (
  • - {(JSON.parse(formation).distantiel) === "1" && } - {(JSON.parse(formation).presentiel) === "1" && } + {(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) && + + } + + {(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) && + + } + + + + {(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) && + + } + + {(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) && + + } + + + {(JSON.parse(formation).presentiel) === "1" && ((JSON.parse(formation).distantiel) === "0" || !(JSON.parse(formation).distantiel)) && + (JSON.parse(formation).date_debut).substring(0, 10) !== (JSON.parse(formation).date_fin).substring(0, 10) && + } + + {(JSON.parse(formation).presentiel) === "1" && ((JSON.parse(formation).distantiel) === "0" || !(JSON.parse(formation).distantiel)) && + (JSON.parse(formation).date_debut).substring(0, 10) === (JSON.parse(formation).date_fin).substring(0, 10) && + }
  • @@ -1173,9 +1340,10 @@ const DisplayDetailClass_new_v2 = (props) => {
    -
    - Formations & tutoriels du même organisme -
    + {associatedtraining_message && associatedtraining_message.length > 0 && +
    + Cela pourrait aussi vous intéresser +
    }
    @@ -1450,16 +1618,15 @@ const DisplayDetailClass_new_v2 = (props) => { {(String(action).toLocaleLowerCase() === "inscription" || String(action).toLocaleLowerCase() === "information") && String(action).toLocaleLowerCase() !== "evaluation" &&
    - +
    } {String(action).toLocaleLowerCase() !== "inscription" && String(action).toLocaleLowerCase() !== "information" && String(tokenEval_api) === "true" &&
    - Zone evaluation : -
    - + +
    } @@ -1490,12 +1657,57 @@ const DisplayDetailClass_new_v2 = (props) => { {GetCurrentClass_result && GetCurrentClass_result.slice(0, 5).map((formation) => ( + +
  • - {(JSON.parse(formation).distantiel) === "1" && } - {(JSON.parse(formation).presentiel) === "1" && } + + {(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) && + + } + + {(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) && + + } + + + + {(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) && + + } + + {(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) && + + } + + + {(JSON.parse(formation).presentiel) === "1" && ((JSON.parse(formation).distantiel) === "0" || !(JSON.parse(formation).distantiel)) && + (JSON.parse(formation).date_debut).substring(0, 10) !== (JSON.parse(formation).date_fin).substring(0, 10) && + } + + {(JSON.parse(formation).presentiel) === "1" && ((JSON.parse(formation).distantiel) === "0" || !(JSON.parse(formation).distantiel)) && + (JSON.parse(formation).date_debut).substring(0, 10) === (JSON.parse(formation).date_fin).substring(0, 10) && + }
  • @@ -1831,7 +2043,7 @@ const DisplayDetailClass_new_v2 = (props) => {
    -
    Formations & tutoriels du même organisme
    +
    Cela pourrait aussi vous intéresser
    @@ -1895,7 +2107,7 @@ const DisplayDetailClass_new_v2 = (props) => { />
    -
    {parse(String(JSON.parse(formation).title))} +
    {parse(String(JSON.parse(formation).title)).substring(0, 50)}
    diff --git a/src/components/Formation.js b/src/components/Formation.js index da25da4..fd8f327 100644 --- a/src/components/Formation.js +++ b/src/components/Formation.js @@ -561,7 +561,7 @@ const Formation = (props) => {
    }
    -
    + {/*
    Type
    @@ -574,7 +574,7 @@ const Formation = (props) => {
    NC
    } -
    +
    */}
    diff --git a/src/components/Fotter.js b/src/components/Fotter.js index beb1d40..d20f431 100644 --- a/src/components/Fotter.js +++ b/src/components/Fotter.js @@ -116,7 +116,7 @@ const Footer = () => {

    - Copyright © 2022 MySy. Tous droits réservés.   + Copyright © 2023 MySy. Tous droits réservés.   | Confidentialité | Cookies | données personnelles   | Conditions d’utilisation   | Mentions légales diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index ff66ac6..13b352b 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -510,6 +510,7 @@ function GestionAdministrative(props) { setliste_participants_file_change_api(); setliste_sessions_file_change_api(); setCreateSessionFormation_api(); + setdisplay_detail_insc(); document.getElementById('menu_preinscrit').style.background = "#104277"; document.getElementById('menu_preinscrit').style.color = "#ffffff"; @@ -566,6 +567,7 @@ function GestionAdministrative(props) { setliste_participants_file_change_api(); setliste_sessions_file_change_api(); setCreateSessionFormation_api(); + setdisplay_detail_insc(); document.getElementById('menu_emarge').style.background = "#104277"; document.getElementById('menu_emarge').style.color = "#ffffff"; @@ -587,6 +589,7 @@ function GestionAdministrative(props) { setliste_participants_file_change_api(); setliste_sessions_file_change_api(); setCreateSessionFormation_api(); + setdisplay_detail_insc(); document.getElementById('menu_eval').style.background = "#104277"; document.getElementById('menu_eval').style.color = "#ffffff"; diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js index 5e2d39e..eb8d62c 100644 --- a/src/components/Inscription_Information.js +++ b/src/components/Inscription_Information.js @@ -394,7 +394,7 @@ function Inscription_Information(props) { if (props.Close_info_form) props.Close_info_form(); } - + const editorRef_description = useRef(null); const [field_description, setfield_description] = useState(""); @@ -536,6 +536,15 @@ function Inscription_Information(props) { logistique = ele[i].value; } + + if (!RatingValue){ + + alert(" Vous n'avez pas donné une appreciation globle. Le point N° 1. Merci d'avance") + return; + } + + + formData.append('inscription_id', props.eval_token); formData.append('eval_note', RatingValue); formData.append('eval_eval', message); @@ -778,12 +787,12 @@ function Inscription_Information(props) { }
    - {
    -
    + {
    +
    - {
    + {
    } @@ -803,7 +812,7 @@ function Inscription_Information(props) { String(AnnulerFction_status) !== "1" && String(SendEvaluationClass_api) === "true" &&
    - Votre évaluation à bien été prise en compte. Merci. + Votre évaluation à bien été prise en compte. Merci.
    } @@ -823,19 +832,22 @@ function Inscription_Information(props) {
    }

    Demande d'evaluation

    -
    - { - setRatingValue(newValue); - }} />
    +
    +
    + + { + setRatingValue(newValue); + }} />
    +
    - - + +
       @@ -849,8 +861,8 @@ function Inscription_Information(props) {
    - - + +
       @@ -864,7 +876,7 @@ function Inscription_Information(props) {
    - + editorRef_evaluation.current = editor} @@ -895,7 +907,7 @@ function Inscription_Information(props) {
    {
    -
    +
    diff --git a/src/components/Partner.js b/src/components/Partner.js index 5c9b077..dfc1a50 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -157,11 +157,12 @@ const Partner = (props) => { useEffect(() => { - setapiexcelimportmessage(""); + setapiexcelimportmessage(); getImage(); GetPartnerNameFromToken(); DiplaytrainingList(); + if (location && location.state && location.state.local_sub_menu) { setmenu(location.state.local_sub_menu); setpartnerPackService(location.state.currentpack); diff --git a/src/components/Recherche_new_v2.js b/src/components/Recherche_new_v2.js index 5647d00..0b03c86 100644 --- a/src/components/Recherche_new_v2.js +++ b/src/components/Recherche_new_v2.js @@ -4,7 +4,7 @@ import axios from "axios"; import Formation from "./Formation"; import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa'; import { BsFillXCircleFill } from "react-icons/bs"; -import { IoAddSharp } from "react-icons/io5"; +import { IoAddSharp, IoAtCircle } from "react-icons/io5"; import bannerimg from "../mysy_img/MYSY_banner_compte.png"; import bannerimg2 from "../mysy_img/MYSY-LOGO-BLUE.png"; import logowhite from "../mysy_img/MYSY-LOGO-WHITE.png"; @@ -525,7 +525,7 @@ const Recherche_new_v2 = () => { } } - + } @@ -653,12 +653,13 @@ const Recherche_new_v2 = () => { if (myelement) { // 👇 Will scroll smoothly to the top of the next section myelement.scrollIntoView({ behavior: 'smooth' }); - + } + return; - + @@ -1411,7 +1412,7 @@ const Recherche_new_v2 = () => { //setmyApimyApiMessage("") }) - // window.scrollTo(0, 600); + // window.scrollTo(0, 600); @@ -3138,6 +3139,24 @@ const Recherche_new_v2 = () => {
    +
    +
    + + +
    +
    + Management +
    +
    + +
    + +
    +
    +
    + + +
    @@ -3169,21 +3188,7 @@ const Recherche_new_v2 = () => {
    -
    -
    - - -
    -
    - Projets -
    -
    - -
    - -
    -
    -
    + {!displayAllmetiers &&
    @@ -3198,22 +3203,41 @@ const Recherche_new_v2 = () => {
    } + + {displayAllmetiers &&
    - +
    - Management + Développement Personnel
    -
    +
    } + {displayAllmetiers &&
    +
    + + +
    +
    + Projets +
    +
    + +
    +
    + +
    +
    } + + {displayAllmetiers &&
    diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index a1c5521..4ef5405 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -667,6 +667,21 @@ font-size: small; padding-left: 5px; } + + .div_row_ch{ + width: 100%; + display: flex; + flex-direction: row; + align-items: flex-end; + padding: 0px; + border: #104277; + padding-bottom: 20px; + padding-top: 2rem; + height: 2rem; + text-transform: uppercase; + margin-top: 1rem; + + } } @media only screen and (min-width: 992px) and (max-width: 1199px) { @@ -1018,6 +1033,21 @@ font-size: small; padding-left: 5px; } + + .div_row_ch{ + width: 100%; + display: flex; + flex-direction: row; + align-items: flex-end; + padding: 0px; + border: #104277; + padding-bottom: 20px; + padding-top: 2rem; + height: 2rem; + text-transform: uppercase; + margin-top: 1rem; + + } } @media only screen and (min-width: 1200px) { @@ -1386,6 +1416,7 @@ padding-top: 2rem; height: 2rem; text-transform: uppercase; + margin-top: 1rem; } diff --git a/src/styles/components/_displaydetailclass_new_v2.scss b/src/styles/components/_displaydetailclass_new_v2.scss index d85fe46..60c8b2a 100644 --- a/src/styles/components/_displaydetailclass_new_v2.scss +++ b/src/styles/components/_displaydetailclass_new_v2.scss @@ -2899,7 +2899,7 @@ //width: 80px; height: 16px; //left: 965px; - top: 700px; + top: 715px; left: 35%; } @@ -3248,7 +3248,7 @@ font-family: 'Albert Sans'; font-style: normal; font-weight: 600; - font-size: 15px; + font-size: 12px; line-height: 26px; font-feature-settings: 'liga' off; text-align: left; @@ -4866,7 +4866,7 @@ //width: 80px; height: 16px; //left: 965px; - top: 700px; + top: 715px; left: 35%; } @@ -5779,7 +5779,7 @@ padding: 0px; gap: 345px; - width: 1296px; + width: 100%; height: 56px; @@ -6849,7 +6849,7 @@ //width: 80px; height: 16px; //left: 965px; - top: 700px; + top: 720px; left: 35%; } @@ -7197,8 +7197,8 @@ font-family: 'Albert Sans'; font-style: normal; - font-weight: 700; - font-size: 18px; + font-weight: 600; + font-size: 16px; line-height: 26px; font-feature-settings: 'liga' off; text-align: left;