Change Informasi in Beranda
This commit is contained in:
@@ -10,16 +10,10 @@ interface MahasiswaTotal {
|
||||
total_berprestasi: number;
|
||||
prestasi_akademik: number;
|
||||
prestasi_non_akademik: number;
|
||||
ipk_rata_rata_aktif: number;
|
||||
ipk_rata_rata_lulus: number;
|
||||
total_mahasiswa_aktif_lulus: number;
|
||||
}
|
||||
|
||||
interface IPKData {
|
||||
nim: string;
|
||||
mahasiswa: {
|
||||
ipk: number;
|
||||
};
|
||||
total_mahasiswa_beasiswa: number;
|
||||
total_mahasiswa_beasiswa_pemerintah: number;
|
||||
total_mahasiswa_beasiswa_non_pemerintah: number;
|
||||
}
|
||||
|
||||
// Fungsi untuk menangani preflight request (OPTIONS)
|
||||
@@ -91,27 +85,22 @@ export async function GET() {
|
||||
.select('*', { count: 'exact', head: true })
|
||||
.in('status_kuliah', ['Aktif', 'Lulus']);
|
||||
|
||||
// Get IPK rata-rata aktif
|
||||
const { data: ipkAktifData } = await supabase
|
||||
.from('mahasiswa')
|
||||
.select('ipk')
|
||||
.eq('status_kuliah', 'Aktif')
|
||||
.not('ipk', 'is', null);
|
||||
// Total mahasiswa beasiswa
|
||||
const { count: totalMahasiswaBeasiswa } = await supabase
|
||||
.from('beasiswa_mahasiswa')
|
||||
.select('*', { count: 'exact', head: true });
|
||||
|
||||
const ipkRataRataAktif = ipkAktifData && ipkAktifData.length > 0
|
||||
? Math.round((ipkAktifData.reduce((sum, item: any) => sum + (item.ipk || 0), 0) / ipkAktifData.length) * 100) / 100
|
||||
: 0;
|
||||
// Total mahasiswa beasiswa Pemerintah
|
||||
const { count: totalMahasiswaBeasiswaPemerintah } = await supabase
|
||||
.from('beasiswa_mahasiswa')
|
||||
.select('*', { count: 'exact', head: true })
|
||||
.eq('jenis_beasiswa', 'Pemerintah');
|
||||
|
||||
// Get IPK rata-rata lulus
|
||||
const { data: ipkLulusData } = await supabase
|
||||
.from('mahasiswa')
|
||||
.select('ipk')
|
||||
.eq('status_kuliah', 'Lulus')
|
||||
.not('ipk', 'is', null);
|
||||
|
||||
const ipkRataRataLulus = ipkLulusData && ipkLulusData.length > 0
|
||||
? Math.round((ipkLulusData.reduce((sum, item: any) => sum + (item.ipk || 0), 0) / ipkLulusData.length) * 100) / 100
|
||||
: 0;
|
||||
// Total mahasiswa beasiswa Non-Pemerintah
|
||||
const { count: totalMahasiswaBeasiswaNonPemerintah } = await supabase
|
||||
.from('beasiswa_mahasiswa')
|
||||
.select('*', { count: 'exact', head: true })
|
||||
.eq('jenis_beasiswa', 'Non-Pemerintah');
|
||||
|
||||
const results: MahasiswaTotal = {
|
||||
total_mahasiswa: totalMahasiswa || 0,
|
||||
@@ -122,9 +111,10 @@ export async function GET() {
|
||||
total_berprestasi: totalBerprestasi || 0,
|
||||
prestasi_akademik: prestasiAkademik || 0,
|
||||
prestasi_non_akademik: prestasiNonAkademik || 0,
|
||||
ipk_rata_rata_aktif: ipkRataRataAktif,
|
||||
ipk_rata_rata_lulus: ipkRataRataLulus,
|
||||
total_mahasiswa_aktif_lulus: totalMahasiswaAktifLulus || 0,
|
||||
total_mahasiswa_beasiswa: totalMahasiswaBeasiswa || 0,
|
||||
total_mahasiswa_beasiswa_pemerintah: totalMahasiswaBeasiswaPemerintah || 0,
|
||||
total_mahasiswa_beasiswa_non_pemerintah: totalMahasiswaBeasiswaNonPemerintah || 0,
|
||||
};
|
||||
|
||||
// Menambahkan header cache dan CORS
|
||||
|
||||
23
app/page.tsx
23
app/page.tsx
@@ -17,9 +17,10 @@ interface MahasiswaTotal {
|
||||
total_berprestasi: number;
|
||||
prestasi_akademik: number;
|
||||
prestasi_non_akademik: number;
|
||||
ipk_rata_rata_aktif: number;
|
||||
ipk_rata_rata_lulus: number;
|
||||
total_mahasiswa_aktif_lulus: number;
|
||||
total_mahasiswa_beasiswa: number;
|
||||
total_mahasiswa_beasiswa_pemerintah: number;
|
||||
total_mahasiswa_beasiswa_non_pemerintah: number;
|
||||
}
|
||||
|
||||
// Skeleton loading component
|
||||
@@ -50,11 +51,12 @@ export default function DashboardPage() {
|
||||
total_berprestasi: 0,
|
||||
prestasi_akademik: 0,
|
||||
prestasi_non_akademik: 0,
|
||||
ipk_rata_rata_aktif: 0,
|
||||
ipk_rata_rata_lulus: 0,
|
||||
total_mahasiswa_aktif_lulus: 0
|
||||
total_mahasiswa_aktif_lulus: 0,
|
||||
total_mahasiswa_beasiswa: 0,
|
||||
total_mahasiswa_beasiswa_pemerintah: 0,
|
||||
total_mahasiswa_beasiswa_non_pemerintah: 0
|
||||
});
|
||||
const [selectedYear, setSelectedYear] = useState<string>("all");
|
||||
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
@@ -177,18 +179,19 @@ export default function DashboardPage() {
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
{/* Kartu Rata-rata IPK */}
|
||||
{/* Kartu Mahasiswa Beasiswa */}
|
||||
<Card className="bg-white dark:bg-slate-900 shadow-lg">
|
||||
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
|
||||
<CardTitle className="text-sm font-medium dark:text-white">
|
||||
Rata-rata IPK
|
||||
Mahasiswa Beasiswa
|
||||
</CardTitle>
|
||||
<BookOpen className="h-4 w-4 text-muted-foreground" />
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div className="text-2xl font-bold dark:text-white">{mahasiswaData.mahasiswa_aktif}</div>
|
||||
<div className="text-2xl font-bold dark:text-white">{mahasiswaData.total_mahasiswa_beasiswa}</div>
|
||||
<div className="flex justify-between mt-2 text-xs text-muted-foreground">
|
||||
<span className="dark:text-white">Aktif: <span className="text-green-500">{mahasiswaData.ipk_rata_rata_aktif}</span></span>
|
||||
<span className="dark:text-white">Pemerintah: <span className="text-green-500">{mahasiswaData.total_mahasiswa_beasiswa_pemerintah}</span></span>
|
||||
<span className="dark:text-white">Non-Pemerintah: <span className="text-amber-400">{mahasiswaData.total_mahasiswa_beasiswa_non_pemerintah}</span></span>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
Reference in New Issue
Block a user