-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ISSUE #5173 - vertical calib is required
- Loading branch information
1 parent
d92b22d
commit 5d498f2
Showing
14 changed files
with
315 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
...end/src/v5/ui/routes/dashboard/projects/drawings/drawingDialogs/drawingForm.component.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /** | ||
| * Copyright (C) 2024 3D Repo Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import { formatMessage } from '@/v5/services/intl'; | ||
| import { FormTextField, FormSelect, FormNumberField } from '@controls/inputs/formInputs.component'; | ||
| import { MenuItem } from '@mui/material'; | ||
| import { DrawingsHooksSelectors, ProjectsHooksSelectors } from '@/v5/services/selectorsHooks'; | ||
| import { nameAlreadyExists, numberAlreadyExists } from '@/v5/validation/errors.helpers'; | ||
| import { UnhandledErrorInterceptor } from '@controls/errorMessage/unhandledErrorInterceptor/unhandledErrorInterceptor.component'; | ||
| import { IDrawing } from '@/v5/store/drawings/drawings.types'; | ||
| import { ShareTextField } from '@controls/shareTextField'; | ||
| import { FormattedMessage } from 'react-intl'; | ||
| import { DoubleInputLineContainer, SubTitle, Title } from './drawingForm.styles'; | ||
| import { Gap } from '@controls/gap'; | ||
| import { MODEL_UNITS } from '../../models.helpers'; | ||
|
|
||
| interface Props { | ||
| formData: any, | ||
| drawing?: IDrawing, | ||
| } | ||
|
|
||
| export const DrawingForm = ({ formData, drawing }:Props) => { | ||
| const types = DrawingsHooksSelectors.selectTypes(); | ||
| const isProjectAdmin = ProjectsHooksSelectors.selectIsProjectAdmin(); | ||
|
|
||
| const { formState: { errors }, control } = formData; | ||
|
|
||
| return ( | ||
| <> | ||
| <Title> | ||
| <FormattedMessage | ||
| id="drawings.form.informationTitle" | ||
| defaultMessage="Drawing information" | ||
| /> | ||
| </Title> | ||
| {(drawing as any)?._id && ( | ||
| <ShareTextField | ||
| label={formatMessage({ id: 'drawings.id', defaultMessage: 'ID' })} | ||
| value={(drawing as any)?._id} | ||
| /> | ||
| )} | ||
| <FormTextField | ||
| control={control} | ||
| name="name" | ||
| label={formatMessage({ id: 'drawings.form.name', defaultMessage: 'Name' })} | ||
| formError={errors.name} | ||
| disabled={!isProjectAdmin} | ||
| required | ||
| /> | ||
| <FormTextField | ||
| control={control} | ||
| name="number" | ||
| label={formatMessage({ id: 'drawings.form.number', defaultMessage: 'Number' })} | ||
| formError={errors.number} | ||
| disabled={!isProjectAdmin} | ||
| required | ||
| /> | ||
| <FormSelect | ||
| control={control} | ||
| name="type" | ||
| label={formatMessage({ id: 'drawings.form.type', defaultMessage: 'Category' })} | ||
| disabled={!isProjectAdmin} | ||
| required | ||
| > | ||
| {types.map((type) => ( | ||
| <MenuItem key={type} value={type}> {type}</MenuItem> | ||
| ))} | ||
| </FormSelect> | ||
| <FormTextField | ||
| control={control} | ||
| name="desc" | ||
| label={formatMessage({ id: 'drawings.form.description', defaultMessage: 'Description' })} | ||
| formError={errors.desc} | ||
| disabled={!isProjectAdmin} | ||
| /> | ||
| <Gap $height="18px" /> | ||
| <Title> | ||
| <FormattedMessage | ||
| defaultMessage="Calibration Information" | ||
| id="drawings.form.calibrationInformation" | ||
| /> | ||
| </Title> | ||
| <SubTitle> | ||
| <FormattedMessage | ||
| defaultMessage="This sets the vertical axis limits of the drawing in relation to the model" | ||
| id="drawings.form.calibrationInformation.description" | ||
| /> | ||
| </SubTitle> | ||
| <DoubleInputLineContainer> | ||
| <FormNumberField | ||
| control={control} | ||
| name="calibration.verticalRange.0" | ||
| label={formatMessage({ id: 'drawings.form.bottomExtent', defaultMessage: 'Bottom Extent' })} | ||
| formError={errors.calibration?.verticalRange?.[0]} | ||
| defaultValue={0} | ||
| required | ||
| /> | ||
| <FormNumberField | ||
| control={control} | ||
| name="calibration.verticalRange.1" | ||
| label={formatMessage({ id: 'drawings.form.topExtent', defaultMessage: 'Top Extent' })} | ||
| formError={errors.calibration?.verticalRange?.[1]} | ||
| required | ||
| defaultValue={1} | ||
| /> | ||
| </DoubleInputLineContainer> | ||
| <FormSelect | ||
| required | ||
| control={control} | ||
| label={formatMessage({ id: 'drawings.form.units', defaultMessage: 'Units' })} | ||
| defaultValue="mm" | ||
| name="calibration.units" | ||
| > | ||
| {MODEL_UNITS.map(({ value, name }) => ( | ||
| <MenuItem key={value} value={value}>{name}</MenuItem> | ||
| ))} | ||
| </FormSelect> | ||
| <UnhandledErrorInterceptor expectedErrorValidators={[nameAlreadyExists, numberAlreadyExists]} /> | ||
| </> | ||
| ); | ||
| }; |
44 changes: 44 additions & 0 deletions
44
frontend/src/v5/ui/routes/dashboard/projects/drawings/drawingDialogs/drawingForm.styles.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /** | ||
| * Copyright (C) 2024 3D Repo Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import { Typography } from '@controls/typography'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| export const Title = styled(Typography).attrs({ variant: 'h5' })` | ||
| color: ${({ theme }) => theme.palette.secondary.main}; | ||
| `; | ||
|
|
||
| export const SubTitle = styled(Typography).attrs({ variant: 'body1' })` | ||
| color: ${({ theme }) => theme.palette.base.main}; | ||
| `; | ||
|
|
||
| export const DoubleInputLineContainer = styled.div` | ||
| display: grid; | ||
| grid-template-columns: 1fr 1fr; | ||
| width: 100%; | ||
| gap: 9px; | ||
| & > * { | ||
| .MuiFormHelperText-root { | ||
| width: 200%; | ||
| } | ||
| &:nth-of-type(2) .MuiFormHelperText-root { | ||
| display: none; | ||
| } | ||
| } | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.