Affichage :
planning
@@ -1522,7 +1547,7 @@ const Module_Absence = (props) => {
displayEventEnd={true}
eventContent={renderEventContent}
eventClick={handleEventClick}
-
+ hiddenDays={[0]}
/>
@@ -1704,4 +1729,19 @@ width: 100%;
.fc-event-main{
word-wrap: break-word;
}
+
+ .fc .fc-timegrid-slot {
+ height: 35px !important;
+}
+
+.fc .fc-timegrid-slot-label-cushion {
+ font-size: 13px;
+ font-weight: 700;
+ color: #475569;
+}
+
+.fc .fc-timegrid-axis-cushion {
+ font-size: 13px;
+ color: #64748b;
+}
`;
\ No newline at end of file
diff --git a/src/components/Module_ENT_Absence.js b/src/components/Module_ENT_Absence.js
index 6784e83..0c4488d 100644
--- a/src/components/Module_ENT_Absence.js
+++ b/src/components/Module_ENT_Absence.js
@@ -15,7 +15,7 @@ import fr from 'date-fns/locale/fr';
import { registerLocale } from 'react-datepicker';
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
-
+import { FlagTriangleRight } from 'lucide-react';
import moment from "moment";
import Box from '@mui/material/Box';
@@ -200,7 +200,6 @@ const Module_ENT_Absence = (props) => {
'start': String(JSON.parse(obj).event_start),
'end': String(JSON.parse(obj).event_end),
'id': String(JSON.parse(obj)._id),
-
'type': String(JSON.parse(obj).event_type),
'justified': String(JSON.parse(obj).justified),
'session_id': String(JSON.parse(obj).session_id),
@@ -416,12 +415,14 @@ const Module_ENT_Absence = (props) => {
})
}
+ const [local_heure_non_justifie, setlocal_heure_non_justifie] = useState();
const [Get_ENT_Apprenant_Total_Heure_Absence_api, setGet_ENT_Apprenant_Total_Heure_Absence_api] = useState();
const [Get_ENT_Apprenant_Total_Heure_Absence_message, setGet_ENT_Apprenant_Total_Heure_Absence_message] = useState();
const [Get_ENT_Apprenant_Total_Heure_Absence_result, setGet_ENT_Apprenant_Total_Heure_Absence_result] = useState();
function Get_ENT_Apprenant_Total_Heure_Absence(event) {
+ setlocal_heure_non_justifie();
var form = new FormData();
const stored_cookie = getCookie('tokenmysych');
form.append("token", stored_cookie);
@@ -434,13 +435,15 @@ const Module_ENT_Absence = (props) => {
axios.post(myurl, form).then(res => {
//console.log(" In Get_ENT_Apprenant_Total_Heure_Absence res.data.status = " + res.data.status);
- console.log(" In Get_ENT_Apprenant_Total_Heure_Absence res.data.message r_class = " + res.data.message);
+ // console.log(" In Get_ENT_Apprenant_Total_Heure_Absence res.data.message r_class = " + res.data.message);
setLoading(false);
if (String(res.data.status) === String("true")) {
setGet_ENT_Apprenant_Total_Heure_Absence_api("true");
setGet_ENT_Apprenant_Total_Heure_Absence_result(res.data.message);
+ setlocal_heure_non_justifie(JSON.parse(res.data.message).total_heure_absence_non_justifie)
+
}
else if (String(res.data.status) === String("Err_Connexion")) {
@@ -702,8 +705,21 @@ const Module_ENT_Absence = (props) => {
//console.log(eventInfo);
return (
<>
-
{eventInfo.timeText}
- {eventInfo.event.extendedProps.code_session &&
{eventInfo.event.extendedProps.code_session} }
+
{eventInfo.timeText}
+
+ {eventInfo.event.extendedProps.justified && eventInfo.event.extendedProps.justified === "true" &&
+ }
+
+ {eventInfo.event.extendedProps.justified && eventInfo.event.extendedProps.justified !== "true" &&
+ }
+
+
+
+ {eventInfo.event.title && <>
{eventInfo.event.title} >}
+
+
+
+
>
)
};
@@ -1425,11 +1441,21 @@ const Module_ENT_Absence = (props) => {
}
-
+
-
Absences - {Get_ENT_Apprenant_Total_Heure_Absence_result && {JSON.parse(Get_ENT_Apprenant_Total_Heure_Absence_result).total_heure_absence} heure(s) }
-
+
+
+ {local_heure_non_justifie && local_heure_non_justifie.length > 0 &&
Absences - {Get_ENT_Apprenant_Total_Heure_Absence_result &&
+
+ {JSON.parse(Get_ENT_Apprenant_Total_Heure_Absence_result).total_heure_absence} heure(s) dont {JSON.parse(Get_ENT_Apprenant_Total_Heure_Absence_result).total_heure_absence_non_justifie} non justifiée (s) }
+ }
+
+ {!local_heure_non_justifie || local_heure_non_justifie.length <= 0 &&
Absences - {Get_ENT_Apprenant_Total_Heure_Absence_result &&
+
+ {JSON.parse(Get_ENT_Apprenant_Total_Heure_Absence_result).total_heure_absence} heure(s) }
+ }
+
Affichage : planning
@@ -1468,6 +1494,7 @@ const Module_ENT_Absence = (props) => {
eventContent={renderEventContent}
eventClick={handleEventClick}
editable={false}
+ hiddenDays={[0]}
/>
diff --git a/src/components/Module_Email_Management.js b/src/components/Module_Email_Management.js
index ae4027a..54f051e 100644
--- a/src/components/Module_Email_Management.js
+++ b/src/components/Module_Email_Management.js
@@ -453,9 +453,9 @@ const Module_Email_Management = (props) => {
}
}
- console.log(" ### form = ",form)
+ //console.log(" ### form = ", form)
- // return;
+ // return;
setLoading(true);
@@ -503,7 +503,7 @@ const Module_Email_Management = (props) => {
}
-
+
useEffect(() => {
Get_Partner_List_SendEmail_Document("SENDEMAIL_MODELE");
@@ -764,23 +764,23 @@ const Module_Email_Management = (props) => {
}}
renderInput={(params) =>
- }
+ }
/>}
@@ -924,8 +924,8 @@ const Module_Email_Management = (props) => {
height: 400,
menubar: true,
plugins: [
- 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace',
- 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount',
+ 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace',
+ 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'code', 'help', 'wordcount',
'lists', 'link', 'image', 'charmap', 'preview', 'anchor', 'searchreplace', 'visualblocks',
],
@@ -1024,7 +1024,7 @@ const Module_Email_Management = (props) => {