Merge branch 'main' of https://github.com/tekdi/shiksha-admin into co…

…hort_list
tekdi · Jul 30, 2024 · 987d933 · 987d933
2 parents 04d760e + b0b3c30
commit 987d933
Show file tree

Hide file tree

Showing 7 changed files with 421 additions and 385 deletions.
diff --git a/src/components/HeaderComponent.tsx b/src/components/HeaderComponent.tsx
@@ -13,8 +13,6 @@ import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
 import {
-  getBlockList,
-  getDistrictList,
   getStateBlockDistrictList,
 } from "../services/MasterDataService";
 import AreaSelection from "./AreaSelection";

diff --git a/src/components/KaTableComponent.tsx b/src/components/KaTableComponent.tsx
@@ -1,16 +1,12 @@
-// components/KaTableComponent.tsx
-
 import React, { useState } from "react";
 import { ITableProps, Table } from "ka-table";
 import { SortingMode, PagingPosition } from "ka-table/enums";
 import { Paper, Checkbox } from "@mui/material";
 import "ka-table/style.css";
-import { IPagingProps } from "ka-table/props";
-import { updatePageIndex, updatePageSize } from "ka-table/actionCreators";
-import ActionCell from "./ActionCell";
 import ActionIcon from "./ActionIcon";
 import { format } from "date-fns";
 import { DataKey, DateFormat } from "@/utils/app.constant";
+import { useTranslation } from "react-i18next";
 
 interface KaTableComponentProps {
   columns: ITableProps["columns"];
@@ -30,6 +26,7 @@ interface KaTableComponentProps {
   }[];
   paginationEnable?: boolean;
   showIcons?: boolean;
+  noData?: any;
   pagination?: boolean;
 }
 
@@ -46,9 +43,11 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
   onDelete,
   showIcons,
   pageSizes,
+  noData,
   pagination = true,
 }) => {
   const [selectedRowIds, setSelectedRowIds] = useState<number[]>([]);
+  const { t } = useTranslation();
 
   const handleCheckboxChange = (rowId: number) => {
     setSelectedRowIds((prevSelected) =>
@@ -79,6 +78,13 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
       <div className="ka-table-wrapper">
         <Table
           {...tableProps}
+          paging={{
+            enabled: paginationEnable,
+            pageIndex: offset,
+            pageSize: limit,
+            pageSizes: pageSizes,
+            position: PagingPosition.Bottom,
+          }}
           childComponents={{
             pagingSizes: {
               content: (props) => <PageSizeSelector {...props} />,
@@ -111,10 +117,8 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
                 if (props.column.key === "selection-cell") {
                   return (
                     <Checkbox
-                      checked={selectedRowIds.includes(props.rowData.userId)}
-                      onChange={() =>
-                        handleCheckboxChange(props.rowData.userId)
-                      }
+                      checked={selectedRowIds.includes(props.rowData.id)}
+                      onChange={() => handleCheckboxChange(props.rowData.id)}
                     />
                   );
                 }
@@ -127,6 +131,9 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
               },
             },
           }}
+          noData={{
+            text: t("COURSE_PLANNER.DATA_NOT_FOUND"),
+          }}
         />
       </div>
     </Paper>