diff options
author | Rosyid Haryadi <rosyid_haryadi@protonmail.com> | 2023-10-01 14:34:37 +0700 |
---|---|---|
committer | Rosyid Haryadi <rosyid_haryadi@protonmail.com> | 2023-10-01 14:34:37 +0700 |
commit | 2d1a0042f74a6fe85aa5e408eb1dd3066efbaf72 (patch) | |
tree | ea309a64bef46bc9882adcc646318d8151a2ed19 /src | |
parent | a4f1b82242b37cc96047d41af04f9f689a8232bd (diff) |
upd: minTime maxTime makes it annoying to input, invalid time handled in result instead
Diffstat (limited to 'src')
-rw-r--r-- | src/App.jsx | 23 | ||||
-rw-r--r-- | src/Entry.jsx | 4 | ||||
-rw-r--r-- | src/Result.jsx | 10 |
3 files changed, 28 insertions, 9 deletions
diff --git a/src/App.jsx b/src/App.jsx index a53e59b..db340da 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -7,13 +7,15 @@ import SalaryInput from "./SalaryInput.jsx"; import Result from "./Result.jsx"; import RemoveCircleIcon from '@mui/icons-material/RemoveCircle'; import AddCircleIcon from '@mui/icons-material/AddCircle'; +import Icon from '@mdi/react'; +import { mdiGitlab } from '@mdi/js'; function App() { const [baseSalary, setBaseSalary] = useState(0); const [listEntry, setListEntry] = useState( [ - {id: 0, date: dayjs(), start: dayjs(), finish: dayjs()}, + {id: 0, date: dayjs(), start: dayjs().set('hour', 17).set('minute', 30), finish: dayjs().set('hour', 18).set('minute', 30)}, ] ); const [removeDisabled, setRemoveDisabled] = useState(false); @@ -125,12 +127,19 @@ function App() { <li><Typography>Belum termasuk versi 6 hari kerja (todo)</Typography></li> <li><Typography>UI belum responsive (todo)</Typography></li> </ul> - <Typography paragraph={true} padding={'10px'} marginTop={'5px'}> - <a href='https://gitlab.com/rosyidharyadi/overreact' target='_blank'>Source</a> - </Typography> - <Typography variant='overline' display='block' align='center' padding={'10px'} marginTop={'5px'}> - Rosyid - </Typography> + <div style={{textAlign: 'center'}}> + <a href='https://gitlab.com/rosyidharyadi/overreact' target='_blank'> + <Icon path={mdiGitlab} + title="Repository" + size={2} + // horizontal + // vertical + // rotate={90} + color="blue" + spin + /> + </a> + </div> </Paper> </Grid> </Grid> diff --git a/src/Entry.jsx b/src/Entry.jsx index c486680..6c57903 100644 --- a/src/Entry.jsx +++ b/src/Entry.jsx @@ -22,7 +22,7 @@ function Entry({propId, propDate, propStart, propFinish, handleEntryChange}) { <TimePicker label="Mulai" ampm={false} value={start} - maxTime={finish} + // maxTime={finish} onAccept={(newStart) => { setStart(newStart); handleEntryChange({id: propId, start: newStart}, 'start') @@ -31,7 +31,7 @@ function Entry({propId, propDate, propStart, propFinish, handleEntryChange}) { <TimePicker label="Selesai" ampm={false} value={finish} - minTime={start} + // minTime={start} onAccept={(newFinish) => { setFinish(newFinish); handleEntryChange({id: propId, finish: newFinish}, 'finish') diff --git a/src/Result.jsx b/src/Result.jsx index dd977c5..3ba9a4e 100644 --- a/src/Result.jsx +++ b/src/Result.jsx @@ -9,6 +9,16 @@ function Result({listEntry, baseSalary}) { setTotalOvertimePay(getOvertimePayTotal(listEntry, baseSalary)); }, [listEntry, baseSalary]); + if (totalOvertimePay < 0) { + return ( + <Container> + <Typography variant='h5'> + Waktu selesai mendahului waktu mulai. Mohon diperbaiki input. + </Typography> + </Container> + ) + } + return ( <Container> <Typography variant='h5'> |