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

Jump to bottom

PSP-8183 : UI UX Clean Up - Filter Map - Moving Ownwership Flags to t… #4107

Merged
merged 2 commits into from
Jun 13, 2024
Merged

PSP-8183 : UI UX Clean Up - Filter Map - Moving Ownwership Flags to t… #4107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9fa0fa
PSP-8183 : UI UX Clean Up - Filter Map - Moving Ownwership Flags to t…
Jun 12, 2024
18d665c
Merge branch 'dev' into psp-8183
asanchezr Jun 13, 2024
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
118 changes: 59 additions & 59 deletions source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,65 @@ export const FilterContentForm: React.FC<React.PropsWithChildren<IFilterContentF
<Form>
<FormObserver onChange={onChange} />
<LoadingBackdrop show={isLoading} parentScreen />
<Section header="Show Ownership" isCollapsable initiallyExpanded>
<SectionField label={null} contentWidth="12">
<Row>
<Col xs={1}>
<Check field="isCoreInventory" />
</Col>
<Col xs={1}>
<Image height={36} src={CoreInventoryPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Core Inventory</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isPropertyOfInterest" />
</Col>
<Col xs={1}>
<Image height={36} src={PropertyOfInterestPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Property of Interest</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isOtherInterest" />
</Col>
<Col xs={1}>
<Image height={36} src={OtherInterestPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Other Interest</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isDisposed" />
</Col>
<Col xs={1}>
<Image height={36} src={DisposedPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Disposed</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isRetired" />
</Col>
<Col xs={1}>
<Image height={36} src={RetiredPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Retired</StyledSpan>
</Col>
</Row>
</SectionField>
</Section>
<Section header="Project" isCollapsable initiallyExpanded>
<SectionField label={null} contentWidth="12">
<ProjectSelector field="projectPrediction" />
Expand Down Expand Up @@ -186,65 +245,6 @@ export const FilterContentForm: React.FC<React.PropsWithChildren<IFilterContentF
/>
</SectionField>
</Section>
<Section header="Show Ownership" isCollapsable initiallyExpanded>
<SectionField label={null} contentWidth="12">
<Row>
<Col xs={1}>
<Check field="isCoreInventory" />
</Col>
<Col xs={1}>
<Image height={36} src={CoreInventoryPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Core Inventory</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isPropertyOfInterest" />
</Col>
<Col xs={1}>
<Image height={36} src={PropertyOfInterestPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Property of Interest</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isOtherInterest" />
</Col>
<Col xs={1}>
<Image height={36} src={OtherInterestPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Other Interest</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isDisposed" />
</Col>
<Col xs={1}>
<Image height={36} src={DisposedPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Disposed</StyledSpan>
</Col>
</Row>
<Row className="pt-4">
<Col xs={1}>
<Check field="isRetired" />
</Col>
<Col xs={1}>
<Image height={36} src={RetiredPng} />
</Col>
<Col className="pl-5">
<StyledSpan className="mb-3">Retired</StyledSpan>
</Col>
</Row>
</SectionField>
</Section>
</Form>
</Formik>
);
Expand Down
Loading