23/10/2023 - 13h

recette2
cherif 2023-10-23 13:12:54 +02:00
parent de91f4b79b
commit 2db635c451
6 changed files with 3835 additions and 10 deletions

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@ import DialogContent from '@mui/material/DialogContent';
import DialogContentText from '@mui/material/DialogContentText';
import DialogTitle from '@mui/material/DialogTitle';
import { TransitionProps } from '@mui/material/transitions';
const Config_Documents = (props) => {
const history = useHistory();
const [submenu, setsubmenu] = useState("");
@ -947,8 +947,8 @@ const Config_Documents = (props) => {
axios.post(myurl, form).then(res => {
if (String(res.data.status) === String("true")) {
console.log(" In Get_Given_Personnalisable_Collection_and_Fields res.data.status = " + res.data.status);
console.log(" In Get_Given_Personnalisable_Collection_and_Fields res.data.message r_class = " + res.data.message);
//console.log(" In Get_Given_Personnalisable_Collection_and_Fields res.data.status = " + res.data.status);
//console.log(" In Get_Given_Personnalisable_Collection_and_Fields res.data.message r_class = " + res.data.message);
setGet_Given_Personnalisable_Collection_and_Fields_api("true");
setGet_Given_Personnalisable_Collection_and_Fields_result(res.data.message);
@ -1047,8 +1047,8 @@ const Config_Documents = (props) => {
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Update_Partner_Document/";
axios.post(myurl, form).then(res => {
console.log(" In Update_one_Partner_Document res.data.status = " + res.data.status);
console.log(" In Update_one_Partner_Document res.data.message r_class = " + res.data.message);
//console.log(" In Update_one_Partner_Document res.data.status = " + res.data.status);
//console.log(" In Update_one_Partner_Document res.data.message r_class = " + res.data.message);
if (String(res.data.status) === String("true")) {
setUpdate_one_Partner_Document_api("true");

View File

@ -2126,6 +2126,14 @@ const Employes = (props) => {
form.append("ismanager", "0");
/*
Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire
*/
for (let i = 0; i < spec_field_updated_values_hooks.length; i++) {
form.append(String(spec_field_updated_values_hooks[i].field_name), String(spec_field_updated_values_hooks[i].field_value));
}
console.log(" form == ", form);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Ressource_Humaine/";
@ -3451,7 +3459,7 @@ const Employes = (props) => {
form.append("token", stored_cookie);
form.append("object_name", local_collection_obj_metier);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_list_specific_field_partner_by_object/";
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Partner_Object_Specific_Valide_Displayed_Fields/";
axios.post(myurl, form).then(res => {
@ -5386,11 +5394,49 @@ const Employes = (props) => {
</div>
<div className="div_row">
<hr />
</div>
<div className="div_row" style={{ "padding": "5px" }}> Vos champs spécifiques<br />
{rows_champs_specifics &&
rows_champs_specifics.map((champ_spec) => (
<div className="session_caract"> {JSON.parse(champ_spec).field_label} <br />
<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
name={JSON.parse(champ_spec).field_name}
id={JSON.parse(champ_spec).field_name}
InputLabelProps={{
shrink: true,
}}
className="disabled_style"
onChange={(e) => {
change_champs_spec_handle(e.target.value);
setEmployee_data_changed("1");
}}
//onChange={change_champs_spec_handle}
/>
</div>
))}
<br />
</div>
<div className="div_row" style={{ "border": "None" }}>
&nbsp;
</div>
<div className="div_row" style={{ "border": "None", "color": "orange", "textAlign": "center" }}>
{<div className="div_row_gauche" style={{ "textAlign": 'left', 'marginLeft': '15px' }}>
@ -5761,7 +5807,7 @@ const Employes = (props) => {
&nbsp;
</div>
{String(Affectation_data_changed) === "1" && String(edite_affectation_form) === "1" && <div className="div_row" style={{ "border": "None", "color": "orange", "textAlign": "center" }}>
/!\ Pensez à enregistrer les modifications bb
/!\ Pensez à enregistrer les modifications
</div>}

View File

@ -51,6 +51,9 @@ import Partner_Commande from "./Partner_Commande";
import Config_Documents from "./Config_Document";
import Factures_Client from "./Partner_Facture";
import Configuration_Technique from "./Partner_Config_Technique";
import Config_Champs_Personnalise from "./Config_Champs_Personnalise";
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
@ -302,7 +305,8 @@ const Partner = (props) => {
var list_menu = ['creation', 'infopartner', 'statistique', 'abonnement', 'affichage', 'ordervalide',
'mes_sessions', 'setuplms', 'facture', 'pricing', 'mes_clients', 'mes_devis', 'mes_cmd',
'mes_stagiaires', 'mes_employes', 'mon_materiel', 'config_document', 'factures_client', "config_technique"]
'mes_stagiaires', 'mes_employes', 'mon_materiel', 'config_document', 'factures_client', "config_technique",
"config_champ_specific"]
if (action && list_menu.includes(action)) {
@ -364,6 +368,21 @@ const Partner = (props) => {
}
}
function config_specfic_fields_func(event) {
var security_retval = check_user_acces_right("config_document", "read");
if (security_retval === 1) {
setmenu("config_champ_specific");
setapiexcelimportmessage();
setformation_file_name();
history.push("/Partner/config_champ_specific");
} else {
Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants pour acceder à la gestion des documents");
}
}
function config_technique_func(event) {
var security_retval = check_user_acces_right("config_document", "read");
if (security_retval === 1) {
@ -1074,6 +1093,14 @@ const Partner = (props) => {
{String(menu) !== "config_document" && <div className="sousmenu" onClick={config_document_func}>&nbsp;&nbsp;<FcFinePrint className="icone_menu" />&nbsp;MES DOCUMENTS</div>}
{String(menu) === "config_document" && <div className="sousmenu_selected" onClick={config_document_func}> &nbsp;&nbsp; <FcFinePrint className="icone_menu" />&nbsp;MES DOCUMENTS</div>}
</div>
<div>
<hr className="my_hr" />
{String(menu) !== "config_champ_specific" && <div className="sousmenu" onClick={config_specfic_fields_func}>&nbsp;&nbsp;<FcFinePrint className="icone_menu" />&nbsp;CHAMP SPECIFIQUE</div>}
{String(menu) === "config_champ_specific" && <div className="sousmenu_selected" onClick={config_specfic_fields_func}> &nbsp;&nbsp; <FcFinePrint className="icone_menu" />&nbsp;CHAMP SPECIFIQUE</div>}
</div>
<div>
<hr className="my_hr" />
{String(menu) !== "config_technique" && <div className="sousmenu" onClick={config_technique_func}>&nbsp;&nbsp;<FcFinePrint className="icone_menu" />&nbsp;TECHNIQUE</div>}
@ -1330,7 +1357,7 @@ const Partner = (props) => {
{String(menu) === "mes_clients" && <div className="div_droite">
<Partner_Client conntected_employee_id={conntected_employee_id}/>
<Partner_Client conntected_employee_id={conntected_employee_id} />
</div>
}
@ -1346,6 +1373,13 @@ const Partner = (props) => {
</div>
}
{String(menu) === "config_champ_specific" && <div className="div_droite">
<Config_Champs_Personnalise />
</div>
}
<div className="pieddepage">
<Footer />

File diff suppressed because it is too large Load Diff

View File

@ -82,4 +82,5 @@
@import 'react-big-calendar/lib/addons/dragAndDrop/styles';
@import "./components/partner_facture";
@import "./components/partner_configuration_technique";
@import "./components/config_champs_personnalise";