diff --git a/app/page.tsx b/app/page.tsx index 24066e6..d86ade8 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -199,40 +199,20 @@ export default function DashboardPage() { - - - - - Filter Data - - - -
- -
-
-
- - {selectedYear === "all" ? ( -
- - - - - -
- ) : ( -
- - - -
- )} - - )} - +
+
+ +
+
+ +
+
+ +
+
+ + ) + } + ); } diff --git a/app/visualisasi/mahasiswa/page.tsx b/app/visualisasi/mahasiswa/page.tsx new file mode 100644 index 0000000..71384fa --- /dev/null +++ b/app/visualisasi/mahasiswa/page.tsx @@ -0,0 +1,56 @@ +'use client'; + +import { useState } from "react"; +import StatistikMahasiswaChart from "@/components/charts/StatistikMahasiswaChart"; +import StatistikPerAngkatanChart from "@/components/charts/StatistikPerAngkatanChart"; +import JenisPendaftaranChart from "@/components/charts/JenisPendaftaranChart"; +import AsalDaerahChart from "@/components/charts/AsalDaerahChart"; +import IPKChart from "@/components/charts/IPKChart"; +import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; +import JenisPendaftaranPerAngkatanChart from "@/components/charts/JenisPendaftaranPerAngkatanChart"; +import AsalDaerahPerAngkatanChart from "@/components/charts/AsalDaerahPerAngkatanChart"; +import StatusMahasiswaChart from "@/components/charts/StatusMahasiswaChart"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; + +export default function TotalMahasiswaPage() { + const [selectedYear, setSelectedYear] = useState("all"); + + return ( +
+

Mahasiswa

+ +
+

+ Informasi jumlah mahasiswa, jenis pendaftaran, status mahasiswa, rata-rata IPK, dan asal daerah dengan filter tahun angkatan. +

+
+ + + +
+ +
+
+
+ + {selectedYear === "all" ? ( +
+ + + + + +
+ ) : ( +
+ + + +
+ )} +
+ ); +} diff --git a/app/visualisasi/status/page.tsx b/app/visualisasi/status/page.tsx index 8b1054c..7797fe9 100644 --- a/app/visualisasi/status/page.tsx +++ b/app/visualisasi/status/page.tsx @@ -17,20 +17,15 @@ export default function StatusMahasiswaPage() { return (
-

Status Mahasiswa

+

Status Kuliah

- Mahasiswa status adalah status kuliah mahasiswa program studi Informatika Fakultas Teknik Universitas Tanjungpura. + Informasi jumlah mahasiswa, jenis pendaftaran, asal daerah, dan rata-rata IPK dengan filter tahun angkatan dan status kuliah.

- - - Filter Data - -
- + + + - + + /> +
) : ( <> +
- - )} - - - - {selectedYear === "all" && ( - + /> +
+ )}
diff --git a/app/visualisasi/tipekelulusan/page.tsx b/app/visualisasi/tipekelulusan/page.tsx index 543ad20..0d98dc3 100644 --- a/app/visualisasi/tipekelulusan/page.tsx +++ b/app/visualisasi/tipekelulusan/page.tsx @@ -24,11 +24,6 @@ export default function LulusTepatWaktuPage() { - - - Filter Data - -
{selectedYear === "all" ? ( - <> - - - +
+ + +
) : ( - <> +
- +
)} - - {selectedYear === "all" && ( - - )} +
+ + {selectedYear === "all" && ( + + )} +
); diff --git a/components/FilterStatusKuliah.tsx b/components/FilterStatusKuliah.tsx index db0922b..e770096 100644 --- a/components/FilterStatusKuliah.tsx +++ b/components/FilterStatusKuliah.tsx @@ -17,7 +17,6 @@ export default function FilterStatusKuliah({ selectedStatus, onStatusChange }: P ]; return ( -
-
); } \ No newline at end of file diff --git a/components/FilterTahunAngkatan.tsx b/components/FilterTahunAngkatan.tsx index 4950a49..9659faf 100644 --- a/components/FilterTahunAngkatan.tsx +++ b/components/FilterTahunAngkatan.tsx @@ -30,7 +30,6 @@ export default function FilterTahunAngkatan({ selectedYear, onYearChange, showAl }, []); return ( -
-
); } \ No newline at end of file diff --git a/components/charts/AsalDaerahChart.tsx b/components/charts/AsalDaerahChart.tsx index 6215523..8a4fd6c 100644 --- a/components/charts/AsalDaerahChart.tsx +++ b/components/charts/AsalDaerahChart.tsx @@ -262,7 +262,7 @@ export default function AsalDaerahChart() { -
+
-
+
diff --git a/components/charts/AsalDaerahStatusChart.tsx b/components/charts/AsalDaerahStatusChart.tsx index cce94e1..515a977 100644 --- a/components/charts/AsalDaerahStatusChart.tsx +++ b/components/charts/AsalDaerahStatusChart.tsx @@ -119,7 +119,7 @@ export default function AsalDaerahStatusChart({ selectedYear, selectedStatus }: fontSize: '12px', colors: theme === 'dark' ? '#fff' : '#000' } - } + }, }, yaxis: { title: { @@ -224,14 +224,14 @@ export default function AsalDaerahStatusChart({ selectedYear, selectedStatus }: -
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/charts/IPKChart.tsx b/components/charts/IPKChart.tsx index 9376e6a..c9a5356 100644 --- a/components/charts/IPKChart.tsx +++ b/components/charts/IPKChart.tsx @@ -324,13 +324,13 @@ export default function IPKChart() { -
+
diff --git a/components/charts/IpkStatusChart.tsx b/components/charts/IpkStatusChart.tsx index 3bc3e70..8e81e01 100644 --- a/components/charts/IpkStatusChart.tsx +++ b/components/charts/IpkStatusChart.tsx @@ -278,14 +278,14 @@ export default function IpkStatusChart({ selectedYear, selectedStatus }: Props) -
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/charts/JenisPendaftaranChart.tsx b/components/charts/JenisPendaftaranChart.tsx index 59eacda..11918b5 100644 --- a/components/charts/JenisPendaftaranChart.tsx +++ b/components/charts/JenisPendaftaranChart.tsx @@ -32,7 +32,7 @@ export default function JenisPendaftaranChart() { }, plotOptions: { bar: { - horizontal: true, + horizontal: false, columnWidth: '55%', }, }, @@ -66,7 +66,7 @@ export default function JenisPendaftaranChart() { fontSize: '12px', colors: theme === 'dark' ? '#fff' : '#000' } - } + }, }, yaxis: { title: { @@ -82,7 +82,9 @@ export default function JenisPendaftaranChart() { fontSize: '12px', colors: theme === 'dark' ? '#fff' : '#000' } - } + }, + min:0, + tickAmount: 5 }, fill: { opacity: 1, @@ -280,7 +282,7 @@ export default function JenisPendaftaranChart() { -
+
Jenis Pendaftaran Angkatan {tahunAngkatan} -
- Total Mahasiswa: {totalMahasiswa} -
-
+
diff --git a/components/charts/JenisPendaftaranStatusChart.tsx b/components/charts/JenisPendaftaranStatusChart.tsx index 9a7e7ab..9a7af93 100644 --- a/components/charts/JenisPendaftaranStatusChart.tsx +++ b/components/charts/JenisPendaftaranStatusChart.tsx @@ -137,7 +137,7 @@ export default function JenisPendaftaranStatusChart({ selectedYear, selectedStat } }, min:0, - tickAmount: 5 + tickAmount: 10 }, fill: { opacity: 1, @@ -235,14 +235,14 @@ export default function JenisPendaftaranStatusChart({ selectedYear, selectedStat -
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/charts/JenisPendaftaranStatusPieChart.tsx b/components/charts/JenisPendaftaranStatusPieChart.tsx index 1cd2d31..aadb7a1 100644 --- a/components/charts/JenisPendaftaranStatusPieChart.tsx +++ b/components/charts/JenisPendaftaranStatusPieChart.tsx @@ -171,19 +171,16 @@ export default function JenisPendaftaranStatusPieChart({ selectedYear, selectedS Jenis Pendaftaran Mahasiswa {selectedStatus} {selectedYear !== 'all' ? ` Angkatan ${selectedYear}` : ''} -
- Total Mahasiswa: {totalMahasiswa} -
-
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/charts/StatistikMahasiswaChart.tsx b/components/charts/StatistikMahasiswaChart.tsx index c691b7c..33702d2 100644 --- a/components/charts/StatistikMahasiswaChart.tsx +++ b/components/charts/StatistikMahasiswaChart.tsx @@ -311,7 +311,7 @@ export default function StatistikMahasiswaChart() { -
+
Total Mahasiswa Angkatan {tahunAngkatan} -
- Total Mahasiswa: {totalMahasiswa} -
-
+
diff --git a/components/charts/StatusMahasiswaChart.tsx b/components/charts/StatusMahasiswaChart.tsx index d4a41aa..2f9c85d 100644 --- a/components/charts/StatusMahasiswaChart.tsx +++ b/components/charts/StatusMahasiswaChart.tsx @@ -84,6 +84,8 @@ export default function StatusMahasiswaChart() { colors: theme === 'dark' ? '#fff' : '#000' } }, + min:0, + tickAmount: 5 }, fill: { opacity: 1, @@ -200,7 +202,7 @@ export default function StatusMahasiswaChart() { -
+
{typeof window !== 'undefined' && ( - Status Mahasiswa {selectedStatus} - {selectedYear !== 'all' ? ` Angkatan ${selectedYear}` : ''} + Jumlah Mahasiswa {selectedStatus} -
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/charts/StatusMahasiswaFilterPieChart.tsx b/components/charts/StatusMahasiswaFilterPieChart.tsx index eb36b2d..1c6b7c8 100644 --- a/components/charts/StatusMahasiswaFilterPieChart.tsx +++ b/components/charts/StatusMahasiswaFilterPieChart.tsx @@ -163,19 +163,16 @@ export default function StatusMahasiswaFilterPieChart({ selectedYear, selectedSt Status Mahasiswa {selectedStatus} {selectedYear !== 'all' ? ` Angkatan ${selectedYear}` : ''} -
- Total Mahasiswa: {totalMahasiswa} -
-
+
{typeof window !== 'undefined' && ( )}
diff --git a/components/ui/Navbar.tsx b/components/ui/Navbar.tsx index ced9b0b..6478197 100644 --- a/components/ui/Navbar.tsx +++ b/components/ui/Navbar.tsx @@ -151,7 +151,7 @@ const Navbar = () => { - + Prestasi @@ -287,7 +287,7 @@ const MobileNavContent = ({ user, onLogout }: MobileNavContentProps) => { Beasiswa - + Prestasi @@ -309,10 +309,6 @@ const MobileNavContent = ({ user, onLogout }: MobileNavContentProps) => { Prestasi - - - Kelompok Keahlian -
)}