diff --git a/src/module/division_new/components/create_report.tsx b/src/module/division_new/components/create_report.tsx index ac934ae..d613903 100644 --- a/src/module/division_new/components/create_report.tsx +++ b/src/module/division_new/components/create_report.tsx @@ -1,10 +1,12 @@ -"use client" -import { LayoutNavbarNew, WARNA } from '@/module/_global'; -import { Box, Select, Stack } from '@mantine/core'; -import { DateInput } from '@mantine/dates'; -import React, { useState } from 'react'; -import EchartPaiReport from './echart_pai_report'; -import EchartBarReport from './echart_bar_report'; +"use client"; +import { LayoutNavbarNew, WARNA } from "@/module/_global"; +import { Box, Select, Stack, Text } from "@mantine/core"; +import { DateInput } from "@mantine/dates"; +import React, { useState } from "react"; +import EchartPaiReport from "./echart_pai_report"; +import EchartBarReport from "./echart_bar_report"; +import EventReport from "./event_report"; +import DiscussionReport from "./discussion_report"; export default function CreateReport() { const [value, setValue] = useState(null); @@ -30,28 +32,55 @@ export default function CreateReport() { placeholder="Date input" /> - + - + - - + + + + + + + + + + ); } - diff --git a/src/module/division_new/components/discussion_report.tsx b/src/module/division_new/components/discussion_report.tsx new file mode 100644 index 0000000..1dae551 --- /dev/null +++ b/src/module/division_new/components/discussion_report.tsx @@ -0,0 +1,67 @@ +import { WARNA } from "@/module/_global"; +import { Box, Group, Text } from "@mantine/core"; +import { GoDiscussionClosed } from "react-icons/go"; +import { CiClock2, CiUser } from "react-icons/ci"; + +const dataDiskusi = [ + { + id: 1, + judul: 'Mengatasi Limbah Makanan ', + user: 'Fibra Marcell', + date: '21 Juni 2024' + }, + { + id: 2, + judul: 'Pentingnya Menjaga Kelestarian Hutan ', + user: 'Bayu Tegar', + date: '15 Juni 2024' + }, + { + id: 3, + judul: 'Mengatasi Limbah Industri ', + user: 'Nian Putri', + date: '11 Mei 2024' + }, + { + id: 4, + judul: 'Manfaat Sampah Plastik', + user: 'Budi Prasetyo', + date: '10 Mei 2024' + }, +] +export default function DiscussionReport() { + return ( + + DISKUSI + {dataDiskusi.map((v, i) => { + return ( + + + + + + {v.judul} + + + + + + {v.user} + + + + {v.date} + + + + + ) + }) + } + + ) +} \ No newline at end of file diff --git a/src/module/division_new/components/echart_bar_report.tsx b/src/module/division_new/components/echart_bar_report.tsx index 1cf0136..ee0e6eb 100644 --- a/src/module/division_new/components/echart_bar_report.tsx +++ b/src/module/division_new/components/echart_bar_report.tsx @@ -16,9 +16,11 @@ export default function EchartBarReport() { const loadData = () => { const option: EChartsOption = { title: { - text: "SENTIMENT ANALYSIS", + text: "DOKUMEN", + top: '2%', + left: 'center', textStyle: { - color: "white" + color: WARNA.biruTua } }, tooltip: { diff --git a/src/module/division_new/components/echart_pai_report.tsx b/src/module/division_new/components/echart_pai_report.tsx index 351331b..d937e84 100644 --- a/src/module/division_new/components/echart_pai_report.tsx +++ b/src/module/division_new/components/echart_pai_report.tsx @@ -30,7 +30,7 @@ export default function EchartPaiReport() { { name: 'Progres Tugas', type: 'pie', - radius: '80%', + radius: '70%', avoidLabelOverlap: false, itemStyle: { borderRadius: 2, diff --git a/src/module/division_new/components/event_report.tsx b/src/module/division_new/components/event_report.tsx new file mode 100644 index 0000000..32077ec --- /dev/null +++ b/src/module/division_new/components/event_report.tsx @@ -0,0 +1,62 @@ +import { Box, Divider, Group, ScrollArea, Stack, Text } from '@mantine/core'; +import React from 'react'; + +const dataEvent = [ + { + id: 1, + title: 'Pembahasan Mengenai Darmasaba', + jamAwal: "10.00", + jamAkhir: "11.00", + dibuat: "Jhon" + }, + { + id: 2, + title: 'Pembahasan Mengenai Darmasaba', + jamAwal: "11.00", + jamAkhir: "12.00", + dibuat: "Jhon" + }, + { + id: 3, + title: 'Pembahasan Mengenai Darmasaba', + jamAwal: "13.00", + jamAkhir: "14.00", + dibuat: "Jhon" + }, + { + id: 4, + title: 'Pembahasan Mengenai Darmasaba', + jamAwal: "15.00", + jamAkhir: "16.00", + dibuat: "Jhon" + }, +] + +export default function EventReport() { + + return ( + + EVENT SELESAI DILAKSANAKAN + {dataEvent.map((event, index) => { + const bgColor = ['#D8D8F1', '#FED6C5'][index % 2] + const colorDivider = ['#535FCA', '#A7A7A7'][index % 2] + return ( + + + + + + {event.jamAwal} - {event.jamAkhir} + {event.title} + Dibuat oleh : {event.dibuat} + + + + + ) + })} + + ); +} diff --git a/src/module/home/components/list_event.tsx b/src/module/home/components/list_event.tsx index 11eae86..3c86a09 100644 --- a/src/module/home/components/list_event.tsx +++ b/src/module/home/components/list_event.tsx @@ -49,14 +49,16 @@ export default function ListEvent() { }} mb={10}> - {v.judul} + + {v.judul} + - - + + {v.user} - - + + {v.date}