Tidak ada data
- ) - } return (
{data.map((item, index) => (
@@ -185,9 +157,7 @@ const Dashboard: React.FC = () => {
const [batches, setBatches] = useState([]);
const [selectedBatchId, setSelectedBatchId] = useState(null);
const [batchDropdownOpen, setBatchDropdownOpen] = useState(false);
-
- const selectedBatch =
- batches.find((b) => b.id === selectedBatchId) ?? null;
+ const selectedBatch = batches.find((b) => b.id === selectedBatchId) ?? null;
const getTokenFromCookie = () => {
return document.cookie
@@ -235,10 +205,11 @@ const Dashboard: React.FC = () => {
return msgFromBe || `Request gagal (status ${status ?? "unknown"}).`;
};
+ // Effect 1: ambil daftar batch sekali, set default = batch aktif
useEffect(() => {
const fetchBatches = async () => {
try {
- const res = await api.get("/batch-api/");
+ const res = await api.get("/batch-api");
if (res.data?.status) {
const list = res.data.data || [];
setBatches(list);
@@ -258,9 +229,7 @@ const Dashboard: React.FC = () => {
useEffect(() => {
if (selectedBatchId === null) return;
- const batch = batches.find((b) => b.id === selectedBatchId);
- if (!batch) return;
- const batchNumber = batch.batch_number;
+ const batchId = selectedBatchId;
const fetchDashboardData = async () => {
try {
@@ -274,95 +243,142 @@ const Dashboard: React.FC = () => {
return;
}
- const batchParams = { params: { batch: batchNumber } };
+ const params = { batch_id: batchId };
- const handle404 = (err: unknown) => {
- if (axios.isAxiosError(err) && err.response?.status === 404) {
- return { data: { status: true, data: [] } } as any;
- }
- throw err;
- };
+ const [statsRes, positionRes, countryRes, appsRes] =
+ await Promise.all([
+ api.get(
+ "/lamaran-magang-api/statistics/dashboard", { params }
+ ),
+ api.get(
+ "/lamaran-magang-api/statistics/position", { params }
+ ),
+ api.get(
+ "/lamaran-magang-api/statistics/country", { params }
+ ),
+ api.get("/lamaran-magang-api/statistics/university", { params }),
+ ]);
- const [lamaranRes, countryRes, uniRes] = await Promise.all([
- api.get("/lamaran-magang-api/get", {
- params: { limit: 9999, page: 1 },
- }),
- api
- .get("/lamaran-magang-api/statistics/country", batchParams)
- .catch(handle404),
- api
- .get("/lamaran-magang-api/statistics/university", batchParams)
- .catch(handle404),
- ]);
+ const statsJson = statsRes.data;
+ const positionJson = positionRes.data;
+ const countryJson = countryRes.data;
+ const appsJson = appsRes.data;
- const all = lamaranRes.data?.data ?? [];
+ if (!statsJson?.status) {
+ setErrorMessage(
+ statsJson?.message ||
+ "Gagal mengambil data dashboard (statistics/dashboard)."
+ );
+ setLoading(false);
+ return;
+ }
- // filter manual per batch
- const rows = all.filter((r) => Number(r.batch) === Number(batchNumber));
+ if (!positionJson?.status) {
+ setErrorMessage(
+ positionJson?.message ||
+ "Gagal mengambil data dashboard (statistics/position)."
+ );
+ setLoading(false);
+ return;
+ }
- const norm = (s?: string) => (s ?? "").toLowerCase().trim();
+ if (!countryJson?.status) {
+ setErrorMessage(
+ countryJson?.message ||
+ "Gagal mengambil data dashboard (statistics/country)."
+ );
+ setLoading(false);
+ return;
+ }
+
+ if (!appsJson?.status) {
+ console.warn(
+ "Fetch applicants list gagal (untuk universitas chart):",
+ appsJson?.message
+ );
+ }
+
+ const stats = statsJson.data;
+ const positions = positionJson.data || [];
+ const countries = countryJson.data || [];
// === Stat Cards ===
- const totalPendaftar = rows.length;
- const totalDiterima = rows.filter((r) => norm(r.status) === "diterima").length;
- const totalDitolak = rows.filter((r) => norm(r.status) === "ditolak").length;
- const sedangDiproses = rows.filter((r) => norm(r.status) === "diproses").length;
-
const statCardsFromApi: StatCard[] = [
- { title: "Total Pendaftar", value: totalPendaftar, icon:
@@ -477,7 +495,7 @@ const Dashboard: React.FC = () => {
@@ -377,11 +393,13 @@ const Dashboard: React.FC = () => {
Dashboard
+ {/* Batch Filter */}
+ {/* Batch Filter */}
- {/* Search Box */}
- {/*
- {/* Batch Filter */}
)}
+
-
*/}
+ {/* Search Box */}
+
+
{/* Avatar dengan badge edit */}
-
+
{photoPreview && !imageError ? (
{/* Info & Action Buttons */}
- {!isIntern &&
+ {!isIntern ? (
- }
+ ) : (
+ Profile Photo
@@ -175,7 +173,12 @@ export default function MentorSettingsPage() {
+
+ )}
{/* Hidden file input */}
{/* Loading skeleton */}
- {/* {loading && (
+ {loading && (
Nama
+{user?.full_name || formData.fullName || 'User'}
+
{[...Array(3)].map((_, i) => (
))}
- )} */}
+ )}
{/* Error */}
{error && {error}
} - {/* Timeline + Task list — hanya tampil jika ada task */} - {/* {!loading && tasks.length === 0 ? ( */} {tasks.length === 0 ? (Belum ada tugas yang dapat dikerjakan.
) : ( diff --git a/src/Pages/internify/intern/TaskSubmission.tsx b/src/Pages/internify/intern/TaskSubmission.tsx index 29e5ea2..9d5ad9c 100644 --- a/src/Pages/internify/intern/TaskSubmission.tsx +++ b/src/Pages/internify/intern/TaskSubmission.tsx @@ -3,12 +3,16 @@ import { FileText, Info } from "lucide-react"; import TaskFormFile from "./components/TaskForm-file"; import TaskFormLink from "./components/TaskForm-link"; import { useTaskDetail } from "../../../hooks/useTasks"; +import { useProjectDetail } from "../../../hooks/useProjects"; export default function TaskSubmission() { const [searchParams] = useSearchParams(); const { slug, taskSlug } = useParams<{ slug: string; taskSlug: string }>(); const submissionType = (searchParams.get("type") ?? "file") as "file_upload" | "url_link"; const { task, loading, error } = useTaskDetail(taskSlug!, slug); + const { project } = useProjectDetail(slug!); + + const isProjectActive = project?.status === "active"; const formatDeadline = (dateStr: string) => new Date(dateStr).toLocaleDateString("id-ID", { day: "numeric", month: "long", year: "numeric" }); @@ -53,6 +57,7 @@ export default function TaskSubmission() { projectId={String(task.project.id)} deadline={new Date(task.deadline_at)} initialSubmission={task.my_submission} + isProjectActive={isProjectActive} /> ) : (
-
+
Timeline
-
@@ -20,7 +20,6 @@ export default function ProjectTimeline({ tasks }: { tasks: InternTaskItem[] })
const active = isToday || isPast;
return (
-
- {/* Vertical line ke bawah, kecuali item terakhir */}
{index < tasks.length - 1 && (
)}
@@ -30,10 +29,10 @@ export default function ProjectTimeline({ tasks }: { tasks: InternTaskItem[] })
active ? 'bg-red' : 'bg-gray-400'
} ${isToday ? 'shadow-md' : ''}`}
/>
- +{isToday ? 'Hari ini' : formatDate(task.deadline_at)}-+{task.title}diff --git a/src/Pages/internify/intern/components/SubmissionStatusTable.tsx b/src/Pages/internify/intern/components/SubmissionStatusTable.tsx index b902f73..4bce00b 100644 --- a/src/Pages/internify/intern/components/SubmissionStatusTable.tsx +++ b/src/Pages/internify/intern/components/SubmissionStatusTable.tsx @@ -10,6 +10,7 @@ interface SubmitStatusTableProps { deadline?: Date; onEdit: () => void; onDelete: () => void; + disabled: boolean; } function getTimeEarly(submittedAt: Date, deadline: Date): string { @@ -32,6 +33,7 @@ export default function SubmitStatusTable({ deadline, onEdit, onDelete, + disabled = false, }: SubmitStatusTableProps) { const [confirmDelete, setConfirmDelete] = useState(false); @@ -86,13 +88,15 @@ export default function SubmitStatusTable({diff --git a/src/Pages/internify/intern/components/TaskForm-file.tsx b/src/Pages/internify/intern/components/TaskForm-file.tsx index 4588d6f..2edf76a 100644 --- a/src/Pages/internify/intern/components/TaskForm-file.tsx +++ b/src/Pages/internify/intern/components/TaskForm-file.tsx @@ -11,9 +11,10 @@ interface TaskFormFileProps { projectId?: string; deadline?: Date; initialSubmission?: TaskSubmissionData | null; + isProjectActive?: boolean; } -export default function TaskFormFile({ taskId, projectId, deadline, initialSubmission }: TaskFormFileProps) { +export default function TaskFormFile({ taskId, projectId, deadline, initialSubmission, isProjectActive = true }: TaskFormFileProps) { const { submission, loading, submitFile, updateFile, remove } = useSubmission(taskId, initialSubmission, projectId); const [files, setFiles] = useState