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

LF-3951: Show water calculator with wild crops #3280

Merged
merged 8 commits into from
Aug 16, 2024
Merged

LF-3951: Show water calculator with wild crops #3280

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd4e2e5
LF-3951 Show water calculator with wild crops
Joaquin-M2 Jun 27, 2024
75f2f55
LF-3951 Restore condition from 'waterCalculatorDisabled' variable
Joaquin-M2 Aug 8, 2024
8a09887
LF-3951 Disable water usage calculator link and show a warning if the…
Joaquin-M2 Aug 8, 2024
7405ca4
LF-3951 Move 'margin-top' css property to the wrapper
Joaquin-M2 Aug 8, 2024
a5e5253
LF-3951 Rename typography 'styles' import
Joaquin-M2 Aug 13, 2024
ca1c9af
LF-3951 Move wrapper styles into their own .scss file
Joaquin-M2 Aug 13, 2024
c3ff98c
LF-3951 Use md (900px) instead of xs (599px) breakpoint
Joaquin-M2 Aug 16, 2024
7302aa6
LF-3951 Use i18n instead of hardcoding in the jsx the warning message
Joaquin-M2 Aug 16, 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
2 changes: 1 addition & 1 deletion packages/webapp/src/components/Task/PureIrrigationTask/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export default function PureIrrigationTask({
const waterCalculatorDisabled =
!showWaterUseCalculatorModal ||
!measurement_type ||
(measurement_type === 'DEPTH' && !location);
(measurement_type === 'DEPTH' && !(location || getValues().show_wild_crop));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Using this form value works on task creation, but if the user wants to open the calculator when they complete the task, show_wild_crop won't be available -- I think it's unique to creation and maybe something else like pinCoordinates would have to control the logic for task completion?


return (
<>
Expand Down
Loading