@@ -413,6 +430,27 @@ const Dashbord_Inscriptions = (props) => {
height: 500,
width: '100%',
paddingRight: '1px',
+ '& .cell--inscrit': {
+ backgroundColor: '#2ECC71',
+ color: '#1a3e72',
+ fontWeight: 'bold',
+ },
+ '& .cell--preinscrit': {
+ backgroundColor: '#F7DC6F',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+ '& .cell--encours': {
+ backgroundColor: '#D2B4DE',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+ '& .cell--annule': {
+ backgroundColor: '#ABB2B9',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+
"& .MuiDataGrid-columnHeaders": {
backgroundColor: "#c8cfd5",
@@ -467,7 +505,9 @@ const Dashbord_Inscriptions = (props) => {
session_date_fin: JSON.parse(item).session_date_fin,
session_distantiel: JSON.parse(item).session_distantiel,
session_presentiel: JSON.parse(item).session_presentiel,
-
+ inscription_status: JSON.parse(item).inscription_status,
+ apprenant_id: JSON.parse(item).apprenant_id,
+
}
))}
@@ -476,7 +516,7 @@ const Dashbord_Inscriptions = (props) => {
className="datagridclass"
onRowDoubleClick={(newSelectionModel) => {
-
+
}}
@@ -489,15 +529,19 @@ const Dashbord_Inscriptions = (props) => {
//sx={datagridSx}
getCellClassName={(params) => {
- // 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 === 'inscription_status' && String(params.value) === "-1") {
+ return 'cell--annule';
}
- else if (parseInt(String(params.row.id)) % 2 === 0) {
- return 'line--statut--pair';
+ if (params.field === "inscription_status" && String(params.value) == "0") {
+ return 'cell--preinscrit';
}
- else if (parseInt(String(params.row.id)) % 2 !== 0) {
- return 'line--statut--impair';
+
+ if (params.field === "inscription_status" && String(params.value) == "1") {
+ return 'cell--inscrit';
+ }
+
+ if (params.field === "inscription_status" && String(params.value) == "2") {
+ return '.cell--encours';
}
}}
diff --git a/src/components/Dashbord_Inscription_All_Inscription.js b/src/components/Dashbord_Inscription_All_Inscription.js
index 57151e5..a2533d5 100644
--- a/src/components/Dashbord_Inscription_All_Inscription.js
+++ b/src/components/Dashbord_Inscription_All_Inscription.js
@@ -41,6 +41,23 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
const columns = [
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
+ {
+ field: 'inscription_status', headerName: 'Inscrit', hide: false, minWidth: 50, flex: 1, maxWidth: 60,
+ valueFormatter: (params) => {
+ if (String(params.value) === "0")
+ return "Pré.";
+ else if (String(params.value) === "1")
+ return "Ins.";
+ else if (String(params.value) === "2")
+ return "Enc.";
+ else if (String(params.value) === "-1")
+ return "Ann.";
+
+ else
+ return "?";
+ },
+ },
+ { field: 'apprenant_id', headerName: 'apprenant_id', hide: true, Width: 0, },
{ field: 'civilite', headerName: 'Civ.', hide: false, minWidth: 50, flex: 1, maxWidth: 60 },
{ field: 'nom', headerName: 'Nom', hide: false, flex: 1, minWidth: 20 },
{ field: 'prenom', headerName: 'Prénom', hide: false, flex: 1, minWidth: 200 },
@@ -99,7 +116,7 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
form.append("filter_value", filter_value);
-
+ console.log(' #### Get_Qery_Inscription_By_Session_By_Periode form = ', form);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Qery_Inscription_By_Session_By_Periode/";
@@ -266,6 +283,8 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
useEffect(() => {
+ console.log(" &&&& props.user_dashbord_filter_end = ", props.user_dashbord_filter_end);
+
setp_filter_date_from(props.user_dashbord_filter_start);
setp_filter_date_to(props.user_dashbord_filter_end);
setevent_type_filter(props.user_dashbord_filter_type_envent);
@@ -277,7 +296,7 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
@@ -395,6 +414,27 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
height: 500,
width: '100%',
paddingRight: '1px',
+ '& .cell--inscrit': {
+ backgroundColor: '#2ECC71',
+ color: '#1a3e72',
+ fontWeight: 'bold',
+ },
+ '& .cell--preinscrit': {
+ backgroundColor: '#F7DC6F',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+ '& .cell--encours': {
+ backgroundColor: '#D2B4DE',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+ '& .cell--annule': {
+ backgroundColor: '#ABB2B9',
+ color: '#1a3e72',
+ fontWeight: 'light',
+ },
+
"& .MuiDataGrid-columnHeaders": {
backgroundColor: "#c8cfd5",
@@ -449,6 +489,8 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
session_date_fin: JSON.parse(item).session_date_fin,
session_distantiel: JSON.parse(item).session_distantiel,
session_presentiel: JSON.parse(item).session_presentiel,
+ inscription_status: JSON.parse(item).inscription_status,
+ apprenant_id: JSON.parse(item).apprenant_id,
}
))}
@@ -471,15 +513,19 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => {
//sx={datagridSx}
getCellClassName={(params) => {
- // 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 === 'inscription_status' && String(params.value) === "-1") {
+ return 'cell--annule';
}
- else if (parseInt(String(params.row.id)) % 2 === 0) {
- return 'line--statut--pair';
+ if (params.field === "inscription_status" && String(params.value) == "0") {
+ return 'cell--preinscrit';
}
- else if (parseInt(String(params.row.id)) % 2 !== 0) {
- return 'line--statut--impair';
+
+ if (params.field === "inscription_status" && String(params.value) == "1") {
+ return 'cell--inscrit';
+ }
+
+ if (params.field === "inscription_status" && String(params.value) == "2") {
+ return '.cell--encours';
}
}}
diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js
index 4f7bbe8..e0c2cfc 100644
--- a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js
+++ b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js
@@ -212,7 +212,7 @@ const Dashbord_Ressources_Humaines_Tache_Couts = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
function Export_Dashbord_to_CSV(local_dashbord_internal_id) {
diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js
index 045875a..b46c4f7 100644
--- a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js
+++ b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js
@@ -198,7 +198,7 @@ const Dashbord_Ressources_Humaines_Tache_by_rhid = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
function Export_Dashbord_to_CSV(local_dashbord_internal_id) {
diff --git a/src/components/Dashbord_Session_Par_Fteur.js b/src/components/Dashbord_Session_Par_Fteur.js
index 024bb79..defc5f6 100644
--- a/src/components/Dashbord_Session_Par_Fteur.js
+++ b/src/components/Dashbord_Session_Par_Fteur.js
@@ -361,7 +361,7 @@ const Dashbord_Session_Par_Fteur = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
const [filter_value, setfilter_value] = useState("");
diff --git a/src/components/Dashbord_Session_Repartition_Fteur.js b/src/components/Dashbord_Session_Repartition_Fteur.js
index 5e41133..6b25a0a 100644
--- a/src/components/Dashbord_Session_Repartition_Fteur.js
+++ b/src/components/Dashbord_Session_Repartition_Fteur.js
@@ -361,7 +361,7 @@ const Dashbord_Session_Repartition_Fteur = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
const [filter_value, setfilter_value] = useState("");
diff --git a/src/components/Dashbord_Session_Taux_Remplissage.js b/src/components/Dashbord_Session_Taux_Remplissage.js
index ff6c3b9..3025a59 100644
--- a/src/components/Dashbord_Session_Taux_Remplissage.js
+++ b/src/components/Dashbord_Session_Taux_Remplissage.js
@@ -363,7 +363,7 @@ const Dashbord_Session_Taux_Remplissage = (props) => {
behavior: "smooth",
});
- }, [])
+ }, [p_filter_date_from, p_filter_date_to])
const [filter_value, setfilter_value] = useState("m0");
diff --git a/src/components/Mon_Tableau_De_Bord.js b/src/components/Mon_Tableau_De_Bord.js
index a4823e7..d40b2b8 100644
--- a/src/components/Mon_Tableau_De_Bord.js
+++ b/src/components/Mon_Tableau_De_Bord.js
@@ -194,6 +194,8 @@ const Mon_Tableau_De_Bord = (props) => {
}
{String(JSON.parse(step).dashbord_internal_code) === "tbd_inscription_01" &&
+
+