icleafreportui 0.2.5 → 0.2.7

package/dist/App.js

@@ -12,7 +12,7 @@ const App = () => {
 
   // Configuration for API calls
   const config = {
-    baseURL: process.env.REACT_APP_BASE_URL || 'http://192.168.2.203:8080/icleafreport',
+    baseURL: process.env.REACT_APP_BASE_URL || 'http://192.168.2.203:8080/icleafreport/',
     tenantToken: 'tn_96ef3426276611f19d84005056575b50'
   };
   return /*#__PURE__*/_jsx(TenantProvider, {

package/dist/Reports/CourseReport.js

@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom';
 import Header from '../components/Header';
 import Sidebar from '../components/sidebar';
 import '../App.css';
+import { useTenant } from '../context/TenantProvider';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function CourseReport() {
   const [token, setToken] = useState(localStorage.getItem("token"));
@@ -19,6 +20,9 @@ function CourseReport() {
   const [loading, setLoading] = useState(false);
   const [alertOpen, setAlertOpen] = useState(false);
   const baseURL = process.env.REACT_APP_BASE_URL;
+  const {
+    apiClient
+  } = useTenant();
   useEffect(() => {
     if (token == null) {
       navigate("/login");
@@ -26,33 +30,32 @@ function CourseReport() {
       fetchAllSubjects();
     }
   }, []);
+
+  // const fetchAllSubjects = async () => {
+  //   try {
+  //     const response = await axios({
+  //       method: "get",
+  //       url: `${baseURL}api/showAllSubjects`,
+  //       headers: { Authorization: `Bearer ${token}` },
+  //     });
+  //     setSubjects(response.data);
+  //   } catch (error) {
+  //     console.error('Error fetching subjects:', error);
+  //   }
+  // };
+
   const fetchAllSubjects = async () => {
     try {
-      const response = await axios({
-        method: "get",
-        url: `${baseURL}api/showAllSubjects`,
-        headers: {
-          Authorization: `Bearer ${token}`
-        }
-      });
-      setSubjects(response.data);
+      const data = await apiClient.get('/api/showAllSubjects');
+      setSubjects(data);
     } catch (error) {
       console.error('Error fetching subjects:', error);
     }
   };
   const fetchCourses = async subjectId => {
     try {
-      const response = await axios({
-        method: "get",
-        params: {
-          subjectId
-        },
-        url: `${baseURL}api/getCoursesBySubject`,
-        headers: {
-          Authorization: `Bearer ${token}`
-        }
-      });
-      setCourses(response.data);
+      const data = await apiClient.get(`/api/getCoursesBySubject?subjectId=${subjectId}`);
+      setCourses(data);
     } catch (error) {
       console.error('Error fetching courses:', error);
     }
@@ -71,35 +74,75 @@ function CourseReport() {
   const handleReportTypeChange = (event, newValue) => {
     setSelectedReportType(newValue);
   };
+
+  // const handleDownload = async () => {
+  //   setLoading(true);
+  //   try {
+  //     let url;
+  //     if (selectedReportType === 'Summary') {
+  //       url = `${baseURL}api/downloadUserCorpCourseExcel?corpCourseId=${selectedCourse.id}`;
+  //     } else if (selectedReportType === 'Daywise') {
+  //       url = `${baseURL}api/downloadUserCorpCourseExcelDayWise?corpCourseId=${selectedCourse.id}`;
+  //     }
+
+  //     const response = await axios.get(url, {
+  //       responseType: 'blob',
+  //       headers: {
+  //         Authorization: `Bearer ${token}`
+  //       }
+  //     });
+  //     const contentDisposition = response.headers['content-disposition'];
+  //     const text = await response.data.text();
+  //     if (text.includes('Course not configured')) {
+  //       setAlertMessage('Course not configured.');
+  //       setAlertOpen(true);
+  //     } else {
+  //       const filename = 'course_report.xlsx';
+  //       const blob = new Blob([response.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+  //       const blobUrl = URL.createObjectURL(blob);
+  //       const link = document.createElement('a');
+  //       link.href = blobUrl;
+  //       link.setAttribute('download', filename);
+  //       document.body.appendChild(link);
+  //       link.click();
+  //       link.parentNode.removeChild(link);
+  //       URL.revokeObjectURL(blobUrl);
+  //     }
+  //   } catch (error) {
+  //     console.error('Error downloading course report:', error);
+  //   } finally {
+  //     setLoading(false);
+  //   }
+  // };
+
   const handleDownload = async () => {
     setLoading(true);
     try {
       let url;
       if (selectedReportType === 'Summary') {
-        url = `${baseURL}api/downloadUserCorpCourseExcel?corpCourseId=${selectedCourse.id}`;
+        url = '/api/downloadUserCorpCourseExcel';
       } else if (selectedReportType === 'Daywise') {
-        url = `${baseURL}api/downloadUserCorpCourseExcelDayWise?corpCourseId=${selectedCourse.id}`;
+        url = '/api/downloadUserCorpCourseExcelDayWise';
       }
-      const response = await axios.get(url, {
-        responseType: 'blob',
+      const fullUrl = `${url}?corpCourseId=${selectedCourse.id}`;
+      const response = await fetch(`${baseURL}${fullUrl}`, {
         headers: {
-          Authorization: `Bearer ${token}`
+          'X-Tenant-Token': apiClient.tenantToken
         }
       });
-      const contentDisposition = response.headers['content-disposition'];
-      const text = await response.data.text();
+      const blob = await response.blob();
+      const text = await blob.text();
       if (text.includes('Course not configured')) {
         setAlertMessage('Course not configured.');
         setAlertOpen(true);
       } else {
-        const filename = 'course_report.xlsx';
-        const blob = new Blob([response.data], {
+        const downloadBlob = new Blob([blob], {
           type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         });
-        const blobUrl = URL.createObjectURL(blob);
+        const blobUrl = URL.createObjectURL(downloadBlob);
         const link = document.createElement('a');
         link.href = blobUrl;
-        link.setAttribute('download', filename);
+        link.setAttribute('download', 'course_report.xlsx');
         document.body.appendChild(link);
         link.click();
         link.parentNode.removeChild(link);

package/dist/Reports/ImportContent/CourseReportContent.js

@@ -0,0 +1,213 @@
+import React, { useState, useEffect } from 'react';
+import { Autocomplete, FormControl, Button, Grid, Box, Typography, Paper, Snackbar, Alert, CircularProgress, TextField } from '@mui/material';
+import { useTenant } from '../context/TenantProvider';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+function CourseReportContent() {
+  const {
+    apiClient
+  } = useTenant();
+  const [subjects, setSubjects] = useState([]);
+  const [courses, setCourses] = useState([]);
+  const [selectedSubject, setSelectedSubject] = useState(null);
+  const [selectedCourse, setSelectedCourse] = useState(null);
+  const [reportTypes] = useState(['Summary', 'Daywise']);
+  const [selectedReportType, setSelectedReportType] = useState(null);
+  const [alertMessage, setAlertMessage] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [alertOpen, setAlertOpen] = useState(false);
+  useEffect(() => {
+    fetchAllSubjects();
+  }, []);
+  const fetchAllSubjects = async () => {
+    try {
+      const data = await apiClient.get('/api/showAllSubjects');
+      setSubjects(data);
+    } catch (error) {
+      console.error('Error fetching subjects:', error);
+    }
+  };
+  const fetchCourses = async subjectId => {
+    try {
+      const data = await apiClient.get(`/api/getCoursesBySubject?subjectId=${subjectId}`);
+      setCourses(data);
+    } catch (error) {
+      console.error('Error fetching courses:', error);
+    }
+  };
+  const handleSubjectChange = (event, newValue) => {
+    setSelectedSubject(newValue);
+    setSelectedCourse(null);
+    setCourses([]);
+    if (newValue) {
+      fetchCourses(newValue.subjectId);
+    }
+  };
+  const handleCourseChange = (event, newValue) => {
+    setSelectedCourse(newValue);
+  };
+  const handleReportTypeChange = (event, newValue) => {
+    setSelectedReportType(newValue);
+  };
+  const handleDownload = async () => {
+    setLoading(true);
+    try {
+      let url;
+      if (selectedReportType === 'Summary') {
+        url = '/api/downloadUserCorpCourseExcel';
+      } else if (selectedReportType === 'Daywise') {
+        url = '/api/downloadUserCorpCourseExcelDayWise';
+      }
+      const fullUrl = `${url}?corpCourseId=${selectedCourse.id}`;
+      const response = await fetch(`${apiClient.baseURL}${fullUrl}`, {
+        headers: {
+          'X-Tenant-Token': apiClient.tenantToken
+        }
+      });
+      const blob = await response.blob();
+      const text = await blob.text();
+      if (text.includes('Course not configured')) {
+        setAlertMessage('Course not configured.');
+        setAlertOpen(true);
+      } else {
+        const downloadBlob = new Blob([blob], {
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        });
+        const blobUrl = URL.createObjectURL(downloadBlob);
+        const link = document.createElement('a');
+        link.href = blobUrl;
+        link.setAttribute('download', 'course_report.xlsx');
+        document.body.appendChild(link);
+        link.click();
+        link.parentNode.removeChild(link);
+        URL.revokeObjectURL(blobUrl);
+      }
+    } catch (error) {
+      console.error('Error downloading course report:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+  return /*#__PURE__*/_jsxs(Box, {
+    sx: {
+      maxWidth: 800,
+      mx: 'auto',
+      my: 4,
+      p: 3,
+      backgroundColor: '#f5f5f5',
+      borderRadius: 2
+    },
+    children: [/*#__PURE__*/_jsxs(Paper, {
+      elevation: 6,
+      sx: {
+        p: 5,
+        textAlign: 'center',
+        backgroundColor: '#fff'
+      },
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "h4",
+        component: "h1",
+        gutterBottom: true,
+        sx: {
+          color: '#3f51b5',
+          marginBottom: "20px"
+        },
+        children: "Course Report"
+      }), /*#__PURE__*/_jsxs(Grid, {
+        container: true,
+        spacing: 2,
+        justifyContent: "center",
+        children: [/*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          sm: 4,
+          children: /*#__PURE__*/_jsx(FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/_jsx(Autocomplete, {
+              options: subjects,
+              getOptionLabel: option => option.subjectName,
+              value: selectedSubject,
+              onChange: handleSubjectChange,
+              renderInput: params => /*#__PURE__*/_jsx(TextField, {
+                ...params,
+                label: "Subject"
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          sm: 4,
+          children: /*#__PURE__*/_jsx(FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/_jsx(Autocomplete, {
+              options: courses,
+              getOptionLabel: option => option.courseName,
+              value: selectedCourse,
+              onChange: handleCourseChange,
+              renderInput: params => /*#__PURE__*/_jsx(TextField, {
+                ...params,
+                label: "Course"
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          sm: 4,
+          children: /*#__PURE__*/_jsx(FormControl, {
+            fullWidth: true,
+            children: /*#__PURE__*/_jsx(Autocomplete, {
+              options: reportTypes,
+              getOptionLabel: option => option,
+              value: selectedReportType,
+              onChange: handleReportTypeChange,
+              renderInput: params => /*#__PURE__*/_jsx(TextField, {
+                ...params,
+                label: "Report Type"
+              })
+            })
+          })
+        })]
+      }), /*#__PURE__*/_jsxs(Box, {
+        sx: {
+          mt: 3,
+          position: 'relative'
+        },
+        children: [/*#__PURE__*/_jsx(Button, {
+          variant: "contained",
+          color: "primary",
+          onClick: handleDownload,
+          disabled: !selectedSubject || !selectedCourse || !selectedReportType || loading,
+          sx: {
+            width: 'auto',
+            backgroundColor: '#3f51b5'
+          },
+          children: loading ? 'Downloading...' : 'Download Report'
+        }), loading && /*#__PURE__*/_jsx(CircularProgress, {
+          size: 24,
+          sx: {
+            position: 'absolute',
+            top: '50%',
+            left: '50%',
+            marginTop: '-12px',
+            marginLeft: '-12px'
+          }
+        })]
+      })]
+    }), /*#__PURE__*/_jsx(Snackbar, {
+      open: alertOpen,
+      autoHideDuration: 6000,
+      onClose: () => setAlertOpen(false),
+      anchorOrigin: {
+        vertical: 'top',
+        horizontal: 'center'
+      },
+      children: /*#__PURE__*/_jsx(Alert, {
+        onClose: () => setAlertOpen(false),
+        severity: "info",
+        children: alertMessage
+      })
+    })]
+  });
+}
+export default CourseReportContent;