recette2
cherif 2024-09-09 19:18:13 +02:00
parent e0e80bd13f
commit ee525aedac
3 changed files with 65 additions and 25 deletions

View File

@ -2282,7 +2282,14 @@ const DistplayPartnerTraningsPage = (props) => {
}}
>
{New_Get_List_Domaines_result && <DataGrid
{New_Get_List_Domaines_result &&
New_Get_List_Metiers_result &&
New_Get_List_Categorie_result &&
New_Get_List_Domaines_result.length > 0 &&
New_Get_List_Metiers_result.length > 0 &&
New_Get_List_Categorie_result.length > 0 &&
<DataGrid
checkboxSelection
onSelectionModelChange={(newSelectionModel) => {

View File

@ -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" && <div className="nom_prenom">
{parntername && <nav>
<b> {parntername}&nbsp;-&nbsp;{String(partnerPackService).toUpperCase()} ({parnternbformation})</b> &nbsp; &nbsp;
{conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
<StyledBadge badgeContent={conntected_employee_activite_retard} color="red" style={{ "cursor": "pointer" }}
{GetPartnerNameFromToken_api_result && conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
<StyledBadge_mysy_red badgeContent={String(parseFloat(conntected_employee_activite_retard))} style={{ "cursor": "pointer" }}
onClick={(event) => {
monactivite_func();
@ -1655,10 +1688,10 @@ const Partner = (props) => {
&nbsp; &nbsp;</a>
</StyledBadge>} &nbsp; &nbsp;
</StyledBadge_mysy_red>} &nbsp; &nbsp;
{conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 &&
<StyledBadge badgeContent={conntected_employee_activite_new} color="secondary" style={{ "cursor": "pointer" }}
{GetPartnerNameFromToken_api_result && conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 &&
<StyledBadge_mysy_color1 badgeContent={conntected_employee_activite_new} style={{ "cursor": "pointer" }}
onClick={(event) => {
monactivite_func();
@ -1667,7 +1700,7 @@ const Partner = (props) => {
<a data-tooltip-id="badge_tool_02" data-tooltip-html="Nouvelle(s) activité(s) pour vous">
&nbsp; &nbsp;</a>
</StyledBadge>}
</StyledBadge_mysy_color1>}
</nav>}
{!parntername && <b> Partenaire </b>} </div>}
@ -1676,8 +1709,8 @@ const Partner = (props) => {
{String(part_is_partner_admin_account) !== "1" && <div className="nom_prenom">
{parnter_user_employee}
{!parntername && <b> Utilisateur </b>} &nbsp; &nbsp;
{conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
<StyledBadge badgeContent={conntected_employee_activite_retard} color="red" style={{ "cursor": "pointer" }}
{GetPartnerNameFromToken_api_result && conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
<StyledBadge_mysy_red badgeContent={conntected_employee_activite_retard} style={{ "cursor": "pointer" }}
onClick={(event) => {
monactivite_func();
@ -1685,10 +1718,10 @@ const Partner = (props) => {
<Tooltip className="tooltip_css" id="badge_tool_03" style={{ "fontSize": "12px" }} />
<a data-tooltip-id="badge_tool_03" data-tooltip-html="Activité(s) en retard">
&nbsp; &nbsp;</a>
</StyledBadge>} &nbsp; &nbsp;
</StyledBadge_mysy_red>} &nbsp; &nbsp;
{conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 &&
<StyledBadge badgeContent={conntected_employee_activite_new} color="secondary" style={{ "cursor": "pointer" }}
{GetPartnerNameFromToken_api_result && conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 &&
<StyledBadge_mysy_color1 badgeContent={conntected_employee_activite_new} style={{ "cursor": "pointer" }}
onClick={(event) => {
monactivite_func();
@ -1697,7 +1730,7 @@ const Partner = (props) => {
<a data-tooltip-id="badge_tool_04" data-tooltip-html="Nouvelle(s) activité(s) pour vous">
&nbsp; &nbsp;</a>
</StyledBadge>}
</StyledBadge_mysy_color1>}
</div>}

View File

@ -1886,7 +1886,7 @@ const PartnerClientActivite = (props) => {
className="detail_activite">
<nav className="detail_header" recid={String(JSON.parse(item).recid)} > {String(JSON.parse(item).deadline)} : {String(JSON.parse(item).type)}</nav>
<nav recid={String(JSON.parse(item).recid)} > ttt
<nav recid={String(JSON.parse(item).recid)} >
{JSON.parse(item).employee_assigned_view_statut && String(JSON.parse(item).employee_assigned_view_statut) !== "1" &&
<nav style={{ marginRight: "10px", textAlign: "right" }}> <FiberNewIcon style={{ color: 'red', }} /> </nav>}