From ee525aedac4bbe2e4124a71a77464e16091e17c6 Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 9 Sep 2024 19:18:13 +0200 Subject: [PATCH] ssd --- .../DisplayPartnerTrainingsPagination.js | 9 ++- src/components/Partner.js | 79 +++++++++++++------ src/components/PartnerClient_Activite.js | 2 +- 3 files changed, 65 insertions(+), 25 deletions(-) diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 6d8b9a5..3887220 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -2282,7 +2282,14 @@ const DistplayPartnerTraningsPage = (props) => { }} > - {New_Get_List_Domaines_result && 0 && + New_Get_List_Metiers_result.length > 0 && + New_Get_List_Categorie_result.length > 0 && + + { diff --git a/src/components/Partner.js b/src/components/Partner.js index 80a3047..8babc25 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -130,14 +130,7 @@ import { styled } from '@mui/material/styles'; import IconButton from '@mui/material/IconButton'; import ShoppingCartIcon from '@mui/icons-material/ShoppingCart'; -const StyledBadge = styled(Badge)(({ theme }) => ({ - '& .MuiBadge-badge': { - right: 0, - top: 0, - border: `2px solid ${theme.palette.background.paper}`, - padding: '0 4px', - }, -})); + const Partner = (props) => { @@ -197,6 +190,40 @@ const Partner = (props) => { }, }); + const StyledBadge = styled(Badge)(({ theme }) => ({ + '& .MuiBadge-badge': { + right: 0, + top: 0, + border: `2px solid ${theme.palette.background.paper}`, + padding: '0 4px', + }, + })); + + + const StyledBadge_mysy_color1 = styled(Badge)(({ }) => ({ + '& .MuiBadge-badge': { + right: 0, + top: 0, + border: '2px solid #ffffff', + padding: '0 4px', + background:'#6a329f', + color:"#ffffff" + }, + })); + + + const StyledBadge_mysy_red = styled(Badge)(({ }) => ({ + '& .MuiBadge-badge': { + right: 0, + top: 0, + border: '2px solid ', + padding: '0 4px', + background:'#f44336', + color:"#ffffff", + }, + })); + + // Constante permet de savoir a fonction du menu on a faire const [menu, setmenu] = useState(); @@ -1215,11 +1242,15 @@ const Partner = (props) => { const [formation_initiale, setformation_initiale] = useState(""); const [document_super_admin, setdocument_super_admin] = useState(""); - const [conntected_employee_activite_retard, setconntected_employee_activite_retard] = useState(""); + const [conntected_employee_activite_retard, setconntected_employee_activite_retard] = useState("0"); const [conntected_employee_activite_new, setconntected_employee_activite_new] = useState(""); const [conntected_employee_email, setconntected_employee_email] = useState(""); const [conntected_employee_id, setconntected_employee_id] = useState(""); + + + const [GetPartnerNameFromToken_api_result, setGetPartnerNameFromToken_api_result] = useState(); + function GetPartnerNameFromToken(event) { var form = new FormData(); @@ -1232,8 +1263,9 @@ const Partner = (props) => { axios.post(myurl, form).then(res => { if (String(res.data.status) === String("true")) { + setGetPartnerNameFromToken_api_result(true); //console.log(" In GetPartnerNameFromToken res.data.status = " + res.data.status); - // console.log(" In GetPartnerNameFromToken res.data.message = " + res.data.message); + //console.log(" In GetPartnerNameFromToken res.data.message = " + res.data.message); setparntername(JSON.parse(res.data.message).nom); setconntected_employee_email(JSON.parse(res.data.message).email); @@ -1241,7 +1273,7 @@ const Partner = (props) => { if (JSON.parse(res.data.message).nb_activite_retard) setconntected_employee_activite_retard(JSON.parse(res.data.message).nb_activite_retard) else - setconntected_employee_activite_retard("") + setconntected_employee_activite_retard("0") if (JSON.parse(res.data.message).nb_activite_new) @@ -1643,8 +1675,9 @@ const Partner = (props) => { {String(part_is_partner_admin_account) === "1" &&
{parntername && } {!parntername && Partenaire }
} @@ -1676,8 +1709,8 @@ const Partner = (props) => { {String(part_is_partner_admin_account) !== "1" &&
{parnter_user_employee} {!parntername && Utilisateur }     - {conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 && - 0 && + { monactivite_func(); @@ -1685,10 +1718,10 @@ const Partner = (props) => {     - }     + }     - {conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 && - 0 && + { monactivite_func(); @@ -1697,7 +1730,7 @@ const Partner = (props) => {     - } + }
} diff --git a/src/components/PartnerClient_Activite.js b/src/components/PartnerClient_Activite.js index d8f2b44..b104ca7 100644 --- a/src/components/PartnerClient_Activite.js +++ b/src/components/PartnerClient_Activite.js @@ -1886,7 +1886,7 @@ const PartnerClientActivite = (props) => { className="detail_activite"> -