diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js
index 18e2325..56f21d9 100644
--- a/src/components/AddPartnerClient.js
+++ b/src/components/AddPartnerClient.js
@@ -4654,7 +4654,8 @@ const AddParnerClient = (props) => {
{String(submenu).trim() === "submenu_activite" &&
- < PartnerClientActivite email={p_client_email} conntected_employee_id={props.conntected_employee_id} />
+
}
{String(submenu).trim() === "submenu_piece_jointe" &&
diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js
index a4bca06..3747ac1 100644
--- a/src/components/Crm_Opportunite.js
+++ b/src/components/Crm_Opportunite.js
@@ -527,9 +527,7 @@ const CRM_Opportunite = (props) => {
local_opport_chanel_label[String(local_opport_chanel[i])] = temp_val[0].toUpperCase() + temp_val.slice(1);
}
-
setOpportunite_chanel_label(local_opport_chanel_label);
-
}
else {
setGetall_Partner_CRM_Opport_Step_api("false");
@@ -1358,6 +1356,8 @@ const CRM_Opportunite = (props) => {
// MySy Comment : quand on change la position d'une tache, dans cette fonction on appel l'api de mise à jour
const changeTaskStatus = useCallback(
(id, status) => {
+
+
let task = tasks.find(task => task._id === id);
const taskIndex = tasks.indexOf(task);
task = { ...task, status };
@@ -1958,7 +1958,7 @@ const CRM_Opportunite = (props) => {
-
+ {selected_id && String(selected_id).length > 2 &&
-
+
}
diff --git a/src/components/DisplayPartnerUnite_Enseignement.js b/src/components/DisplayPartnerUnite_Enseignement.js
index 8591bf0..cd6102a 100644
--- a/src/components/DisplayPartnerUnite_Enseignement.js
+++ b/src/components/DisplayPartnerUnite_Enseignement.js
@@ -4057,7 +4057,7 @@ const DisplayPartnerUnite_Enseignement = (props) => {
-
diff --git a/src/components/Module_Activite.js b/src/components/Module_Activite.js
index 0fc1a6a..546b03d 100644
--- a/src/components/Module_Activite.js
+++ b/src/components/Module_Activite.js
@@ -191,49 +191,51 @@ const Module_Activite = (props) => {
}
- // Recuperation des activités du client d'un partner
- const [Get_List_Activite_Of_client_Part_api, setGet_List_Activite_Of_client_Part_api] = useState();
- const [Get_List_Activite_Of_client_Part_message, setGet_List_Activite_Of_client_Part_message] = useState();
- const [Get_List_Activite_Of_client_Part_result, setGet_List_Activite_Of_client_Part_result] = useState();
- function Get_List_Activite_Of_client_Part(event) {
-
- var form = new FormData();
- const stored_cookie = getCookie('tokenmysypart');
- const related_collection = "partner_client"
-
-
- form.append("token", stored_cookie);
- form.append("related_collection", related_collection);
- form.append("related_collection_owner_email", props.email);
-
-
- var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Entity_Activite/";
-
- axios.post(myurl, form).then(res => {
- //console.log(" In Get_List_Activite_Of_client_Part res.data.status = " + res.data.status);
- //console.log(" In Get_List_Activite_Of_client_Part res.data.message r_class = " + res.data.message);
-
- if (String(res.data.status) === String("true")) {
- setGet_List_Activite_Of_client_Part_api("true");
- setGet_List_Activite_Of_client_Part_result(res.data.message);
-
- }
- else if (String(res.data.status) === String("Err_Connexion")) {
- alert('Erreur: ' + res.data.message);
- history.push("/Connexion");
- }
- else {
- setGet_List_Activite_Of_client_Part_api("false");
- setGet_List_Activite_Of_client_Part_message(res.data.message);
- }
-
- }).catch((error) => {
- console.warn('Not good man :( Get_List_Activite_Of_client_Part = ', error);
+ const [nb_activite_en_retard, setnb_activite_en_retard] = useState("");
+
+ // Recuperation des activités du client d'un partner
+ const [Get_List_Activite_Of_client_Part_api, setGet_List_Activite_Of_client_Part_api] = useState();
+ const [Get_List_Activite_Of_client_Part_message, setGet_List_Activite_Of_client_Part_message] = useState();
+ const [Get_List_Activite_Of_client_Part_result, setGet_List_Activite_Of_client_Part_result] = useState();
+ function Get_List_Activite_Of_client_Part(event) {
+
+ var form = new FormData();
+ const stored_cookie = getCookie('tokenmysypart');
+ const related_collection = "partner_client"
+
+
+ form.append("token", stored_cookie);
+ form.append("related_collection", related_collection);
+ form.append("related_collection_owner_email", props.email);
+
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Entity_Activite/";
+
+ axios.post(myurl, form).then(res => {
+ //console.log(" In Get_List_Activite_Of_client_Part res.data.status = " + res.data.status);
+ //console.log(" In Get_List_Activite_Of_client_Part res.data.message r_class = " + res.data.message);
+
+ if (String(res.data.status) === String("true")) {
+ setGet_List_Activite_Of_client_Part_api("true");
+ setGet_List_Activite_Of_client_Part_result(res.data.message);
+ setnb_activite_en_retard(res.data.nb_activite_en_retard);
+ }
+ else if (String(res.data.status) === String("Err_Connexion")) {
+ alert('Erreur: ' + res.data.message);
+ history.push("/Connexion");
+ }
+ else {
setGet_List_Activite_Of_client_Part_api("false");
- //setmyApimyApiMessage("")
- })
- }
-
+ setGet_List_Activite_Of_client_Part_message(res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( Get_List_Activite_Of_client_Part = ', error);
+ setGet_List_Activite_Of_client_Part_api("false");
+ //setmyApimyApiMessage("")
+ })
+ }
+
useEffect(() => {
diff --git a/src/components/Partner.js b/src/components/Partner.js
index fe39a92..a4b7937 100644
--- a/src/components/Partner.js
+++ b/src/components/Partner.js
@@ -125,6 +125,21 @@ import Partner_Product_Service from "./Partner_Product_Service";
import Module_Email_Management from "./Module_Email_Management";
import ForwardToInboxIcon from '@mui/icons-material/ForwardToInbox';
+import Badge from '@mui/material/Badge';
+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) => {
const { commingmenu, commingpack } = useParams();
const [myApiResponse, setmyApiResponse] = useState("");
@@ -525,7 +540,7 @@ const Partner = (props) => {
setmenu("monactivite");
setapiexcelimportmessage();
setformation_file_name();
- history.push("/Partner/infopartner");
+ history.push("/Partner/monactivite");
document.body.style.backgroundColor = "#ffffff";
inactive_active_menu_header("monactivite");
@@ -1200,6 +1215,8 @@ 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_email, setconntected_employee_email] = useState("");
const [conntected_employee_id, setconntected_employee_id] = useState("");
function GetPartnerNameFromToken(event) {
@@ -1217,6 +1234,13 @@ const Partner = (props) => {
//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);
+
+ 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("")
+
if (JSON.parse(res.data.message).pack_service) {
@@ -1495,6 +1519,10 @@ const Partner = (props) => {
}
+ function update_nb_activite_en_retard(new_val) {
+ setconntected_employee_activite_retard(String(new_val));
+ }
+
return (
@@ -1591,6 +1619,7 @@ const Partner = (props) => {
+
}
{isimgSelected &&
@@ -1598,12 +1627,30 @@ const Partner = (props) => {
}
- {String(part_is_partner_admin_account) === "1" && {parntername &&
{parntername} - {String(partnerPackService).toUpperCase()} ({parnternbformation})}
+ {String(part_is_partner_admin_account) === "1" &&
+ {parntername && }
{!parntername && Partenaire }
}
- {String(part_is_partner_admin_account) !== "1" &&
{parnter_user_employee}
- {!parntername && Utilisateur }
}
+ {String(part_is_partner_admin_account) !== "1" &&
+ {parnter_user_employee}
+ {!parntername && Utilisateur }
+ {conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
+ {
+ monactivite_func();
+
+ }}>}
+
}
{String(formation_initiale) === "1" &&
Ftion Initiale
@@ -1615,6 +1662,8 @@ const Partner = (props) => {