diff --git a/package-lock.json b/package-lock.json
index 8499111..0932473 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,10 +18,15 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
- "@fullcalendar/core": "^6.1.9",
+ "@fullcalendar/core": "^6.1.11",
"@fullcalendar/daygrid": "^6.1.9",
"@fullcalendar/interaction": "^6.1.9",
+ "@fullcalendar/multimonth": "^6.1.11",
"@fullcalendar/react": "^6.1.9",
+ "@fullcalendar/resource": "^6.1.11",
+ "@fullcalendar/resource-timegrid": "^6.1.11",
+ "@fullcalendar/resource-timeline": "^6.1.11",
+ "@fullcalendar/scrollgrid": "^6.1.11",
"@fullcalendar/timegrid": "^6.1.9",
"@mantine/core": "^4.2.10",
"@mantine/hooks": "^4.2.10",
@@ -3224,19 +3229,19 @@
}
},
"node_modules/@fullcalendar/core": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.9.tgz",
- "integrity": "sha512-eeG+z9BWerdsU9Ac6j16rpYpPnE0wxtnEHiHrh/u/ADbGTR3hCOjCD9PxQOfhOTHbWOVs7JQunGcksSPu5WZBQ==",
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.11.tgz",
+ "integrity": "sha512-TjG7c8sUz+Vkui2FyCNJ+xqyu0nq653Ibe99A66LoW95oBo6tVhhKIaG1Wh0GVKymYiqAQN/OEdYTuj4ay27kA==",
"dependencies": {
"preact": "~10.12.1"
}
},
"node_modules/@fullcalendar/daygrid": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.9.tgz",
- "integrity": "sha512-o/6joH/7lmVHXAkbaa/tUbzWYnGp/LgfdiFyYPkqQbjKEeivNZWF1WhHqFbhx0zbFONSHtrvkjY2bjr+Ef2quQ==",
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.11.tgz",
+ "integrity": "sha512-hF5jJB7cgUIxWD5MVjj8IU407HISyLu7BWXcEIuTytkfr8oolOXeCazqnnjmRbnFOncoJQVstTtq6SIhaT32Xg==",
"peerDependencies": {
- "@fullcalendar/core": "~6.1.9"
+ "@fullcalendar/core": "~6.1.11"
}
},
"node_modules/@fullcalendar/interaction": {
@@ -3247,6 +3252,25 @@
"@fullcalendar/core": "~6.1.9"
}
},
+ "node_modules/@fullcalendar/multimonth": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/multimonth/-/multimonth-6.1.11.tgz",
+ "integrity": "sha512-7DbPC+AAlaKnquGVdw1Z85Q3nSZ4GZ1NcVIk4k7bLnqDlntwHPPsrDlSIzUWKcN0q5/u7jQHm4PU1m3LAl70Sg==",
+ "dependencies": {
+ "@fullcalendar/daygrid": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/premium-common": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/premium-common/-/premium-common-6.1.11.tgz",
+ "integrity": "sha512-3WsSizkGDJEu+AlgQlFXKI+/DYCYTRp0PQRz0vS63qKBEUsVzfSD0oi/7jCylZJlCUteIjbi4Hu1I2I5o6UHrQ==",
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11"
+ }
+ },
"node_modules/@fullcalendar/react": {
"version": "6.1.9",
"resolved": "https://registry.npmjs.org/@fullcalendar/react/-/react-6.1.9.tgz",
@@ -3257,15 +3281,90 @@
"react-dom": "^16.7.0 || ^17 || ^18"
}
},
- "node_modules/@fullcalendar/timegrid": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.9.tgz",
- "integrity": "sha512-le7UV05wVE1Trdr054kgJXTwa+A1pEI8nlCBnPWdcyrL+dTLoPvQ4AWEVCnV7So+4zRYaCqnqGXfCJsj0RQa0g==",
+ "node_modules/@fullcalendar/resource": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource/-/resource-6.1.11.tgz",
+ "integrity": "sha512-hxTQQ+eywfcC28JeyQEdJov+Jqa73zy4xU0Gg7DTTOVlS2lFVrQKM5aMXW8iz800rPbvHFAyVwfFNHclJrRoeQ==",
"dependencies": {
- "@fullcalendar/daygrid": "~6.1.9"
+ "@fullcalendar/premium-common": "~6.1.11"
},
"peerDependencies": {
- "@fullcalendar/core": "~6.1.9"
+ "@fullcalendar/core": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/resource-daygrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-daygrid/-/resource-daygrid-6.1.11.tgz",
+ "integrity": "sha512-d/tuNS3mEDELlcohaJ/tQh4SbfeJzO6+1jLZ7Zzpm2oerdYskAzroB0qUlzhs4F9E5WeMj5RfXWUbZ+bmeoYvQ==",
+ "dependencies": {
+ "@fullcalendar/daygrid": "~6.1.11",
+ "@fullcalendar/premium-common": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11",
+ "@fullcalendar/resource": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/resource-timegrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timegrid/-/resource-timegrid-6.1.11.tgz",
+ "integrity": "sha512-oomckSrvBjRpp2U8knsimhUWIaIcHf834gWOHpNMwxthzDX1CZ+QzQ3/ZSwMSu0N+L8y2TMpfcBwddX3gCEkTA==",
+ "dependencies": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/resource-daygrid": "~6.1.11",
+ "@fullcalendar/timegrid": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11",
+ "@fullcalendar/resource": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/resource-timeline": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timeline/-/resource-timeline-6.1.11.tgz",
+ "integrity": "sha512-RIQOwGxN8n2jSIOsEGUjzoGgdYDZq8t4sUvSUfnahGwyCesMqsYNmpA+58PFy/BHPIgxyvy8awH2CnjjSN7Uiw==",
+ "dependencies": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/scrollgrid": "~6.1.11",
+ "@fullcalendar/timeline": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11",
+ "@fullcalendar/resource": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/scrollgrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/scrollgrid/-/scrollgrid-6.1.11.tgz",
+ "integrity": "sha512-GRhhU8ACHqgfxdMnP59VPThfNG3Stkp9zq1sLnI992g1fZQ+V2UhYvl5qhu3eEVSp2KTDPx4NaoR35cQGrC1Mw==",
+ "dependencies": {
+ "@fullcalendar/premium-common": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/timegrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.11.tgz",
+ "integrity": "sha512-0seUHK/ferH89IeuCvV4Bib0zWjgK0nsptNdmAc9wDBxD/d9hm5Mdti0URJX6bDoRtsSfRDu5XsRcrzwoc+AUQ==",
+ "dependencies": {
+ "@fullcalendar/daygrid": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11"
+ }
+ },
+ "node_modules/@fullcalendar/timeline": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/timeline/-/timeline-6.1.11.tgz",
+ "integrity": "sha512-MGUEAHlFBWxpuhSWhZbHOtD9i+b8GZjqNV82MH+vwPHq1Jjqe8qj9Wby00vKikdWH+RuAB+IuiKjQaROEU0Ecw==",
+ "dependencies": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/scrollgrid": "~6.1.11"
+ },
+ "peerDependencies": {
+ "@fullcalendar/core": "~6.1.11"
}
},
"node_modules/@googlemaps/js-api-loader": {
@@ -35898,34 +35997,101 @@
}
},
"@fullcalendar/core": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.9.tgz",
- "integrity": "sha512-eeG+z9BWerdsU9Ac6j16rpYpPnE0wxtnEHiHrh/u/ADbGTR3hCOjCD9PxQOfhOTHbWOVs7JQunGcksSPu5WZBQ==",
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.11.tgz",
+ "integrity": "sha512-TjG7c8sUz+Vkui2FyCNJ+xqyu0nq653Ibe99A66LoW95oBo6tVhhKIaG1Wh0GVKymYiqAQN/OEdYTuj4ay27kA==",
"requires": {
"preact": "~10.12.1"
}
},
"@fullcalendar/daygrid": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.9.tgz",
- "integrity": "sha512-o/6joH/7lmVHXAkbaa/tUbzWYnGp/LgfdiFyYPkqQbjKEeivNZWF1WhHqFbhx0zbFONSHtrvkjY2bjr+Ef2quQ=="
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.11.tgz",
+ "integrity": "sha512-hF5jJB7cgUIxWD5MVjj8IU407HISyLu7BWXcEIuTytkfr8oolOXeCazqnnjmRbnFOncoJQVstTtq6SIhaT32Xg=="
},
"@fullcalendar/interaction": {
"version": "6.1.9",
"resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.9.tgz",
"integrity": "sha512-I3FGnv0kKZpIwujg3HllbKrciNjTqeTYy3oJG226oAn7lV6wnrrDYMmuGmA0jPJAGN46HKrQqKN7ItxQRDec4Q=="
},
+ "@fullcalendar/multimonth": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/multimonth/-/multimonth-6.1.11.tgz",
+ "integrity": "sha512-7DbPC+AAlaKnquGVdw1Z85Q3nSZ4GZ1NcVIk4k7bLnqDlntwHPPsrDlSIzUWKcN0q5/u7jQHm4PU1m3LAl70Sg==",
+ "requires": {
+ "@fullcalendar/daygrid": "~6.1.11"
+ }
+ },
+ "@fullcalendar/premium-common": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/premium-common/-/premium-common-6.1.11.tgz",
+ "integrity": "sha512-3WsSizkGDJEu+AlgQlFXKI+/DYCYTRp0PQRz0vS63qKBEUsVzfSD0oi/7jCylZJlCUteIjbi4Hu1I2I5o6UHrQ=="
+ },
"@fullcalendar/react": {
"version": "6.1.9",
"resolved": "https://registry.npmjs.org/@fullcalendar/react/-/react-6.1.9.tgz",
"integrity": "sha512-ioxu0V++pYz2u/N1LL1V8DkMyiKGRun0gMAll2tQz3Kzi3r9pTwncGKRb1zO8h0e+TrInU08ywk/l5lBwp7eog=="
},
- "@fullcalendar/timegrid": {
- "version": "6.1.9",
- "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.9.tgz",
- "integrity": "sha512-le7UV05wVE1Trdr054kgJXTwa+A1pEI8nlCBnPWdcyrL+dTLoPvQ4AWEVCnV7So+4zRYaCqnqGXfCJsj0RQa0g==",
+ "@fullcalendar/resource": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource/-/resource-6.1.11.tgz",
+ "integrity": "sha512-hxTQQ+eywfcC28JeyQEdJov+Jqa73zy4xU0Gg7DTTOVlS2lFVrQKM5aMXW8iz800rPbvHFAyVwfFNHclJrRoeQ==",
"requires": {
- "@fullcalendar/daygrid": "~6.1.9"
+ "@fullcalendar/premium-common": "~6.1.11"
+ }
+ },
+ "@fullcalendar/resource-daygrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-daygrid/-/resource-daygrid-6.1.11.tgz",
+ "integrity": "sha512-d/tuNS3mEDELlcohaJ/tQh4SbfeJzO6+1jLZ7Zzpm2oerdYskAzroB0qUlzhs4F9E5WeMj5RfXWUbZ+bmeoYvQ==",
+ "requires": {
+ "@fullcalendar/daygrid": "~6.1.11",
+ "@fullcalendar/premium-common": "~6.1.11"
+ }
+ },
+ "@fullcalendar/resource-timegrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timegrid/-/resource-timegrid-6.1.11.tgz",
+ "integrity": "sha512-oomckSrvBjRpp2U8knsimhUWIaIcHf834gWOHpNMwxthzDX1CZ+QzQ3/ZSwMSu0N+L8y2TMpfcBwddX3gCEkTA==",
+ "requires": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/resource-daygrid": "~6.1.11",
+ "@fullcalendar/timegrid": "~6.1.11"
+ }
+ },
+ "@fullcalendar/resource-timeline": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timeline/-/resource-timeline-6.1.11.tgz",
+ "integrity": "sha512-RIQOwGxN8n2jSIOsEGUjzoGgdYDZq8t4sUvSUfnahGwyCesMqsYNmpA+58PFy/BHPIgxyvy8awH2CnjjSN7Uiw==",
+ "requires": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/scrollgrid": "~6.1.11",
+ "@fullcalendar/timeline": "~6.1.11"
+ }
+ },
+ "@fullcalendar/scrollgrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/scrollgrid/-/scrollgrid-6.1.11.tgz",
+ "integrity": "sha512-GRhhU8ACHqgfxdMnP59VPThfNG3Stkp9zq1sLnI992g1fZQ+V2UhYvl5qhu3eEVSp2KTDPx4NaoR35cQGrC1Mw==",
+ "requires": {
+ "@fullcalendar/premium-common": "~6.1.11"
+ }
+ },
+ "@fullcalendar/timegrid": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.11.tgz",
+ "integrity": "sha512-0seUHK/ferH89IeuCvV4Bib0zWjgK0nsptNdmAc9wDBxD/d9hm5Mdti0URJX6bDoRtsSfRDu5XsRcrzwoc+AUQ==",
+ "requires": {
+ "@fullcalendar/daygrid": "~6.1.11"
+ }
+ },
+ "@fullcalendar/timeline": {
+ "version": "6.1.11",
+ "resolved": "https://registry.npmjs.org/@fullcalendar/timeline/-/timeline-6.1.11.tgz",
+ "integrity": "sha512-MGUEAHlFBWxpuhSWhZbHOtD9i+b8GZjqNV82MH+vwPHq1Jjqe8qj9Wby00vKikdWH+RuAB+IuiKjQaROEU0Ecw==",
+ "requires": {
+ "@fullcalendar/premium-common": "~6.1.11",
+ "@fullcalendar/scrollgrid": "~6.1.11"
}
},
"@googlemaps/js-api-loader": {
diff --git a/package.json b/package.json
index fc55b8b..a625e80 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,15 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
- "@fullcalendar/core": "^6.1.9",
+ "@fullcalendar/core": "^6.1.11",
"@fullcalendar/daygrid": "^6.1.9",
"@fullcalendar/interaction": "^6.1.9",
+ "@fullcalendar/multimonth": "^6.1.11",
"@fullcalendar/react": "^6.1.9",
+ "@fullcalendar/resource": "^6.1.11",
+ "@fullcalendar/resource-timegrid": "^6.1.11",
+ "@fullcalendar/resource-timeline": "^6.1.11",
+ "@fullcalendar/scrollgrid": "^6.1.11",
"@fullcalendar/timegrid": "^6.1.9",
"@mantine/core": "^4.2.10",
"@mantine/hooks": "^4.2.10",
diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js
index 55e3b63..422f6cd 100644
--- a/src/components/AddClassManual.js
+++ b/src/components/AddClassManual.js
@@ -121,6 +121,33 @@ const AddClassManual = (props) => {
{ field: '_id', headerName: '_id', hide: true },
{ field: 'code', headerName: 'Code', minWidth: 150, flex: 1, renderCell: (params) => , },
{ field: 'titre', headerName: 'Titre', minWidth: 150, flex: 1, renderCell: (params) => , },
+ { field: 'credit', headerName: 'Credit', minWidth: 150, flex: 1, renderCell: (params) => , },
+ {
+ field: 'pres_dist_hyp', headerName: 'Animation', minWidth: 150, flex: 1,
+ renderCell: (cellValues) => {
+ return (
+
+ {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "1" && "Distanciel"}
+ {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "0" && "Présentiel"}
+ {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "2" && "Hybride"}
+
+
+ );
+ }
+ },
+ {
+ field: 'is_noted', headerName: 'Evalué', minWidth: 150, flex: 1, renderCell: (params) => ,
+ renderCell: (cellValues) => {
+ return (
+
+ {cellValues.row.is_noted && String(cellValues.row.is_noted) === "1" && "Oui"}
+ {cellValues.row.is_noted && String(cellValues.row.is_noted) === "0" && "Non"}
+
+
+
+ );
+ }
+ },
{ field: 'duration_concat', headerName: 'Durée', minWidth: 150, flex: 1, renderCell: (params) => , },
{ field: 'duration', headerName: 'Durée', minWidth: 150, hide: true, flex: 1, renderCell: (params) => , },
{ field: 'duration_unite', headerName: 'Unit.', minWidth: 150, hide: true, editable: false, renderCell: (params) => , },
@@ -133,7 +160,7 @@ const AddClassManual = (props) => {
@@ -187,7 +214,7 @@ const AddClassManual = (props) => {
]
- function handleClick_delete_UE_From_Class(event, cellValues){
+ function handleClick_delete_UE_From_Class(event, cellValues) {
Delete_Given_UE_From_Class(cellValues.row._id);
}
@@ -197,40 +224,40 @@ const AddClassManual = (props) => {
function Delete_Given_UE_From_Class(local_ue_id) {
- var form = new FormData();
+ var form = new FormData();
- const stored_cookie = getCookie('tokenmysypart');
- form.append("token", stored_cookie);
- form.append("class_id", props.mytrainingclass['class_id']);
- form.append("ue_id", local_ue_id);
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+ form.append("class_id", props.mytrainingclass['class_id']);
+ form.append("ue_id", local_ue_id);
- var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_UE_From_Class/";
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_UE_From_Class/";
- axios.post(myurl, form).then(res => {
- //console.log(" In Delete_Given_UE_From_Class res.data.status = " + res.data.status);
- //console.log(" In Delete_Given_UE_From_Class res.data.message r_class = " + res.data.message);
+ axios.post(myurl, form).then(res => {
+ //console.log(" In Delete_Given_UE_From_Class res.data.status = " + res.data.status);
+ //console.log(" In Delete_Given_UE_From_Class res.data.message r_class = " + res.data.message);
- if (String(res.data.status) === String("true")) {
- setDelete_Given_UE_From_Class_api("true");
- setDelete_Given_UE_From_Class_result(res.data.message);
- Getall_Class_List_UE();
- alert(res.data.message)
- }
- else {
- setDelete_Given_UE_From_Class_api("false");
- setDelete_Given_UE_From_Class_message(res.data.message);
+ if (String(res.data.status) === String("true")) {
+ setDelete_Given_UE_From_Class_api("true");
+ setDelete_Given_UE_From_Class_result(res.data.message);
+ Getall_Class_List_UE();
+ alert(res.data.message)
+ }
+ else {
+ setDelete_Given_UE_From_Class_api("false");
+ setDelete_Given_UE_From_Class_message(res.data.message);
- alert(res.data.message);
+ alert(res.data.message);
- }
+ }
- }).catch((error) => {
+ }).catch((error) => {
- console.warn('Delete_Given_UE_From_Class : Not good man :( mysearchtext = ' + error);
- setDelete_Given_UE_From_Class_api("false");
- alert(" Impossible de supprimer l'UE ");
- })
+ console.warn('Delete_Given_UE_From_Class : Not good man :( mysearchtext = ' + error);
+ setDelete_Given_UE_From_Class_api("false");
+ alert(" Impossible de supprimer l'UE ");
+ })
}
const [ue_gridline_id, setue_gridline_id] = useState("");
@@ -864,13 +891,13 @@ const AddClassManual = (props) => {
}
if (mylocaltraining.presentiel.distantiel) {
- console.log(" ### distantiel distantiel distantiel = ", mylocaltraining.presentiel.distantiel);
+
setmydistance(mylocaltraining.presentiel.distantiel);
var result2 = presentiel.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.presentiel.distantiel)))
- if (result2[0]){
+ if (result2[0]) {
setmydistance_label(result2[0].label);
- console.log(" IN DISTANTIEL : result2[0].label = ", result2[0].label)
+
}
} else {
setmydistance("0");
@@ -880,13 +907,13 @@ const AddClassManual = (props) => {
if (mylocaltraining.presentiel.presentiel) {
- console.log(" ### presentiel presentiel presentiel = ", mylocaltraining.presentiel.presentiel);
+
setmypresence(mylocaltraining.presentiel.presentiel);
var result2 = presentiel.filter((local_mymanager) => local_mymanager.value === String((mylocaltraining.presentiel.presentiel)))
- if (result2[0]){
+ if (result2[0]) {
setmypresence_label(result2[0].label);
- console.log(" IN PRESEINTIEL : result2[0].label = ", result2[0].label)
+
}
} else {
setmypresence("0");
@@ -1514,7 +1541,7 @@ const AddClassManual = (props) => {
.then((data) => data.json())
.then((data) => {
setLoading(false);
- // console.log(' IN Get_List_Metiers Success:', data['message'], "data['status'] = ", data['status']);
+ // console.log(' IN Get_List_Metiers Success:', data['message'], "data['status'] = ", data['status']);
if (String(data['status']) === String("true")) {
setGet_List_Metiers_api("true");
@@ -2339,6 +2366,9 @@ const AddClassManual = (props) => {
};
+
+ const [add_one_eu_to_class, setadd_one_eu_to_class] = useState("");
+
const [Record_All_PJ_api, setRecord_All_PJ_api] = useState();
const [Record_All_PJ_result, setRecord_All_PJ_result] = useState();
const [Record_All_PJ_message, setRecord_All_PJ_message] = useState();
@@ -2603,9 +2633,7 @@ const AddClassManual = (props) => {
const [selected_ue_id, setselected_ue_id] = useState("");
const [selected_ue_credit, setselected_ue_credit] = useState("");
-
const [selected_ue_is_noted, setselected_ue_is_noted] = useState("");
-
const [selected_ue_pres_dist_hyp, setselected_ue_pres_dist_hyp] = useState("");
const New_Option_Is_Noted = [
@@ -2629,15 +2657,27 @@ const AddClassManual = (props) => {
setselected_ue_credit("");
setselected_ue_is_noted("");
setselected_ue_pres_dist_hyp("");
+ setadd_one_eu_to_class("");
};
+
+ function clean_ue_data() {
+ setselected_ue_id("");
+ setselected_ue_credit("");
+ setselected_ue_is_noted("");
+ setselected_ue_pres_dist_hyp("");
+ setadd_one_eu_to_class("");
+
+ }
+
const Dialog_Unite_Enseignement_handleClose_buton = () => {
setDialog_Unite_Enseignement_open(false);
setselected_ue_id("");
setselected_ue_credit("");
setselected_ue_is_noted("");
setselected_ue_pres_dist_hyp("");
+ setadd_one_eu_to_class("");
};
const [Dialog_1_message, setDialog_1_message] = React.useState(false);
@@ -2693,6 +2733,13 @@ const AddClassManual = (props) => {
})
}
+
+ const [gridline_ue_id, setgridline_ue_id] = useState("");
+
+ const sleep = (milliseconds) => {
+ return new Promise(resolve => setTimeout(resolve, milliseconds))
+ }
+
return (
{isLoading &&
@@ -2712,35 +2759,56 @@ const AddClassManual = (props) => {
{Dialog_1_message}
+
-
Choisir une unité d'enseignement
-
Choisir une unité d'enseignement
+ {New_Getall_Partner_List_UE_result && New_Getall_Partner_List_UE_result.length > 0 &&
+ (data)._id === String(selected_ue_id))[0].label}
+ onChange={(event, value) => {
+ if (value && value._id) {
- onChange={(event, value) => {
- if (value && value._id) {
+ setselected_ue_id(value._id);
- setselected_ue_id(value._id);
+ } else {
+ setselected_ue_id("");
+ }
+ }}
- } else {
- setselected_ue_id("");
+ renderInput={(params) =>
}
- }}
+ />}
- renderInput={(params) => }
- />
- }
+
+
+ {add_one_eu_to_class && String(add_one_eu_to_class) !== "1" &&
+ New_Getall_Partner_List_UE_result && New_Getall_Partner_List_UE_result.length > 0 &&
+ selected_ue_id && Unité d'enseignement
+ (data)._id === String(selected_ue_id))[0].label}
+
/>
+
+ }
Crédits
{
id="event_dialog_credit"
type="number"
fullWidth
- //value={p_detail_tuteur1_nom}
+ value={selected_ue_credit}
onChange={(e) => {
setselected_ue_credit(e.target.value);
}
@@ -2761,11 +2829,12 @@ const AddClassManual = (props) => {
Est Evalué
-
(data).value === String(p_detail_tuteur1_civilite))[0].label}
+ value={New_Option_Is_Noted.filter((data) => (data).id === String(selected_ue_is_noted))[0].label}
fullWidth
@@ -2780,8 +2849,7 @@ const AddClassManual = (props) => {
renderInput={(params) =>
- }
+ />}
/>
@@ -2792,7 +2860,7 @@ const AddClassManual = (props) => {
disablePortal
name="event_dialog_mode_animation"
id="event_dialog_mode_animation"
- //value={New_civilite.filter((data) => (data).value === String(p_detail_tuteur1_civilite))[0].label}
+ value={New_Option_pres_dist_hyp.filter((data) => (data).id === String(selected_ue_pres_dist_hyp))[0].label}
fullWidth
@@ -2948,6 +3016,11 @@ const AddClassManual = (props) => {
_id: JSON.parse(item)._id,
code: JSON.parse(item).code,
titre: JSON.parse(item).titre,
+
+ credit: JSON.parse(item).credit,
+ pres_dist_hyp: JSON.parse(item).pres_dist_hyp,
+ is_noted: JSON.parse(item).is_noted,
+
duration: JSON.parse(item).duration,
duration_unite: JSON.parse(item).duration_unite,
duration_concat: JSON.parse(item).duration_concat,
@@ -2959,24 +3032,22 @@ const AddClassManual = (props) => {
pageSize={10}
className="datagridclass"
- /* onRowDoubleClick={(newSelectionModel) => {
- setgridline_id(newSelectionModel.row.id);
-
- setsequence_gridline_id("");
-
- setaddOneSession("0");
- setEdite_session("0");
- setsessionChanged(false);
- //handleClick_edit_session_From_Line(newSelectionModel.row.id);
-
- setselected_session_id(newSelectionModel.row._id);
-
- setsession_selected_row_id(newSelectionModel.row.id);
-
- setDialog_2_message(String(JSON.parse(rowss[newSelectionModel.row.id]).title));
- setDialog_2_open(true);
-
- }}*/
+ onRowDoubleClick={(newSelectionModel) => {
+ clean_ue_data();
+ setgridline_ue_id(newSelectionModel.row.id);
+ setselected_ue_id(newSelectionModel.row._id)
+
+ var current_class_ue_data = New_Getall_Class_List_UE_result.filter((ue_data) => ue_data._id === String((newSelectionModel.row._id)))
+
+ setselected_ue_credit(current_class_ue_data[0]['credit']);
+ setselected_ue_is_noted(current_class_ue_data[0]['is_noted']);
+ setselected_ue_pres_dist_hyp(current_class_ue_data[0]['pres_dist_hyp']);
+ setadd_one_eu_to_class("0");
+
+ setDialog_Unite_Enseignement_open(true);
+
+
+ }}
@@ -3041,10 +3112,11 @@ const AddClassManual = (props) => {
@@ -3241,8 +3313,8 @@ const AddClassManual = (props) => {
onChange={(event, value) => {
if (value && value.value) {
-
-
+
+
setmypresence(value.value);
setmypresence_label(value.label);
setdatamodification("1");
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js
index a19a696..a220060 100644
--- a/src/components/DisplayPartnerSession.js
+++ b/src/components/DisplayPartnerSession.js
@@ -62,6 +62,7 @@ import FullCalendar from "@fullcalendar/react";
import daygridPlugin from "@fullcalendar/daygrid";
import interactionPlugin from "@fullcalendar/interaction";
import timeGridPlugin from "@fullcalendar/timegrid";
+import resourceTimeGridPlugin from '@fullcalendar/resource-timegrid';
import allLocales from '@fullcalendar/core/locales-all'
@@ -10044,10 +10045,7 @@ const DisplayPartnerSession = (props) => {
const handleSelect = (info) => {
- /*if (String(selected_attendee_email).length < 2) {
- alert(" Vous devez choisir un stagiaire");
- return;
- }
+
setp_detail_title("Nouvelle")
@@ -10060,12 +10058,26 @@ const DisplayPartnerSession = (props) => {
setStartDate(info.start);
setendDate(info.end);
- setDialog_1_open(true);*/
+ setDialog_DIALOG_AGENDA_open(true);
};
+ const [p_detail_event_id, setp_detail_event_id] = useState();
+ const [p_detail_title, setp_detail_title] = useState();
+ const [p_detail_start, setp_detail_start] = useState();
+ const [p_detail_end, setp_detail_end] = useState();
+ const [p_detail_comment, setp_detail_comment] = useState();
+ const [p_detail_sequence_session_id, setp_detail_sequence_session_id] = useState("");
+
+ const [p_detail_justified, setp_detail_justified] = useState(false);
+ const [p_detail_event_type, setp_detail_event_type] = useState();
+
+
+ const [startDate, setStartDate] = useState(new Date());
+ const [endDate, setendDate] = useState(new Date());
+
const [mysy_events, setmysy_events] = useState();
const [Partner_Debut_Journee, setPartner_Debut_Journee] = useState("7:00");
@@ -10073,51 +10085,72 @@ const DisplayPartnerSession = (props) => {
const handleEventClick = (arg) => {
- /* if (String(selected_attendee_email).length < 2) {
- alert(" Vous devez choisir un stagiaire");
- return;
- }
-
-
- setp_detail_title(arg.event.title)
- setp_detail_start(arg.event.start)
- setp_detail_end(arg.event.end)
- setp_detail_event_id(arg.event.id);
-
- if (arg.event.extendedProps.comment) {
- setp_detail_comment(arg.event.extendedProps.comment);
- }
- else
- setp_detail_comment("");
-
-
- if (arg.event.extendedProps.justified) {
- if (String(arg.event.extendedProps.justified) === "true")
- setp_detail_justified(true);
-
- else
- setp_detail_justified(false);
-
-
- }
- else
- setp_detail_justified(false);
-
-
-
- if (arg.event.extendedProps.type) {
- setp_detail_event_type(arg.event.extendedProps.type);
- }
- else
- setp_detail_event_type("");
-
-
- setStartDate(arg.event.start);
- setendDate(arg.event.end);
- setDialog_1_open(true);
- */
+
+ setp_detail_title(arg.event.title)
+ setp_detail_start(arg.event.start)
+ setp_detail_end(arg.event.end)
+ setp_detail_event_id(arg.event.id);
+
+ /*
+ if (arg.event.extendedProps.comment) {
+ setp_detail_comment(arg.event.extendedProps.comment);
+ }
+ else
+ setp_detail_comment("");
+
+
+ if (arg.event.extendedProps.justified) {
+ if (String(arg.event.extendedProps.justified) === "true")
+ setp_detail_justified(true);
+
+ else
+ setp_detail_justified(false);
+
+
+ }
+ else
+ setp_detail_justified(false);
+
+
+
+ if (arg.event.extendedProps.type) {
+ setp_detail_event_type(arg.event.extendedProps.type);
+ }
+ else
+ setp_detail_event_type("");
+*/
+
+ setStartDate(arg.event.start);
+ setendDate(arg.event.end);
+ setDialog_DIALOG_AGENDA_open(true);
+
}
+
+const [Dialog_DIALOG_AGENDA_message, setDialog_DIALOG_AGENDA_message] = React.useState(false);
+const [Dialog_DIALOG_AGENDA_open, setDialog_DIALOG_AGENDA_open] = React.useState(false);
+function Dialog_DIALOG_AGENDA_handle_change_participant_session(message) {
+ setDialog_DIALOG_AGENDA_message(message);
+ setDialog_DIALOG_AGENDA_open(true);
+}
+
+const Dialog_DIALOG_AGENDA_handleClose = () => {
+ //alert(" Utiliser le bouton 'fermer' ");
+ //setOpen(false);
+};
+
+const Dialog_DIALOG_AGENDA_handleClose_buton = () => {
+ setDialog_DIALOG_AGENDA_open(false);
+};
+
+const New_Option_Type_Event = [
+
+ { "id": "0", "label": "Absence", "value": "absence" },
+ { "id": "1", "label": "Planning", "value": "planning" },
+ { "id": "2", "label": "Autre", "value": "autre" },
+]
+
+
return (
@@ -10361,6 +10394,219 @@ const DisplayPartnerSession = (props) => {
{/*** fin dialog choix modele sequence */}
+
+ {/**** Dialogue pour agenda */}
+
+
+
+
+ {/*** fin dialogue pr agenda */}