From cc89db7888e2d10bc9996858d441926a4d574545 Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 20 May 2024 21:28:57 +0200 Subject: [PATCH] 20/05/2024 - 22h00 --- src/components/AddClassManual.js | 14 +++++++++----- src/components/Notes_Evaluation.js | 12 ++++++------ src/components/Partner.js | 14 +++++++------- src/styles/components/_partner.scss | 3 ++- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 6791fa6..46d267d 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -2368,15 +2368,19 @@ const AddClassManual = (props) => { //console.log(" getClassImage : In test res.data.status = " + res.data.status); //console.log(" getClassImage: res.data.message.img = " + res.data.message); - if (res.data.message.img.length > 0) { + if (res.data.message && res.data.message.img && res.data.message.img.length > 0) { setisclassimage("True"); + + setisclassimage(res.data.message.img); + var ch_img = "data:image/png;base64," + res.data.message.img; + setuserimgclassprofil(ch_img); + } else { setisclassimage("False"); + setuserimgclassprofil(); } - setisclassimage(res.data.message.img); - var ch_img = "data:image/png;base64," + res.data.message.img; - setuserimgclassprofil(ch_img); + } else { //console.log(" In Erreur res.data.status = " + res.data.status); @@ -3758,7 +3762,7 @@ const AddClassManual = (props) => { - + diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js index d8ca31b..bd724b1 100644 --- a/src/components/Notes_Evaluation.js +++ b/src/components/Notes_Evaluation.js @@ -3143,7 +3143,7 @@ const Notes_Evaluation = (props) => { -
Formation bbb
+
Formation
{New_Getall_Partner_Class_Reduice_Fields_result && New_Getall_Partner_Class_Reduice_Fields_result.length > 0 && {
-
Classe bbb
+
Classe
{New_Getall_Partner_Session_Reduice_Fields_result && New_Getall_Partner_Session_Reduice_Fields_result.length > 0 && { -
Unite D'enseignement bbbb
+
Unite D'enseignement
{New_Getall_Partner_List_UE_result && New_Getall_Partner_List_UE_result.length > 0 && { -
Formation aaaa
+
Formation
{New_Getall_Partner_Class_Reduice_Fields_result && New_Getall_Partner_Class_Reduice_Fields_result.length > 0 && {
-
Classe aaaa
+
Classe
{New_Getall_Partner_Session_Reduice_Fields_result && New_Getall_Partner_Session_Reduice_Fields_result.length > 0 && {
-
Unite D'enseignement aaaa
+
Unite D'enseignement
{New_Get_List_UE_From_Class_Id_result && { form.append("type", "partner"); axios.post(myurl, form).then(res => { + console.log(" getImage : In test res.data.status = " + res.data.status); + //console.log(" getImage: res.data.message.img = " + res.data.message); if (String(res.data.status) === "true") { - //console.log(" getImage : In test res.data.status = " + res.data.status); - //console.log(" getImage: res.data.message.img = " + res.data.message); - if (res.data.message.img.length > 0) { + if (res.data.message && res.data.message.img && res.data.message.img.length > 0) { setisimage("True"); } else { @@ -1530,8 +1530,8 @@ const Partner = (props) => { {String(menu) !== "affichage" && }> CATALOGUE } {String(menu) === "affichage" && }> CATALOGUE } - {String(menu) !== "mes_ue" && }> UNIT. ENSEI. } - {String(menu) === "mes_ue" && }> UNIT. ENSEI. } + {String(formation_initiale) === "1" && String(menu) !== "mes_ue" && }> UNIT. ENSEI. } + {String(formation_initiale) === "1" && String(menu) === "mes_ue" && }> UNIT. ENSEI. } {String(menu) !== "domaine_categorie_metier" && }> CARACTERISTIQUES } {String(menu) === "domaine_categorie_metier" && }> CARACTERISTIQUES } @@ -1556,9 +1556,9 @@ const Partner = (props) => { {String(formation_initiale) === "1" &&
- + {String(menu) !== "note_evaluation" &&    NOTES & EVALUATIONS } - {String(menu) === "note_evaluation" &&   NOTES & EVALUATIONS } + {String(menu) === "note_evaluation" &&   NOTES & EVALUATIONS }
} diff --git a/src/styles/components/_partner.scss b/src/styles/components/_partner.scss index 872aee2..a2deea2 100644 --- a/src/styles/components/_partner.scss +++ b/src/styles/components/_partner.scss @@ -2054,7 +2054,8 @@ padding-bottom: 5px; cursor: pointer; font-weight: 400; - font-size: 14px; + font-size: 14px !important; + color: white !important; } .ps-menu-button{