qsq
parent
4a78dfba68
commit
27046bfce7
|
@ -4654,7 +4654,8 @@ const AddParnerClient = (props) => {
|
|||
|
||||
|
||||
{String(submenu).trim() === "submenu_activite" && <div className="training_data">
|
||||
< PartnerClientActivite email={p_client_email} conntected_employee_id={props.conntected_employee_id} />
|
||||
<PartnerClientActivite email={p_client_email} conntected_employee_id={props.conntected_employee_id}
|
||||
related_collection={"partner_client"} />
|
||||
</div>}
|
||||
|
||||
{String(submenu).trim() === "submenu_piece_jointe" && <div className="training_data">
|
||||
|
|
|
@ -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) => {
|
|||
<Button onClick={Dialog_OPPORTUNITE_handleClose_buton} className="bton_annule_dialog" >Fermer</Button>
|
||||
</div>
|
||||
|
||||
<div className="div_row">
|
||||
{selected_id && String(selected_id).length > 2 && <div className="div_row">
|
||||
<div className="div_row" style={{ "textAlign": "center", "marginTop": "10px" }}>
|
||||
<Button onClick={(e) => {
|
||||
const response = window.confirm("Confirmez-vous la suppression de l'opportunité ?");
|
||||
|
@ -1971,7 +1971,7 @@ const CRM_Opportunite = (props) => {
|
|||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>}
|
||||
</div>
|
||||
|
||||
</DialogActions>
|
||||
|
|
|
@ -4057,7 +4057,7 @@ const DisplayPartnerUnite_Enseignement = (props) => {
|
|||
|
||||
<div className="div_row_gauche" style={{ "textAlign": 'left', 'marginLeft': '15px' }}>
|
||||
|
||||
<Button variant="contained" className="bton_enreg" onClick={Add_Update_UE_Data}>Enregistrer
|
||||
<Button variant="contained" className="bton_enreg" onClick={Add_Update_UE_Data} >Enregistrer
|
||||
</Button>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -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(() => {
|
||||
|
|
|
@ -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 (
|
||||
|
||||
<div className="partner">
|
||||
|
@ -1591,6 +1619,7 @@ const Partner = (props) => {
|
|||
<label for="files" className="label">Changer image</label>
|
||||
|
||||
|
||||
|
||||
</div>}
|
||||
|
||||
{isimgSelected && <div className="nonlable">
|
||||
|
@ -1598,12 +1627,30 @@ const Partner = (props) => {
|
|||
</div>}
|
||||
|
||||
|
||||
{String(part_is_partner_admin_account) === "1" && <div className="nom_prenom"> {parntername && <b> {parntername} - {String(partnerPackService).toUpperCase()} ({parnternbformation})</b>}
|
||||
{String(part_is_partner_admin_account) === "1" && <div className="nom_prenom">
|
||||
{parntername && <nav>
|
||||
<b> {parntername} - {String(partnerPackService).toUpperCase()} ({parnternbformation})</b>
|
||||
{conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
|
||||
<StyledBadge badgeContent={conntected_employee_activite_retard} color="secondary" style={{ "cursor": "pointer" }}
|
||||
onClick={(event) => {
|
||||
monactivite_func();
|
||||
|
||||
}}></StyledBadge>}
|
||||
|
||||
</nav>}
|
||||
{!parntername && <b> Partenaire </b>} </div>}
|
||||
|
||||
|
||||
{String(part_is_partner_admin_account) !== "1" && <div className="nom_prenom"> {parnter_user_employee}
|
||||
{!parntername && <b> Utilisateur </b>} </div>}
|
||||
{String(part_is_partner_admin_account) !== "1" && <div className="nom_prenom">
|
||||
{parnter_user_employee}
|
||||
{!parntername && <b> Utilisateur </b>}
|
||||
{conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 &&
|
||||
<StyledBadge badgeContent={conntected_employee_activite_retard} color="secondary" style={{ "cursor": "pointer" }}
|
||||
onClick={(event) => {
|
||||
monactivite_func();
|
||||
|
||||
}}></StyledBadge>}
|
||||
</div>}
|
||||
|
||||
{String(formation_initiale) === "1" && <div className="nom_prenom"> Ftion Initiale
|
||||
|
||||
|
@ -1615,6 +1662,8 @@ const Partner = (props) => {
|
|||
<div>
|
||||
<Sidebar className="my_sidebar">
|
||||
<Menu className="my_menu">
|
||||
|
||||
|
||||
<SubMenu label="Mon Compte" className="my_chart" id="my_account" name="my_account" icon={<AccountBalanceIcon color={"primary"} />} style={{ overflow: 'hidden' }}>
|
||||
{String(menu) !== "infopartner" && <MenuItem onClick={PersonnalData} className="sousmenu" icon={<FcHome className="icone_menu" />}> MES INFORMATIONS </MenuItem>}
|
||||
{String(menu) === "infopartner" && <MenuItem onClick={PersonnalData} className="sousmenu_selected" icon={<FcHome className="icone_menu" />}> MES INFORMATIONS </MenuItem>}
|
||||
|
@ -2361,7 +2410,8 @@ const Partner = (props) => {
|
|||
}
|
||||
|
||||
{String(menu) === "monactivite" && <div className="div_droite">
|
||||
<PartnerClientActivite conntected_employee_id={conntected_employee_id} check_user_acces_right={check_user_acces_right} email={""} />
|
||||
<PartnerClientActivite conntected_employee_id={conntected_employee_id} check_user_acces_right={check_user_acces_right}
|
||||
email={conntected_employee_email} related_collection={"partnair_account"} update_nb_activite_en_retard={update_nb_activite_en_retard} />
|
||||
</div>
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2653,7 +2653,7 @@
|
|||
font-size: small;
|
||||
margin-bottom: 1rem !important;
|
||||
}
|
||||
|
||||
|
||||
.session_caract_Dialog_comment_2_lines {
|
||||
|
||||
width: 100%;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
z-index: 9999;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.okUpdateData {
|
||||
font-size: small;
|
||||
color: green;
|
||||
|
@ -50,12 +50,11 @@
|
|||
text-align: center;
|
||||
margin-bottom: 0.8rem;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
cursor: unset;
|
||||
font-style: italic;
|
||||
background-color: gray;
|
||||
font-weight: normal;
|
||||
float: left;
|
||||
width: 100%;
|
||||
padding: 2px !important;
|
||||
}
|
||||
|
||||
|
||||
|
@ -221,7 +220,7 @@
|
|||
box-shadow: 5px 1px 5px 1px rgb(0 0 0 / 25%);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.detail_header {
|
||||
display: inline-block;
|
||||
|
@ -281,8 +280,13 @@
|
|||
float: left;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
.mode_affichage {
|
||||
width: 25%;
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 601px) and (max-width: 991px) {
|
||||
|
@ -317,12 +321,11 @@
|
|||
text-align: center;
|
||||
margin-bottom: 0.8rem;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
cursor: unset;
|
||||
font-style: italic;
|
||||
background-color: gray;
|
||||
font-weight: normal;
|
||||
float: left;
|
||||
width: 100%;
|
||||
padding: 2px !important;
|
||||
}
|
||||
|
||||
|
||||
|
@ -488,7 +491,7 @@
|
|||
box-shadow: 5px 1px 5px 1px rgb(0 0 0 / 25%);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.detail_header {
|
||||
display: inline-block;
|
||||
|
@ -519,6 +522,8 @@
|
|||
border-top-right-radius: 10px !important;
|
||||
height: 8rem !important;
|
||||
font-size: small;
|
||||
width: 96%;
|
||||
margin-left: 2%;
|
||||
}
|
||||
|
||||
.scroll_mysy {
|
||||
|
@ -548,6 +553,15 @@
|
|||
float: left;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.mode_affichage {
|
||||
width: 15%;
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 992px) and (max-width: 1199px) {
|
||||
|
@ -582,12 +596,11 @@
|
|||
text-align: center;
|
||||
margin-bottom: 0.8rem;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
cursor: unset;
|
||||
font-style: italic;
|
||||
background-color: gray;
|
||||
font-weight: normal;
|
||||
float: left;
|
||||
width: 100%;
|
||||
padding: 2px !important;
|
||||
}
|
||||
|
||||
|
||||
|
@ -778,6 +791,8 @@
|
|||
border-top-right-radius: 10px !important;
|
||||
height: 8rem !important;
|
||||
font-size: small;
|
||||
width: 96%;
|
||||
margin-left: 2%;
|
||||
}
|
||||
|
||||
.detail_activite:hover {
|
||||
|
@ -814,6 +829,13 @@
|
|||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.mode_affichage {
|
||||
width: 12%;
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 1200px) {
|
||||
|
@ -849,12 +871,11 @@
|
|||
text-align: center;
|
||||
margin-bottom: 0.8rem;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
cursor: unset;
|
||||
font-style: italic;
|
||||
background-color: gray;
|
||||
font-weight: normal;
|
||||
float: left;
|
||||
width: 100%;
|
||||
padding: 2px !important;
|
||||
}
|
||||
|
||||
|
||||
|
@ -1061,7 +1082,8 @@
|
|||
vertical-align: middle;
|
||||
padding: 5px;
|
||||
text-align: left;
|
||||
width: 20rem;
|
||||
width: 96%;
|
||||
margin-left: 2%;
|
||||
border-radius: 10px !important;
|
||||
height: 7rem !important;
|
||||
font-size: small;
|
||||
|
@ -1095,7 +1117,7 @@
|
|||
|
||||
|
||||
.block_activite {
|
||||
width: 30%;
|
||||
width: 30%;
|
||||
float: left;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
@ -1103,7 +1125,12 @@
|
|||
.css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input:invalid {
|
||||
padding-left: 5px !important;
|
||||
padding-top: 0px !important;
|
||||
padding-bottom: 0px !important;
|
||||
padding-bottom: 0px !important;
|
||||
}
|
||||
.mode_affichage {
|
||||
width: 8%;
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1121,7 +1148,7 @@
|
|||
padding: 0px !important;
|
||||
padding-left: 5px !important;
|
||||
padding-right: 5px !important;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.css-1jy569b-MuiFormLabel-root-MuiInputLabel-root {
|
||||
|
|
Loading…
Reference in New Issue