| @@ -13,7 +13,7 @@ import * as DateUtils from "utils/DateUtils" | |||||
| import { useParams } from "react-router-dom"; | import { useParams } from "react-router-dom"; | ||||
| import Loadable from 'components/Loadable'; | import Loadable from 'components/Loadable'; | ||||
| const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); | const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); | ||||
| import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import FileList from "components/FileList" | import FileList from "components/FileList" | ||||
| // ==============================|| DASHBOARD - DEFAULT ||============================== // | // ==============================|| DASHBOARD - DEFAULT ||============================== // | ||||
| const ApplicationDetailCard = ({ formData, }) => { | const ApplicationDetailCard = ({ formData, }) => { | ||||
| @@ -90,7 +90,7 @@ const Index = () => { | |||||
| <Grid item xs={12} width="100%"> | <Grid item xs={12} width="100%"> | ||||
| <div style={BackgroundHead} width="100%"> | <div style={BackgroundHead} width="100%"> | ||||
| <Stack direction="row" height='70px'> | <Stack direction="row" height='70px'> | ||||
| <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>校對記錄</Typography> | |||||
| <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>Proof Record</Typography> | |||||
| </Stack> | </Stack> | ||||
| </div> | </div> | ||||
| </Grid> | </Grid> | ||||
| @@ -14,7 +14,7 @@ import * as DateUtils from "utils/DateUtils" | |||||
| import { useParams } from "react-router-dom"; | import { useParams } from "react-router-dom"; | ||||
| import Loadable from 'components/Loadable'; | import Loadable from 'components/Loadable'; | ||||
| const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); | const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); | ||||
| import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import FileList from "components/FileList" | import FileList from "components/FileList" | ||||
| // ==============================|| DASHBOARD - DEFAULT ||============================== // | // ==============================|| DASHBOARD - DEFAULT ||============================== // | ||||
| const ApplicationDetailCard = ({ formData, }) => { | const ApplicationDetailCard = ({ formData, }) => { | ||||
| @@ -5,7 +5,7 @@ import { | |||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import {useNavigate} from "react-router-dom"; | import {useNavigate} from "react-router-dom"; | ||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -8,7 +8,7 @@ import { | |||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import {FiDataGrid} from "components/FiDataGrid"; | import {FiDataGrid} from "components/FiDataGrid"; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import {useNavigate} from "react-router-dom"; | import {useNavigate} from "react-router-dom"; | ||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -4,7 +4,7 @@ import { | |||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils"; | import * as DateUtils from "utils/DateUtils"; | ||||
| import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import {useNavigate} from "react-router-dom"; | import {useNavigate} from "react-router-dom"; | ||||
| import {FiDataGrid} from "components/FiDataGrid"; | import {FiDataGrid} from "components/FiDataGrid"; | ||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -22,7 +22,7 @@ import { lazy } from 'react'; | |||||
| const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); | const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); | ||||
| // import {useParams} from "react-router-dom"; | // import {useParams} from "react-router-dom"; | ||||
| import * as HttpUtils from "utils/HttpUtils" | import * as HttpUtils from "utils/HttpUtils" | ||||
| import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import * as DateUtils from "utils/DateUtils"; | import * as DateUtils from "utils/DateUtils"; | ||||
| // import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined'; | // import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined'; | ||||
| @@ -7,7 +7,6 @@ import { | |||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| // import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| export default function BaseGrid({rows}) { | export default function BaseGrid({rows}) { | ||||
| @@ -6,8 +6,6 @@ import { | |||||
| import { | import { | ||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| // import * as DateUtils from "utils/DateUtils" | |||||
| // import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| export default function ProofTab({rows}) { | export default function ProofTab({rows}) { | ||||
| @@ -3,12 +3,8 @@ import * as React from 'react'; | |||||
| import { | import { | ||||
| DataGrid, | DataGrid, | ||||
| } from "@mui/x-data-grid"; | } from "@mui/x-data-grid"; | ||||
| // import dayjs from "dayjs"; | |||||
| // import { | |||||
| // Button | |||||
| // } from '@mui/material'; | |||||
| // import * as DateUtils from "utils/DateUtils" | |||||
| import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -20,7 +20,7 @@ import Loadable from 'components/Loadable'; | |||||
| import { lazy } from 'react'; | import { lazy } from 'react'; | ||||
| const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); | const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); | ||||
| import * as HttpUtils from "utils/HttpUtils" | import * as HttpUtils from "utils/HttpUtils" | ||||
| import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import DoneIcon from '@mui/icons-material/Done'; | import DoneIcon from '@mui/icons-material/Done'; | ||||
| import CloseIcon from '@mui/icons-material/Close'; | import CloseIcon from '@mui/icons-material/Close'; | ||||
| @@ -5,7 +5,6 @@ import { | |||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| // import * as StatusUtils from "./PublicNoteStatusUtils"; | |||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| export default function BaseGrid({rows}) { | export default function BaseGrid({rows}) { | ||||
| @@ -6,7 +6,7 @@ import {FiDataGrid} from "components/FiDataGrid"; | |||||
| // Button | // Button | ||||
| // } from '@mui/material'; | // } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils" | import * as DateUtils from "utils/DateUtils" | ||||
| import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -4,7 +4,7 @@ import { | |||||
| Button | Button | ||||
| } from '@mui/material'; | } from '@mui/material'; | ||||
| import * as DateUtils from "utils/DateUtils"; | import * as DateUtils from "utils/DateUtils"; | ||||
| import * as StatusUtils from "pages/PublicNotice/ListPanel/PublicNoteStatusUtils"; | |||||
| import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils"; | |||||
| import {useNavigate} from "react-router-dom"; | import {useNavigate} from "react-router-dom"; | ||||
| import {FiDataGrid} from "components/FiDataGrid"; | import {FiDataGrid} from "components/FiDataGrid"; | ||||
| // ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
| @@ -0,0 +1,6 @@ | |||||
| export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) { | |||||
| return ( | |||||
| <div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px" }}><b>{text}</b></div> | |||||
| ) | |||||
| } | |||||
| @@ -1,5 +1,7 @@ | |||||
| import {getStatusTag} from "utils/statusUtils/Base"; | |||||
| export function getStatus(params) { | export function getStatus(params) { | ||||
| return getStatusByText(params.row.status); | return getStatusByText(params.row.status); | ||||
| } | } | ||||
| @@ -66,9 +68,3 @@ export function getStatusByTextEng(status) { | |||||
| return getStatusTag({ text: status }) | return getStatusTag({ text: status }) | ||||
| } | } | ||||
| } | } | ||||
| export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) { | |||||
| return ( | |||||
| <div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px" }}><b>{text}</b></div> | |||||
| ) | |||||
| } | |||||