diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts index 2119229..8cc6eb5 100644 --- a/src/app/api/home/route.ts +++ b/src/app/api/home/route.ts @@ -143,9 +143,27 @@ export async function GET(request: Request) { _count: true }) - console.log(data) - allData = data + const dataStatus = [{ name: 'Segera dikerjakan', status: 0 }, { name: 'Dikerjakan', status: 1 }, { name: 'Selesai dikerjakan', status: 2 }, { name: 'Dibatalkan', status: 3 }] + const hasil: any[] = [] + let input + for (let index = 0; index < dataStatus.length; index++) { + const cek = data.some((i: any) => i.status == dataStatus[index].status) + if (cek) { + const find = (Number(data.find((i: any) => i.status == dataStatus[index].status)?._count) * 100)/ data.reduce((n, {_count}) => n + _count, 0) + input = { + name: dataStatus[index].name, + value: find + } + } else { + input = { + name: dataStatus[index].name, + value: 0 + } + } + hasil.push(input) + } + allData = hasil } else if (kategori == "dokumen") { let kondisi @@ -181,7 +199,7 @@ export async function GET(request: Request) { jumlah: v.length, })) - console.log(allData) + // console.log(allData) diff --git a/src/module/home/ui/chart_progress_tugas.tsx b/src/module/home/ui/chart_progress_tugas.tsx index bf4105c..e96c213 100644 --- a/src/module/home/ui/chart_progress_tugas.tsx +++ b/src/module/home/ui/chart_progress_tugas.tsx @@ -14,7 +14,6 @@ export default function ChartProgressHome() { const [loading, setLoading] = useState(true); useShallowEffect(() => { - loadData() fetchData() }, []) @@ -28,6 +27,7 @@ export default function ChartProgressHome() { if (response.success) { setData(response.data) + loadData(response.data) } else { toast.error(response.message); } @@ -40,7 +40,7 @@ export default function ChartProgressHome() { } }; - const loadData = () => { + const loadData = (value:any) => { const option: EChartsOption = { title: { text: "PROGRES KEGIATAN", @@ -69,12 +69,7 @@ export default function ChartProgressHome() { return `${a.value + "%"}`; }, }, - data: [ - { value: 25, name: 'Dikerjakan' }, - { value: 35, name: 'Selesai dikerjakan' }, - { value: 10, name: 'Segera dikerjakan' }, - { value: 30, name: 'Batal dikerjakan' }, - ], + data: value, emphasis: { itemStyle: { shadowBlur: 10,