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

fix: handle unselected year for period calcs #522

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+71 −6
Draft

fix: handle unselected year for period calcs #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 70 additions & 5 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2025-02-25T12:48:21.517Z\n"
"PO-Revision-Date: 2025-02-25T12:48:21.518Z\n"
"POT-Creation-Date: 2025-02-28T08:48:54.069Z\n"
"PO-Revision-Date: 2025-02-28T08:48:54.070Z\n"

msgid "schemas"
msgstr "schemas"
Expand Down Expand Up @@ -93,6 +93,27 @@ msgstr "Filter options"
msgid "Retry"
msgstr "Retry"

msgid "Please enter a GeoJSON value"
msgstr "Please enter a GeoJSON value"

msgid "Please provide a positive integer"
msgstr "Please provide a positive integer"

msgid "Please provide a negative integer"
msgstr "Please provide a negative integer"

msgid "Please provide a 0 or positive integer"
msgstr "Please provide a 0 or positive integer"

msgid "Please provide valid percantage (0-100)."
msgstr "Please provide valid percantage (0-100)."

msgid "Please provide valid unit interval (0-1)."
msgstr "Please provide valid unit interval (0-1)."

msgid "Must be checked"
msgstr "Must be checked"

msgid "Save and close"
msgstr "Save and close"

Expand All @@ -114,9 +135,6 @@ msgstr "Something went wrong when submitting the form"
msgid "<No value>"
msgstr "<No value>"

msgid "Please enter a GeoJSON value."
msgstr "Please enter a GeoJSON value."

msgid "Attributes"
msgstr "Attributes"

Expand Down Expand Up @@ -1411,12 +1429,59 @@ msgstr ""
"level means that data from lower levels will not be included in the "
"aggregation."

msgid "Send complete notifications"
msgstr "Send complete notifications"

msgid "Recipient user group"
msgstr "Recipient user group"

msgid "Send notification to completing user"
msgstr "Send notification to completing user"

msgid "Advanced options"
msgstr "Advanced options"

msgid "These options are used for advanced data set configurations."
msgstr "These options are used for advanced data set configurations."

msgid "Don't save this data to offline storage (skip offline)"
msgstr "Don't save this data to offline storage (skip offline)"

msgid ""
"Include data element descriptions in offline storage (data element "
"decoration)"
msgstr ""
"Include data element descriptions in offline storage (data element "
"decoration)"

msgid "Use this data set with Java mobile client"
msgstr "Use this data set with Java mobile client"

msgid "Notifications"
msgstr "Notifications"

msgid ""
"Send notifications when data sets are marked complete, using the DHIS2 "
"Messages app."
msgstr ""
"Send notifications when data sets are marked complete, using the DHIS2 "
"Messages app."

msgid "Legends"
msgstr "Legends"

msgid "Choose legends that will do something (?????????)"
msgstr "Choose legends that will do something (?????????)"

msgid "Available legends"
msgstr "Available legends"

msgid "Search available legends"
msgstr "Search available legends"

msgid "Search selected legends"
msgstr "Search selected legends"

msgid "Configure data elements"
msgstr "Configure data elements"

Expand Down
2 changes: 1 addition & 1 deletion src/pages/dataSetsWip/form/dataInputPeriods/useGetPeriods.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const useGetPeriods = ({
const yearRange = currentYear
? Array.from({ length: 16 }, (_, i) => String(-11 + i + currentYear))
: []
const generateYear = selectedYear
const generateYear = selectedYear ?? currentYear
const periods = !selectedPeriodType
? []
: annual
Expand Down
Loading