Merge branch 'master' of https://codefirst.iut.uca.fr/git/CRM_Production/JTT_CrM

src/pages/Analyse.js

@@ -3,7 +3,7 @@ import axios from 'axios'
 import Chart from 'chart.js/auto'
 import NavigationDashboard from '../components/NavigationDashboard';
 import { Pie } from "react-chartjs-2";
-import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
+import { Chart as ChartJS, ArcElement, Tooltip, Legend, DoughnutController } from 'chart.js';
 import { setDefaultLocale } from 'react-datepicker';
 import { private_excludeVariablesFromRoot } from '@mui/material';
 import Session from 'react-session-api';
@@ -91,6 +91,14 @@ const Analyse = () => {
                     'rgba(153, 102, 255, 1)',
                     'rgba(255, 159, 64, 1)',
                 ],
+                fontColor: [
+                    'rgba(255, 99, 132, 0.2)',
+                    'rgba(54, 162, 235, 0.2)',
+                    'rgba(255, 206, 86, 0.2)',
+                    'rgba(75, 192, 192, 0.2)',
+                    'rgba(153, 102, 255, 0.2)',
+                    'rgba(255, 159, 64, 0.2)',
+                ],
                 borderWidth: 1,
                 },
             ],

src/styles/components/_calendrier.scss

@@ -121,7 +121,7 @@ body {
                 display: flex;
                 flex-direction: row;
                 background: rgba(255, 255, 255, 0.3);
-                border-radius: 15px;
+                border-radius: 5px;
                 box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
                 backdrop-filter: blur(3px);
                 -webkit-backdrop-filter: blur(15px);
@@ -176,7 +176,7 @@ body {
             }
 
             .rbc-calendar {
-                border-radius: 15px;
+                border-radius: 5px;
                 border: 1px solid black;
 
                 .rbc-day-bg {
@@ -189,6 +189,17 @@ body {
                     border-right: none;
                     border-bottom: none;
                 }
+
+                .rbc-toolbar-label {
+                    display: flex;
+                    justify-content: center;
+                    flex-wrap: wrap;
+                }
+
+                .rbc-btn-group {
+                    display: flex;
+                    flex-wrap: wrap;
+                }
             }
 
             .ajout_input {