diff --git a/src/roles/admin/dashboard/hooks/useDashboard.jsx b/src/roles/admin/dashboard/hooks/useDashboard.jsx index ce92c06..fab5a83 100644 --- a/src/roles/admin/dashboard/hooks/useDashboard.jsx +++ b/src/roles/admin/dashboard/hooks/useDashboard.jsx @@ -32,7 +32,7 @@ const useDashboard = () => { setLoadingActivity(true); try { const data = await dashboardService.fetchActivity("", "", 1, 5); - setActivity(data.payload.monitorings); + setActivity(data.payload.studentActivities); } catch (err) { setError(err); } finally { diff --git a/src/roles/admin/dashboard/services/serviceDashboard.jsx b/src/roles/admin/dashboard/services/serviceDashboard.jsx index 6caec6b..9eae75b 100644 --- a/src/roles/admin/dashboard/services/serviceDashboard.jsx +++ b/src/roles/admin/dashboard/services/serviceDashboard.jsx @@ -22,7 +22,7 @@ const fetchTotalTeacher = async (search, sort, page, limit) => { const fetchActivity = async (search, sort, page, limit) => { try { - const response = await axiosInstance.get(`/monitoring/progress?search=${search}&sort=${sort}&page=${page}&limit=${limit}`); + const response = await axiosInstance.get(`/stdLearning/activities?search=${search}&sort=${sort}&page=${page}&limit=${limit}`); return response.data; } catch (error) { console.error('Error fetching reports:', error); diff --git a/src/roles/admin/dashboard/views/Dashboard.jsx b/src/roles/admin/dashboard/views/Dashboard.jsx index afdcf0d..7433cc0 100644 --- a/src/roles/admin/dashboard/views/Dashboard.jsx +++ b/src/roles/admin/dashboard/views/Dashboard.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { Table, Row, Col, Card, Button, Spinner } from 'react-bootstrap'; -import { NavLink } from 'react-router-dom'; +import { NavLink, Link } from 'react-router-dom'; import useDashboard from '../hooks/useDashboard'; function validName(text) { @@ -46,17 +46,18 @@ const AdminDashboard = () => { - - - - + + + + + {loadingActivity?( - - - - - - - + + + + + + + + )) ):( - diff --git a/src/roles/teacher/dashboard/hooks/useDashboard.jsx b/src/roles/teacher/dashboard/hooks/useDashboard.jsx index 98b48a6..46db611 100644 --- a/src/roles/teacher/dashboard/hooks/useDashboard.jsx +++ b/src/roles/teacher/dashboard/hooks/useDashboard.jsx @@ -42,7 +42,7 @@ const useDashboard = () => { setLoadingActivity(true); try { const data = await dashboardService.fetchActivity("", "", 1, 5); - setActivity(data.payload.monitorings); + setActivity(data.payload.studentActivities); } catch (err) { setError(err); } finally { diff --git a/src/roles/teacher/dashboard/services/serviceDashboard.jsx b/src/roles/teacher/dashboard/services/serviceDashboard.jsx index 8f86d71..daac097 100644 --- a/src/roles/teacher/dashboard/services/serviceDashboard.jsx +++ b/src/roles/teacher/dashboard/services/serviceDashboard.jsx @@ -32,7 +32,7 @@ const fetchTotalClass = async (search, sort, page, limit) => { const fetchActivity = async (search, sort, page, limit) => { try { - const response = await axiosInstance.get(`/monitoring/progress?search=${search}&sort=${sort}&page=${page}&limit=${limit}`); + const response = await axiosInstance.get(`/stdLearning/activities?search=${search}&sort=${sort}&page=${page}&limit=${limit}`); return response.data; } catch (error) { console.error('Error fetching reports:', error); diff --git a/src/roles/teacher/dashboard/views/Dashboard.jsx b/src/roles/teacher/dashboard/views/Dashboard.jsx index 2e44346..135298b 100644 --- a/src/roles/teacher/dashboard/views/Dashboard.jsx +++ b/src/roles/teacher/dashboard/views/Dashboard.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { Table, Row, Col, Card, Button, Spinner } from 'react-bootstrap'; -import { NavLink } from 'react-router-dom'; +import { NavLink, Link } from 'react-router-dom'; import avatar from '../../../../assets/images/avatar.png'; import useDashboard from '../hooks/useDashboard'; @@ -121,17 +121,20 @@ const TeacherDashboard = () => {
NoNISNNameSectionFull NameClass TopicLevelScoreReview
+ @@ -68,17 +69,20 @@ const AdminDashboard = () => { ):( activity.length > 0?( activity.map((data, index) => ( -
{index + 1}{data.NISN}{data.NAME_USERS}{data.NAME_SECTION}{data.NAME_TOPIC}
{data.NAME_USERS}{data.NAME_CLASS ? data.NAME_CLASS : '-'}{data.NAME_TOPIC}{data.NAME_LEVEL}{data.SCORE} + +
+

Empty Data

- - - + + + + + + {loadingActivity?( - - - - - - - + + + + + + + + + + )) ):( -
NoNISNNameNISNFull NameClass Section TopicLevelScoreReview
+ @@ -143,17 +146,22 @@ const TeacherDashboard = () => { ):( activity.length > 0?( activity.map((data, index) => ( -
{index + 1}{data.NISN}{data.NAME_USERS}{data.NAME_SECTION}{data.NAME_TOPIC}
{data.NISN}{data.NAME_USERS}{data.NAME_CLASS ? data.NAME_CLASS : '-'}{data.NAME_SECTION}{data.NAME_TOPIC}{data.NAME_LEVEL}{data.SCORE} + +
+

Empty Data