diff --git a/src/components/Partner.js b/src/components/Partner.js
index a4b7937..762aa3e 100644
--- a/src/components/Partner.js
+++ b/src/components/Partner.js
@@ -1216,6 +1216,8 @@ const Partner = (props) => {
const [document_super_admin, setdocument_super_admin] = useState("");
const [conntected_employee_activite_retard, setconntected_employee_activite_retard] = useState("");
+ 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("");
function GetPartnerNameFromToken(event) {
@@ -1231,7 +1233,7 @@ const Partner = (props) => {
axios.post(myurl, form).then(res => {
if (String(res.data.status) === String("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);
@@ -1242,6 +1244,12 @@ const Partner = (props) => {
setconntected_employee_activite_retard("")
+ if (JSON.parse(res.data.message).nb_activite_new)
+ setconntected_employee_activite_new(JSON.parse(res.data.message).nb_activite_new)
+ else
+ setconntected_employee_activite_new("")
+
+
if (JSON.parse(res.data.message).pack_service) {
setpartnerPackService(JSON.parse(res.data.message).pack_service);
@@ -1523,6 +1531,11 @@ const Partner = (props) => {
setconntected_employee_activite_retard(String(new_val));
}
+ function update_nb_activite_en_new(new_val) {
+ setconntected_employee_activite_new(String(new_val));
+ }
+
+
return (
Ftion Initiale
@@ -2411,7 +2460,10 @@ const Partner = (props) => {
{String(menu) === "monactivite" &&
+ email={conntected_employee_email} related_collection={"partnair_account"} update_nb_activite_en_retard={update_nb_activite_en_retard}
+ update_nb_activite_en_new={update_nb_activite_en_new}
+
+ />
}
diff --git a/src/components/PartnerClient_Activite.js b/src/components/PartnerClient_Activite.js
index 921d0b2..a2488ce 100644
--- a/src/components/PartnerClient_Activite.js
+++ b/src/components/PartnerClient_Activite.js
@@ -36,6 +36,8 @@ import fileDownload from 'js-file-download'
import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5";
import { AiOutlineUserAdd } from "react-icons/ai";
+import FiberNewIcon from '@mui/icons-material/FiberNew';
+
import Timeline from '@mui/lab/Timeline';
import TimelineItem from '@mui/lab/TimelineItem';
import TimelineSeparator from '@mui/lab/TimelineSeparator';
@@ -248,7 +250,7 @@ const PartnerClientActivite = (props) => {
const [p_activite_deadline_label, setp_activite_deadline_label] = useState("");
const [p_activite_type, setp_activite_type] = useState("");
- const [p_activite_status, setp_activite_status] = useState("");
+ const [p_activite_status, setp_activite_status] = useState("0");
const [p_activite_status_label, setp_activite_status_label] = useState("");
const [p_activite_employee_assigned_id, setp_activite_employee_assigned_id] = useState(props.conntected_employee_id);
const [p_activite_employee_assigned_nom_prenom, setp_activite_employee_assigned_nom_prenom] = useState();
@@ -257,6 +259,7 @@ const PartnerClientActivite = (props) => {
const [nb_activite_en_retard, setnb_activite_en_retard] = useState("");
+ const [nb_activite_new, setnb_activite_new] = 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();
@@ -284,8 +287,12 @@ const PartnerClientActivite = (props) => {
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);
+ setnb_activite_new(res.data.nb_new_activite_assigned_to_me);
+
props.update_nb_activite_en_retard(res.data.nb_activite_en_retard);
+ props.update_nb_activite_en_new(res.data.nb_new_activite_assigned_to_me);
+
var new_data2 = [];
const new_data = res.data.message.map((x) => {
@@ -360,7 +367,7 @@ const PartnerClientActivite = (props) => {
axios.post(myurl, form).then(res => {
//console.log(" In Get_List_Activite_Assign_To_Me res.data.status = " + res.data.status);
- //console.log(" In Get_List_Activite_Assign_To_Me res.data.message r_class = " + res.data.message);
+ console.log(" In Get_List_Activite_Assign_To_Me res.data.message r_class = " + res.data.message);
if (String(res.data.status) === String("true")) {
setGet_List_Activite_Assign_To_Me_api("true");
@@ -400,7 +407,7 @@ const PartnerClientActivite = (props) => {
const [Getall_Training_Employee_No_Filter_api, setGetall_Training_Employee_No_Filter_api] = useState();
const [Getall_Training_Employee_No_Filter_message, setGetall_Training_Employee_No_Filter_message] = useState();
- const [Getall_Training_Employee_No_Filter_result, setGetall_Training_Employee_No_Filter_result] = useState();
+ const [Getall_Training_Employee_No_Filter_result, setGetall_Training_Employee_No_Filter_result] = useState([]);
function Getall_Training_Employee_No_Filter(event) {
var form = new FormData();
@@ -696,8 +703,19 @@ const PartnerClientActivite = (props) => {
else
form.append("detail", "");
+
+ var new_dead_line_format = "";
+
+ if (typeof p_activite_deadline == "object") {
+ var act_deadline = format(p_activite_deadline, 'dd/MM/yyyy');
+ new_dead_line_format = act_deadline;
+ } else {
+ new_dead_line_format = p_activite_deadline;
+ }
+
+
if (p_activite_deadline)
- form.append("deadline", p_activite_deadline);
+ form.append("deadline", new_dead_line_format);
if (p_activite_type)
form.append("type", p_activite_type);
@@ -901,10 +919,11 @@ const PartnerClientActivite = (props) => {
axios.post(myurl, form).then(res => {
if (String(res.data.status) === String("true")) {
//console.log(" In Display_Given_Activite_From_Activite_Recid res.data.status = " + res.data.status);
- //console.log(" In Display_Given_Activite_From_Activite_Recid res.data.message = " + res.data.message);
+ // console.log(" In Display_Given_Activite_From_Activite_Recid res.data.message = " + res.data.message);
setDisplay_Given_Activite_From_Activite_Recid_api("true");
setDisplay_Given_Activite_From_Activite_Recid_result(res.data.message);
+ props.update_nb_activite_en_new(res.data.nb_new_activite_assigned_to_me);
var mylocalclient_activite = JSON.parse(res.data.message);
@@ -967,6 +986,12 @@ const PartnerClientActivite = (props) => {
setcurrent_activite_recid(mylocalclient_activite.recid);
else
setcurrent_activite_recid("");
+
+
+
+ // Apres avoir ouvert l'activité, on va rafraichir l'affichage de a liste des activitées qui me sont assignée
+ // ceci pour actualiser le statut "employee_assigned_view_statut"
+ Get_List_Activite_Assign_To_Me();
}
@@ -1075,7 +1100,7 @@ const PartnerClientActivite = (props) => {
setp_activite_detail("");
setp_activite_deadline(new Date());
setp_activite_type("");
- setp_activite_status("");
+ setp_activite_status("0");
setp_activite_status_label("");
setp_activite_detail("");
@@ -1545,6 +1570,7 @@ const PartnerClientActivite = (props) => {
+ {/*
Activité(s) qui me sont Assignée(s)
@@ -1564,6 +1590,10 @@ const PartnerClientActivite = (props) => {
}}
className="detail_activite">
+
+ {JSON.parse(client).employee_assigned_view_statut && String(JSON.parse(client).employee_assigned_view_statut) !== "1" &&
+
}
+
+
+
*/}
+
+
+
Activité(s) qui me sont Assignée(s)
+
+ {/*
+ Affichage : Kanban
+ Liste
+
*/}
+
+
+
+
+
+ {activite_status_list_pave_affiche.map(channel => (
+
+
+
{Opportunite_chanel_label[channel.id]}
+
+ {Get_List_Activite_Assign_To_Me_result && Get_List_Activite_Assign_To_Me_result.length > 0 &&
+ Get_List_Activite_Assign_To_Me_result.filter(item => JSON.parse(item).status === channel.id)
+ .map(item => (
+
+
+
+
+ {String(String(JSON.parse(item).status)) === "1" &&
+ {
+ Display_Given_Activite_From_Activite_Recid(String(JSON.parse(item).recid));
+ setDialog_ACTIVITE_open(true);
+ }}
+
+ className="detail_activite">
+ {String(JSON.parse(item).deadline)} : {String(JSON.parse(item).type)}
+
+ FAIT
+ {(JSON.parse(item).description).substring(0, 50)}
+ {(JSON.parse(item).detail).substring(0, 50)}
+
+
+ }
+
+ {String(String(JSON.parse(item).status)) === "0" &&
+ {
+ Display_Given_Activite_From_Activite_Recid(String(JSON.parse(item).recid));
+ setDialog_ACTIVITE_open(true);
+ }}
+
+ className="detail_activite">
+ {JSON.parse(item).employee_assigned_view_statut && String(JSON.parse(item).employee_assigned_view_statut) !== "1" &&
+ }
+
+ {String(JSON.parse(item).deadline)} : {String(JSON.parse(item).type)}
+
+
+
+ {parseInt(String(JSON.parse(item).retard)) < 0 && RETARD de {String(JSON.parse(item).retard)} jours
}
+ {parseInt(String(JSON.parse(item).retard)) > 0 && DANS {String(JSON.parse(item).retard)} jours
}
+ {parseInt(String(JSON.parse(item).retard)) == 0 && AUJOURD'HUI
}
+
+
+ {(JSON.parse(item).description).substring(0, 50)}
+ {(JSON.parse(item).detail).substring(0, 50)}
+
+
+ }
+
+ {String(String(JSON.parse(item).status)) === "-1" &&
+ {
+ Display_Given_Activite_From_Activite_Recid(String(JSON.parse(item).recid));
+ setDialog_ACTIVITE_open(true);
+ }}
+
+ className="detail_activite">
+ {String(JSON.parse(item).deadline)} : {String(JSON.parse(item).type)}
+
+ ANNULE
+ {(JSON.parse(item).description).substring(0, 50)}
+ {(JSON.parse(item).detail).substring(0, 50)}
+
+
+ }
+
+
+
+ ))}
+
+
+
+ ))}
+
+
+
+
+
+
Activté(s) que j'ai créée(s)
-
+ {/*
Affichage : Kanban
Liste
-
+
*/}
@@ -1741,7 +1887,10 @@ const PartnerClientActivite = (props) => {
className="detail_activite">
{String(JSON.parse(item).deadline)} : {String(JSON.parse(item).type)}
-
+ ttt
+
+ {JSON.parse(item).employee_assigned_view_statut && String(JSON.parse(item).employee_assigned_view_statut) !== "1" &&
+ }
{parseInt(String(JSON.parse(item).retard)) < 0 && RETARD de {String(JSON.parse(item).retard)} jours
}
{parseInt(String(JSON.parse(item).retard)) > 0 && DANS {String(JSON.parse(item).retard)} jours
}
@@ -1788,7 +1937,13 @@ const PartnerClientActivite = (props) => {
+
}
+
+
+
+
+
{String(showactivite_detail) === "ttt1" &&
Description
@@ -2218,10 +2373,10 @@ const PartnerClientActivite = (props) => {
}
-
+
-