Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed checkbox and search button overflow in ElectronicOrders #814

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Fixed checkbox and search button overflow in ElectronicOrders #814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions frontend/src/components/eOrder/EOrderSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const EOrderSearch = ({
<>
<PageBreadCrumb breadcrumbs={breadcrumbs} />
<Grid fullWidth={true}>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<Section>
<Section>
<Heading>
Expand Down Expand Up @@ -142,14 +142,15 @@ const EOrderSearch = ({
<FormattedMessage id="eorder.search2.text" />
<br></br>
<div className="formInlineDiv">
<div className="formInlineDiv">
<CustomDatePicker
id={"eOrder_startDate"}
labelText={intl.formatMessage({ id: "eorder.date.start" })}
value={startDate}
className="inputDate"
onChange={(date) => setStartDate(date)}
/>
</div>
<div className="formInlineDiv">
<CustomDatePicker
id={"eOrder_startDate"}
labelText={intl.formatMessage({ id: "eorder.date.end" })}
Expand Down Expand Up @@ -187,13 +188,15 @@ const EOrderSearch = ({
setAllInfo(e.currentTarget.checked);
}}
/>
<div className="formInlineDiv">
<div></div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always share screen shot in tablet veiw

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always share screen shot in tablet veiw

Tablet view:
Screen Shot 2024-03-17 at 00 32 18

<Button onClick={searchByDateAndStatus}>
<FormattedMessage id="label.button.search" />
</Button>
</div>
</div>
</div>
</div>
</div>
{searchCompleted && !hasEOrders && (
<FormattedMessage id="eorder.search.noresults" />
)}
Expand Down
Loading