From 15be3f76a3dff1a36ab95f4618fa1c517b6291d1 Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 29 Jan 2023 20:40:24 +0100 Subject: [PATCH] 29/01/23 - 20h --- src/components/AddClassManual.js | 33 +++- src/components/DisplayDetailClass_new_v2.js | 50 ++++-- src/components/Formation.js | 11 +- src/components/Inscription_Information.js | 5 +- src/styles/components/_addclassmanual.scss | 7 + src/styles/components/_buttonhilight.scss | 27 +-- .../_displaydetailclass_new_v2.scss | 161 +++++++++++++++++- src/styles/components/_formation.scss | 6 +- .../components/_gestionadministrative.scss | 8 +- src/styles/components/_reherche_new.scss | 14 -- src/styles/components/_reherche_new_v2.scss | 75 ++++---- 11 files changed, 272 insertions(+), 125 deletions(-) diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 525b56d..f482340 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -131,6 +131,10 @@ const AddClassManual = (props) => { value: 'document', label: 'Document', }, + { + value: 'réalité virtuelle', + label: 'Réalité Virtuelle', + }, { value: 'mixte', label: 'Mixte', @@ -452,15 +456,18 @@ const AddClassManual = (props) => { } + + const [title_limite, settitle_limite] = useState(60); + const editorRef_description = useRef(null); - const [editorRef_description_limite, seteditorRef_description_limite] = useState(700); + const [editorRef_description_limite, seteditorRef_description_limite] = useState(1000); const editorRef_objectif = useRef(null); - const [editorRef_objectif_limite, seteditorRef_objectif] = useState(300); + const [editorRef_objectif_limite, seteditorRef_objectif] = useState(1000); const editorRef_programme = useRef(null); - const [editorRef_programme_limite, seteditorRef_programme] = useState(700); + const [editorRef_programme_limite, seteditorRef_programme] = useState(1000); const editorRef_prerequis = useRef(null); const editorRef_pourqui = useRef(null); @@ -473,6 +480,12 @@ const AddClassManual = (props) => { function RecordTraining(event) { var code = document.getElementsByName("external_code")[0].value; var title = document.getElementsByName("title")[0].value; + if (String(title).length > title_limite) { + alert(" Champ 'Titre', limite depassée !") + return; + } + + var trainer = document.getElementsByName("trainer")[0].value; var presentiel = document.getElementsByName("presentiel")[0].value; var distentiel = document.getElementsByName("distentiel")[0].value; @@ -649,6 +662,8 @@ const AddClassManual = (props) => { function DataUpdated() { setdatamodification("1"); + setimportmessage(); + } @@ -997,7 +1012,7 @@ const AddClassManual = (props) => { {
- { className="disabled_style" > {support_training_list.map((option) => ( - + {option.label}  
))} @@ -1335,7 +1350,7 @@ const AddClassManual = (props) => {
-
Description (max 700 caractères)
+
Description (max 1000 caractères)
editorRef_description.current = editor} initialValue={field_description} @@ -1368,7 +1383,7 @@ const AddClassManual = (props) => {
-
Objectif (max 300 caractères)
+
Objectif (max 1000 caractères)
editorRef_objectif.current = editor} initialValue={field_objectif} @@ -1399,7 +1414,7 @@ const AddClassManual = (props) => {
-
Programme (max 700 caractères)
+
Programme (max 1000 caractères)
editorRef_programme.current = editor} initialValue={field_programme} diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index f1ea59e..a11f45e 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -403,11 +403,20 @@ const DisplayDetailClass_new_v2 = (props) => { } else { /* gestions des mini */ - if (local_tmp < 1700) { - local_tmp = 1700; + if (local_tmp < 2200) { + local_tmp = 2200; } - if (main_h < 3500) { - main_h = 3500 + + if (local_tmp < 2300) { + local_tmp = 2300; + } + + + if (main_h < 3100) { + main_h = 3100 + } + if( main_h < 3200){ + main_h = 3200 } val = local_tmp + "px"; main_h_px = main_h + "px" @@ -1136,7 +1145,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- {DetailTraining["duration"]}   {DetailTraining["duration_unit"]} + {DetailTraining["duration"]}   {DetailTraining["duration_unit"]}(s)
@@ -1253,7 +1262,7 @@ const DisplayDetailClass_new_v2 = (props) => {
-
+
{parse(String(DetailTraining["description"]))}
@@ -1270,7 +1279,7 @@ const DisplayDetailClass_new_v2 = (props) => { Les Sessions
-
+
    @@ -1342,7 +1351,7 @@ const DisplayDetailClass_new_v2 = (props) => { Objectif
- {DetailTraining["objectif"] &&
+ {DetailTraining["objectif"] &&
{parse(String(DetailTraining["objectif"]))}
} @@ -1356,7 +1365,7 @@ const DisplayDetailClass_new_v2 = (props) => { Programme
- {DetailTraining["programme"] &&
+ {DetailTraining["programme"] &&
{parse(String(DetailTraining["programme"]))}
} @@ -1371,7 +1380,7 @@ const DisplayDetailClass_new_v2 = (props) => { Pour Qui ?
- {DetailTraining["pourqui"] &&
+ {DetailTraining["pourqui"] &&
{parse(String(DetailTraining["pourqui"]))}
} @@ -1688,8 +1697,9 @@ const DisplayDetailClass_new_v2 = (props) => {
Description
- {DetailTraining["description"] &&
+ {DetailTraining["description"] &&
{parse(String(DetailTraining["description"]))} +
} @@ -1701,7 +1711,7 @@ const DisplayDetailClass_new_v2 = (props) => { Les Sessions
-
+
    @@ -1773,30 +1783,34 @@ const DisplayDetailClass_new_v2 = (props) => {
    Objectif
    - {DetailTraining["objectif"] &&
    + {DetailTraining["objectif"] &&
    {parse(String(DetailTraining["objectif"]))} +
    }
    -
    +
    Programme
    - {DetailTraining["programme"] &&
    + {DetailTraining["programme"] &&
    {parse(String(DetailTraining["programme"]))} +
    }
    {DetailTraining["pourqui"] &&
    -
    +
    Pour Qui ?
    - {DetailTraining["pourqui"] &&
    + {DetailTraining["pourqui"] &&
    {parse(String(DetailTraining["pourqui"]))} + +
    }
    } @@ -1872,7 +1886,7 @@ const DisplayDetailClass_new_v2 = (props) => {
    - {DetailTraining["duration"]}   {DetailTraining["duration_unit"]} + {DetailTraining["duration"]}   {DetailTraining["duration_unit"]}(s)
    diff --git a/src/components/Formation.js b/src/components/Formation.js index 75ac336..f06e0a2 100644 --- a/src/components/Formation.js +++ b/src/components/Formation.js @@ -288,6 +288,7 @@ const Formation = (props) => {
    + {props.formation.cpf && String(props.formation.cpf) === String("1") &&
    OUI Éligible au CPF   @@ -311,7 +312,7 @@ const Formation = (props) => {

    - {parse(String(props.formation.title).replace(/(<([^>]+)>)/ig, ''))} + {String(parse(String(props.formation.title).replace(/(<([^>]+)>)/ig, ''))).substring(0, 60)}

    @@ -361,18 +362,18 @@ const Formation = (props) => { {String(props.formation.duration_unit) === "heure" &&
    - {props.formation.duration} hr   + {props.formation.duration} hr(s)  
    } {String(props.formation.duration_unit) === "heures" &&
    - {props.formation.duration} hr   + {props.formation.duration} hr(s)  
    } {String(props.formation.duration_unit) === "jour" &&
    - {props.formation.duration} jr   + {props.formation.duration} jr(s)  
    }
    @@ -385,7 +386,7 @@ const Formation = (props) => {
    {props.formation.duration &&
    - {props.formation.duration} jrs   + {props.formation.duration} jr(s)  
    } {!props.formation.duration &&
    diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js index c1d34e6..b21e3bd 100644 --- a/src/components/Inscription_Information.js +++ b/src/components/Inscription_Information.js @@ -461,7 +461,10 @@ function Inscription_Information(props) { } - var employeur = valemployeur_info; + var employeur = "" + if( valemployeur_info ){ + employeur = valemployeur_info; + } var message = ""; diff --git a/src/styles/components/_addclassmanual.scss b/src/styles/components/_addclassmanual.scss index 25da55c..d2298b0 100644 --- a/src/styles/components/_addclassmanual.scss +++ b/src/styles/components/_addclassmanual.scss @@ -1,4 +1,7 @@ .addclassmanual { + + + .tox-statusbar__branding { display: none !important; } @@ -1572,4 +1575,8 @@ } .mce-content-body{ line-height: 1.2rem !important; +} + +.css-6hp17o-MuiList-root-MuiMenu-list{ + width: 10%; } \ No newline at end of file diff --git a/src/styles/components/_buttonhilight.scss b/src/styles/components/_buttonhilight.scss index dc1c296..91ab15e 100644 --- a/src/styles/components/_buttonhilight.scss +++ b/src/styles/components/_buttonhilight.scss @@ -638,13 +638,14 @@ color: black; letter-spacing: 2px; margin: 10px; + background-image: none; } .bton_menu:hover { color: black; letter-spacing: 3px; background: white; - //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); + background-image: none; } @@ -737,22 +738,6 @@ } -.bton_menu_old { - background-color: black; - width: 100%; - border: 0px; - text-align: left; - color: white; - letter-spacing: 0.1rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} - -.bton_menu_old:hover { - color: white; - letter-spacing: 0.2rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} - .bton_menu { background-color: white; @@ -762,17 +747,15 @@ color: black; letter-spacing: 2px; margin: 10px; - //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); + background-image: none; } .bton_menu:hover { //color: white; letter-spacing: 3px; background-color: whitesmoke; - //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); + background-image: none; + color: black; } -.MuiPaper-rounded { - top: 20px !important; -} \ No newline at end of file diff --git a/src/styles/components/_displaydetailclass_new_v2.scss b/src/styles/components/_displaydetailclass_new_v2.scss index 433fbd6..2b5ec19 100644 --- a/src/styles/components/_displaydetailclass_new_v2.scss +++ b/src/styles/components/_displaydetailclass_new_v2.scss @@ -953,7 +953,7 @@ position: absolute; width: 96%; - height: 1425px; + //height: 1425px; left: 2%; top: 3100px; } @@ -969,7 +969,7 @@ width: 90%; margin-left: 5%; - height: 1329px; + //height: 1329px; /* Inside auto layout */ @@ -1011,7 +1011,7 @@ gap: 16px; width: 100%; - height: 1199px; + //height: 1199px; /* Inside auto layout */ @@ -1423,6 +1423,42 @@ border-bottom-right-radius: 0px; width: 99%; } + .programme_block{ + max-height: 18rem; + min-height: 10rem; + overflow: auto; + padding: 10px; + } + + .description_block{ + max-height: 13rem; + min-height: 8rem; + overflow: auto; + padding: 10px; + } + + .objectif_block{ + max-height: 11rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + .session_block{ + max-height: 10rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + + .pourqui_block{ + max-height: 7rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -2428,6 +2464,41 @@ align-self: stretch; flex-grow: 0; } + .programme_block{ + max-height: 18rem; + min-height: 10rem; + overflow: auto; + padding: 10px; + } + + .description_block{ + max-height: 13rem; + min-height: 8rem; + overflow: auto; + padding: 10px; + } + + .objectif_block{ + max-height: 11rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + .session_block{ + max-height: 10rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + + .pourqui_block{ + max-height: 7rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } .block_sticky_info { @@ -4289,7 +4360,7 @@ padding: 5px; gap: 5px; - width: 95%; + width: 98%; //height: 165px; /* White */ @@ -4320,7 +4391,7 @@ padding: 5px; gap: 5px; - width: 95%; + width: 98%; //height: 165px; /* White */ @@ -4369,7 +4440,7 @@ } .block_info_page_pave_title_desc_desc { - width: 100%; + width: 98%; //height: 72px; @@ -4396,6 +4467,42 @@ flex-grow: 0; } + .programme_block{ + max-height: 18rem; + min-height: 10rem; + overflow: auto; + padding: 10px; + } + + .description_block{ + max-height: 13rem; + min-height: 8rem; + overflow: auto; + padding: 10px; + } + + .objectif_block{ + max-height: 11rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + .session_block{ + max-height: 10rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + + .pourqui_block{ + max-height: 7rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + .block_sticky_info { /* Sticky Infos */ @@ -6272,7 +6379,7 @@ padding: 5px; gap: 5px; - width: 95%; + width: 100%; //height: 165px; /* White */ @@ -6303,7 +6410,7 @@ padding: 5px; gap: 5px; - width: 95%; + width: 100%; //height: 165px; /* White */ @@ -6379,6 +6486,44 @@ flex-grow: 0; } + .programme_block{ + max-height: 18rem; + min-height: 10rem; + overflow: auto; + padding: 10px; + } + + .description_block{ + max-height: 13rem; + min-height: 8rem; + overflow: auto; + padding: 10px; + } + + .objectif_block{ + max-height: 11rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + .session_block{ + max-height: 10rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + + .pourqui_block{ + max-height: 7rem; + min-height: 5rem; + overflow: auto; + padding: 10px; + } + + + .block_sticky_info { /* Sticky Infos */ diff --git a/src/styles/components/_formation.scss b/src/styles/components/_formation.scss index 62e919f..8767e62 100644 --- a/src/styles/components/_formation.scss +++ b/src/styles/components/_formation.scss @@ -217,6 +217,7 @@ flex: none; order: 1; flex-grow: 0; + text-transform: uppercase; } .training_price { @@ -614,6 +615,7 @@ flex: none; order: 1; flex-grow: 0; + text-transform: uppercase; } .training_price { @@ -961,6 +963,7 @@ flex: none; order: 1; flex-grow: 0; + text-transform: uppercase; } .training_price { @@ -1303,7 +1306,7 @@ font-weight: 700; font-size: 20px; line-height: 25px; - /* identical to box height */ + /* identical to box height */ font-feature-settings: 'liga' off; @@ -1317,6 +1320,7 @@ flex: none; order: 1; flex-grow: 0; + text-transform: uppercase; } .training_price { diff --git a/src/styles/components/_gestionadministrative.scss b/src/styles/components/_gestionadministrative.scss index b492f5f..8b8cbfc 100644 --- a/src/styles/components/_gestionadministrative.scss +++ b/src/styles/components/_gestionadministrative.scss @@ -84,7 +84,7 @@ margin-right: 1rem; padding: 0.3rem; margin-bottom: 0.5rem; - width: 10rem; + width: 10.5rem; text-align: center; border: 1px solid #9cf; color: #3b3e40; @@ -305,7 +305,7 @@ margin-right: 1rem; padding: 0.3rem; margin-bottom: 0.5rem; - width: 10rem; + width: 10.5rem; text-align: center; border: 1px solid #9cf; color: #3b3e40; @@ -531,7 +531,7 @@ margin-right: 1rem; padding: 0.3rem; margin-bottom: 0.5rem; - width: 10rem; + width: 11rem; text-align: center; border: 1px solid #9cf; color: #3b3e40; @@ -758,7 +758,7 @@ margin-right: 1rem; padding: 0.3rem; margin-bottom: 0.5rem; - width: 10rem; + width: 11rem; text-align: center; border: 1px solid #9cf; color: #3b3e40; diff --git a/src/styles/components/_reherche_new.scss b/src/styles/components/_reherche_new.scss index e89d5a9..8a8981f 100644 --- a/src/styles/components/_reherche_new.scss +++ b/src/styles/components/_reherche_new.scss @@ -3948,21 +3948,7 @@ border-radius: 0px !important; } -.bton_menu { - background-color: black; - width: 100%; - border: 0px; - text-align: left; - color: white; - letter-spacing: 0.1rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} -.bton_menu:hover { - color: white; - letter-spacing: 0.2rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} .iSfofc { width: 90% !important; diff --git a/src/styles/components/_reherche_new_v2.scss b/src/styles/components/_reherche_new_v2.scss index 4a7c2f1..6bac8af 100644 --- a/src/styles/components/_reherche_new_v2.scss +++ b/src/styles/components/_reherche_new_v2.scss @@ -898,7 +898,7 @@ .title1 { position: absolute; - + height: 120px; font-family: "Albert Sans"; font-style: normal; @@ -1771,7 +1771,7 @@ border: #0A043C solid; width: 24px; height: 24px; -cursor: pointer; + cursor: pointer; /* Inside auto layout */ @@ -4494,7 +4494,7 @@ cursor: pointer; width: 24px; height: 24px; -cursor: pointer; + cursor: pointer; /* Inside auto layout */ flex: none; @@ -7353,7 +7353,7 @@ cursor: pointer; width: 24px; height: 24px; -cursor: pointer; + cursor: pointer; /* Inside auto layout */ flex: none; @@ -10212,7 +10212,7 @@ cursor: pointer; width: 24px; height: 24px; -cursor: pointer; + cursor: pointer; /* Inside auto layout */ flex: none; @@ -13087,7 +13087,7 @@ cursor: pointer; border: #0A043C solid; width: 24px; height: 24px; -cursor: pointer; + cursor: pointer; /* Inside auto layout */ @@ -13784,6 +13784,30 @@ cursor: pointer; background: transparent; width: 5rem; } + + .MuiPaper-rounded { + top: 60px !important; + } + + .bton_menu_v2 { + background-color: white; + width: 100%; + border: 0px; + text-align: left; + color: black; + letter-spacing: 2px; + margin: 10px; + //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); + } + + .bton_menu_v2:hover { + //color: white; + letter-spacing: 3px; + //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); + } + + + } .header_img_logo22 { @@ -13833,38 +13857,7 @@ cursor: pointer; border-radius: 0px !important; } -.bton_menu { - background-color: black; - width: 100%; - border: 0px; - text-align: left; - color: white; - letter-spacing: 0.1rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} -.bton_menu:hover { - color: white; - letter-spacing: 0.2rem; - background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} - -.bton_menu_v2 { - background-color: white; - width: 100%; - border: 0px; - text-align: left; - color: black; - letter-spacing: 2px; - margin: 10px; - //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} - -.bton_menu_v2:hover { - //color: white; - letter-spacing: 3px; - //background-image: url("../../mysy_img/MYSY-banner-compte_v2.png"); -} @@ -13885,14 +13878,10 @@ cursor: pointer; background: white !important; } -.MuiMenu-paper{ +.MuiMenu-paper { border-radius: 10px !important; } -.MuiListItem-button{ +.MuiListItem-button { background: white !important; -} - -.MuiPaper-rounded{ - top: 60px !important; } \ No newline at end of file