Change update semester

app/api/keloladata/update-semester/route.ts

@@ -42,22 +42,23 @@ export async function POST() {
         }
 
         // Calculate current semester based on tahun_angkatan and current date
-        const yearsSinceEnrollment = currentYear - tahunAngkatan;
-        let currentSemester = yearsSinceEnrollment * 2; // 2 semesters per year
+        const years = currentYear - tahunAngkatan;
+        let currentSemester: number;
 
-        // Adjust for current month (odd months = odd semesters, even months = even semesters)
-        if (currentMonth >= 2 && currentMonth <= 7) {
-          // February to July = odd semester (1, 3, 5, etc.)
-          currentSemester += 1;
+        if (currentMonth >= 8 && currentMonth <= 12) {
+          // Agustus–Desember: semester ganjil tahun akademik berjalan
+          currentSemester = years * 2 + 1;
+        } else if (currentMonth >= 2 && currentMonth <= 7) {
+          // Februari–Juli: semester genap tahun akademik berjalan
+          currentSemester = years * 2 + 2;
         } else {
-          // August to January = even semester (2, 4, 6, etc.)
-          currentSemester += 2;
+          // Januari: masih semester ganjil dari T.A. sebelumnya
+          currentSemester = (years - 1) * 2 + 1;
         }
 
-        // Cap at semester 14 (7 years)
-        if (currentSemester > 14) {
-          currentSemester = 14;
-        }
+        // Jaga batas
+        if (currentSemester < 1) currentSemester = 1;
+        if (currentSemester > 14) currentSemester = 14;
 
         // Update semester if different
         if (student.semester !== currentSemester) {

app/api/mahasiswa/kelompok-keahlian-status/route.ts

@@ -0,0 +1,96 @@
+import { NextResponse } from 'next/server';
+import supabase from '@/lib/db';
+
+interface KelompokKeahlianStatus {
+  tahun_angkatan: number;
+  status_kuliah: string;
+  nama_kelompok: string;
+  jumlah_mahasiswa: number;
+}
+
+export async function GET(request: Request) {
+  const { searchParams } = new URL(request.url);
+  const tahunAngkatan = searchParams.get('tahun_angkatan');
+  const statusKuliah = searchParams.get('status_kuliah');
+
+  try {
+    let query = supabase
+      .from('mahasiswa')
+      .select('tahun_angkatan, status_kuliah, id_kelompok_keahlian, kelompok_keahlian!inner(id_kk, nama_kelompok)')
+      .eq('status_kuliah', statusKuliah);
+
+    if (tahunAngkatan && tahunAngkatan !== 'all') {
+      query = query.eq('tahun_angkatan', parseInt(tahunAngkatan));
+    }
+
+    const { data, error } = await query;
+
+    if (error) {
+      console.error('Error fetching kelompok keahlian status:', error);
+      return NextResponse.json(
+        { error: 'Failed to fetch kelompok keahlian status data' },
+        {
+          status: 500,
+          headers: {
+            'Cache-Control': 'public, max-age=60, stale-while-revalidate=30',
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'GET, OPTIONS',
+            'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+          },
+        }
+      );
+    }
+
+    // Group by tahun_angkatan, status_kuliah, nama_kelompok
+    const groupedData = data.reduce((acc, item: any) => {
+      const tahun_angkatan = item.tahun_angkatan;
+      const status_kuliah = item.status_kuliah;
+      const nama_kelompok = item.kelompok_keahlian?.nama_kelompok;
+      const key = `${tahun_angkatan}-${status_kuliah}-${nama_kelompok}`;
+      acc[key] = (acc[key] || 0) + 1;
+      return acc;
+    }, {} as Record<string, number>);
+
+    // Convert to final format and sort
+    const results: KelompokKeahlianStatus[] = Object.entries(groupedData)
+      .map(([key, jumlah_mahasiswa]) => {
+        const [tahun_angkatan, status_kuliah, nama_kelompok] = key.split('-');
+        return {
+          tahun_angkatan: parseInt(tahun_angkatan),
+          status_kuliah,
+          nama_kelompok,
+          jumlah_mahasiswa
+        };
+      })
+      .sort((a, b) => {
+        // Sort by tahun_angkatan ASC, nama_kelompok ASC
+        if (a.tahun_angkatan !== b.tahun_angkatan) {
+          return a.tahun_angkatan - b.tahun_angkatan;
+        }
+        return a.nama_kelompok.localeCompare(b.nama_kelompok);
+      });
+
+    return NextResponse.json(results, {
+      headers: {
+        'Cache-Control': 'public, max-age=60, stale-while-revalidate=30',
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, OPTIONS',
+        'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+      },
+    });
+  } catch (error) {
+    console.error('Error fetching kelompok keahlian status:', error);
+    return NextResponse.json(
+      { error: 'Failed to fetch kelompok keahlian status data' },
+      {
+        status: 500,
+        headers: {
+          'Cache-Control': 'public, max-age=60, stale-while-revalidate=30',
+          'Access-Control-Allow-Origin': '*',
+          'Access-Control-Allow-Methods': 'GET, OPTIONS',
+          'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+        },
+      }
+    );
+  }
+} 

app/visualisasi/dashboard/page.tsx

@@ -0,0 +1,147 @@
+'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";
+
+export default function TotalMahasiswaPage() {
+  const [selectedYear, setSelectedYear] = useState<string>("all");
+
+  return (
+    <div className="p-4 bg-gray-50 dark:bg-[var(--background)] min-h-screen">
+      {/* Header */}
+      <div className="mb-4">
+        <div className="flex flex-col lg:flex-row justify-between items-start lg:items-center gap-4">
+          <div>
+            <h1 className="text-2xl font-bold text-gray-900 dark:text-white">
+              Dashboard Mahasiswa
+            </h1>
+            <p className="text-sm text-gray-600 dark:text-gray-300">
+              Data visualisasi mahasiswa per jenis pendaftaran, status, IPK, dan asal daerah
+            </p>
+          </div>
+          <div className="flex-shrink-0">
+            <FilterTahunAngkatan 
+              selectedYear={selectedYear}
+              onYearChange={setSelectedYear}
+            />
+          </div>
+        </div>
+      </div>
+
+      {selectedYear === "all" ? (
+        /* Layout untuk semua data */
+        <div className="space-y-4">
+          {/* Row 1: Main chart + Side chart */}
+          <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+            {/* Statistik Mahasiswa - Large */}
+            <div className="lg:col-span-2">
+              <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm h-full">
+                <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                  Statistik Mahasiswa (Keseluruhan)
+                </h3>
+                <div style={{ height: '300px' }}>
+                  <StatistikMahasiswaChart />
+                </div>
+              </div>
+            </div>
+
+            {/* Jenis Pendaftaran */}
+            <div className="lg:col-span-1">
+              <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm h-full">
+                <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                  Jenis Pendaftaran Mahasiswa
+                </h3>
+                <div style={{ height: '300px' }}>
+                  <JenisPendaftaranChart />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          {/* Row 2: Three equal charts */}
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+            {/* Status Mahasiswa */}
+            <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm">
+              <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                Status Mahasiswa
+              </h3>
+              <div style={{ height: '250px' }}>
+                <StatusMahasiswaChart />
+              </div>
+            </div>
+
+            {/* IPK Chart */}
+            <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm">
+              <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                Rata-rata IPK per Program Studi
+              </h3>
+              <div style={{ height: '250px' }}>
+                <IPKChart />
+              </div>
+            </div>
+
+            {/* Asal Daerah */}
+            <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm">
+              <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                Distribusi Asal Daerah Mahasiswa
+              </h3>
+              <div style={{ height: '250px' }}>
+                <AsalDaerahChart />
+              </div>
+            </div>
+          </div>
+        </div>
+      ) : (
+        /* Layout untuk data per angkatan */
+        <div className="space-y-4">
+          {/* Row 1: Main chart + Side chart */}
+          <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+            {/* Statistik Per Angkatan - Large */}
+            <div className="lg:col-span-2">
+              <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm h-full">
+                <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                  Statistik Mahasiswa Angkatan {selectedYear}
+                </h3>
+                <div style={{ height: '300px' }}>
+                  <StatistikPerAngkatanChart tahunAngkatan={selectedYear} />
+                </div>
+              </div>
+            </div>
+
+            {/* Jenis Pendaftaran Per Angkatan */}
+            <div className="lg:col-span-1">
+              <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm h-full">
+                <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                  Jenis Pendaftaran Angkatan {selectedYear}
+                </h3>
+                <div style={{ height: '300px' }}>
+                  <JenisPendaftaranPerAngkatanChart tahunAngkatan={selectedYear} />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          {/* Row 2: Full width chart */}
+          <div className="grid grid-cols-1 gap-4">
+            <div className="bg-white dark:bg-slate-800 rounded-lg p-4 shadow-sm">
+              <h3 className="text-base font-medium text-gray-800 dark:text-gray-200 mb-3">
+                Asal Daerah Mahasiswa Angkatan {selectedYear}
+              </h3>
+              <div style={{ height: '250px' }}>
+                <AsalDaerahPerAngkatanChart tahunAngkatan={selectedYear} />
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

app/visualisasi/status/page.tsx

@@ -11,6 +11,8 @@ import AsalDaerahStatusChart from '@/components/charts/AsalDaerahStatusChart';
 import IpkStatusChart from '@/components/charts/IpkStatusChart';
 import MasaStudiChart from '@/components/charts/MasaStudiChart';
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import KelompokKeahlianStatusChart from "@/components/charts/KelompokKeahlianStatusChart";
+import KelompokKeahlianStatusPieChart from "@/components/charts/KelompokKeahlianStatusPieChart";
 
 export default function StatusMahasiswaPage() {
     const [selectedYear, setSelectedYear] = useState<string>("all");
@@ -44,7 +46,7 @@ export default function StatusMahasiswaPage() {
         {selectedYear === "all" ? (
         <>
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <StatusMahasiswaFilterChart 
+            <StatusMahasiswaFilterChart
               selectedYear={selectedYear}
               selectedStatus={selectedStatus}
             />
@@ -56,6 +58,10 @@ export default function StatusMahasiswaPage() {
             selectedYear={selectedYear}
             selectedStatus={selectedStatus}
             />
+            <KelompokKeahlianStatusChart
+            selectedYear={selectedYear}
+            selectedStatus={selectedStatus}
+            />
             <IpkStatusChart
             selectedYear={selectedYear}
             selectedStatus={selectedStatus}
@@ -77,6 +83,10 @@ export default function StatusMahasiswaPage() {
               selectedYear={selectedYear}
               selectedStatus={selectedStatus}
             />
+            <KelompokKeahlianStatusPieChart
+            selectedYear={selectedYear}
+            selectedStatus={selectedStatus}
+            />
             <AsalDaerahStatusChart
             selectedYear={selectedYear}
             selectedStatus={selectedStatus}