Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

feat: [BB-333] implement datepickers #342

Merged
merged 9 commits into from
Aug 10, 2024
Merged

feat: [BB-333] implement datepickers #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a8cf19
changed type to date
kcaparas1630 Aug 9, 2024
b9631fe
added aria-hidden for eslint error
kcaparas1630 Aug 9, 2024
45061aa
minor revisions
kcaparas1630 Aug 9, 2024
ccaf7c6
changed timezone
kcaparas1630 Aug 9, 2024
c5e6e5c
removed comment
kcaparas1630 Aug 9, 2024
4691e1e
Merge branch 'main' of https://github.com/bcgov/nr-sustainment-capsto…
kcaparas1630 Aug 9, 2024
6f8dc47
changed to year and month
kcaparas1630 Aug 10, 2024
f362f84
removed comment
kcaparas1630 Aug 10, 2024
30a0f0f
reverted back margin:
kcaparas1630 Aug 10, 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
3 changes: 2 additions & 1 deletion frontend/src/Commons/Forms/InputModules/CalculateNutrients/CalculateNutrients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ const CalculateNutrientsComponent: FC<InputModuleProps> = ({
id: fertilizersDetails[selectedIndex].id,
fertilizerTypeId: fertilizersDetails[selectedIndex].fertilizerTypeId,
fertilizerId: fertilizersDetails[selectedIndex].fertilizerId,
applDate: new Date(values.applDate).toISOString(),
customN: fertBalance.N,
customP2o5: fertBalance.P,
customK2o: fertBalance.K,
Expand Down Expand Up @@ -396,7 +397,7 @@ const CalculateNutrientsComponent: FC<InputModuleProps> = ({
label="Date (optional)"
name="applDate"
id="applDate"
type="text"
type="date"
kcaparas1630 marked this conversation as resolved.
Show resolved Hide resolved
desktopWidth="50%"
/>
</StyledSmallFormGroup>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/Commons/Forms/InputModules/FieldsAndSoil/FieldsAndSoil.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const FieldsAndSoilComponent: FC<InputModuleProps> = ({
HasSoilTest: values.HasSoilTest,
SoilTest: {
TestingMethod: values.SoilTest.TestingMethod,
sampleDate: values.SoilTest.sampleDate,
sampleDate: new Date(values.SoilTest.sampleDate).toISOString(),
valNO3H: values.SoilTest.valNO3H,
ValP: values.SoilTest.ValP,
valK: values.SoilTest.valK,
Expand Down Expand Up @@ -346,7 +346,7 @@ const FieldsAndSoilComponent: FC<InputModuleProps> = ({
label="Sample Month"
id="SoilTest.sampleDate"
name="SoilTest.sampleDate"
type="text"
type="date"
mobileWidth="223px"
desktopWidth="226px"
/>
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/Commons/Forms/InputModules/FieldsAndSoil/FieldsListComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,15 @@ const FieldsListComponent: FC<FieldListProps> = ({ farmDetails }) => {
marginRight="50px"
>
<h2>Sampling Month</h2>
<p>{HasSoilTest ? SoilTest.sampleDate : ComponentText.NA}</p>
<p>
{HasSoilTest
? new Date(SoilTest.sampleDate).toLocaleDateString('en-US', {
timeZone: 'UTC',
month: 'long',
year: 'numeric',
})
: ComponentText.NA}
</p>
</StyledListItem>
<StyledListItemGroup desktopWidth="25%">
<StyledListItem
Expand Down
Loading