diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index 761b5ec..58be5c4 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -4,7 +4,7 @@ import {
DataGrid, GridOverlay,
} from "@mui/x-data-grid";
import {FormattedMessage, useIntl} from "react-intl";
-import {Typography} from '@mui/material';
+import {TablePagination, Typography} from '@mui/material';
// ==============================|| EVENT TABLE ||============================== //
@@ -124,27 +124,12 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
return (
-
+
);
}
- const CustomPagination = (props) => {
- const { pagination } = props;
- const { page, pageSize, rowCount } = pagination;
-
- const startIndex = page * pageSize + 1;
- const endIndex = Math.min((page + 1) * pageSize, rowCount);
-
- return (
-
-
{`${startIndex}-${endIndex} YES ${rowCount}`}
- {/* Render other pagination controls */}
-
- );
- };
-
return (
(
+ {
+ return '' + from + '-' + to + ' ' + count
+ }
+ }
+ />
+ ),
}}
componentsProps={{
pagination: {
- labelRowsPerPage: intl.formatMessage({id: 'rowsPerPage'}),
+ labelRowsPerPage: intl.formatMessage({id: 'rowsPerPage'}) + ":",
}
}}
/>
diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js
index 339e8c9..740cde8 100644
--- a/src/pages/DemandNote/Create/SearchForm.js
+++ b/src/pages/DemandNote/Create/SearchForm.js
@@ -144,6 +144,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
-
+
-
+