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

Responsiveness #1458

Merged
merged 12 commits into from
Feb 5, 2025
Merged

Responsiveness #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
36fcd93
Added responsiveness to the Non-Conform Pages
peach280 Jan 28, 2025
c8f7573
Updated
peach280 Jan 28, 2025
d52fc3f
Merge branch 'develop' into responsiveness
peach280 Jan 29, 2025
f69e842
Merge branch 'develop' into responsiveness
peach280 Jan 29, 2025
5142083
Merge branch 'develop' into responsiveness
peach280 Jan 29, 2025
1a754ce
Merge branch 'develop' into responsiveness
mozzy11 Feb 5, 2025
7a6044e
Merge branch 'develop' into responsiveness
mozzy11 Feb 5, 2025
544cbc4
Formatted
peach280 Feb 5, 2025
2763e5c
Merge branch 'responsiveness' of https://github.com/peach280/OpenELIS…
peach280 Feb 5, 2025
1798027
Updated
peach280 Feb 5, 2025
7fcb566
Updated
peach280 Feb 5, 2025
52851e3
Updated
peach280 Feb 5, 2025
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
19 changes: 10 additions & 9 deletions frontend/src/components/nonconform/common/NCECorrectiveAction.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ export const NCECorrectiveAction = () => {
<div>
{notificationVisible && <AlertDialog />}
<Grid fullWidth={true}>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<h2>
<FormattedMessage id={`nonconform.corrective.title`} />
</h2>
</Column>
<Column lg={16} md={10} sm={8}>
<Column lg={16} md={8} sm={4}>
<Form>
<Grid fullWidth={true}>
<Column lg={4} md={8}>
<Column lg={4} md={4} sm={2}>
<Select
id="type"
labelText={intl.formatMessage({
Expand All @@ -265,7 +265,7 @@ export const NCECorrectiveAction = () => {
))}
</Select>
</Column>
<Column lg={4}>
<Column lg={4} md={4} sm={2}>
<TextInput
labelText={intl.formatMessage({
id: "testcalculation.label.textValue",
Expand All @@ -281,10 +281,11 @@ export const NCECorrectiveAction = () => {
/>
</Column>

<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<br />
</Column>
<Column lg={16}>

<Column lg={16} md={8} sm={4}>
<Button
type="button"
data-testid="nce-search-button"
Expand All @@ -304,14 +305,14 @@ export const NCECorrectiveAction = () => {
</Section>
</Form>
</Column>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<br />
</Column>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
{tData && (
<div>
<Grid>
<Column lg={16} md={16} sm={16}>
<Column lg={16} md={8} sm={4}>
<Table style={{ marginTop: "1em" }}>
<TableHead>
<TableRow>
Expand Down
13 changes: 7 additions & 6 deletions frontend/src/components/nonconform/common/ViewNonConforming.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ export const ViewNonConformingEvent = () => {
<>
{notificationVisible === true ? <AlertDialog /> : ""}
<Grid fullWidth={true}>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<h2>
<FormattedMessage id={`nonconform.view.report`} />
</h2>
</Column>
<Column lg={16} md={10} sm={8}>
<Column lg={16} md={8} sm={4}>
<Form>
<Grid fullWidth={true}>
<Column lg={4} md={8}>
<Column lg={4} md={4} sm={2}>
<Select
id="type"
labelText={intl.formatMessage({
Expand All @@ -294,7 +294,7 @@ export const ViewNonConformingEvent = () => {
))}
</Select>
</Column>
<Column lg={4}>
<Column lg={4} md={4} sm={2}>
<TextInput
labelText={intl.formatMessage({
id: "testcalculation.label.textValue",
Expand All @@ -309,10 +309,11 @@ export const ViewNonConformingEvent = () => {
id={`field.name`}
/>
</Column>
<Column lg={16}>
<Column lg={16} md={8} sm={4}>
<br></br>
</Column>
<Column lg={16}>

<Column lg={16} md={8} sm={4}>
<Button
type="button"
data-testid="nce-search-button"
Expand Down
Loading