diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index 2e4e1aa..59e5034 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -3096,7 +3096,7 @@ const Config_Documents = (props) => { {String(partner_document_data_edit_mode) !== "1" &&
- {p_detail_joint_pdf === true &&
+ {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Corps du mail
@@ -3180,7 +3180,7 @@ const Config_Documents = (props) => {
- {p_detail_joint_pdf === true &&
+ {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Modifier le Corps du mail
@@ -3556,7 +3556,7 @@ const Config_Documents = (props) => {
- {p_detail_joint_pdf === true &&
+ {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Créer le Corps du mail
diff --git a/src/components/Config_Document_Super_Admin.js b/src/components/Config_Document_Super_Admin.js index a2b0c23..21ddb04 100644 --- a/src/components/Config_Document_Super_Admin.js +++ b/src/components/Config_Document_Super_Admin.js @@ -2969,7 +2969,8 @@ const Config_Documents_Super_Admin = (props) => {
{String(partner_document_data_edit_mode) !== "1" &&
- {p_detail_joint_pdf === true &&
+ + {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
+ className="detail_class_submenu" id='detail_corps_mail' name='detail_corps_mail'>Corps du mail
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Corps du mail
@@ -3053,7 +3054,7 @@ const Config_Documents_Super_Admin = (props) => {
- {p_detail_joint_pdf === true &&
+ {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Modifier le Corps du mail
@@ -3386,7 +3387,7 @@ const Config_Documents_Super_Admin = (props) => {
- {p_detail_joint_pdf === true &&
+ {p_detail_joint_pdf === true && p_detail_type_doc === "email" &&
} - {p_detail_joint_pdf === true && String(document_principal_ou_corp_mail) === "2" && + {p_detail_joint_pdf === true && p_detail_type_doc === "email" && String(document_principal_ou_corp_mail) === "2" &&
Créer le Corps du mail
diff --git a/src/components/New_C_Formation_2025.js b/src/components/New_C_Formation_2025.js index db89cd5..8e3f67c 100644 --- a/src/components/New_C_Formation_2025.js +++ b/src/components/New_C_Formation_2025.js @@ -1,25 +1,18 @@ import React, { useState, useEffect } from "react"; -import ReactPlayer from 'react-player' -import { FacebookShareButton, LinkedinShareButton, TwitterShareButton } from "react-share"; -import { SocialIcon } from 'react-social-icons'; -import { Button, } from "reactstrap"; + import { useHistory } from "react-router-dom"; -import { Helmet } from "react-helmet"; + import { useCookies } from "react-cookie"; import { confirmAlert } from 'react-confirm-alert'; -import topimg from "../mysy_img/top.png"; -import coeurimg from "../mysy_img/coeur.png"; + import img_met_program from "../mysy_img/met_programmation.jpg"; -import img_met_hotel from "../mysy_img/met_hotel.jpg"; + import img_met_graphisme from "../mysy_img/metier_graphisme.jpg"; import img_met_autre from "../mysy_img/met_autre.jpg"; import img_met_digital from "../mysy_img/met_digital.jpg"; import img_met_management from "../mysy_img/met_management.jpg"; -import img_met_projet from "../mysy_img/met_projet.jpg"; -import img_met_market from "../mysy_img/met_market.jpg"; -import img_met_autre2 from "../mysy_img/met_autre2.jpg"; import img_met_dev_perso from "../mysy_img/metier_dev_perso.jpg"; import img_met_rh from "../mysy_img/met_rh.jpg"; @@ -30,7 +23,7 @@ import axios from "axios"; import Rating from '@mui/material/Rating'; import parse from 'html-react-parser' import { CiLocationOn } from "react-icons/ci"; - + const New_C_Formation_2025 = (props) => { const [userconnected, setuserconnected] = useState("0"); const [partnerconnected, setpartnerconnected] = useState("0"); @@ -92,8 +85,6 @@ const New_C_Formation_2025 = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/getRecodedClassImage_no_token/"; - - var form = new FormData(); form.append("type", "partner"); @@ -101,13 +92,13 @@ const New_C_Formation_2025 = (props) => { form.append("related_collection_recid", props.formation._id); form.append("class_external_code", props.formation.external_code); - axios.post(myurl, form).then(res => { - if (res.data.status != "False") { + // console.log(" getClassImage_no_token : In test res.data.status = ", res.data.status); + if (String(res.data.status) === "true") { - //console.log(" getClassImage : In test res.data.status = " + res.data.status); - //console.log(" getClassImage: res.data.message.img = " + res.data.message); + + //console.log(" getClassImage_no_token: res.data.message.img = ", res.data.message); if (res.data.message.img.length > 0) { setisclassimage("True"); @@ -118,9 +109,11 @@ const New_C_Formation_2025 = (props) => { setisclassimage(res.data.message.img); var ch_img = "data:image/png;base64," + res.data.message.img; setclass_img_stored_in_bdd(ch_img); + // console.log(" getClassImage_no_token: setclass_img_stored_in_bdd = ", setclass_img_stored_in_bdd); + } else { - //console.log(" In Erreur res.data.status = " + res.data.status); + // console.log(" In Erreur res.data.status = " + res.data.status); //console.log(" In Erreur res.data.message = " + res.data.message); setisclassimage("False"); setuserimgclassprofil(); @@ -147,6 +140,9 @@ const New_C_Formation_2025 = (props) => { useEffect(() => { setmyfilter(props.myfil); + // console.log(" #### useEffect props.formation = ", props.formation); + + if (typeof (stored_user) === "undefined" || String(stored_user) === '') { setuserconnected("0"); } else { @@ -357,11 +353,15 @@ const New_C_Formation_2025 = (props) => { {class_img_stored_in_bdd && String(class_img_stored_in_bdd).length > 50 && - Course - } + Formation + } + + {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && + (!props.formation.img_url || String(props.formation.img_url).length <= 10) && + String(ismetiermanaged) !== "0" && String(ismetiermanaged) !== "1" && - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) !== "0" && String(ismetiermanaged) !== "1" &&
+ {(!props.formation.img_url || String(props.formation.img_url).length <= 0) && props.formation.metier && String(props.formation.metier).toLocaleLowerCase() === String("it") && String(isclassimage) === "False" && informatique} @@ -400,23 +400,26 @@ const New_C_Formation_2025 = (props) => {
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length > 100 &&
- autre - {/*props.formation.institut_formation &&
Dispensé par :
+ {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length > 100 && +
+ autre + {/*props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
*/} -
} +
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length <= 100 &&
- autre - {/*props.formation.institut_formation &&
Dispensé par :
+ {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" && String(userimgclassprofil).length <= 100 && +
+ autre + {/*props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
*/} -
} +
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "1" &&
- autre - {/*props.formation.institut_formation &&
Dispensé par :
+ {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "1" && +
+ autre + {/*props.formation.institut_formation &&
Dispensé par :
{String(props.formation.institut_formation)}
*/} -
} +
}
diff --git a/src/components/detail_formation_automatic_files/new_detail_formation_2025.js b/src/components/detail_formation_automatic_files/new_detail_formation_2025.js index 7af33ee..be80228 100644 --- a/src/components/detail_formation_automatic_files/new_detail_formation_2025.js +++ b/src/components/detail_formation_automatic_files/new_detail_formation_2025.js @@ -2248,7 +2248,7 @@ const New_C_Detail_Formation_2025 = (props) => {
))} -
+
} diff --git a/src/components/detail_formation_automatic_files/new_s_detail_formation_2025.css b/src/components/detail_formation_automatic_files/new_s_detail_formation_2025.css index d5257ba..5dad11b 100644 --- a/src/components/detail_formation_automatic_files/new_s_detail_formation_2025.css +++ b/src/components/detail_formation_automatic_files/new_s_detail_formation_2025.css @@ -6897,7 +6897,7 @@ .block_info_page_pave_title_desc_title { - + height: 24px; @@ -6926,7 +6926,6 @@ .block_info_page_pave_title_desc_desc { width: 100%; - font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 500; @@ -6951,24 +6950,22 @@ .programme_block { font-family: 'Inter'; -font-style: normal; -font-weight: 400; -font-size: 16px; -line-height: 160%; -/* or 26px */ -font-feature-settings: 'liga' off; + font-style: normal; + font-weight: 400; + font-size: 16px; + line-height: 160%; + /* or 26px */ + font-feature-settings: 'liga' off; -/* Foundation /Blue-Grey/Normal */ -color: #4B5162; - - -/* Inside auto layout */ -flex: none; -order: 1; -align-self: stretch; -flex-grow: 0; + /* Foundation /Blue-Grey/Normal */ + color: #4B5162; + /* Inside auto layout */ + flex: none; + order: 1; + align-self: stretch; + flex-grow: 0; } @@ -6996,22 +6993,22 @@ flex-grow: 0; .objectif_block { font-family: 'Inter'; -font-style: normal; -font-weight: 400; -font-size: 16px; -line-height: 160%; -/* or 26px */ -font-feature-settings: 'liga' off; + font-style: normal; + font-weight: 400; + font-size: 16px; + line-height: 160%; + /* or 26px */ + font-feature-settings: 'liga' off; -/* Foundation /Blue-Grey/Normal */ -color: #4B5162; + /* Foundation /Blue-Grey/Normal */ + color: #4B5162; -/* Inside auto layout */ -flex: none; -order: 1; -align-self: stretch; -flex-grow: 0; + /* Inside auto layout */ + flex: none; + order: 1; + align-self: stretch; + flex-grow: 0; } @@ -7020,22 +7017,44 @@ flex-grow: 0; min-height: 5rem; overflow: auto; padding: 10px; - font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; - line-height: 30px; - font-size: 14px; - padding: 0px; + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + font-size: 16px; + line-height: 160%; + /* or 26px */ + font-feature-settings: 'liga' off; + + /* Foundation /Blue-Grey/Normal */ + color: #4B5162; + + + /* Inside auto layout */ + flex: none; + order: 1; + align-self: stretch; + flex-grow: 0; } .pourqui_block { - max-height: 7rem; - min-height: 5rem; - overflow: auto; - padding: 10px; - font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; - line-height: 30px; - font-size: 14px; - padding: 0px; + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + font-size: 16px; + line-height: 160%; + /* or 26px */ + font-feature-settings: 'liga' off; + + /* Foundation /Blue-Grey/Normal */ + color: #4B5162; + + + /* Inside auto layout */ + flex: none; + order: 1; + align-self: stretch; + flex-grow: 0; } diff --git a/src/components/marketplace_automatic_files/new_marketplace_2025.js b/src/components/marketplace_automatic_files/new_marketplace_2025.js index 57b3a0c..06e6a9e 100644 --- a/src/components/marketplace_automatic_files/new_marketplace_2025.js +++ b/src/components/marketplace_automatic_files/new_marketplace_2025.js @@ -29,8 +29,6 @@ import 'react-input-range/lib/css/index.css'; import tick_ko from "../../mysy_img/tick_KO.png"; - -import mysy_logo2 from "../../mysy_img2/Logo_MySy.png" import { AiTwotoneFolder } from "react-icons/ai"; import Dialog from '@mui/material/Dialog'; @@ -39,9 +37,6 @@ import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import DialogTitle from '@mui/material/DialogTitle'; -import Box from '@mui/material/Box'; -import TextField from '@mui/material/TextField'; - import { CiCircleRemove, CiCircleMinus } from "react-icons/ci"; let PageSize = 10; @@ -1420,7 +1415,7 @@ const New_C_Marketplace_2025 = () => { axios.post(myurl, form).then(res => { if (String(res.data.status) != String("false")) { //console.log(" In test res.data.status = " + res.data.status); - //console.log(" In test res.data.message = " + res.data.message); + // console.log(" In searchFunction res.data.message = " + res.data.message); setmyApiResponse("True"); setResult(res.data.message) @@ -3751,7 +3746,7 @@ const New_C_Marketplace_2025 = () => {
}
- + {result && myApiResponse == "True" && fin == 0 && !newresult && result.slice(0, PageSize).map((formation) => (
@@ -3774,7 +3769,7 @@ const New_C_Marketplace_2025 = () => { {result && myApiResponse === "True" && fin === 1 && !newresult && currentTableData2 && currentTableData2.map((formation) => ( -
+