recette2
cherif 2025-04-30 20:53:24 +02:00
parent 1902119c62
commit 5b6321ee35
8 changed files with 5728 additions and 69 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1557,14 +1557,23 @@ const Groupe_Apprenant = (props) => {
setgrp_apprenant_data_edit_mode("");
clear_DetailFieds();
handleClick_edit_evaluation_From_Line(gridline_id);
if (selected_id && String(selected_id).length > 5) {
handleClick_edit_evaluation_From_Line(gridline_id);
Disable_Grp_Apprenant_DetailFields();
setgrp_apprenant_data_changed("");
setgrp_apprenant_data_edit_mode("");
setdisplay_grp_apprenant('1');
if (document.getElementById('myRef')) {
// myRef.current.scrollIntoView({ behavior: "smooth" });
var divh = document.getElementById('myRef').offsetTop;
window.scrollTo({
top: divh,
behavior: "smooth",
});
}
} else {
Disable_Grp_Apprenant_DetailFields();
@ -1573,6 +1582,12 @@ const Groupe_Apprenant = (props) => {
setdisplay_grp_apprenant("");
setadd_one_grp_apprenant("");
setsubmenu("");
window.scrollTo({
top: 0,
behavior: "smooth",
});
}
Getall_Partner_Groupe_Inscrit();
@ -1583,14 +1598,7 @@ const Groupe_Apprenant = (props) => {
setalert_message(res.data.message);
setalert_type("success");
if (document.getElementById('myRef')) {
// myRef.current.scrollIntoView({ behavior: "smooth" });
var divh = document.getElementById('myRef').offsetTop;
window.scrollTo({
top: divh,
behavior: "smooth",
});
}
}
else {
@ -2410,7 +2418,7 @@ const Groupe_Apprenant = (props) => {
aria-labelledby="draggable-dialog-title"
>
<DialogTitle> Choisir une couleur</DialogTitle>
<DialogTitle style={{ cursor: 'move', fontFamily: "DM Sans" }} id="draggable-dialog-title"> Choisir une couleur</DialogTitle>
<DialogContent className="DialogContent_color_pickup_width" >
<DialogContentText>
@ -2493,7 +2501,7 @@ const Groupe_Apprenant = (props) => {
aria-labelledby="draggable-dialog-title"
>
<DialogTitle> Création automatique des groupes </DialogTitle>
<DialogTitle style={{ cursor: 'move', fontFamily: "DM Sans" }} id="draggable-dialog-title"> Création automatique des groupes </DialogTitle>
<DialogContent className="DialogContent_width">
<DialogContentText>
@ -2751,7 +2759,7 @@ const Groupe_Apprenant = (props) => {
{/*** Fin ajout GROUPE AUTOMATIC */}
<h3 style={{ fontFamily:'DM Sans' }}> Les groupes d'apprenants </h3>
<h3 style={{ fontFamily: 'DM Sans' }}> Les groupes d'apprenants </h3>
<div className="div_row">
<div className="titre1"> Utilisez les filtres !</div>
@ -3284,7 +3292,6 @@ const Groupe_Apprenant = (props) => {
className="detail_class_submenu bton_add_session bton_add_session_create_automatic" style={{ "width": "40%" }}
id='menu_import_participant' name='menu_import_participant' onClick={(event) => {
setDialog_GRP_AUTOMATIC_open(true);
submenu_create_grp();
@ -3662,7 +3669,7 @@ const Groupe_Apprenant = (props) => {
<div className="div_row" style={{ "border": "None", "color": "orange", "textAlign": "center" }}>
{String(grp_apprenant_data_changed) === "1" && String(grp_apprenant_data_edit_mode) === "1" && <div className="div_row_gauche" style={{ "textAlign": 'left', 'marginLeft': '15px' }}>
{ String(grp_apprenant_data_edit_mode) === "1" && <div className="div_row_gauche" style={{ "textAlign": 'left', 'marginLeft': '15px' }}>
<Button variant="contained" className="bton_enreg" onClick={Add_Update_Grp_Apprenant_Data}>Enregistrer les modifications
</Button>
@ -4081,11 +4088,7 @@ const Groupe_Apprenant = (props) => {
{String(submenu) === "apprenant" && <div>
<div className="div_row" style={{ paddingRight: '10px' }}>
<div className="session_data">
<div style={{ "border": "None" }}>
<nav style={{ "border": "None", "fontSize": "20px", "paddingTop": "5px", "paddingLeft": "5px" }}> Membres du groupe </nav>

View File

@ -1577,28 +1577,7 @@ const Module_Agenda = (props) => {
{p_filtre1 && String(p_filtre1) === "ressource_humaine" && <div className="div_row_droite texte_area_filter_value" >
{/*<Autocomplete
disablePortal
name="filtre1_value"
id="filtre1_value"
className="disabled_style"
options={New_Getall_Training_Employee_No_Filter_result}
//value={selected_employee_id}
onChange={(event, value) => {
if (value && value._id) {
Get_Ressource_Data(value._id)
setselected_employee_id(value._id);
Get_List_Agenda_Events_For_Given_User(value._id);
}
}}
renderInput={(params) => <TextField {...params} label="Cible" />
}
/>*/}
<Autocomplete
disablePortal
@ -1612,6 +1591,8 @@ const Module_Agenda = (props) => {
onChange={(event, value) => {
// console.log(" ## settab_selected_users = ", tab_selected_users)
settab_selected_users([
...fixedVal,
...value.filter((i) => fixedVal.indexOf(i) === -1),
@ -1628,7 +1609,7 @@ const Module_Agenda = (props) => {
}
}}
renderInput={(params) => <TextField {...params} label="Choisir " />
renderInput={(params) => <TextField {...params} label="Choisir " />
}
/>
@ -1683,7 +1664,7 @@ const Module_Agenda = (props) => {
{tab_selected_users.length <= 1 && <div className="div_row" style={{ "border": "None" }}>
{agenda_owner_name && String(agenda_owner_name) === "Mon Planning" && <h5> <i> {agenda_owner_name} </i> </h5>}
{agenda_owner_name && String(agenda_owner_name) !== "Mon Planning" && tab_selected_users.length === 1 && <h5> Vous êtes sur le planning de <i> {agenda_owner_name} - ({agenda_owner_type}) </i> </h5>}
{agenda_owner_name && String(agenda_owner_name) !== "Mon Planning" && tab_selected_users.length === 1 && <h5> Vous êtes sur le planning de <i> {agenda_owner_name} - ({agenda_owner_type}) </i> </h5>}
</div>}
{tab_selected_users.length <= 1 && <div style={{ "width": "98%", "marginLeft": "5px" }}>

View File

@ -121,7 +121,9 @@ import Partner_Config_Ftion_Initiale from "./Partner_Config_Ftion_Initiale";
import Notes_Evaluation from "./Notes_Evaluation";
import ScoreboardIcon from '@mui/icons-material/Scoreboard';
import Groupe_Apprenant from "./Groupe_Apprenant";
import Equipe_Team from "./Equipe_Team";
import Groups2Icon from '@mui/icons-material/Groups2';
import Diversity3Icon from '@mui/icons-material/Diversity3';
import { LiaProductHunt } from "react-icons/lia";
import Partner_Product_Service from "./Partner_Product_Service";
import Module_Email_Management from "./Module_Email_Management";
@ -481,7 +483,7 @@ const Partner = (props) => {
"dashbord_session", "mon_tableau_de_bord", "prix_achat", "mes_apprenants", "dashbord_ressources_humaines",
"dashbord_inscriptions", "mes_salles", "mes_opportunites", "config_formulaires", "dashbord_factures", "mes_ue",
"domaine_categorie_metier", "config_formation_initiale", "note_evaluation", "groupe_apprenant",
"part_produit_service", "config_document_super_admin", "tous_mes_document"]
"part_produit_service", "config_document_super_admin", "tous_mes_document", "equipe_team"]
if (action && list_menu.includes(action)) {
@ -517,7 +519,7 @@ const Partner = (props) => {
const list_menu_header_names = ['my_account', 'my_class', 'my_session', 'my_apprenant', 'my_ressource', 'my_planning',
'my_partners', 'my_invoices', 'my_prix_achat', 'my_e_learning', 'my_configuration', 'my_tbd', 'my_ue', 'domaine_categorie_metier',
'config_formation_initiale', 'note_evaluation', 'groupe_apprenant', 'part_produit_service', 'monactivite', 'mon_tableau_de_bord',
'tous_mes_document']
'tous_mes_document', 'equipe_team']
for (let i = 0; i < list_menu_header_names.length; i++) {
if (document.getElementsByName(String(list_menu_header_names[i])) && document.getElementsByName(String(list_menu_header_names[i]))[0]) {
document.getElementsByName(String(list_menu_header_names[i]))[0].style.fontWeight = "400";
@ -534,7 +536,7 @@ const Partner = (props) => {
const list_menu_header_names = ['my_account', 'my_class', 'my_session', 'my_apprenant', 'my_ressource', 'my_planning',
'my_partners', 'my_invoices', 'my_prix_achat', 'my_e_learning', 'my_configuration', 'my_tbd', 'my_ue', 'domaine_categorie_metier',
'config_formation_initiale', 'note_evaluation', 'groupe_apprenant', 'part_produit_service', 'monactivite', 'mon_tableau_de_bord',
'tous_mes_document']
'tous_mes_document', 'equipe_team']
for (let i = 0; i < list_menu_header_names.length; i++) {
if (document.getElementsByName(String(list_menu_header_names[i])) && document.getElementsByName(String(list_menu_header_names[i]))[0]) {
document.getElementsByName(String(list_menu_header_names[i]))[0].style.fontWeight = "400";
@ -1006,6 +1008,20 @@ const Partner = (props) => {
}
}
function equipe_team_func(event) {
var security_retval = check_user_acces_right("equipe", "read");
if (security_retval === 1) {
setmenu("equipe_team");
setapiexcelimportmessage();
setformation_file_name();
history.push("/Partner/equipe_team");
document.body.style.backgroundColor = "#ffffff";
inactive_active_menu_header("equipe_team");
} else {
Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants pour accéder à la gestion des équipes");
}
}
function DisplayeEmployeList(event) {
var security_retval = check_user_acces_right("employe", "read");
if (security_retval === 1) {
@ -2031,6 +2047,14 @@ const Partner = (props) => {
</Sidebar>
</div>
<div>
<Sidebar className="my_sidebar">
{String(menu) !== "equipe_team" && <Menu className="my_menu bck_menu_seul" id="my_equipe_team" name="my_equipe_team" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" color={"tercier"} /> &nbsp; &nbsp;EQUIPE </Menu>}
{String(menu) === "equipe_team" && <Menu className="my_menu bck_menu_seul_selected" id="my_equipe_team" name="my_equipe_team" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" color={"tercier"} />&nbsp; &nbsp;EQUIPE </Menu>}
</Sidebar>
</div>
<div>
<Sidebar className="my_sidebar">
@ -2054,11 +2078,12 @@ const Partner = (props) => {
<Sidebar className="my_sidebar">
{String(menu) !== "prix_achat" && <Menu className="my_menu bck_menu_seul" id="my_prix_achat" name="my_prix_achat" onClick={prix_achat_func} > <LocalOfferIcon className="icone_menu" color={"tercier"} /> &nbsp; &nbsp;PRIX ACHAT </Menu>}
{String(menu) === "prix_achat" && <Menu className="my_menu bck_menu_seul_selected" id="my_prix_achat" name="my_prix_achat" onClick={prix_achat_func} > <LocalOfferIcon className="icone_menu" color={"tercier"} />&nbsp; &nbsp;PRIX ACHAT </Menu>}
</Sidebar>
</div>
<div class="separator"></div>
<div>
@ -2476,10 +2501,10 @@ const Partner = (props) => {
{String(menu) === "mon_materiel" &&
<div className="div_droite">
<Materiels conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
<Materiels conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
</div>
}
@ -2487,9 +2512,9 @@ const Partner = (props) => {
{String(menu) === "mes_salles" &&
<div className="div_droite">
<Materiel_Salle conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
</div>
}
@ -2503,6 +2528,17 @@ const Partner = (props) => {
</div>
}
{String(menu) === "equipe_team" &&
<div className="div_droite">
<Equipe_Team conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("equipe", "read")}
write_access={check_user_acces_right("equipe", "write")}
check_user_acces_right={check_user_acces_right}
reduce={"0"} />
</div>
}
{String(menu) === "mes_cmd" &&
<div className="div_droite">
@ -2860,12 +2896,25 @@ const Partner = (props) => {
</a>
</div>
<div>
<hr className="my_hr" />
<Tooltip className="tooltip_css" id="tooltip_id_16aa" />
<a data-tooltip-id="tooltip_id_16aa" data-tooltip-html="EQUIPEz">
{String(menu) !== "equipe_team" && <Menu className="sousmenu" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{color:'#dbff75'}}/> &nbsp; </Menu>}
{String(menu) === "equipe_team" && <Menu className="sousmenu_selected" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{color:'#dbff75'}}/>&nbsp; </Menu>}
</a>
</div>
<div>
<hr className="my_hr" />
<Tooltip className="tooltip_css" id="tooltip_id_16a" />
<a data-tooltip-id="tooltip_id_16a" data-tooltip-html="OPPORTUNITES">
{String(menu) !== "mes_opportunites" && <div className="sousmenu" onClick={Display_mes_opportunites_func}><MdAddShoppingCart className="icone_menu" />&nbsp;</div>}
{String(menu) === "mes_opportunites" && <div className="sousmenu_selected" onClick={Display_mes_opportunites_func}> <MdAddShoppingCart className="icone_menu" />&nbsp;</div>}
{String(menu) !== "mes_opportunites" && <div className="sousmenu" onClick={Display_mes_opportunites_func}><MdAddShoppingCart className="icone_menu" style={{color:'#dbff75'}} />&nbsp;</div>}
{String(menu) === "mes_opportunites" && <div className="sousmenu_selected" onClick={Display_mes_opportunites_func}> <MdAddShoppingCart className="icone_menu" style={{color:'#dbff75'}} />&nbsp;</div>}
</a>
</div>
@ -2873,8 +2922,8 @@ const Partner = (props) => {
<hr className="my_hr" />
<Tooltip className="tooltip_css" id="tooltip_id_16" />
<a data-tooltip-id="tooltip_id_16" data-tooltip-html=" PRIX CLIENT">
{String(menu) !== "pricing" && <div className="sousmenu" onClick={pricing_func} ><FcCurrencyExchange className="icone_menu" />&nbsp;</div>}
{String(menu) === "pricing" && <div className="sousmenu_selected" onClick={pricing_func} > <FcCurrencyExchange className="icone_menu" />&nbsp;</div>}
{String(menu) !== "pricing" && <div className="sousmenu" onClick={pricing_func} ><FcCurrencyExchange className="icone_menu" style={{color:'#dbff75'}} />&nbsp;</div>}
{String(menu) === "pricing" && <div className="sousmenu_selected" onClick={pricing_func} > <FcCurrencyExchange className="icone_menu" style={{color:'#dbff75'}} />&nbsp;</div>}
</a>
</div>
@ -2882,8 +2931,8 @@ const Partner = (props) => {
<hr className="my_hr" />
<Tooltip className="tooltip_css" id="tooltip_id_17" />
<a data-tooltip-id="tooltip_id_17" data-tooltip-html="COMMANDES & DEVIS">
{String(menu) !== "mes_cmd" && <div className="sousmenu" onClick={mes_cmd_func}><FcCollect className="icone_menu" />&nbsp;</div>}
{String(menu) === "mes_cmd" && <div className="sousmenu_selected" onClick={mes_cmd_func}> <FcCollect className="icone_menu" />&nbsp;</div>}
{String(menu) !== "mes_cmd" && <div className="sousmenu" onClick={mes_cmd_func}><FcCollect className="icone_menu" style={{color:'#dbff75'}}/>&nbsp;</div>}
{String(menu) === "mes_cmd" && <div className="sousmenu_selected" onClick={mes_cmd_func}> <FcCollect className="icone_menu" style={{color:'#dbff75'}}/>&nbsp;</div>}
</a>
</div>
@ -2891,8 +2940,8 @@ const Partner = (props) => {
<hr className="my_hr" />
<Tooltip className="tooltip_css" id="tooltip_id_18" />
<a data-tooltip-id="tooltip_id_18" data-tooltip-html="FACTURES & AVOIRS">
{String(menu) !== "factures_client" && <div className="sousmenu" onClick={mes_factures_client_func}><FcKindle className="icone_menu" />&nbsp;</div>}
{String(menu) === "factures_client" && <div className="sousmenu_selected" onClick={mes_factures_client_func}> <FcCollect FcKindle="icone_menu" />&nbsp;</div>}
{String(menu) !== "factures_client" && <div className="sousmenu" onClick={mes_factures_client_func}><FcKindle className="icone_menu" style={{color:'#dbff75'}}/>&nbsp;</div>}
{String(menu) === "factures_client" && <div className="sousmenu_selected" onClick={mes_factures_client_func}> <FcCollect FcKindle="icone_menu" style={{color:'#dbff75'}}/>&nbsp;</div>}
</a>
</div>
@ -3216,8 +3265,8 @@ const Partner = (props) => {
{String(menu) === "mon_materiel" &&
<div className="div_droite div_droite_ralonge">
<Materiels conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
<Materiels conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
</div>
@ -3226,8 +3275,8 @@ const Partner = (props) => {
{String(menu) === "mes_salles" &&
<div className="div_droite div_droite_ralonge">
<Materiel_Salle conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
<Materiel_Salle conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right} />
</div>
@ -3235,7 +3284,20 @@ const Partner = (props) => {
{String(menu) === "mes_opportunites" &&
<div className="div_droite div_droite_ralonge">
<CRM_Opportunite conntected_employee_id={conntected_employee_id} read_access={check_user_acces_right("materiel", "read")} write_access={check_user_acces_right("materiel", "write")} />
<CRM_Opportunite conntected_employee_id={conntected_employee_id} read_access={check_user_acces_right("materiel", "read")}
write_access={check_user_acces_right("materiel", "write")}
check_user_acces_right={check_user_acces_right}
/>
</div>
}
{String(menu) === "equipe_team" &&
<div className="div_droite div_droite_ralonge">
<Equipe_Team conntected_employee_id={conntected_employee_id}
read_access={check_user_acces_right("equipe", "read")}
write_access={check_user_acces_right("equipe", "write")}
check_user_acces_right={check_user_acces_right}
/>
</div>
}
@ -3244,7 +3306,8 @@ const Partner = (props) => {
<div className="div_droite div_droite_ralonge">
<Partner_Commande conntected_employee_id={conntected_employee_id} read_access={check_user_acces_right("commande", "read")}
write_access={check_user_acces_right("commande", "write")}
check_user_acces_right={check_user_acces_right} />
check_user_acces_right={check_user_acces_right}
/>
</div>
}

View File

@ -510,7 +510,7 @@ const New_C_Marketplace_2025 = () => {
setv11(filtre1);
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@
padding-left: 5px !important;
}
@media screen and (max-width: 600px) {
.okUpdateData {

View File

@ -195,6 +195,7 @@
@import "./components/mon_intranet_public";
@import "./components/module_connexion_intranet_client";
@import "./components/module_alert_confirmation";
@import "./components/equipe_team";
// New Design 2025