diff --git a/.env b/.env index abf1550..6063796 100644 --- a/.env +++ b/.env @@ -10,6 +10,18 @@ REACT_APP_FRONT_URL=http://localhost:3009/ REACT_APP_FRONT_URL_CANONICAL=localhost:3009/ REACT_APP_PART_PUB_CATALOG_DOMAIN=localhost:3009/ + +# EN DEMO +#REACT_APP_PART_PUB_CATALOG_DOMAIN=demomysy-hosting.online/ + +# EN RECETTE +#REACT_APP_PART_PUB_CATALOG_DOMAIN=devmysy-hosting.online/ + + +# EN PRODUCTION +#REACT_APP_PART_PUB_CATALOG_DOMAIN=mysy-hosting.online/ + + REACT_APP_ENV=DEV GENERATE_SOURCEMAP=false REACT_APP_MAINTENANCE=1 \ No newline at end of file diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index a28e7ed..cdb7190 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -50,6 +50,12 @@ import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react- import { areOptionsEqual } from "@mui/base"; import { style } from "@mui/system"; +import Accordion from '@mui/material/Accordion'; +import AccordionDetails from '@mui/material/AccordionDetails'; +import AccordionSummary from '@mui/material/AccordionSummary'; +import Typography from '@mui/material/Typography'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; + const DisplayDetailClass_new_v2 = (props) => { const { classId, action } = useParams(); const [result, setResult] = useState(""); @@ -391,8 +397,8 @@ const DisplayDetailClass_new_v2 = (props) => { //alert("myurl = "+myurl); axios.post(myurl, form).then(res => { - // console.log(" In Display res.data.status = " + res.data.status); - //console.log(" In Display res.data.message = " + res.data.message); + // console.log(" In Display res.data.status = " + res.data.status); + console.log(" In Display res.data.message = " + res.data.message); if (String(res.data.status) === String("true")) { if (res.data.message.length > 0) { @@ -957,7 +963,7 @@ const DisplayDetailClass_new_v2 = (props) => { axios.post(myurl, form).then(res => { //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); if (String(res.data.status) === String("true")) { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); @@ -1165,6 +1171,13 @@ const DisplayDetailClass_new_v2 = (props) => { } + const [expanded, setExpanded] = React.useState(false); + + const handleChange = (panel) => (event, isExpanded) => { + setExpanded(isExpanded ? panel : false); + }; + + /// ---- return ( @@ -2081,6 +2094,51 @@ const DisplayDetailClass_new_v2 = (props) => { } + + {DetailTraining["tab_ue_detail_data"] && < div className="block_info_page_pave_title_desc_long_text" > +
+ Modules +
+ + + {DetailTraining["tab_ue_detail_data"] &&
+ +
+ {DetailTraining["tab_ue_detail_data"] && DetailTraining["tab_ue_detail_data"].map((val) => ( +
+ + + } + aria-controls={val._id} + id={val._id} + > + {val.code} + + {val.titre} + + + + + {parse(String(val.description).replace(/(<([^>]+)>)/ig, ''))} + + + + + + +
+ ))} +
+ +
} + + + + } + + + {DetailTraining["pourqui"] && String(DetailTraining["pourqui"]).length > 2 &&
Pour Qui ? @@ -2129,15 +2187,15 @@ const DisplayDetailClass_new_v2 = (props) => {
} - + {class_img_stored_in_bdd && String(class_img_stored_in_bdd).length > 50 &&
- +
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50 ) && 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" &&
{(!DetailTraining.img_url || String(DetailTraining.img_url).length <= 0) && DetailTraining.metier && String(DetailTraining.metier).toLocaleLowerCase() === String("it") && @@ -2183,12 +2241,12 @@ const DisplayDetailClass_new_v2 = (props) => {
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50 ) && String(ismetiermanaged) === "0" &&
+ {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "0" &&
autre
} - {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50 ) && String(ismetiermanaged) === "1" &&
+ {(!class_img_stored_in_bdd || String(class_img_stored_in_bdd).length < 50) && String(ismetiermanaged) === "1" &&
autre
} @@ -2995,7 +3053,7 @@ Si non, on utilise le formumaire de mysy,.
-
+ ) } diff --git a/src/components/Mon_Catalogue_Public.js b/src/components/Mon_Catalogue_Public.js index 5396837..b0af025 100644 --- a/src/components/Mon_Catalogue_Public.js +++ b/src/components/Mon_Catalogue_Public.js @@ -2621,7 +2621,7 @@ const Mon_Catalogue_Public = () => { if (String(res.data.status) === "true") { //console.log(" In Get_Subdomain_Partner_Data res.data.status = " + res.data.status); - console.log(" In Get_Subdomain_Partner_Data res.data.message r_class = " + res.data.message); + //console.log(" In Get_Subdomain_Partner_Data res.data.message r_class = " + res.data.message); setGet_Subdomain_Partner_Data_api("true"); setGet_Subdomain_Partner_Data_result(res.data.message); diff --git a/src/styles/components/_displayactionandclass.scss b/src/styles/components/_displayactionandclass.scss index 639c994..3d23263 100644 --- a/src/styles/components/_displayactionandclass.scss +++ b/src/styles/components/_displayactionandclass.scss @@ -2478,7 +2478,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 600; font-size: 20px; @@ -4563,7 +4563,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 700; font-size: 24px; @@ -6664,7 +6664,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 700; font-size: 24px; diff --git a/src/styles/components/_displaydetailclass_new_v2.scss b/src/styles/components/_displaydetailclass_new_v2.scss index 00bec79..ff68a06 100644 --- a/src/styles/components/_displaydetailclass_new_v2.scss +++ b/src/styles/components/_displaydetailclass_new_v2.scss @@ -1433,6 +1433,7 @@ min-height: 10rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .description_block { @@ -1440,6 +1441,7 @@ min-height: 8rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .objectif_block { @@ -1447,6 +1449,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .session_block { @@ -1454,6 +1457,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -1462,6 +1466,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .sticky_div_hilight { @@ -2477,7 +2482,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 600; font-size: 20px; @@ -2505,7 +2510,7 @@ - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 500; font-size: 14px; @@ -2532,6 +2537,7 @@ min-height: 10rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .description_block { @@ -2539,6 +2545,7 @@ min-height: 8rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .objectif_block { @@ -2546,6 +2553,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .session_block { @@ -2553,6 +2561,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -2561,6 +2570,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -4530,7 +4540,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 700; font-size: 24px; @@ -4558,7 +4568,7 @@ - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 500; font-size: 16px; @@ -4585,6 +4595,7 @@ min-height: 10rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .description_block { @@ -4592,6 +4603,7 @@ min-height: 8rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .objectif_block { @@ -4599,6 +4611,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .session_block { @@ -4606,6 +4619,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -4614,6 +4628,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -6599,7 +6614,7 @@ width: 100%; height: 29px; - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 700; font-size: 24px; @@ -6627,7 +6642,7 @@ - font-family: 'Albert Sans'; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; font-style: normal; font-weight: 500; font-size: 16px; @@ -6654,6 +6669,7 @@ min-height: 10rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .description_block { @@ -6661,6 +6677,7 @@ min-height: 8rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .objectif_block { @@ -6668,6 +6685,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } .session_block { @@ -6675,6 +6693,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; } @@ -6683,6 +6702,7 @@ min-height: 5rem; overflow: auto; padding: 10px; + font-family: Roboto, Verdana, Georgia, Arial, 'Times New Roman'; }