Feat : fix lỗi chart, khia báo tất cả

uat
Quy_FE 3 months ago
parent 62fac2ec8a
commit 16d12050c7
  1. 32
      src/_components/chart/RDoughnutChart.js
  2. 31
      src/_components/chart/RPieChart.js
  3. 19
      src/_components/chart/VerticalBarChart.js
  4. 17
      src/_screens/home/teacher/index.js

@ -1,37 +1,9 @@
import React from 'react';
import { Chart } from 'react-chartjs-2';
import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
import { PRIMARY_COLOR } from '../../_constants/common';
import { Chart as ChartJS, registerables } from 'chart.js';
ChartJS.register(ArcElement, Tooltip, Legend);
// const data = {
// labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
// datasets: [
// {
// label: '# of Votes',
// data: [12, 19, 3, 5, 2, 3],
// backgroundColor: [
// '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)',
// ],
// borderColor: [
// 'rgba(255, 99, 132, 1)',
// 'rgba(54, 162, 235, 1)',
// 'rgba(255, 206, 86, 1)',
// 'rgba(75, 192, 192, 1)',
// 'rgba(153, 102, 255, 1)',
// 'rgba(255, 159, 64, 1)',
// ],
// borderWidth: 1,
// },
// ],
// };
ChartJS.register(...registerables);
export default function RDoughnutChart({data = [], ...other}) {
if (!data?.length) {

@ -1,35 +1,8 @@
import React from 'react';
import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
import { Pie } from 'react-chartjs-2';
import { Chart as ChartJS, registerables } from 'chart.js';
ChartJS.register(ArcElement, Tooltip, Legend);
// const data = {
// labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
// datasets: [
// {
// label: '# of Votes',
// data: [12, 19, 3, 5, 2, 3],
// backgroundColor: [
// '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)',
// ],
// borderColor: [
// 'rgba(255, 99, 132, 1)',
// 'rgba(54, 162, 235, 1)',
// 'rgba(255, 206, 86, 1)',
// 'rgba(75, 192, 192, 1)',
// 'rgba(153, 102, 255, 1)',
// 'rgba(255, 159, 64, 1)',
// ],
// borderWidth: 1,
// },
// ],
// };
ChartJS.register(...registerables);
export default function RPieChart({data, ...other}) {
return <Pie data={data} {...other} />;

@ -1,24 +1,9 @@
import React from 'react';
import {
Chart as ChartJS,
CategoryScale,
LinearScale,
BarElement,
Title,
Tooltip,
Legend,
} from 'chart.js';
import { Bar } from 'react-chartjs-2';
import { PRIMARY_COLOR } from '../../_constants/common';
import { Chart as ChartJS, registerables } from 'chart.js';
ChartJS.register(
CategoryScale,
LinearScale,
BarElement,
Title,
Tooltip,
Legend
);
ChartJS.register(...registerables);
export function VerticalBarChart({data = [], labels = []}) {
if (!data?.length) {

@ -105,7 +105,19 @@ export default function TeacherHome() {
getData();
};
const handleExport = () => {
const handleExport = async () => {
let queryParams = []
if(!!semester?.value){
queryParams.push(`&semester=${semester?.value}`)
}
if(!!month?.value){
queryParams.push(`month=${month?.value}`)
}
const endPoint =
`/api_exercise_report/teacher_report_summary?teacher_id=${id}&year=${schoolYear?.value.trim()}&detail=true` +
(queryParams.length > 0 ? `&${queryParams.join("&")}` : "");
const res = await apiCaller(endPoint, "GET");
if(res?.status){
const listHeader = [
"STT",
"Tên lớp",
@ -121,7 +133,7 @@ export default function TeacherHome() {
"học kỳ",
"Niên khóa",
];
const listData = listClass.map((item, index) => [
const listData = res.data.map((item, index) => [
index + 1,
item?.class_name,
teacherName,
@ -150,6 +162,7 @@ export default function TeacherHome() {
listData,
`Danh sách lớp của giáo viên ${teacherName}.xlsx`,
);
}
};
useEffect(() => {

Loading…
Cancel
Save