-
{Session_step_chanel_label[channel]}
+
{channel.label}
+ ({tasks.filter(item => item.is_session_alert === "1").filter(item => item.session_etape === channel.label).length})
+
{tasks
.filter(item => item.is_session_alert === "1")
- .filter(item => item.session_etape === channel)
+ .filter(item => item.session_etape === channel.label)
.map(item => (
- {
setgridline_id(item.id);
@@ -16892,9 +16957,17 @@ const DisplayPartnerSession = (props) => {
{String(item.code_session).length > 30 && }
{String(item.code_session).length <= 30 && }
+ {String(item.date_debut) && }
+ {String(item.date_fin) && }
+ {String(item.nb_participant) && }
+
+
+
+ {item.taux_remplissage && parseFloat(item.taux_remplissage) < 0.3 && }
+ {item.taux_remplissage && parseFloat(item.taux_remplissage) >= 0.3 && parseFloat(item.taux_remplissage) <= 0.6 && }
+ {item.taux_remplissage && parseFloat(item.taux_remplissage) > 0.6 && }
+
- {String(item.titre).length > 30 && }
- {String(item.titre).length <= 30 && }
@@ -16910,6 +16983,178 @@ const DisplayPartnerSession = (props) => {
}
+ {(!data_row_grouped_by || String(data_row_grouped_by) === "") && session_display_view && String(session_display_view) === "timeline" &&
+ New_Getall_TrainingSession_result_Timeline_Group && New_Getall_TrainingSession_result_Timeline_Group.length > 0 &&
+ New_Getall_TrainingSession_result_Timeline_Item && New_Getall_TrainingSession_result_Timeline_Item.length > 0 &&
+
+
+
+
item.is_session_alert === "1")}
+ items={New_Getall_TrainingSession_result_Timeline_Item.filter(item => item.is_session_alert === "1")}
+ defaultTimeStart={defaultTimeStart}
+ defaultTimeEnd={defaultTimeEnd}
+ fullUpdate
+ itemTouchSendsClick={false}
+ stackItems
+ itemHeightRatio={0.75}
+ canMove={true}
+ canResize={"both"}
+ onItemDoubleClick={(ItemId) => {
+
+ var myrowId = ItemId;
+ var myrow_id = New_Getall_TrainingSession_result_Timeline_Item[ItemId]._id;
+ var my_invoice_status = New_Getall_TrainingSession_result_Timeline_Item[ItemId].invoiced_statut;
+ var my_class_id = New_Getall_TrainingSession_result_Timeline_Item[ItemId].class_id;
+ var my_title = JSON.parse(rowss[ItemId]).title
+ var my_taux_remplissage = parseFloat(String(JSON.parse(rowss[ItemId]).taux_remplissage))*100;
+
+ setgridline_id(ItemId);
+
+ setsequence_gridline_id("");
+
+ setaddOneSession("0");
+ setEdite_session("0");
+ setsessionChanged(false);
+ //handleClick_edit_session_From_Line(newSelectionModel.row.id);
+
+ setselected_session_id(myrow_id);
+
+ setsession_selected_row_id(myrowId);
+ setselected_session_invoiced_statut(my_invoice_status);
+ setsession_selected_class_id(my_class_id);
+
+ setDialog_2_message(String(my_title));
+ setDialog_2_open(true);
+ }}
+
+
+ >
+
+
+ {({ getRootProps }) => {
+ return Date/
Code Session
+ }}
+
+
+
+
+
+
+
+
+
+
+ }
+
}
diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js
index 5dee75e..9141f5d 100644
--- a/src/components/DisplayPartnerTrainingsPagination.js
+++ b/src/components/DisplayPartnerTrainingsPagination.js
@@ -52,7 +52,7 @@ import {
} from '@mui/x-data-grid';
import * as XLSX from 'xlsx';
-
+import { useCookies } from "react-cookie";
import { makeStyles } from "@material-ui/core/styles";
import Paper from '@material-ui/core/Paper';
import Draggable from 'react-draggable';
@@ -103,6 +103,8 @@ const useStyles = makeStyles((theme) => ({
const DistplayPartnerTraningsPage = (props) => {
+ const stored_cookie_catalog_data_row_grouped_by = getCookie('mysy_catalog_data_row_grouped_by');
+
const history = useHistory();
const [myApiResponse, setmyApiResponse] = useState("false");
const filters = [
@@ -354,7 +356,7 @@ const DistplayPartnerTraningsPage = (props) => {
.then((data) => data.json())
.then((data) => {
// console.log('GetAllClass_new ==> Success:', data['message'], "data['status'] = ", data['status']);
- console.log(" String(data['status'] = ", String(data['status']));
+ // console.log(" String(data['status'] = ", String(data['status']));
setTableData(data['message']);
setRows(data['message']);
if (String(data['status']) === String("false")) {
@@ -526,7 +528,7 @@ const DistplayPartnerTraningsPage = (props) => {
{ field: 'metier', headerName: 'Métier', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: true, editable: false, renderCell: (params) =>
, },
- { field: 'categorie', headerName: 'Catégorie', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: true, editable: false, renderCell: (params) =>
, },
+ { field: 'categorie', headerName: 'Catégorie', minWidth: 100, flex: 1, maxWidth: 200, hideable: true, hide: false, editable: false, renderCell: (params) =>
, },
{
@@ -1772,6 +1774,14 @@ const DistplayPartnerTraningsPage = (props) => {
setdatagrid_columns_size_model2(10);
}
}
+
+ // Recuperation de mode de regroupement des données de session
+ if (stored_cookie_catalog_data_row_grouped_by) {
+ setdata_row_grouped_by(stored_cookie_catalog_data_row_grouped_by);
+ setdata_row_grouped_field(stored_cookie_catalog_data_row_grouped_by);
+ datagrid_grouped_by(stored_cookie_catalog_data_row_grouped_by);
+ }
+
}, []);
function Clearselectedfilt1() {
@@ -2245,10 +2255,9 @@ const DistplayPartnerTraningsPage = (props) => {
function getTreeDataPath(param) {
var local_tmp = data_row_grouped_field;
-
var local_tab_array = [];
-
+
if (param[local_tmp]) {
local_tab_array.push(String(param[local_tmp]));
} else {
@@ -2271,8 +2280,18 @@ const DistplayPartnerTraningsPage = (props) => {
{ "id": "", "label": "Aucun", "value": "" },
{ "id": "domain", "label": "Domaine", "value": "domain" },
{ "id": "metier", "label": "Métier ", "value": "metier" },
+ { "id": "categorie", "label": "Gatégorie ", "value": "categorie" },
]
+ const [cookie_catalog_display_view, setcookie_catalog_display_view, removecookie_catalog_display_view] = useCookies(['mysy_catalog_data_row_grouped_by,']);
+
+ function func_catalog_data_grouped_by(grouped_by) {
+ setdata_row_grouped_by(grouped_by);
+ setdata_row_grouped_field(grouped_by);
+ datagrid_grouped_by(grouped_by);
+ setcookie_catalog_display_view("mysy_catalog_data_row_grouped_by", String(grouped_by), { path: '/' });
+ }
+
return (
@@ -2795,17 +2814,15 @@ const DistplayPartnerTraningsPage = (props) => {
id="filtre11"
className="disabled_style"
options={New_option_group_by}
+ value={data_row_grouped_field}
onChange={(event, value) => {
if (value && value.value) {
- setdata_row_grouped_by(value.value);
- setdata_row_grouped_field(value.value);
- datagrid_grouped_by(value.value);
+
+ func_catalog_data_grouped_by(value.value);
} else {
- setdata_row_grouped_by("");
- setdata_row_grouped_field("");
- datagrid_grouped_by("");
+ func_catalog_data_grouped_by("");
}
}}
@@ -2992,7 +3009,8 @@ const DistplayPartnerTraningsPage = (props) => {
}
- {data_row_grouped_by && (String(data_row_grouped_by) === "domain" || String(data_row_grouped_by) === "metier") &&
+ {data_row_grouped_by && (String(data_row_grouped_by) === "domain" || String(data_row_grouped_by) === "metier" ||
+ String(data_row_grouped_by) === "categorie") &&