diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js index f1a1f05..43d96b7 100644 --- a/src/components/FiDataGrid.js +++ b/src/components/FiDataGrid.js @@ -110,7 +110,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, count={_rows.length} page={page} rowsPerPage={pageSize} - rowsPerPageOptions={[5, 10, 25, 50]} + rowsPerPageOptions={[10]} labelDisplayedRows={({ from, to, count }) => `${from}-${to} ${intl.formatMessage({ id: "of" })} ${count}` } diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js index 740cde8..2473214 100644 --- a/src/pages/DemandNote/Create/SearchForm.js +++ b/src/pages/DemandNote/Create/SearchForm.js @@ -1,7 +1,6 @@ // material-ui import { Button, - CardContent, Grid, TextField, Autocomplete, Typography, @@ -15,6 +14,8 @@ import * as UrlUtils from "utils/ApiPathConst"; import * as HttpUtils from "utils/HttpUtils"; import { useNavigate } from "react-router-dom"; import { notifyDownloadSuccess } from 'utils/CommonFunction'; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -35,22 +36,6 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p const [issueCombo, setIssueCombo] = React.useState([]); const navigate = useNavigate() - const _sx = { - padding: "4 2 4 2", - boxShadow: 1, - border: 1, - borderColor: '#DDD', - '& .MuiDataGrid-cell': { - borderTop: 1, - borderBottom: 1, - borderColor: "#EEE" - }, - '& .MuiDataGrid-footerContainer': { - border: 1, - borderColor: "#EEE" - } - } - React.useEffect(() => { if (issueComboData && issueComboData.length > 0) { setIssueCombo(issueComboData); @@ -128,20 +113,21 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
{/*row 1*/} - - - Please Select Gazette Issue : + + {/*row 1*/} + + + Please Select Gazette Issue : + - + {/*row 2*/} - {/*row 2*/} - - + + */} + + @@ -199,6 +183,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p Pending Publish: {publishCount} +
setIsFailPopUp(false)} > diff --git a/src/pages/DemandNote/Create/index.js b/src/pages/DemandNote/Create/index.js index b8740ac..d0e09c2 100644 --- a/src/pages/DemandNote/Create/index.js +++ b/src/pages/DemandNote/Create/index.js @@ -80,16 +80,18 @@ const Index = () => { !onReady ? : - +
- Create Demand Note + + Create Demand Note +
{/*row 1*/} - + + - Attach DN + Attach DN +
- + {/*row 1*/} - - - - Search Form - - + + + Search Form + {/*row 2*/} @@ -261,28 +260,25 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue {/*last row*/} - + + - + + diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js index 23eaa30..d84e03e 100644 --- a/src/pages/DemandNote/Search/index.js +++ b/src/pages/DemandNote/Search/index.js @@ -98,12 +98,14 @@ const UserSearchPage_Individual = () => {
- Demand Note + + Demand Note +
{/*row 1*/} - + const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); // const [status, setStatus] = React.useState(ComboData.paymentStatus[0]); - const _sx = { - padding: "4 2 4 2", - boxShadow: 1, - border: 1, - borderColor: '#DDD', - '& .MuiDataGrid-cell': { - borderTop: 1, - borderBottom: 1, - borderColor: "#EEE" - }, - '& .MuiDataGrid-footerContainer': { - border: 1, - borderColor: "#EEE" - } - } - const { register, handleSubmit, getValues } = useForm() const onSubmit = (data) => { @@ -67,20 +52,19 @@ const SearchPublicNoticeForm = ({ applySearch, generateXML, searchCriteria }) => -
- {/*row 1*/} - - - Credit Date + + + {/*row 1*/} + + + Credit Date + - - - {/*row 2*/} - + {/*row 2*/} + */} - + + + +
diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js index aaecf68..a20353a 100644 --- a/src/pages/GFMIS/index.js +++ b/src/pages/GFMIS/index.js @@ -100,7 +100,7 @@ const Index = () => { !onReady ? : - +
@@ -109,7 +109,7 @@ const Index = () => {
{/*row 1*/} - + {
{/*row 1*/} - - - Search Form + + {/*row 1*/} + + + Search Form + - - - {/*row 2*/} - - - - - - - - - - - - - - - { - setCreditorSelected(newValue); + {/*row 2*/} + + + + option.label} - renderInput={(params) => ( - - )} /> - - - - + + + + + + + + + + + + { + setCreditorSelected(newValue); + }} + getOptionLabel={(option) => option.label} + renderInput={(params) => ( + + )} + /> + - {/*last row*/} - - - - - - - - - + {/*last row*/} + + + + + + + + + + + + + + - - diff --git a/src/pages/Organization/SearchPage/index.js b/src/pages/Organization/SearchPage/index.js index 770549f..a805885 100644 --- a/src/pages/Organization/SearchPage/index.js +++ b/src/pages/Organization/SearchPage/index.js @@ -76,7 +76,7 @@ const OrganizationSearchPage = () => {
{/*row 1*/} - + {/*row 2*/} diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js index 954bc4f..83dd76d 100644 --- a/src/pages/Payment/Search_GLD/SearchForm.js +++ b/src/pages/Payment/Search_GLD/SearchForm.js @@ -10,6 +10,8 @@ import { useForm } from "react-hook-form"; import * as React from "react"; import * as DateUtils from "utils/DateUtils"; import * as ComboData from "utils/ComboData"; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -44,7 +46,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { >
- + {/*row 1*/} @@ -148,32 +150,25 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { {/*last row*/} - - + + - + +
diff --git a/src/pages/Payment/Search_GLD/index.js b/src/pages/Payment/Search_GLD/index.js index d27248c..f62fe09 100644 --- a/src/pages/Payment/Search_GLD/index.js +++ b/src/pages/Payment/Search_GLD/index.js @@ -75,7 +75,7 @@ const Index = () => { {/*row 1*/} - + +
{ } return ( - + {/*row 1*/} { - +
+ +
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js index ce1c222..f29aa12 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js @@ -121,7 +121,7 @@ export default function SearchPublicNoticeTable({ recordList }) { } return ( -
+
{ { JSON.parse(localStorage.getItem('userData')).creditor ? ( - + - + @@ -166,7 +166,7 @@ const PublicNotice = () => { ) : ( - + diff --git a/src/pages/User/SearchPage/UserSearchForm.js b/src/pages/User/SearchPage/UserSearchForm.js index a2949d7..0b1f1be 100644 --- a/src/pages/User/SearchPage/UserSearchForm.js +++ b/src/pages/User/SearchPage/UserSearchForm.js @@ -1,7 +1,7 @@ // material-uisubDivision import { Button, - CardContent, FormControlLabel, + FormControlLabel, Grid, TextField, Typography } from '@mui/material'; @@ -19,6 +19,8 @@ import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline'; import { useNavigate } from "react-router"; import axios from "axios"; import { GET_EMAIL_LIST } from 'utils/ApiPathConst'; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -76,15 +78,16 @@ const UserSearchForm = ({ applySearch }) => { content={false}>
- {/*row 1*/} - - - Search Form (GLD User) + + {/*row 1*/} + + + Search Form (GLD User) + - + {/*row 2*/} - {/*row 2*/} - + { size="small" /> } - label={Locked} + label={Locked} /> - {/*last row*/} - - - - - - - - - - - - + {/*last row*/} + + + + + + + + + + + + + + + + diff --git a/src/pages/User/SearchPage/index.js b/src/pages/User/SearchPage/index.js index 09ab603..fba0ad2 100644 --- a/src/pages/User/SearchPage/index.js +++ b/src/pages/User/SearchPage/index.js @@ -82,7 +82,7 @@ const UserSettingPage = () => { {/*row 1*/} - + {/*row 2*/} diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js index d89b152..d9ade40 100644 --- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js +++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js @@ -1,7 +1,6 @@ // material-ui import { Button, - CardContent, Grid, TextField, Autocomplete, Typography @@ -10,6 +9,8 @@ import MainCard from "../../../components/MainCard"; import { useForm } from "react-hook-form"; import { useState } from "react"; import * as React from "react"; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -48,15 +49,16 @@ const UserSearchForm_Individual = ({ applySearch }) => { content={false}>
- {/*row 1*/} - - - Search Form + + {/*row 1*/} + + + Search Form + - + {/*row 2*/} - {/*row 2*/} - + { {/*last row*/} - - + + - + + + diff --git a/src/pages/User/SearchPage_Individual/index.js b/src/pages/User/SearchPage_Individual/index.js index 2d9f4f4..131505b 100644 --- a/src/pages/User/SearchPage_Individual/index.js +++ b/src/pages/User/SearchPage_Individual/index.js @@ -71,13 +71,15 @@ const UserSearchPage_Individual = () => {
- View Individual User + + View Individual User +
{/*row 1*/} - + {/*row 2*/} diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js index 80c37cc..bf3917e 100644 --- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js +++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js @@ -1,7 +1,7 @@ // material-ui import { Button, - CardContent, Autocomplete, + Autocomplete, Grid, TextField, Typography } from '@mui/material'; @@ -10,6 +10,8 @@ import {useForm} from "react-hook-form"; import { useState} from "react"; import * as React from "react"; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -51,151 +53,145 @@ const UserSearchForm_Organization = ({applySearch}) => { border={false} content={false}> -
- {/*row 1*/} - - - Search Form - - - - {/*row 2*/} - - - - - - - - + + + {/*row 1*/} + + + Search Form + + {/*row 2*/} + - - - - - - - - - - - - - - - - - { - if (newValue !== null){ - setAccountFilter(newValue); - } - }} - renderInput={(params) => ( - + + + + + + + + + + + + + + + + + + + + + + + + { + if (newValue !== null){ + setAccountFilter(newValue); + } + }} + renderInput={(params) => ( + + )} /> - )} - /> - - {/**/} - {/* */} - {/**/} - - + + {/**/} + {/* */} + {/**/} - - {/*last row*/} - - - - - - + + {/*last row*/} + + + + + + + + + + diff --git a/src/pages/User/SearchPage_Organization/index.js b/src/pages/User/SearchPage_Organization/index.js index 98f9553..e789caa 100644 --- a/src/pages/User/SearchPage_Organization/index.js +++ b/src/pages/User/SearchPage_Organization/index.js @@ -77,7 +77,7 @@ const UserSearchPage_Organization = () => {
{/*row 1*/} - + {/*row 2*/} diff --git a/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js b/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js index 3b2c1c7..8c8d6fa 100644 --- a/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js +++ b/src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js @@ -1,7 +1,6 @@ // material-ui import { Button, - CardContent, Grid, TextField, Typography } from '@mui/material'; @@ -10,6 +9,8 @@ import { useForm } from "react-hook-form"; import * as React from "react"; import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline'; import { useNavigate } from "react-router"; +import {PNSPS_BUTTON_THEME} from "../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -37,83 +38,82 @@ const UserGroupSearchForm = ({ applySearch }) => { >
- {/*row 1*/} - - - Search Form + + {/*row 1*/} + + + Search Form + - + {/*row 2*/} - {/*row 2*/} - - - - + + + + - - + + + - - {/*last row*/} - - - - - - - - - + {/*last row*/} + + + + + + + + + + - - + + + + diff --git a/src/pages/pnspsUserGroupSearchPage/index.js b/src/pages/pnspsUserGroupSearchPage/index.js index fbde832..c0bb997 100644 --- a/src/pages/pnspsUserGroupSearchPage/index.js +++ b/src/pages/pnspsUserGroupSearchPage/index.js @@ -79,13 +79,15 @@ const UserGroupSearchPanel = () => {
- View User Group + + View User Group +
{/*row 1*/} - + {/*row 2*/}