diff --git a/src/roles/teacher/feedback/hooks/useProgressClass.jsx b/src/roles/teacher/feedback/hooks/useProgressClass.jsx index 197d170..9b37b17 100644 --- a/src/roles/teacher/feedback/hooks/useProgressClass.jsx +++ b/src/roles/teacher/feedback/hooks/useProgressClass.jsx @@ -80,14 +80,20 @@ const useProgressClass = (progressId) => { const handleDownloadCSV = async () => { try { - const response = await progressService.getCsvProgress(); + const [classId, topicId] = progressId.split("&"); - const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); + const dataId = { + ID_CLASS: classId, + ID_TOPIC: topicId, + }; + const response = await progressService.getCsvProgress(dataId); + + const blob = new Blob([response], { type: '.csv' }); const downloadUrl = URL.createObjectURL(blob); const link = document.createElement('a'); link.href = downloadUrl; - link.download = `progress ${name}-${topic}.csv`; + link.download = `progress ${name} - ${topic}.csv`; link.click(); URL.revokeObjectURL(downloadUrl); diff --git a/src/roles/teacher/feedback/services/serviceProgress.jsx b/src/roles/teacher/feedback/services/serviceProgress.jsx index 5f774f0..f08b0a2 100644 --- a/src/roles/teacher/feedback/services/serviceProgress.jsx +++ b/src/roles/teacher/feedback/services/serviceProgress.jsx @@ -1,4 +1,6 @@ import axiosInstance from '../../../../utils/axiosInstance'; +import axios from 'axios'; +import { API_URL } from '../../../../utils/Constant'; const fetchDataStudent = async (search, sort, page, limit) => { try { @@ -70,7 +72,7 @@ const postFeedback = async (id, feedback) => { } }; -const getCsvProgress = async () => { +const getCsvProgress = async (data) => { const configs = { headers: { Authorization: localStorage.getItem('token') @@ -78,7 +80,7 @@ const getCsvProgress = async () => { responseType: 'blob', }; try { - const response = await axiosInstance.get(`/monitoring/class/csv`, configs); + const response = await axiosInstance.post(`/monitoring/class/csv`,data ,configs); return response.data; } catch (error) { console.error(`Error get file:`, error); diff --git a/src/roles/teacher/feedback/views/Feedback.jsx b/src/roles/teacher/feedback/views/Feedback.jsx index cbef5f2..78c4bfb 100644 --- a/src/roles/teacher/feedback/views/Feedback.jsx +++ b/src/roles/teacher/feedback/views/Feedback.jsx @@ -114,7 +114,7 @@ const Feedback = () => { )) ):( - +

Empty Data