diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index e227f04..62a65a9 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -4101,7 +4101,7 @@ const AddClassManual = (props) => {
- + */}
diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 4df1bd6..6e6c9b7 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -4837,7 +4837,6 @@ const Apprenant = (props) => { function CustomToolbar(props) { - console.log(" my props = ", props); return ( diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 0eee4dc..061690a 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1614,6 +1614,55 @@ const DisplayPartnerSession = (props) => { } + // lorsqu'on rentre dans ce fichier avec une formation, il faut aller chercher toutes sessions de la formation zzz + + const [Getall_TrainingSession_For_Given_Class_api, setGetall_TrainingSession_For_Given_Class_api] = useState(); + const [Getall_TrainingSession_For_Given_Class_message, setGetall_TrainingSession_For_Given_Class_message] = useState(); + const [Getall_TrainingSession_For_Given_Class_result, setGetall_TrainingSession_For_Given_Class_result] = useState(); + function Getall_TrainingSession_For_Given_Class(props_class_internal_url) { + + var form = new FormData(); + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + + // Recuperation des parametres + var filtre1 = "class_internal_url" + var filtre1_value = props_class_internal_url; + form.append(filtre1, filtre1_value); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List_filter_like/"; + + + + setLoading(true); + axios.post(myurl, form).then(res => { + + if (String(res.data.status) === String("true")) { + //console.log(" In Getall_TrainingSession_For_Given_Class res.data.status = " + res.data.status); + // console.log(" In Getall_TrainingSession_For_Given_Class res.data.message r_class = " + res.data.message); + setGetall_TrainingSession_For_Given_Class_api("true"); + setGetall_TrainingSession_For_Given_Class_result(res.data.message); + setRows(res.data.message); + } + else { + setGetall_TrainingSession_For_Given_Class_api("false"); + setGetall_TrainingSession_For_Given_Class_message(res.data.message); + alert(res.data.message) + } + + setLoading(false); + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( Getall_TrainingSession_For_Given_Class = ', error); + setGetall_TrainingSession_For_Given_Class_api("false"); + alert("Impossible de lancer la recherche"); + //setmyApimyApiMessage("") + }) + } + + + + const [New_Get_List_Partner_Clients_result, setNew_Get_List_Partner_Clients_result] = useState([]); const [Get_List_Partner_Clients_api, setGet_List_Partner_Clients_api] = useState(); @@ -1979,13 +2028,9 @@ const DisplayPartnerSession = (props) => { Get_Partner_Object_Specific_Fields("session_formation"); Getall_Training_Employee_No_Filter(); Getall_Training_Materiel_No_Filter(); - Get_List_Partner_Financeurs(); - Getall_Parter_OR_Default_Session_Steps(); - GetCurrentPartnerClass(); - Getall_TrainingSession(); GetAttestation_Certif(); Get_List_Partner_Clients(); Getall_Partner_Site_Formation(); @@ -1995,13 +2040,24 @@ const DisplayPartnerSession = (props) => { setdatagrid_columns_size_model2(50); } - if (props.object_key && String(props.object_key).length > 3) { + + + if (props.object_key && String(props.object_key).length > 2) { setLoading(true); - GetCurrentSession(props.object_key, props.class_internal_url); - Display_session_From_Props(props.object_key, props.class_internal_url); + + let text = String(props.object_key); + + if (props.object_key === "class") { + Getall_TrainingSession_For_Given_Class(props.class_internal_url); + } else { + Getall_TrainingSession(); + GetCurrentSession(props.object_key, props.class_internal_url); + Display_session_From_Props(props.object_key, props.class_internal_url); + } setLoading(false); } else { + Getall_TrainingSession(); window.scrollTo({ top: 0, behavior: "smooth", diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index f9cfb1f..805340a 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -6557,7 +6557,6 @@ const DisplayPartnerStagiaires = (props) => { function CustomToolbar(props) { - console.log(" my props = ", props); return ( diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 54964de..fd6979f 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -51,7 +51,7 @@ import { GridPreferencePanelsValue, } from '@mui/x-data-grid'; - import * as XLSX from 'xlsx'; +import * as XLSX from 'xlsx'; const DistplayPartnerTraningsPage = (props) => { @@ -408,7 +408,7 @@ const DistplayPartnerTraningsPage = (props) => { const [datagrid_columns_size_model2, setdatagrid_columns_size_model2] = useState(120); const columns = [ - { field: 'id', headerName: 'id', hide: true, maxWidth: 1, disableExport: true,}, + { field: 'id', headerName: 'id', hide: true, maxWidth: 1, disableExport: true, }, { field: '_id', headerName: '_id', hide: true, maxWidth: 1, disableExport: true, }, { field: 'lms_class_code', headerName: 'lms_class_code', hide: true, Width: 0, }, { field: 'duration', headerName: 'duration', hide: true, Width: 0, }, @@ -429,7 +429,52 @@ const DistplayPartnerTraningsPage = (props) => { { field: 'categorie', headerName: 'Catégorie', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: true, editable: false, renderCell: (params) => , }, - { field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", renderCell: (params) => , }, + + + + { + field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", + renderCell: (cellValues) => { + return ( + + + + ); + }, + + + }, + + + { field: 'url', headerName: 'lien', minWidth: 20, hideable: true, hide: true, editable: false, }, { field: 'description', headerName: 'Description', hide: true, resizable: true, minWidth: 250, maxWidth: 300, flex: 1, renderCell: (params) => , }, @@ -454,7 +499,7 @@ const DistplayPartnerTraningsPage = (props) => { ); }, }, - { + /*{ field: "management", headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, renderCell: (cellValues) => { return ( @@ -471,7 +516,7 @@ const DistplayPartnerTraningsPage = (props) => { ); } - }, + },*/ { field: "visual", headerName: 'Visualiser', minWidth: 50, flex: 1, maxWidth: 100, disableExport: true, renderCell: (cellValues) => { @@ -1765,117 +1810,117 @@ const DistplayPartnerTraningsPage = (props) => { { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] - -// DEBUT EXPORT EXCEL DATAGRID -function CustomToolbar(props) { + // DEBUT EXPORT EXCEL DATAGRID - console.log(" my props = ", props); - - return ( - - - - - - - + function CustomToolbar(props) { - - ); -} -function getExcelData(apiRef) { - // Select rows and columns - const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + return ( + - // Format the data. Here we only keep the value - const data = filteredSortedRowIds.map((id) => { - const row = {}; - visibleColumnsField.forEach((field) => { - row[field] = apiRef.current.getCellParams(id, field).value; + + + + + + + + + ); + } + + function getExcelData(apiRef) { + // Select rows and columns + const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + + // Format the data. Here we only keep the value + const data = filteredSortedRowIds.map((id) => { + const row = {}; + visibleColumnsField.forEach((field) => { + row[field] = apiRef.current.getCellParams(id, field).value; + }); + return row; }); - return row; - }); - return data; -} + return data; + } -function ExportButton(props) { - return ( - - - - ); -} + function ExportButton(props) { + return ( + + + + ); + } -function handleExport(apiRef, data_colums) { - const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); - + function handleExport(apiRef, data_colums) { + const data = getExcelData(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); - const local_config = { - keys: visibleColumnsField, - columnNames: data_colums.filter((mydata) => (mydata).disableExport !== true).map(function (mydata) { - if (mydata.headerName && visibleColumnsField.includes(mydata.field)) { - if (mydata.headerName) { - return mydata.headerName; + const local_config = { + keys: visibleColumnsField, + + columnNames: data_colums.filter((mydata) => (mydata).disableExport !== true).map(function (mydata) { + if (mydata.headerName && visibleColumnsField.includes(mydata.field)) { + if (mydata.headerName) { + return mydata.headerName; + } } + + }), + + fileName: 'data_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_") + '.xlsx', + sheetName: 'Export_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_"), + }; + + local_config.columnNames = local_config.columnNames.filter(function (element) { + return element !== undefined; + }); + + + const rows = data.map((row) => { + const mRow = {}; + for (const key of local_config.keys) { + mRow[key] = row[key]; } + return mRow; + }); - }), + const worksheet = XLSX.utils.json_to_sheet(rows); + XLSX.utils.sheet_add_aoa(worksheet, [[...local_config.columnNames]], { + origin: 'A1', + }); - fileName: 'data_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_") + '.xlsx', - sheetName: 'Export_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_"), - }; + const workbook = XLSX.utils.book_new(); + XLSX.utils.book_append_sheet(workbook, worksheet, local_config.sheetName); + XLSX.writeFile(workbook, local_config.fileName, { compression: true }); + } - local_config.columnNames = local_config.columnNames.filter(function( element ) { - return element !== undefined; - }); + function ExportMenuItem(props) { + const apiRef = useGridApiContext(); + const { hideMenu } = props; + return ( + { + handleExport(apiRef, props.data_colums); + // Hide the export menu after the export + hideMenu?.(); + }} + > + Export Excel + + ); + } - const rows = data.map((row) => { - const mRow = {}; - for (const key of local_config.keys) { - mRow[key] = row[key]; - } - return mRow; - }); - - const worksheet = XLSX.utils.json_to_sheet(rows); - XLSX.utils.sheet_add_aoa(worksheet, [[...local_config.columnNames]], { - origin: 'A1', - }); - - const workbook = XLSX.utils.book_new(); - XLSX.utils.book_append_sheet(workbook, worksheet, local_config.sheetName); - XLSX.writeFile(workbook, local_config.fileName, { compression: true }); -} - -function ExportMenuItem(props) { - const apiRef = useGridApiContext(); - const { hideMenu } = props; - - return ( - { - handleExport(apiRef, props.data_colums); - // Hide the export menu after the export - hideMenu?.(); - }} - > - Export Excel - - ); -} - -// FIN EXPORT EXCEL DATAGRID + // FIN EXPORT EXCEL DATAGRID return ( @@ -2042,7 +2087,7 @@ function ExportMenuItem(props) {
Création manuelle d'une formation
@@ -2406,125 +2451,125 @@ function ExportMenuItem(props) { }} > - {New_Get_List_Domaines_result && - New_Get_List_Metiers_result && - New_Get_List_Categorie_result && - New_Get_List_Domaines_result.length > 0 && - New_Get_List_Metiers_result.length > 0 && - New_Get_List_Categorie_result.length > 0 && + {New_Get_List_Domaines_result && + New_Get_List_Metiers_result && + New_Get_List_Categorie_result && + New_Get_List_Domaines_result.length > 0 && + New_Get_List_Metiers_result.length > 0 && + New_Get_List_Categorie_result.length > 0 && - { - setSelectionModel(newSelectionModel); - //console.log("ch selected--" + newSelectionModel); - }} - selectionModel={selectionModel} - localeText={frFR.components.MuiDataGrid.defaultProps.localeText} - rows={rowss.map((item, index) => ( + onSelectionModelChange={(newSelectionModel) => { + setSelectionModel(newSelectionModel); + //console.log("ch selected--" + newSelectionModel); + }} + selectionModel={selectionModel} + localeText={frFR.components.MuiDataGrid.defaultProps.localeText} + rows={rowss.map((item, index) => ( - { - id: index, - _id: JSON.parse(item)._id, - internal_url: JSON.parse(item).internal_url, - zone_diffusion: JSON.parse(item).zone_diffusion_str, - external_code: JSON.parse(item).external_code, - title: parse((JSON.parse(item).title).replace(/(<([^>]+)>)/ig, '')), + { + id: index, + _id: JSON.parse(item)._id, + internal_url: JSON.parse(item).internal_url, + zone_diffusion: JSON.parse(item).zone_diffusion_str, + external_code: JSON.parse(item).external_code, + title: parse((JSON.parse(item).title).replace(/(<([^>]+)>)/ig, '')), - domain: New_Get_List_Domaines_result.filter((data) => (data)._id === String(JSON.parse(item).domaine))[0].label, + domain: New_Get_List_Domaines_result.filter((data) => (data)._id === String(JSON.parse(item).domaine))[0].label, - metier: New_Get_List_Metiers_result.filter((data) => (data)._id === String(JSON.parse(item).metier))[0].label, + metier: New_Get_List_Metiers_result.filter((data) => (data)._id === String(JSON.parse(item).metier))[0].label, - categorie: New_Get_List_Categorie_result.filter((data) => (data)._id === String(JSON.parse(item).categorie))[0].label, + categorie: New_Get_List_Categorie_result.filter((data) => (data)._id === String(JSON.parse(item).categorie))[0].label, - url: JSON.parse(item).url, + url: JSON.parse(item).url, - price: JSON.parse(item).price, - description: parse((JSON.parse(item).description).replace(/(<([^>]+)>)/ig, '')), - published: JSON.parse(item).published, - lms_class_code: JSON.parse(item).lms_class_code, - duration: JSON.parse(item).duration, - duration_unit: JSON.parse(item).duration_unit, - duration_in_hour: JSON.parse(item).duration_in_hour, - presentiel: JSON.parse(item).presentiel.presentiel, - distanciel: JSON.parse(item).presentiel.distantiel, - cible: JSON.parse(item).pourqui, - currency: JSON.parse(item).currecny, + price: JSON.parse(item).price, + description: parse((JSON.parse(item).description).replace(/(<([^>]+)>)/ig, '')), + published: JSON.parse(item).published, + lms_class_code: JSON.parse(item).lms_class_code, + duration: JSON.parse(item).duration, + duration_unit: JSON.parse(item).duration_unit, + duration_in_hour: JSON.parse(item).duration_in_hour, + presentiel: JSON.parse(item).presentiel.presentiel, + distanciel: JSON.parse(item).presentiel.distantiel, + cible: JSON.parse(item).pourqui, + currency: JSON.parse(item).currecny, - version: JSON.parse(item).version, + version: JSON.parse(item).version, - nb_session_formation: JSON.parse(item).nb_session_formation, + nb_session_formation: JSON.parse(item).nb_session_formation, + + } + ))} + + columns={columns} + pageSize={10} + className="datagridclass" + + onRowDoubleClick={(newSelectionModel) => { + setgridline_id(newSelectionModel.row.id); + Closecreatetraining(); + closeTrainingForm(); + + var al = JSON.parse(rowss[newSelectionModel.row.id]) + + setselected_row_data_json(JSON.parse(rowss[newSelectionModel.row.id])); + setclassidtrainingtoupdate(newSelectionModel.row._id); + + setreftrainingtoupdate(newSelectionModel.row.internal_url); + setexternalcodetraining_toupdate(newSelectionModel.row.external_code); + setDialog_formation_open(true); } - ))} - - columns={columns} - pageSize={10} - className="datagridclass" - - onRowDoubleClick={(newSelectionModel) => { - setgridline_id(newSelectionModel.row.id); - Closecreatetraining(); - closeTrainingForm(); - - var al = JSON.parse(rowss[newSelectionModel.row.id]) - - setselected_row_data_json(JSON.parse(rowss[newSelectionModel.row.id])); - setclassidtrainingtoupdate(newSelectionModel.row._id); - - setreftrainingtoupdate(newSelectionModel.row.internal_url); - setexternalcodetraining_toupdate(newSelectionModel.row.external_code); - setDialog_formation_open(true); - - } - } - - rowsPerPageOptions={[10]} - disableSelectionOnClick - /* components={{ - Toolbar: GridToolbar, - }}*/ - - getCellClassName={(params) => { - if (params.field === 'published' && String(params.value) === "1") { - return 'cell--published'; } - if (params.field === "published" && String(params.value) !== "1") { - return 'cell--unpublished' - } + rowsPerPageOptions={[10]} + disableSelectionOnClick + /* components={{ + Toolbar: GridToolbar, + }}*/ - }} - getRowClassName={(params) => { + getCellClassName={(params) => { + if (params.field === 'published' && String(params.value) === "1") { + return 'cell--published'; + } - // Pour la gestion de la couleur de zone double cliquée - if (String(params.row.id) === String(gridline_id)) { - return 'line--statut--selected'; - } + if (params.field === "published" && String(params.value) !== "1") { + return 'cell--unpublished' + } - if (String(params.row.published) === "1") { - return 'line--published'; - } + }} + getRowClassName={(params) => { - if (String(params.row.published) !== "1") { - return 'line--unpublished'; - } + // Pour la gestion de la couleur de zone double cliquée + if (String(params.row.id) === String(gridline_id)) { + return 'line--statut--selected'; + } - }} - getEstimatedRowHeight={() => 200} - getRowHeight={() => "auto"} + if (String(params.row.published) === "1") { + return 'line--published'; + } - sx={datagridSx} + if (String(params.row.published) !== "1") { + return 'line--unpublished'; + } + + }} + getEstimatedRowHeight={() => 200} + getRowHeight={() => "auto"} + + sx={datagridSx} - />} + />} diff --git a/src/components/Groupe_Apprenant.js b/src/components/Groupe_Apprenant.js index 69e395e..cdd1392 100644 --- a/src/components/Groupe_Apprenant.js +++ b/src/components/Groupe_Apprenant.js @@ -2177,7 +2177,6 @@ const Groupe_Apprenant = (props) => { function CustomToolbar(props) { - console.log(" my props = ", props); return ( diff --git a/src/components/Module_Historique_Action.js b/src/components/Module_Historique_Action.js index cfafc24..fe8c121 100644 --- a/src/components/Module_Historique_Action.js +++ b/src/components/Module_Historique_Action.js @@ -162,7 +162,7 @@ const Module_Historique_Action = (props) => {
- +
{ })); - const StyledBadge_mysy_color1 = styled(Badge)(({ }) => ({ + const StyledBadge_mysy_color1 = styled(Badge)(({ }) => ({ '& .MuiBadge-badge': { right: 0, top: 0, border: '2px solid #ffffff', padding: '0 4px', - background:'#6a329f', - color:"#ffffff" + background: '#6a329f', + color: "#ffffff" }, })); - const StyledBadge_mysy_red = styled(Badge)(({ }) => ({ + const StyledBadge_mysy_red = styled(Badge)(({ }) => ({ '& .MuiBadge-badge': { right: 0, top: 0, border: '2px solid ', padding: '0 4px', - background:'#f44336', - color:"#ffffff", + background: '#f44336', + color: "#ffffff", }, })); @@ -1677,7 +1677,7 @@ const Partner = (props) => { {parntername} - {String(partnerPackService).toUpperCase()} ({parnternbformation})     {GetPartnerNameFromToken_api_result && conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 && - { monactivite_func(); @@ -1710,7 +1710,7 @@ const Partner = (props) => { {parnter_user_employee} {!parntername && Utilisateur }     {GetPartnerNameFromToken_api_result && conntected_employee_activite_retard && parseFloat(conntected_employee_activite_retard) > 0 && - { monactivite_func(); @@ -1721,7 +1721,7 @@ const Partner = (props) => { }     {GetPartnerNameFromToken_api_result && conntected_employee_activite_new && parseFloat(conntected_employee_activite_new) > 0 && - { monactivite_func(); @@ -2085,8 +2085,8 @@ const Partner = (props) => {
+ class_external_code={orderid} class_internal_url={packs} formation_initiale={formation_initiale} + check_user_acces_right={check_user_acces_right} />
} @@ -2294,24 +2294,26 @@ const Partner = (props) => { {String(menu) === "mes_sessions" &&
-
} {String(menu) === "mes_employes" &&
- +
} {String(menu) === "factures_client" &&
- +
} @@ -2325,8 +2327,8 @@ const Partner = (props) => { {String(menu) === "mon_materiel" &&
+ write_access={check_user_acces_right("materiel", "write")} + check_user_acces_right={check_user_acces_right} />
} @@ -2350,18 +2352,18 @@ const Partner = (props) => { {String(menu) === "mes_cmd" &&
- +
} {String(menu) === "facture" &&
- +
} @@ -2375,8 +2377,8 @@ const Partner = (props) => { + read_access={check_user_acces_right("stagiaire", "read")} write_access={check_user_acces_right("stagiaire", "write")} + check_user_acces_right={check_user_acces_right} /> } @@ -2384,8 +2386,8 @@ const Partner = (props) => { + formation_initiale={formation_initiale} + check_user_acces_right={check_user_acces_right} /> } @@ -2811,7 +2813,7 @@ const Partner = (props) => {
} @@ -3018,24 +3020,24 @@ const Partner = (props) => {
+ read_access={check_user_acces_right("session", "read")} write_access={check_user_acces_right("session", "write")} + check_user_acces_right={check_user_acces_right} />
} {String(menu) === "mes_employes" &&
- +
} {String(menu) === "factures_client" &&
+ write_access={check_user_acces_right("facture_client", "write")} + check_user_acces_right={check_user_acces_right} />
} @@ -3049,17 +3051,17 @@ const Partner = (props) => { {String(menu) === "mon_materiel" &&
+ write_access={check_user_acces_right("materiel", "write")} + check_user_acces_right={check_user_acces_right} />
} {String(menu) === "mes_salles" &&
- +
} @@ -3073,17 +3075,17 @@ const Partner = (props) => { {String(menu) === "mes_cmd" &&
+ write_access={check_user_acces_right("commande", "write")} + check_user_acces_right={check_user_acces_right} />
} {String(menu) === "facture" &&
- +
} @@ -3096,8 +3098,8 @@ const Partner = (props) => { {String(menu) === "mes_apprenants" &&
+ read_access={check_user_acces_right("stagiaire", "read")} write_access={check_user_acces_right("stagiaire", "write")} + check_user_acces_right={check_user_acces_right} />
} @@ -3105,7 +3107,7 @@ const Partner = (props) => { + formation_initiale={formation_initiale} check_user_acces_right={check_user_acces_right} /> } @@ -3124,8 +3126,8 @@ const Partner = (props) => { {String(menu) === "mes_clients" &&
+ read_access={check_user_acces_right("client", "read")} write_access={check_user_acces_right("client", "write")} + check_user_acces_right={check_user_acces_right} />
} diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index ffea8d5..b5b234e 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -37,7 +37,7 @@ import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import DialogTitle from '@mui/material/DialogTitle'; - +import Module_Historique_Action from "./Module_Historique_Action"; import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; import { Global } from "recharts"; import { FcAddDatabase } from "react-icons/fc"; @@ -156,8 +156,8 @@ const Partner_Commande = (props) => { } const columns = [ - { field: '_id', headerName: '_id', hide: true , disableExport: true,}, - { field: 'id', headerName: 'id', hide: true , disableExport: true,}, + { field: '_id', headerName: '_id', hide: true, disableExport: true, }, + { field: 'id', headerName: 'id', hide: true, disableExport: true, }, { field: 'order_header_ref_interne', headerName: 'Reference', maxWidth: 200, minWidth: 180, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'order_header_type', headerName: 'Type', width: 100, hide: false, editable: false }, { @@ -197,9 +197,9 @@ const Partner_Commande = (props) => { }, - { field: 'order_header_client_id', headerName: 'Client_Id', width: 0, hide: true, editable: false , disableExport: true,}, + { field: 'order_header_client_id', headerName: 'Client_Id', width: 0, hide: true, editable: false, disableExport: true, }, { field: 'order_header_client_nom', headerName: 'Nom Client', minWidth: 200, flex: 1, renderCell: (params) => , }, - { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false , disableExport: true,}, + { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false, disableExport: true, }, { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false, flex: 1 }, { field: 'order_header_date_cmd', headerName: 'Date', minWidth: 150, hide: false, editable: false, flex: 1, renderCell: (params) => , }, { field: 'order_header_date_expiration', headerName: 'Date Expiration', minWidth: 150, hide: false, editable: false }, @@ -988,9 +988,12 @@ const Partner_Commande = (props) => { } + const [history_securite_read, sethistory_securite_read] = useState(""); useEffect(() => { + sethistory_securite_read(props.check_user_acces_right("historique", "read")) + Get_List_Partner_Clients(); Getall_Training_Employee_No_Filter(); GetCurrentPartnerClass(); @@ -1000,7 +1003,7 @@ const Partner_Commande = (props) => { Getall_Partner_Digital_Sign_Status(); Getall_Partner_Product_Service(); - console.log(" ~### mes facture props action, orderid = ", action, orderid); + if (orderid && String(orderid).length > 3) { /* @@ -3410,6 +3413,8 @@ const Partner_Commande = (props) => { } } + + async function order_header_submenu_facturation() { setheader_submenu("facturation"); submenu_color_management("order_header_facturation"); @@ -3464,8 +3469,23 @@ const Partner_Commande = (props) => { } } + async function order_header_submenu_historique() { + /* setheader_submenu("historique"); + + submenu_color_management("historique"); + await sleep(5); + + + if (String(order_data_edit_mode) !== "1") { + disable_Order_Header_DetailFields(); + }*/ + + setDialog_order_history_open(true) + } + function submenu_color_management(current_menu) { - const list_sous_menu = ["order_header_facturation", "order_header_detail", "order_header_main", "order_header_relance",] + const list_sous_menu = ["order_header_facturation", "order_header_detail", "order_header_main", + "order_header_relance", "historique"] for (let i = 0; i < list_sous_menu.length; i++) { @@ -4609,7 +4629,6 @@ const Partner_Commande = (props) => { function CustomToolbar(props) { - console.log(" my props = ", props); return ( @@ -4656,7 +4675,7 @@ const Partner_Commande = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); - + const local_config = { keys: visibleColumnsField, @@ -4674,9 +4693,9 @@ const Partner_Commande = (props) => { sheetName: 'Export_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_"), }; - local_config.columnNames = local_config.columnNames.filter(function( element ) { + local_config.columnNames = local_config.columnNames.filter(function (element) { return element !== undefined; - }); + }); const rows = data.map((row) => { @@ -4714,6 +4733,29 @@ const Partner_Commande = (props) => { } // FIN EXPORT EXCEL DATAGRID + + const [Dialog_order_history_message, setDialog_order_history_message] = React.useState(false); + const [Dialog_order_history_open, setDialog_order_history_open] = React.useState(false); + function Dialog_order_history_handle_change_participant_session(message) { + setDialog_order_history_message(message); + setDialog_order_history_open(true); + } + + const Dialog_order_history_handleClose = () => { + //alert(" Utiliser le bouton 'fermer' "); + //setOpen(false); + }; + + const Dialog_order_history_handleClose_buton = () => { + setDialog_order_history_open(false); + + if (document.getElementsByName("order_history_bton") && document.getElementsByName("order_history_bton")[0]) { + document.getElementsByName("order_history_bton")[0].style.backgroundColor = "#d8edfc"; + document.getElementsByName("order_history_bton")[0].style.color = "#3b3e40"; + } + }; + + return (
@@ -4722,6 +4764,55 @@ const Partner_Commande = (props) => {
} + {/* Dialog affichage historique commande/devis */} + null} > + + MySy Information + + +
+
+ +
+ + +
+ + +
+
+ + +
+ + + + +
+
+   +
+ + +
+ +
+
+ +
+ +
+ {/* FIN Dialog affichage historique commande/devis */} + + {/****** Dialog pour créer une session depuis un devis */} {
- Pièces jointes + Pièces jointes
@@ -5188,7 +5279,7 @@ const Partner_Commande = (props) => { {(!selected_order_line_id || String(selected_order_line_id).length < 3) && -
Type Article +
Type Article {
{New_GetCurrentPartnerClass_result && New_GetCurrentPartnerClass_result.length > 0 && (p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé" && -
Formation +
Formation {
} - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Article + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Article {
} - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Quantité + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Quantité {
} - {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Quantité + {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Quantité {
} - {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Prix Unitaire + {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Prix Unitaire { />
} - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Prix Unitaire + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Prix Unitaire { - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Article + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Article {
} - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Quantité + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Quantité {
} - {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Quantité + {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Quantité {
} - {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Prix Unitaire + {String(p_detail_header_statut_label).toLowerCase() !== "facturé" &&
Prix Unitaire { />
} - {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Prix Unitaire + {String(p_detail_header_statut_label).toLowerCase() === "facturé" &&
Prix Unitaire { {Dialog_1_message} -
Client +
Client { rowsPerPageOptions={[10]} //disableSelectionOnClick - /* components={{ - Toolbar: GridToolbar, - }}*/ + /* components={{ + Toolbar: GridToolbar, + }}*/ //sx={datagridSx} getCellClassName={(params) => { @@ -6625,6 +6716,8 @@ const Partner_Commande = (props) => { {selected_order_header_type && String(selected_order_header_type) !== "devis" && } {selected_order_header_type && String(selected_order_header_type) === "devis" && } + {String(history_securite_read) === "1" && } +
@@ -7747,6 +7840,15 @@ const Partner_Commande = (props) => {
} + {String(header_submenu) === "historique" &&
+ +
} + + +
diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js index aaf76a7..3ca7516 100644 --- a/src/components/Partner_Facture.js +++ b/src/components/Partner_Facture.js @@ -2495,7 +2495,6 @@ const Partner_Facture = (props) => { function CustomToolbar(props) { - // console.log(" my props = ", props); return ( diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss index 2dbe88b..10e712d 100644 --- a/src/styles/components/_displaypartnersession.scss +++ b/src/styles/components/_displaypartnersession.scss @@ -42,7 +42,7 @@ opacity: 100%; } - + .Mui-disabled { font-size: small !important; @@ -2686,6 +2686,9 @@ } + .DialogContent_width_700px{ + width: 700px !important; + } // end media diff --git a/src/styles/components/_partner_commande.scss b/src/styles/components/_partner_commande.scss index ddbfae0..e5dc8a4 100644 --- a/src/styles/components/_partner_commande.scss +++ b/src/styles/components/_partner_commande.scss @@ -107,7 +107,7 @@ border: 1px solid #9cf; color: #3b3e40; font-family: "verdana", "Quicksand", "Signika", sans-serif; - font-size: small; + font-size: 11px; letter-spacing: 0.1rem; font-weight: normal; width: 100%; @@ -689,7 +689,7 @@ border: 1px solid #9cf; color: #3b3e40; font-family: "verdana", "Quicksand", "Signika", sans-serif; - font-size: small; + font-size: 11px; letter-spacing: 0.1rem; font-weight: normal; height: 2rem !important; @@ -1310,7 +1310,7 @@ border: 1px solid #9cf; color: #3b3e40; font-family: "verdana", "Quicksand", "Signika", sans-serif; - font-size: small; + font-size: 11px; letter-spacing: 0.1rem; font-weight: normal; height: 2rem !important; @@ -1810,7 +1810,7 @@ border: 1px solid #9cf; color: #3b3e40; font-family: "verdana", "Quicksand", "Signika", sans-serif; - font-size: small; + font-size: 11px; letter-spacing: 0.1rem; font-weight: normal; height: 2rem !important;