From 9dc3ef5af280a13ef51ecbcfe11a15e7e7e49329 Mon Sep 17 00:00:00 2001 From: henrikmv <110386561+henrikmv@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:39:47 +0200 Subject: [PATCH 01/16] refactor: [DHIS2-17840]replace Material UI Grid (#3763) * feat: remove Grid * feat: remove grid from cardlistitem * feat: remove grid from incompleteselectionsmessage * feat: remove grid registration data entry form * fix: remove use of media for responsiveness * fix: revert code clean up --- .../CardList/CardListItem.component.js | 93 ++++++------ .../IncompleteSelectionsMessage/index.js | 24 +-- .../components/InfoIconText/InfoIconText.js | 21 ++- .../RegistrationDataEntry.component.js | 137 +++++++++--------- 4 files changed, 134 insertions(+), 141 deletions(-) diff --git a/src/core_modules/capture-core/components/CardList/CardListItem.component.js b/src/core_modules/capture-core/components/CardList/CardListItem.component.js index a1fe4bc5d1..d411d1a933 100644 --- a/src/core_modules/capture-core/components/CardList/CardListItem.component.js +++ b/src/core_modules/capture-core/components/CardList/CardListItem.component.js @@ -3,7 +3,7 @@ import i18n from '@dhis2/d2-i18n'; import React from 'react'; import moment from 'moment'; import type { ComponentType } from 'react'; -import { Grid, withStyles } from '@material-ui/core'; +import { withStyles } from '@material-ui/core'; import { colors, Tag, IconCheckmark16, Tooltip } from '@dhis2/ui'; import { useTimeZoneConversion } from '@dhis2/app-runtime'; import { CardImage } from '../../../capture-ui/CardImage/CardImage.component'; @@ -18,21 +18,20 @@ import { dataElementTypes, getTrackerProgramThrowIfNotFound } from '../../metaDa import { useOrgUnitName } from '../../metadataRetrieval/orgUnitName'; import type { ListItem, RenderCustomCardActions } from './CardList.types'; - type OwnProps = $ReadOnly<{| item: ListItem, - currentSearchScopeName?: string, - currentProgramId?: string, - currentSearchScopeType?: string, - renderCustomCardActions?: RenderCustomCardActions, - profileImageDataElement: ?CardProfileImageElementInformation, - dataElements: CardDataElementsInformation, + currentSearchScopeName ?: string, + currentProgramId ?: string, + currentSearchScopeType ?: string, + renderCustomCardActions ?: RenderCustomCardActions, + profileImageDataElement: ?CardProfileImageElementInformation, + dataElements: CardDataElementsInformation, |}>; type Props = $ReadOnly<{| ...OwnProps, ...CssClasses -|}>; + |}>; const getStyles = (theme: Theme) => ({ itemContainer: { @@ -44,6 +43,7 @@ const getStyles = (theme: Theme) => ({ borderRadius: theme.typography.pxToRem(5), border: `1px solid ${colors.grey400}`, backgroundColor: colors.grey050, + position: 'relative', }, itemDataContainer: { display: 'flex', @@ -52,6 +52,9 @@ const getStyles = (theme: Theme) => ({ fontSize: theme.typography.pxToRem(12), color: colors.grey700, paddingBottom: theme.typography.pxToRem(8), + position: 'absolute', + top: theme.typography.pxToRem(8), + right: theme.typography.pxToRem(8), }, enrolled: { display: 'flex', @@ -213,49 +216,39 @@ const CardListItemIndex = ({ return (
-
- - - {renderImageDataElement(profileImageDataElement)} - - - - {dataElements - .map(({ id, name, type }) => ( - )) - } - - {renderEnrollmentDetails()} - - - { - item.tei && item.tei.updatedAt && -
- { i18n.t('Last updated') } {' '} - { item.tei && - { moment(fromServerDate(item.tei.updatedAt)).fromNow() } - } -
- } - -
- {renderTag()} -
-
-
-
+ {renderImageDataElement(profileImageDataElement)} +
+ {dataElements + .map(({ id, name, type }) => ( + + )) + } + {renderEnrollmentDetails()} +
+
+
+ {renderTag()} +
+
- - { - renderCustomCardActions - && + {item.tei && item.tei.updatedAt && ( +
+ {i18n.t('Last updated')}{' '} + {item.tei && ( + + {moment(fromServerDate(item.tei.updatedAt)).fromNow()} + + )} +
+ )} + {renderCustomCardActions && (
{ renderCustomCardActions({ @@ -270,7 +263,7 @@ const CardListItemIndex = ({ }) }
- } + )}
); }; diff --git a/src/core_modules/capture-core/components/IncompleteSelectionsMessage/index.js b/src/core_modules/capture-core/components/IncompleteSelectionsMessage/index.js index aac6f17f94..6c206f72b6 100644 --- a/src/core_modules/capture-core/components/IncompleteSelectionsMessage/index.js +++ b/src/core_modules/capture-core/components/IncompleteSelectionsMessage/index.js @@ -1,6 +1,5 @@ import React from 'react'; import Paper from '@material-ui/core/Paper/Paper'; -import Grid from '@material-ui/core/Grid/Grid'; import { withStyles } from '@material-ui/core'; import { colors } from '@dhis2/ui'; @@ -15,15 +14,16 @@ const StyledPaper = withStyles({ }, })(Paper); -export const IncompleteSelectionsMessage = ({ children, dataTest = 'informative-paper' }) => ( - - - - {children} - - - ); +const containerStyle = { + display: 'flex', + justifyContent: 'center', + width: '100%', +}; +export const IncompleteSelectionsMessage = ({ children, dataTest = 'informative-paper' }) => ( +
+ + {children} + +
+); diff --git a/src/core_modules/capture-core/components/InfoIconText/InfoIconText.js b/src/core_modules/capture-core/components/InfoIconText/InfoIconText.js index 49b416c249..87be34ef5b 100644 --- a/src/core_modules/capture-core/components/InfoIconText/InfoIconText.js +++ b/src/core_modules/capture-core/components/InfoIconText/InfoIconText.js @@ -2,8 +2,6 @@ import React, { type ComponentType, type Node } from 'react'; import withStyles from '@material-ui/core/styles/withStyles'; import { IconInfo16, colors } from '@dhis2/ui'; -import Grid from '@material-ui/core/Grid'; - type OwnProps = {| children: string | Node |} @@ -15,6 +13,8 @@ const styles = () => ({ container: { marginTop: 12, marginBottom: 12, + display: 'flex', + alignItems: 'center', }, text: { fontSize: 14, @@ -24,18 +24,15 @@ const styles = () => ({ }, }); - const InfoIconTextPlain = ({ classes, children }) => ( - - - - - - - +
+ + + + {children} - - + +
); export const InfoIconText: ComponentType = withStyles(styles)(InfoIconTextPlain); diff --git a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js index 511c2da3b7..d2e49fd3b5 100644 --- a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js +++ b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js @@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux'; import { useHistory } from 'react-router'; import i18n from '@dhis2/d2-i18n'; import { Button, colors, spacers } from '@dhis2/ui'; -import { Grid, withStyles } from '@material-ui/core'; +import { withStyles } from '@material-ui/core'; import type { Props } from './RegistrationDataEntry.types'; import { TeiRegistrationEntry, SingleEventRegistrationEntry } from '../../../DataEntries'; import { scopeTypes } from '../../../../metaData'; @@ -42,6 +42,20 @@ const getStyles = ({ typography }) => ({ marginBottom: { marginBottom: spacers.dp16, }, + flexContainer: { + display: 'flex', + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'flex-start', + flexWrap: 'wrap', + }, + flexItem: { + flex: 1, + minWidth: '500px', + }, + dataEntryReadyItem: { + minWidth: '300px', + }, }); const DialogButtons = ({ onCancel, onSave }) => ( @@ -167,8 +181,7 @@ const RegistrationDataEntryPlain = ({ } - { - scopeType === scopeTypes.TRACKER_PROGRAM && + {scopeType === scopeTypes.TRACKER_PROGRAM && (
{ @@ -183,45 +196,40 @@ const RegistrationDataEntryPlain = ({ }
-
- - - i18n.t('Save {{trackedEntityTypeName}}', { +
+
+ + i18n.t('Save {{trackedEntityTypeName}}', { trackedEntityTypeName: trackedEntityTypeNameLC, interpolation: { escapeValue: false }, - })} - duplicatesReviewPageSize={resultsPageSize} - renderDuplicatesDialogActions={renderDuplicatesDialogActions} - renderDuplicatesCardActions={renderDuplicatesCardActions} - ExistingUniqueValueDialogActions={ExistingUniqueValueDialogActions} - trackedEntityInstanceAttributes={trackedEntityInstanceAttributes} + }) + } + duplicatesReviewPageSize={resultsPageSize} + renderDuplicatesDialogActions={renderDuplicatesDialogActions} + renderDuplicatesCardActions={renderDuplicatesCardActions} + ExistingUniqueValueDialogActions={ExistingUniqueValueDialogActions} + trackedEntityInstanceAttributes={trackedEntityInstanceAttributes} + /> +
+ {dataEntryIsReady && ( +
+ - - { - dataEntryIsReady && - -
- -
-
- } - +
+ )}
- } - - { - scopeType === scopeTypes.TRACKED_ENTITY_TYPE && + )} + {scopeType === scopeTypes.TRACKED_ENTITY_TYPE && (
{i18n.t('New {{titleText}}', { @@ -238,40 +246,35 @@ const RegistrationDataEntryPlain = ({ accessNeeded="write" />
-
- - - +
+ +
+ {dataEntryIsReady && ( +
+ - - { - dataEntryIsReady && - -
- -
-
- } - +
+ )}
- } + )} { scopeType === scopeTypes.EVENT_PROGRAM && ( From 5b3cd1c6150d9b6cc47be274d50bffad05b6da73 Mon Sep 17 00:00:00 2001 From: Eirik Haugstulen Date: Thu, 22 Aug 2024 23:38:37 +0200 Subject: [PATCH 02/16] feat: [DHIS2-17575] disable create new buttons if no data write access (#3751) --- .../ProgramStageSelector.feature | 5 ++ .../ProgramStageSelector.js | 4 + .../EnrollmentQuickActions.feature | 5 ++ .../EnrollmentQuickActions.js | 10 +++ .../StagesAndEventsWidget.feature | 6 ++ i18n/en.pot | 13 ++-- .../EnrollmentQuickActions.component.js | 43 ++++++----- .../ProgramStageSelector.component.js | 2 +- .../ProgramStageSelector.container.js | 1 + .../Stages/Stage/Stage.component.js | 29 ++++--- .../StageCreateNewButton.js | 75 +++++++++++++++++++ .../Stage/StageCreateNewButton/index.js | 3 + .../StageDetail/StageDetail.component.js | 44 +++-------- 13 files changed, 165 insertions(+), 75 deletions(-) create mode 100644 src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/StageCreateNewButton.js create mode 100644 src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/index.js diff --git a/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feature b/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feature index fa7b797041..6bbb53cf33 100644 --- a/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feature +++ b/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feature @@ -8,3 +8,8 @@ Feature: User is able to select program stage when navigating to EnrollmentEvent Scenario: The stage-button should be disabled when non-repeatable & event > 0 Given you land on the EnrollmentEventNew-page without a stageId Then the stage-button should be disabled + + @user:trackerAutoTestRestricted + Scenario: The stage-button should be disabled when no data write access + Given you open the enrollment page by typing #enrollmentEventNew?enrollmentId=WKPoiZxZxNG&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&teiId=PgmUFEQYZdt + Then the stage-button should be disabled diff --git a/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.js b/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.js index 6c8eac1dac..4fb525e343 100644 --- a/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.js +++ b/cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.js @@ -1,5 +1,9 @@ import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'; +Given(/^you open the enrollment page by typing (.*)$/, url => + cy.visit(url), +); + Given('you land on the EnrollmentEventNew-page without a stageId', () => { cy.visit('/#/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=x2kJgpb0XQC&enrollmentId=RiNIt1yJoge'); }); diff --git a/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.feature b/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.feature index c010914d88..ea20b12fea 100644 --- a/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.feature +++ b/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.feature @@ -13,3 +13,8 @@ Feature: User interacts with the quick actions-menu When you click the schedule event-button Then you should be navigated to the schedule tab + @user:trackerAutoTestRestricted + Scenario: The create new quick actions button should be disabled if no available stages + Given you open the enrollment page by typing #enrollment?enrollmentId=WKPoiZxZxNG&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&teiId=PgmUFEQYZdt + Then the quick action buttons should be disabled + diff --git a/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.js b/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.js index 23ff019cf3..a450af97d9 100644 --- a/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.js +++ b/cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.js @@ -1,5 +1,9 @@ import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor'; +Given(/^you open the enrollment page by typing (.*)$/, url => + cy.visit(url), +); + Given('you are on an enrollment page with stage available', () => { cy.visit('/#/enrollment?programId=ur1Edk5Oe2n&orgUnitId=UgYg0YW7ZIh&teiId=zmgVvEZ91Kg&enrollmentId=xRnBV5aJDeF'); cy.get('[data-test="enrollment-page-content"]') @@ -31,3 +35,9 @@ Then('the buttons should be disabled', () => { .should('be.disabled'); }); }); + +Then('the quick action buttons should be disabled', () => { + cy.get('[data-test="quick-action-button-container"]') + .find('button') + .should('be.disabled'); +}); diff --git a/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.feature b/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.feature index bdefbaa55c..e76f9dac8a 100644 --- a/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.feature +++ b/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.feature @@ -1,5 +1,10 @@ Feature: User interacts with Stages and Events Widget + @user:trackerAutoTestRestricted + Scenario: Create new event button is disabled if no data write access + Given you open the enrollment page by typing #enrollment?enrollmentId=WKPoiZxZxNG&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&teiId=PgmUFEQYZdt + Then you should see the disabled button New Previous deliveries event + Scenario: User can view program stages Given you open the enrollment page Then the program stages should be displayed @@ -64,3 +69,4 @@ Feature: User interacts with Stages and Events Widget Scenario: Program stage is hidden if no data read access And you open the enrollment page by typing #enrollment?enrollmentId=iNEq9d22Nyp&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&teiId=k4ODejBytgv Then the Care at birth program stage should be hidden + diff --git a/i18n/en.pot b/i18n/en.pot index d8d607944f..7e93f8ab6a 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -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: 2024-08-08T11:49:13.423Z\n" -"PO-Revision-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" +"PO-Revision-Date: 2024-08-10T10:42:21.141Z\n" msgid "Choose one or more dates..." msgstr "Choose one or more dates..." @@ -1496,6 +1496,12 @@ msgstr "Report date" msgid "Please select a valid event" msgstr "Please select a valid event" +msgid "You do not have access to create events in this stage" +msgstr "You do not have access to create events in this stage" + +msgid "This stage can only have one event" +msgstr "This stage can only have one event" + msgid "New {{ eventName }} event" msgstr "New {{ eventName }} event" @@ -1511,9 +1517,6 @@ msgstr "Reset list" msgid "Go to full {{ eventName }}" msgstr "Go to full {{ eventName }}" -msgid "This stage can only have one event" -msgstr "This stage can only have one event" - msgid "Events could not be retrieved. Please try again later." msgstr "Events could not be retrieved. Please try again later." diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js index e5621d7449..55dabda823 100644 --- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js +++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js @@ -42,6 +42,7 @@ const EnrollmentQuickActionsComponent = ({ stages, events, ruleEffects, classes () => stagesWithEventCount.every( programStage => + (!programStage.dataAccess.write) || (!programStage.repeatable && programStage.eventCount > 0) || hiddenProgramStageRuleEffects?.find(ruleEffect => ruleEffect.id === programStage.id), ), @@ -61,27 +62,28 @@ const EnrollmentQuickActionsComponent = ({ stages, events, ruleEffects, classes onClose={() => setOpen(false)} onOpen={() => setOpen(true)} > - {ready &&
- } - label={i18n.t('New Event')} - onClickAction={() => onNavigationFromQuickActions(tabMode.REPORT)} - dataTest={'quick-action-button-report'} - disable={noStageAvailable} - /> + {ready && ( +
+ } + label={i18n.t('New Event')} + onClickAction={() => onNavigationFromQuickActions(tabMode.REPORT)} + dataTest={'quick-action-button-report'} + disable={noStageAvailable} + /> - } - label={i18n.t('Schedule an event')} - onClickAction={() => onNavigationFromQuickActions(tabMode.SCHEDULE)} - dataTest={'quick-action-button-schedule'} - disable={noStageAvailable} - /> + } + label={i18n.t('Schedule an event')} + onClickAction={() => onNavigationFromQuickActions(tabMode.SCHEDULE)} + dataTest={'quick-action-button-schedule'} + disable={noStageAvailable} + /> - {/* DHIS2-13016: Should hide Make referral until the feature is developped + {/* DHIS2-13016: Should hide Make referral until the feature is developped } label={i18n.t('Make referral')} @@ -89,7 +91,8 @@ const EnrollmentQuickActionsComponent = ({ stages, events, ruleEffects, classes dataTest={'quick-action-button-refer'} disable={noStageAvailable} /> */} -
} +
+ )} ); }; diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js index 01967b1f21..1ab8895d04 100644 --- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js +++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js @@ -27,7 +27,7 @@ const ProgramStageSelectorComponentPlain = ({ programStages, onSelectProgramStag
{programStages.map((programStage) => { const disableStage = - (!programStage.repeatable && programStage.eventCount > 0) || programStage.hiddenProgramStage; + !programStage.dataAccess.write || (!programStage.repeatable && programStage.eventCount > 0) || programStage.hiddenProgramStage; return (
!programLoading && program?.programStages?.reduce((accStage, currentStage) => { accStage.push({ id: currentStage.id, + dataAccess: currentStage.access.data, eventCount: (enrollment?.events ?.filter(event => event.programStage === currentStage.id) ?.length diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js index d76690c7eb..6013697b8c 100644 --- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js @@ -1,13 +1,13 @@ // @flow import React, { type ComponentType, useState, useCallback } from 'react'; import cx from 'classnames'; -import i18n from '@dhis2/d2-i18n'; import { withStyles } from '@material-ui/core'; -import { spacersNum, colors, IconAdd16, Button } from '@dhis2/ui'; +import { spacersNum, colors } from '@dhis2/ui'; import { StageOverview } from './StageOverview'; import type { Props } from './stage.types'; import { Widget } from '../../../Widget'; import { StageDetail } from './StageDetail/StageDetail.component'; +import { StageCreateNewButton } from './StageCreateNewButton'; const styles = { overview: { @@ -15,7 +15,7 @@ const styles = { marginRight: spacersNum.dp16, borderTop: `1px solid ${colors.grey300}`, }, - button: { + buttonContainer: { margin: `0 ${spacersNum.dp16}px ${spacersNum.dp16}px ${spacersNum.dp16}px`, }, buttonRow: { @@ -67,19 +67,16 @@ export const StagePlain = ({ stage, events, classes, className, onCreateNew, rul hiddenProgramStage={preventAddingNewEvents} {...passOnProps} /> : ( - +
+ onCreateNew(id)} + stageWriteAccess={stage.dataAccess.write} + eventCount={events.length} + repeatable={repeatable} + preventAddingEventActionInEffect={preventAddingNewEvents} + eventName={name} + /> +
)}
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/StageCreateNewButton.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/StageCreateNewButton.js new file mode 100644 index 0000000000..b5e8e176c8 --- /dev/null +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/StageCreateNewButton.js @@ -0,0 +1,75 @@ +// @flow +import React, { useMemo } from 'react'; +import { Button, IconAdd16 } from '@dhis2/ui'; +import i18n from '@dhis2/d2-i18n'; +import { ConditionalTooltip } from '../../../../Tooltips/ConditionalTooltip'; + +type Props = { + onCreateNew: (stageId: string) => void, + stageWriteAccess: ?boolean, + eventCount: number, + repeatable: ?boolean, + preventAddingEventActionInEffect: ?boolean, + eventName: string, +} + +export const StageCreateNewButton = ({ + onCreateNew, + stageWriteAccess, + eventCount, + repeatable, + preventAddingEventActionInEffect, + eventName, +}: Props) => { + const { isDisabled, tooltipContent } = useMemo(() => { + if (!stageWriteAccess) { + return ({ + isDisabled: true, + tooltipContent: i18n.t('You do not have access to create events in this stage', { + programStageName: eventName, + interpolation: { escapeValue: false }, + }), + }); + } + if (preventAddingEventActionInEffect) { + return { + isDisabled: true, + tooltipContent: i18n.t("You can't add any more {{ programStageName }} events", { + programStageName: eventName, + interpolation: { escapeValue: false }, + }), + }; + } + if (!repeatable && eventCount > 0) { + return { + isDisabled: true, + tooltipContent: i18n.t('This stage can only have one event'), + }; + } + return { + isDisabled: false, + tooltipContent: '', + }; + }, [eventCount, eventName, preventAddingEventActionInEffect, repeatable, stageWriteAccess]); + + return ( + + + + ); +}; diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/index.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/index.js new file mode 100644 index 0000000000..d5cb9dcad9 --- /dev/null +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageCreateNewButton/index.js @@ -0,0 +1,3 @@ +// @flow + +export { StageCreateNewButton } from './StageCreateNewButton'; diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js index 055befd20d..644936ef57 100644 --- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js @@ -13,11 +13,10 @@ import { colors, DataTableCell, DataTableColumnHeader, Button, - IconAdd16, Tooltip, } from '@dhis2/ui'; -import { ConditionalTooltip } from 'capture-core/components/Tooltips/ConditionalTooltip'; import { sortDataFromEvent } from './hooks/sortFuntions'; +import { StageCreateNewButton } from '../StageCreateNewButton'; import { useComputeDataFromEvent, useComputeHeaderColumn, formatRowForView } from './hooks/useEventList'; import { DEFAULT_NUMBER_OF_ROW, SORT_DIRECTION } from './hooks/constants'; import { getProgramAndStageForProgram } from '../../../../../metaData/helpers'; @@ -218,37 +217,16 @@ const StageDetailPlain = (props: Props) => { onClick={handleViewAll} >{i18n.t('Go to full {{ eventName }}', { eventName, interpolation: { escapeValue: false } })} : null); - const renderCreateNewButton = () => { - const shouldDisableCreateNew = (!repeatable && events.length > 0) || hiddenProgramStage; - - const tooltipContent = hiddenProgramStage - ? i18n.t("You can't add any more {{ programStageName }} events", { - programStageName: eventName, - interpolation: { escapeValue: false }, - }) - : i18n.t('This stage can only have one event'); - - return ( - - - - ); - }; + const renderCreateNewButton = () => ( + + ); return ( From f5902dd8f5f39db960e761ff405fba27c0701046 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 22 Aug 2024 21:43:18 +0000 Subject: [PATCH 03/16] chore(release): cut 101.2.0 [skip release] # [101.2.0](https://github.com/dhis2/capture-app/compare/v101.1.3...v101.2.0) (2024-08-22) ### Features * [DHIS2-17575] disable create new buttons if no data write access ([#3751](https://github.com/dhis2/capture-app/issues/3751)) ([5b3cd1c](https://github.com/dhis2/capture-app/commit/5b3cd1c6150d9b6cc47be274d50bffad05b6da73)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8adda64c33..e1e61a3ddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [101.2.0](https://github.com/dhis2/capture-app/compare/v101.1.3...v101.2.0) (2024-08-22) + + +### Features + +* [DHIS2-17575] disable create new buttons if no data write access ([#3751](https://github.com/dhis2/capture-app/issues/3751)) ([5b3cd1c](https://github.com/dhis2/capture-app/commit/5b3cd1c6150d9b6cc47be274d50bffad05b6da73)) + ## [101.1.3](https://github.com/dhis2/capture-app/compare/v101.1.2...v101.1.3) (2024-08-18) diff --git a/package.json b/package.json index f2e2ce30ab..9e0a9abd76 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.1.3", + "version": "101.2.0", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.1.3", + "@dhis2/rules-engine-javascript": "101.2.0", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 66c928a918..d155540271 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.1.3", + "version": "101.2.0", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From e48901278c855e303a906c6bada2c22b16310ca1 Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Fri, 23 Aug 2024 12:41:45 +0200 Subject: [PATCH 04/16] chore: [DHIS2-17925] adapt the transfer scenario to the newly added API restrictions (#3768) chore: adapt the transfer scenario to the newly added API restrictions --- .../WidgetsForEnrollmentPages/WidgetEnrollment/index.js | 8 +++++++- .../WidgetsForEnrollmentDashboard.feature | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js index e88dae07c5..7ad8539f77 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js @@ -232,11 +232,17 @@ Then(/^the user successfully transfers the enrollment/, () => { cy.get('[data-test="widget-enrollment"]').within(() => { cy.get('[data-test="widget-enrollment-owner-orgunit"]') - .contains('Owned by Sierra Leone') + .contains('Owned by Njandama MCHP') .should('exist'); }); }); +Then(/^the user types in (.*)/, (orgunit) => { + cy.get('[data-test="widget-enrollment-transfer-modal"]').within(() => { + cy.get('[data-test="capture-ui-input"]').type(orgunit); + }); +}); + Given(/^the enrollment owner organisation unit is (.*)/, (orgunit) => { cy.get('[data-test="widget-enrollment"]').within(() => { cy.get('[data-test="widget-enrollment-owner-orgunit"]') diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.feature b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.feature index 724567d75d..ffd0a56c1c 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.feature +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.feature @@ -26,7 +26,8 @@ Feature: The user interacts with the widgets on the enrollment dashboard And the user clicks on the transfer action And the user sees the transfer modal And the user sees the organisation unit tree - When the user clicks on the organisation unit with text: Sierra Leone + And the user types in Njandama MCHP + When the user clicks on the organisation unit with text: Njandama MCHP Then the user successfully transfers the enrollment # Scenarios linked to the enrollment dashboard From 7971aa4d5975aa6976912c0fdeb45957955477dc Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 25 Aug 2024 03:44:07 +0200 Subject: [PATCH 05/16] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/ar.po | 23 +-- i18n/cs.po | 27 +-- i18n/es.po | 23 +-- i18n/fr.po | 23 +-- i18n/id.po | 23 +-- i18n/lo.po | 173 ++++++++++-------- i18n/nl.po | 84 +++++---- i18n/ro.po | 84 +++++---- i18n/si.po | 523 +++++++++++++++++++++++++++++++++++++++-------------- i18n/zh.po | 33 ++-- 10 files changed, 628 insertions(+), 388 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index a5c6263a9a..4bb4146a90 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" @@ -494,18 +494,6 @@ msgstr "يحتوي على نص" msgid "Yes" msgstr "نعم" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "السنوات" - -msgid "Months" -msgstr "الأشهر" - -msgid "Days" -msgstr "‏‏الأيام" - msgid "Uploading file" msgstr "تحميل ملف" @@ -1487,6 +1475,12 @@ msgstr "تاريخ التقرير" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "" + msgid "New {{ eventName }} event" msgstr "" @@ -1502,9 +1496,6 @@ msgstr "" msgid "Go to full {{ eventName }}" msgstr "" -msgid "This stage can only have one event" -msgstr "" - msgid "Events could not be retrieved. Please try again later." msgstr "" diff --git a/i18n/cs.po b/i18n/cs.po index b9ed690a2f..9248d56299 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -1,14 +1,14 @@ # # Translators: # Philip Larsen Donnelly, 2024 -# Jiří Podhorecký, 2024 +# Jiří Podhorecký , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Jiří Podhorecký, 2024\n" +"Last-Translator: Jiří Podhorecký , 2024\n" "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -496,18 +496,6 @@ msgstr "Obsahuje text" msgid "Yes" msgstr "Ano" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "Let" - -msgid "Months" -msgstr "Měsíce" - -msgid "Days" -msgstr "Dnů" - msgid "Uploading file" msgstr "Nahrávání souboru" @@ -1535,6 +1523,12 @@ msgstr "Datum zprávy" msgid "Please select a valid event" msgstr "Vyberte prosím platnou událost" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Tato fáze může mít pouze jednu událost" + msgid "New {{ eventName }} event" msgstr "Nová událost {{ eventName }}" @@ -1550,9 +1544,6 @@ msgstr "Resetovat seznam" msgid "Go to full {{ eventName }}" msgstr "Přejít na celou {{ eventName }}" -msgid "This stage can only have one event" -msgstr "Tato fáze může mít pouze jednu událost" - msgid "Events could not be retrieved. Please try again later." msgstr "Události se nepodařilo načíst. Prosím zkuste to znovu později." diff --git a/i18n/es.po b/i18n/es.po index 5084c4372b..c876e8fa4f 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" @@ -514,18 +514,6 @@ msgstr "Contiene texto" msgid "Yes" msgstr "Si" -msgid "mm/dd/yyyy" -msgstr "mm / dd / aaaa" - -msgid "Years" -msgstr "Años" - -msgid "Months" -msgstr "Meses" - -msgid "Days" -msgstr "Días" - msgid "Uploading file" msgstr "Subiendo archivo" @@ -1580,6 +1568,12 @@ msgstr "Fecha de reporte" msgid "Please select a valid event" msgstr "Seleccione un evento válido" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Esta etapa solo puede tener un evento" + msgid "New {{ eventName }} event" msgstr "Nuevo evento {{ eventName }}" @@ -1595,9 +1589,6 @@ msgstr "Resetear lista" msgid "Go to full {{ eventName }}" msgstr "Ir a {{ eventName }} completado" -msgid "This stage can only have one event" -msgstr "Esta etapa solo puede tener un evento" - msgid "Events could not be retrieved. Please try again later." msgstr "" "No se pudieron recuperar los eventos. Por favor, inténtelo de nuevo más " diff --git a/i18n/fr.po b/i18n/fr.po index 7e797409ee..cb371ad974 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Yayra Gomado , 2024\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" @@ -513,18 +513,6 @@ msgstr "Contient le texte" msgid "Yes" msgstr "Oui" -msgid "mm/dd/yyyy" -msgstr "mm/jj/aaaa" - -msgid "Years" -msgstr "Années" - -msgid "Months" -msgstr "Mois" - -msgid "Days" -msgstr "Jours" - msgid "Uploading file" msgstr "Téléchargement du fichier" @@ -1548,6 +1536,12 @@ msgstr "Date du rapport" msgid "Please select a valid event" msgstr "Veuillez sélectionner un événement valide" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Ce stade ne peut avoir qu'un seul événement" + msgid "New {{ eventName }} event" msgstr "Nouvel événement {{ eventName }}" @@ -1563,9 +1557,6 @@ msgstr "Réinitialiser la liste" msgid "Go to full {{ eventName }}" msgstr "Aller à l'intégralité de {{ eventName }}" -msgid "This stage can only have one event" -msgstr "Ce stade ne peut avoir qu'un seul événement" - msgid "Events could not be retrieved. Please try again later." msgstr "" "Les événements n'ont pas pu être récupérés. Veuillez réessayer plus tard." diff --git a/i18n/id.po b/i18n/id.po index a0b5495800..85a7841d2d 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n" @@ -501,18 +501,6 @@ msgstr "Berisi teks" msgid "Yes" msgstr "Iya" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "Tahun" - -msgid "Months" -msgstr "Bulan" - -msgid "Days" -msgstr "Hari" - msgid "Uploading file" msgstr "Mengunggah file" @@ -1493,6 +1481,12 @@ msgstr "Tanggal pelaporan" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "" + msgid "New {{ eventName }} event" msgstr "" @@ -1508,9 +1502,6 @@ msgstr "Mengatur ulang daftar" msgid "Go to full {{ eventName }}" msgstr "" -msgid "This stage can only have one event" -msgstr "" - msgid "Events could not be retrieved. Please try again later." msgstr "" diff --git a/i18n/lo.po b/i18n/lo.po index 14790e04fc..da0a57c457 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -3,16 +3,16 @@ # Philip Larsen Donnelly, 2022 # Saysamone Sibounma, 2023 # Somkhit Bouavong , 2024 -# Namwan Chanthavisouk, 2024 # Thuy Nguyen , 2024 # Viktor Varland , 2024 +# Namwan Chanthavisouk, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Namwan Chanthavisouk, 2024\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,6 +33,8 @@ msgid "" "A possible reason for this is that the browser or mode (e.g. privacy mode) " "is not supported. See log for details." msgstr "" +"ເຫດຜົນທີ່ເປັນໄປໄດ້ແມ່ນຍ້ອນບຣາວເຊີ ຫຼື ຮູບແບບ (ເຊັ່ນ: ຮູບແບບຄວາມເປັນສ່ວນຕົວ) " +"ບໍ່ໄດ້ຖືກຮອງຮັບ. ເບິ່ງລາຍລະອຽດເພີ່ມເຕີມ." msgid "" "You opened another version of the Capture App in the same domain. Currently," @@ -40,6 +42,10 @@ msgid "" " domain). Please refresh this page if you would like to use this version " "again, but be aware that this will close other versions." msgstr "" +"ທ່ານໄດ້ເປີດໃຊ້ເວີຊັນອື່ນຂອງແອັບ Capture ໃນໂດເມນດຽວກັນ. ໃນປັດຈຸບັນ, ແອັບ " +"Capture ພຽງແຕ່ຮອງຮັບການໃຊ້ງານໃນເວີຊັນດຽວກັນ (ໃນໂດເມນດຽວກັນ). " +"ກະ​ລຸ​ນາ​ໂຫຼດ​ຫນ້າ​ນີ້​ຄືນ​ໃຫມ່​ຖ້າ​ຫາກ​ວ່າ​ທ່ານ​ຕ້ອງ​ການ​ທີ່​ຈະ​ນໍາ​ໃຊ້​ເວີຊັນນີ້​ອີກ​ເທື່ອ​ຫນຶ່ງ​," +" ແຕ່​ລະວັງໄວ້ວ່າມັນຈະ​ປິດ​ເວີຊັນ​ອື່ນ​." msgid "More" msgstr "ເພີ່ມເຕີມ" @@ -84,10 +90,10 @@ msgid "This value is validating" msgstr "ຄ່ານີ້ກຳລັງກວດສອບຢູ່" msgid "Async field update failed" -msgstr "" +msgstr "ການອັບເດດຊ່ອງການເຊື່ອມຂໍ້ມູນແມ່ນລົ້ມເຫລວ" msgid "A value is required" -msgstr "" +msgstr "ຕ້ອງຕື່ມຄ່າ" msgid "Please provide a valid number" msgstr "ກະລຸນາລະບຸເບີໂທທີ່ຖືກຕ້ອງ" @@ -108,7 +114,7 @@ msgid "Please provide a valid date" msgstr "ກະລຸນາລະບຸວັນທີໃຫ້ຖືກຕ້ອງ" msgid "A date in the future is not allowed" -msgstr "" +msgstr "ບໍ່ອະນຸຍາດໃຫ້ຕື່ມວັນທີໃນອະນາຄົດ" msgid "Please provide a valid date and time" msgstr "ກະລຸນາລະບຸວັນທີ ແລະ ເວລາໃຫ້ຖືກຕ້ອງ" @@ -171,7 +177,7 @@ msgid "Please select {{categoryName}}" msgstr "ກະລຸນາເລືອກ {{categoryName}}" msgid "A future date is not allowed" -msgstr "" +msgstr "ບໍ່ອະນຸຍາດໃຫ້ມີວັນທີໃນອະນາຄົດ" msgid "Saving a new enrollment in {{programName}} in {{orgUnitName}}." msgstr "ບັນທຶກການລົງທະບຽນໃໝ່ໃນ {{programName}} ໃນ {{orgUnitName}} ." @@ -218,7 +224,7 @@ msgstr "ບັນທຶກໃສ່ {{programName}} ໃນ {{orgUnitName}}" msgid "" "This is not an event program or the metadata is corrupt. See log for " "details." -msgstr "" +msgstr "ນີ້ບໍ່ແມ່ນໂປແກຣມເຫດການ ຫຼື ຂໍ້ມູນເມຕາເສຍຫາຍ. ເບິ່ງລາຍລະອຽດເພີ່ມເຕີມ." msgid "This event" msgstr "ເຫດການນີ້" @@ -237,7 +243,7 @@ msgid "Completed" msgstr "ສໍາເລັດແລ້ວ" msgid "Please add or cancel note before saving the event" -msgstr "" +msgstr "ກະລຸນາເພີ່ມ ຫຼື ຍົກເລີກຂໍ້ຄວາມກ່ອນບັນທຶກເຫດການ" msgid "Save and add another" msgstr "ບັນທຶກ ແລະ ເພີ່ມອີກ" @@ -488,18 +494,6 @@ msgstr "ໃສ່ຂໍ້ຄວາມ" msgid "Yes" msgstr "ແມ່ນ" -msgid "mm/dd/yyyy" -msgstr "ເດືອນ/ວັນ/ປີ" - -msgid "Years" -msgstr "ປີ" - -msgid "Months" -msgstr "ເດືອນ" - -msgid "Days" -msgstr "ມື້" - msgid "Uploading file" msgstr "ກຳລັງອັບໂຫຼດເອກະສານ" @@ -609,7 +603,7 @@ msgid "Program doesn't exist" msgstr "ບໍ່ມີໂປແກຼມ" msgid "Selected program is invalid for selected organisation unit" -msgstr "" +msgstr "ໂປແກຣມທີ່ເລືອກໄວ້ບໍ່ຖືກຕ້ອງກັບຫົວໜ່ວຍອົງການຈັດຕັ້ງ" msgid "Online" msgstr "ມີການເຊື່ອມຕໍ່" @@ -624,13 +618,13 @@ msgid "Add note" msgstr "ຂຽນບັນທຶກລົງ" msgid "You don't have access to write notes" -msgstr "" +msgstr "ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃນການຂຽນຂໍ້ຄວາມ" msgid "Write note" -msgstr "" +msgstr "ຂຽນຂໍ້ຄວາມ" msgid "was blanked out and hidden by your last action" -msgstr "" +msgstr "ແມ່ນວ່າງເປົ່າ ແລະ ຖືກເຊື່ອງໄວ້ໂດຍການເຄື່ອນໄຫວລ່າສຸດຂອງທ່ານ" msgid "Notice" msgstr "ການແຈ້ງເຕືອນ" @@ -652,27 +646,36 @@ msgid "" "functionality in Capture is ongoing and will be added in upcoming app " "releases." msgstr "" +"ໂດຍການຄລິກເລືອກເຂົ້າທາງລຸ່ມນີ້, ທ່ານຈະເລີ່ມໃຊ້ກະດານຂ່າວລົງທະບຽນໃໝ່ໃນແອັບ " +"Capture ສຳລັບໂປແກຣມຕິດຕາມນີ້. ເຊິ່ງໃນປັດຈຸບັນໜ້າທີ່ຫຼັກຈາກການຕິດຕາມ Capture " +"ແມ່ນຍັງບໍ່ໄດ້ເພີ່ມເຂົ້າເທື່ອ, ລວມທັງເຊື່ອມໂຍງ ແລະ ການສົ່ງຕໍ່. " +"ການເຮັດວຽກກ່ຽວກັບໜ້າທີ່ຫຼັກຈາກການຕິດຕາມນີ້ໃນ Capture ແມ່ນກໍາລັງດໍາເນີນຢູ່ " +"ແລະ ຈະຖືກເພີ່ມເຂົ້າໃນແອັບໃໝ່." msgid "" "The core team appreciates any feedback on this new functionality which is " "currently being beta tested, please report any issues and feedback in the " "DHIS2 JIRA project." msgstr "" +"ທີມງານເຮົາຂໍຂອບໃຈສຳລັບຄໍາຕິຊົມກ່ຽວກັບຫນ້າທີ່ໃຫມ່ນີ້ທີ່ກໍາລັງຖືກທົດສອບຢູ່ໃນເບຕ້າ," +" ກະລຸນາລາຍງານບັນຫາ ແລະ ຄໍາຕິຊົມໃນໂຄງການ DHIS2 JIRA." msgid "" "Click the button below to opt-in to the new enrollment dashboard " "functionality in the Capture app (beta) for this Tracker program for all " "users." msgstr "" +"ຄລິກທີ່ປຸ່ມຂ້າງລຸ່ມເພື່ອເລືອກເຂົ້າໃຊ້ໜ້າທີ່ການລົງທະບຽນໃໝ່ຂອງກະດານຂ່າວໃນແອັບ " +"Capture (ເບຕ້າ) ສຳລັບໂປແກຣມການຕິດຕາມນີ້ສຳລັບຜູ້ໃຊ້ທັງໝົດ." msgid "Yes, opt in" -msgstr "" +msgstr "ຕົກລົງ, ເລືອກເຂົ້າ" msgid "Stop using new Enrollment dashboard for {{programName}}" msgstr "ຢຸດໃຊ້ກະດານຂ່າວການລົງທະບຽນໃໝ່ໃນ {{programName}}" msgid "Opt out for {{programName}}" -msgstr "" +msgstr "ເລືອກອອກສຳລັບ {{programName}}" msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "ລົງທະບຽນດ້ວຍໄອດີ \" {{enrollmentId}} \" ແມ່ນບໍ່ພົບ" @@ -707,10 +710,10 @@ msgid "Make referral" msgstr "ສ້າງເປັນໂຕອ້າງອີງ" msgid "No available program stages" -msgstr "" +msgstr "ບໍ່ພົບຂັ້ນໂປແກຣມ" msgid "Program stage not found" -msgstr "" +msgstr "ບໍ່ພົບຂັ້ນໂປແກຣມ" msgid "" "Choose a program to add new or see existing enrollments for " @@ -777,7 +780,7 @@ msgid "There was an error loading the page" msgstr "ພົບຂໍ້ຜິດພາດໃນການໂຫຼດໜ້ານີ້" msgid "Choose an organisation unit to start reporting" -msgstr "" +msgstr "ເລືອກຫົວໜ່ວຍການຈັດຕັ້ງເພື່ອເລີ່ມລາຍງານ" msgid "Program stage is invalid" msgstr "ຂັ້ນຕອນໂປແກຼມບໍ່ຖືກຕ້ອງ" @@ -813,6 +816,8 @@ msgid "" "The category option is not valid for the selected organisation unit. Please " "select a valid combination." msgstr "" +"ຕົວເລືອກໃນໝວດໝູ່ບໍ່ຖືກຕ້ອງສຳລັບຫົວໜ່ວຍການຈັດຕັ້ງ. " +"ກະລຸນາເລືອກທີ່ອັນທີ່ຖືກຕ້ອງ." msgid "Please select {{category}}." msgstr "ກະລຸນາເລືອກ {{category}} ." @@ -830,6 +835,8 @@ msgid "" "You don't have access to create a {{trackedEntityName}} in the current " "selections" msgstr "" +"ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດການເຂົ້າເຖິງເພື່ອສ້າງ {{trackedEntityName}} " +"ກັບຕົວເລືອກປັດຈຸບັນ" msgid "Choose the {{missingCategories}} to start reporting" msgstr "ເລືອກ {{missingCategories}} ເພື່ອເລີ່ມການລາຍງານ" @@ -917,7 +924,7 @@ msgid "Edit event" msgstr "ແກ້ໄຂເຫດການ" msgid "View changelog" -msgstr "" +msgstr "ເບິ່ງບັນທຶກການປ່ຽນແປງ" msgid "Event details" msgstr "ລາຍລະອຽດເຫດການ" @@ -983,7 +990,7 @@ msgid "Loading" msgstr "ກໍາລັງໂຫຼດ" msgid "An error occurred while loading the form" -msgstr "" +msgstr "ພົບບັນຫາໃນລະຫວ່າງການໂຫຼດຟອມ" msgid "Possible duplicates found" msgstr "ພົບການຊໍ້າກັນທີ່ເປັນໄປໄດ້" @@ -1004,7 +1011,7 @@ msgid "No results found for " msgstr "ບໍ່ພົບຜົນໄດ້ຮັບ" msgid "Choose an organisation unit" -msgstr "" +msgstr "ເລືອກຫົວໜ່ວຍການຈັດຕັງ" msgid "Clear selection" msgstr "ລົບການເລືອກ" @@ -1016,7 +1023,7 @@ msgid "Search for a program" msgstr "ຄົ້ນຫາໂປແກຼມ" msgid "Some programs are being filtered by the chosen organisation unit" -msgstr "" +msgstr "ບາງໂປແກຣມກໍາລັງຖືກກັ່ນຕອງໂດຍຫົວໜ່ວຍການຈັດຕັ້ງທີ່ເລືອກ" msgid "Show all programs" msgstr "ສະແດງໂປແກຼມທັງໝົດ" @@ -1102,11 +1109,12 @@ msgstr "ບັນ​ຊີ​ລາຍ​ຊື່​ທີ່​ບັນ​ທ msgid "Saved lists offer quick access to your most used views in a program." msgstr "" +"ບັນຊີລາຍຊື່ທີ່ບັນທຶກໄວ້ແມ່ນໃຊ້ສຳລັບການກວດເບິ່ງຄືນແບບເລັ່ງລັດສຳລັບຂໍ້ມູນທີ່ທ່ານເບິ່ງຫຼາຍທີ່ສຸດໃນໂປແກຣມ." msgid "" "There are no saved lists in this program yet, create one using the button " "below." -msgstr "" +msgstr "ບໍ່ມີລາຍຊື່ທີ່ບັນທຶກໄວ້ໃນໂປຣແກຣມນີ້ເທື່ອ, ກົດສ້າງໂດຍໃຊ້ປຸ່ມລຸ່ມນີ້." msgid "Create saved list" msgstr "ສ້າງບັນຊີລາຍຊື່ທີ່ບັນທຶກໄວ້" @@ -1121,7 +1129,7 @@ msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "ຊອກຫາ {{trackedEntityName}} ໃນ {{programName}}" msgid "No tracked entity types available" -msgstr "" +msgstr "ບໍ່ມີປະເພດບາຍບຸກຄົນທີ່ສາມາດຕິດຕາມໄດ້" msgid "Assigned to" msgstr "ມອບໝາຍໃຫ້" @@ -1150,7 +1158,7 @@ msgstr "ເຫດຜົນໃນການກວດສອບການລົງທ msgid "" "Describe the reason you are checking for enrollments in this protected " "program" -msgstr "" +msgstr "ອະທິບາຍເຫດຜົນທີ່ທ່ານກໍາລັງກວດສອບການລົງທະບຽນໃນໂປແກຣມທີ່ຖືກປ້ອງກັນນີ້" msgid "Check for enrollments" msgstr "ກວດສອບການລົງທະບຽນ" @@ -1159,6 +1167,8 @@ msgid "" "You must provide a reason to check for enrollments in this protected " "program. All activity will be logged." msgstr "" +"ທ່ານຕ້ອງໃຫ້ເຫດຜົນໃນການກວດສອບການລົງທະບຽນໃນໂປແກຣມທີ່ຖືກປ້ອງກັນນີ້. " +"ການເຄື່ອນໄຫວທັງໝົດຈະຖືກບັນທຶກ." msgid "Enrollment actions" msgstr "ການປະຕິບັດການລົງທະບຽນ" @@ -1188,6 +1198,8 @@ msgid "" "Are you sure you want to delete this enrollment? This will permanently " "remove the current enrollment." msgstr "" +"ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລົບການລົງທະບຽນນີ້? " +"ເຊິ່ງນີ້ຈະລົບບການລົງທະບຽນປັດຈຸບັນອອກຢ່າງຖາວອນ." msgid "Yes, delete enrollment." msgstr "ຕົກລົງ, ລົບການລົງທະບຽນ." @@ -1205,7 +1217,7 @@ msgid "An error occurred while transferring ownership" msgstr "ເກີດຄວາມຜິດພາດໃນຂະນະທີ່ໂອນສິດ" msgid "Existing dates for auto-generated events will not be updated." -msgstr "" +msgstr "ວັນທີທີ່ມີຢູ່ແລ້ວສໍາລັບເຫດການທີ່ສ້າງຂຶ້ນໂດຍອັດຕະໂນມັດຈະບໍ່ຖືກອັບເດດ." msgid "Latitude" msgstr "ເສັ້ນຂະໜານ" @@ -1220,7 +1232,7 @@ msgid "Coordinates" msgstr "ປະສານງານ" msgid "Delete polygon" -msgstr "" +msgstr "ລົບຮູບຫຼາຍຫຼ່ຽມ" msgid "Close without saving" msgstr "ປິດໂດຍບໍ່ບັນທຶກ" @@ -1258,7 +1270,7 @@ msgid "Incident date" msgstr "ວັນທີເດືອນປີທີ່ເຫດການເກີດຂື້ນ" msgid "Enrollment widget could not be loaded. Please try again later" -msgstr "" +msgstr "ບໍ່ສາມາດໂຫຼດລາຍການການລົງທະບຽນໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ" msgid "Follow-up" msgstr "ຕິດຕາມ" @@ -1279,7 +1291,7 @@ msgid "Add area" msgstr "ເພີ່ມພື້ນທີ່" msgid "Please add or cancel the note before saving the event" -msgstr "" +msgstr "ກະລຸນາເພີ່ມ ຫຼື ຍົກເລີກຂໍ້ຄວາມກ່ອນບັນທຶກເຫດການ" msgid "organisation unit could not be retrieved. Please try again later." msgstr "ບໍ່ສາມາດດຶງຂໍ້ມູນຫົວໜ່ວຍອົງການຈັດຕັ້ງໄດ້. ກະລຸນາລອງໃໝ່ພາຍຫຼັງ." @@ -1291,13 +1303,13 @@ msgid "program or stage is invalid" msgstr "ໂປແກຼມ ຫຼື ຂັ້ນຕອນບໍ່ຖືກຕ້ອງ" msgid "Notes about this enrollment" -msgstr "" +msgstr "ຂໍ້ຄວາມກ່ຽວກັບການລົງທະບຽນນີ້" msgid "Write a note about this enrollment" -msgstr "" +msgstr "ຂຽນຂໍ້ຄວາມກ່ຽວກັບການລົງທະບຽນນີ້" msgid "This enrollment doesn't have any notes" -msgstr "" +msgstr "ບໍ່ມີຂໍ້ຄວາມໃນການລົງທະບຽນນີ້" msgid "Error" msgstr "ເກີດການຜິດພາດ" @@ -1306,7 +1318,7 @@ msgid "Warning" msgstr "ແຈ້ງເຕືອນ" msgid "stage not found in rules execution" -msgstr "" +msgstr "ບໍ່ພົບຂັ້ນຕອນໃນການປະຕິບັດກົດລະບຽບ" msgid "Delete event" msgstr "ລືບກໍລະນີອອກ" @@ -1327,13 +1339,13 @@ msgid "Back to all stages and events" msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ" msgid "Notes about this event" -msgstr "" +msgstr "ຂໍ້ຄວາມກ່ຽວກັບເຫດການນີ້" msgid "Write a note about this event" -msgstr "" +msgstr "ຂຽນຂໍ້ຄວາມກ່ຽວກັບເຫດການນີ້" msgid "This event doesn't have any notes" -msgstr "" +msgstr "ບໍ່ມີຂໍຄວາມໃນເຫດການນີ້" msgid "Schedule date info" msgstr "ຂໍ້ມູນຕາຕະລາງວັນທີ" @@ -1373,10 +1385,10 @@ msgid "Schedule date / Due date" msgstr "ວັນທີຕາຕະລາງ / ວັນຄົບກໍານົດ" msgid "Event notes" -msgstr "" +msgstr "ຂໍ້ຄວາມຂອງເຫດການ" msgid "Write a note about this scheduled event" -msgstr "" +msgstr "ຂຽນຂໍ້ຄວາມກ່ຽວກັບເຫດການທີ່ໄດ້ກໍານົດໄວ້ນີ້" msgid "Save note" msgstr "ບັນທຶກ" @@ -1386,6 +1398,9 @@ msgid "" "information about this enrollment, use the Edit button in the in the " "Enrollment box on this dashboard" msgstr "" +"ປ່ຽນຂໍ້ມູນກ່ຽວກັບ {{trackedEntityName}} ນີ້. " +"ເພື່ອປ່ຽນຂໍ້ມູນກ່ຽວກັບການລົງທະບຽນນີ້, " +"ໃຫ້ໃຊ້ປຸ່ມແກ້ໄຂໃນປ່ອງການລົງທະບຽນຢູ່ໃນກະດານຂ່າວ" msgid " Loading..." msgstr "ກຳລັງໂຫຼດ..." @@ -1422,6 +1437,9 @@ msgid "" "permanently remove the {{trackedEntityTypeName}} and all its associated " "enrollments and events in all programs." msgstr "" +"ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລົບ {{trackedEntityTypeName}} ນີ້? ນີ້ຈະເປັນການລົບ " +"{{trackedEntityTypeName}} ແລະ ການລົງທະບຽນ ແລະ " +"ເຫດການທີ່ກ່ຽວຂ້ອງທັງໝົດອອກຢ່າງຖາວອນໃນທຸກໂປແກຣມ." msgid "There was a problem deleting the {{trackedEntityTypeName}}" msgstr "ມີບັນຫາໃນການລຶບ {{trackedEntityTypeName}}" @@ -1430,13 +1448,13 @@ msgid "Yes, delete {{trackedEntityTypeName}}" msgstr "ຕົກລົງ, ລຶບ {{trackedEntityTypeName}}" msgid "Profile widget could not be loaded. Please try again later" -msgstr "" +msgstr "ບໍ່ສາມາດໂຫຼດລາຍການຂໍ້ມູນສ່ວນຕົວໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ" msgid "{{trackedEntityTypeName}} profile" msgstr "{{trackedEntityTypeName}} ລາຍລະອຽດສ່ວນຕົວ" msgid "tracked entity instance" -msgstr "" +msgstr "ຕິດຕາມຕົວຢ່າງລາຍບຸກຄົນ" msgid "Link to an existing {{linkableStageLabel}}" msgstr "ເຊື່ອມຫາ {{linkableStageLabel}} ທີ່ມີຢູ່ແລ້ວ" @@ -1445,13 +1463,13 @@ msgid "Choose a {{linkableStageLabel}}" msgstr "ເລືອກ {{linkableStageLabel}}" msgid "{{ linkableStageLabel }} is not repeatable" -msgstr "" +msgstr "{{ linkableStageLabel }} ແມ່ນບໍ່ສາມາດເຮັດຊ້ຳໄດ້" msgid "{{ linkableStageLabel }} has no linkable events" -msgstr "" +msgstr "{{ linkableStageLabel }} ບໍ່ມີເຫດການທີ່ສາມາດເຊື່ອມໂຍງໄດ້" msgid "Ambiguous relationships, contact system administrator" -msgstr "" +msgstr "ການເຊື່ອມໂຍງບໍ່ຊັດເຈນ, ຕິດຕໍ່ຜູ້ດູແລລະບົບ" msgid "" "Enter {{linkableStageLabel}} details in the next step after completing this " @@ -1475,6 +1493,12 @@ msgstr "ວັນທີລາຍງານ" msgid "Please select a valid event" msgstr "ກະລຸນາເລືອກເຫດການທີ່ຖືກຕ້ອງ" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "ຂັ້ນຕອນນີ້ສາມາດມີເຫດການດຽວເທົ່ານັ້ນ" + msgid "New {{ eventName }} event" msgstr "ເຫດການໃໝ່ {{ eventName }}" @@ -1485,13 +1509,10 @@ msgid "Show {{ rest }} more" msgstr "ສະແດງ {{ rest }} ເພີ່ມເຕີມ" msgid "Reset list" -msgstr "" +msgstr "ເຮັດລາຍຊື່ຄືນໃໝ່" msgid "Go to full {{ eventName }}" -msgstr "" - -msgid "This stage can only have one event" -msgstr "ຂັ້ນຕອນນີ້ສາມາດມີເຫດການດຽວເທົ່ານັ້ນ" +msgstr "ໄປທີ່ {{ eventName }} ແບບເຕັມ" msgid "Events could not be retrieved. Please try again later." msgstr "ບໍ່ສາມາດດຶງຂໍ້ມູນເຫດການໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ." @@ -1510,16 +1531,16 @@ msgid "Stages and Events" msgstr "ຂັ້ນຕອນ ແລະ ເຫດການ" msgid "An error occurred while loading the widget." -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ໂຫຼດລາຍການ." msgid "View linked event" -msgstr "" +msgstr "ເບິ່ງເຫດການທີ່ເຊື່ອມໂຍງ" msgid "Scheduled" msgstr "ຕາມເວລາທີ່ກໍານົດ" msgid "Changelog" -msgstr "" +msgstr "ບັນທຶກການປ່ຽນແປງ" msgid "No changes to display" msgstr "ບໍ່ມີການປ່ຽນແປງທີ່ຈະສະແດງ" @@ -1632,43 +1653,43 @@ msgid "Working list could not be updated" msgstr "ລາຍຊື່ເຮັດວຽກບໍ່ສາມາດອັບເດດໄດ້" msgid "an error occurred loading the working lists" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການໂຫຼດລາຍການວຽກ" msgid "an error occurred loading Tracked entity instance lists" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການໂຫຼດລາຍການຕົວຢ່າງການຕິດຕາມລາຍບຸກຄົນ" msgid "Update view" -msgstr "" +msgstr "ອັບເດດມຸມມອງ" msgid "Save current view..." -msgstr "" +msgstr "ບັນທຶກມຸມມອງປັດຈຸບັນ..." msgid "Save current view as..." -msgstr "" +msgstr "ບັນທຶກມຸມມອງປັດຈຸບັນເປັນ..." msgid "Delete view" -msgstr "" +msgstr "ລົບມຸມມອງ" msgid "Share view..." -msgstr "" +msgstr "ແບ່ງປັນມຸມມອງ..." msgid "Do you really want to delete the '{{templateName}}' view?" -msgstr "" +msgstr "ທ່ານຕ້ອງການລົບມຸມມອງ '{{templateName}}' ແທ້ບໍ່?" msgid "Confirm" msgstr "Confirm" msgid "Save As view" -msgstr "" +msgstr "ບັນທຶກເປັນເບິ່ງ" msgid "View name" -msgstr "" +msgstr "ເບິ່ງຊື່" msgid "Show Less" -msgstr "" +msgstr "ສະແດງໜ້ອຍ" msgid "Show All" -msgstr "" +msgstr "ສະແດງທັງໝົດ" msgid "Download as JSON" msgstr "Download as JSON" @@ -1677,7 +1698,7 @@ msgid "Download as CSV" msgstr "ດາວໂຫຼດເປັນ CSV" msgid "Download with current filters" -msgstr "" +msgstr "ດາວໂຫຼດດ້ວຍຕົວກອງປັດຈຸບັນ" msgid "An error has occured. See log for details" msgstr "" diff --git a/i18n/nl.po b/i18n/nl.po index 23b1bd9508..1af9d52450 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Charel van den Elsen, 2024\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" @@ -47,6 +47,9 @@ msgstr "" "gebruiken, maar houd er rekening mee dat hierdoor andere versies worden " "gesloten." +msgid "More" +msgstr "Meer" + msgid "View {{programName}} dashboard" msgstr "Bekijk het {{programName}}-dashboard" @@ -384,17 +387,11 @@ msgstr "Geregistreerde persoon" msgid "validation failed" msgstr "validatie mislukt" -msgid "Errors" -msgstr "Fouten" - -msgid "Feedback" -msgstr "Feedback" - -msgid "Indicators" -msgstr "Indicatoren" +msgid "No feedback for this event yet" +msgstr "" -msgid "Warnings" -msgstr "Waarschuwingen" +msgid "No indicator output for this event yet" +msgstr "" msgid "Generate new event" msgstr "Nieuw evenement genereren" @@ -506,18 +503,6 @@ msgstr "Bevat tekst" msgid "Yes" msgstr "Ja" -msgid "mm/dd/yyyy" -msgstr "mm/dd/jjjj" - -msgid "Years" -msgstr "Jaren" - -msgid "Months" -msgstr "Maanden" - -msgid "Days" -msgstr "Dagen" - msgid "Uploading file" msgstr "Bestand uploaden" @@ -584,6 +569,9 @@ msgstr "Kolommen om in tabel weer te geven" msgid "Column" msgstr "Kolom" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "Bijwerken" @@ -817,12 +805,6 @@ msgstr "Er is een fout opgetreden bij het laden van de pagina" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "Programmafase is ongeldig" @@ -853,6 +835,11 @@ msgstr "Stadium" msgid "Registered events" msgstr "Geregistreerde evenementen" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "Selecteer {{category}}." @@ -971,6 +958,18 @@ msgstr "" "Als u deze pagina verlaat, worden alle selecties die u voor een nieuwe " "relatie hebt gemaakt, verwijderd" +msgid "Errors" +msgstr "Fouten" + +msgid "Feedback" +msgstr "Feedback" + +msgid "Indicators" +msgstr "Indicatoren" + +msgid "Warnings" +msgstr "Waarschuwingen" + msgid "Show all events" msgstr "Toon alle evenementen" @@ -1013,6 +1012,12 @@ msgid "The enrollment event data could not be found" msgstr "" "De gegevens van de inschrijvingsgebeurtenis konden niet worden gevonden" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "Mogelijke duplicaten gevonden" @@ -1531,6 +1536,12 @@ msgstr "Rapporteer datum" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Deze fase kan maar één evenement hebben" + msgid "New {{ eventName }} event" msgstr "Nieuwe {{ eventName }} evenement" @@ -1546,9 +1557,6 @@ msgstr "Lijst resetten" msgid "Go to full {{ eventName }}" msgstr "Ga naar volledige {{ eventName }}" -msgid "This stage can only have one event" -msgstr "Deze fase kan maar één evenement hebben" - msgid "Events could not be retrieved. Please try again later." msgstr "" "Gebeurtenissen kunnen niet worden opgehaald. Probeer het later opnieuw." @@ -1567,6 +1575,15 @@ msgstr "{{ scheduledEvents }} gepland" msgid "Stages and Events" msgstr "stadiums en evenementen" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "Gepland" + msgid "Changelog" msgstr "" @@ -1734,9 +1751,6 @@ msgstr "Er is een fout opgetreden. Zie logboek voor details" msgid "Scheduled{{ escape }} due {{ time }}" msgstr "Gepland{{ escape }} vanwege {{ time }}" -msgid "Scheduled" -msgstr "Gepland" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "Te laat{{ escape }} vanwege {{ time }}" diff --git a/i18n/ro.po b/i18n/ro.po index d39a7acaf0..3b2ff70faf 100644 --- a/i18n/ro.po +++ b/i18n/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Valeriu Plesca , 2024\n" "Language-Team: Romanian (https://app.transifex.com/hisp-uio/teams/100509/ro/)\n" @@ -44,6 +44,9 @@ msgstr "" " să utilizați din nou această versiune, dar rețineți că aceasta va închide " "alte versiuni." +msgid "More" +msgstr "" + msgid "View {{programName}} dashboard" msgstr "" @@ -373,17 +376,11 @@ msgstr "Persoană înregistrată" msgid "validation failed" msgstr "validarea a eșuat" -msgid "Errors" -msgstr "Erori" - -msgid "Feedback" -msgstr "Feedback" - -msgid "Indicators" -msgstr "Indicatori" +msgid "No feedback for this event yet" +msgstr "" -msgid "Warnings" -msgstr "Avertizări" +msgid "No indicator output for this event yet" +msgstr "" msgid "Generate new event" msgstr "" @@ -495,18 +492,6 @@ msgstr "Conține text" msgid "Yes" msgstr "Da" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "Ani" - -msgid "Months" -msgstr "Luni" - -msgid "Days" -msgstr "Zile" - msgid "Uploading file" msgstr "Încărcare fișier" @@ -573,6 +558,9 @@ msgstr "Coloane pentru afișare în tabel" msgid "Column" msgstr "Coloană" +msgid "Visible" +msgstr "Vizibil" + msgid "Update" msgstr "Actualizare" @@ -780,12 +768,6 @@ msgstr "A apărut o eroare la încărcarea paginii" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "Etapa programului este nevalidă" @@ -816,6 +798,11 @@ msgstr "" msgid "Registered events" msgstr "Evenimente înregistrate" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "Selectați {{category}}." @@ -931,6 +918,18 @@ msgid "" "relationship" msgstr "" +msgid "Errors" +msgstr "Erori" + +msgid "Feedback" +msgstr "Feedback" + +msgid "Indicators" +msgstr "Indicatori" + +msgid "Warnings" +msgstr "Avertizări" + msgid "Show all events" msgstr "Afișarea tuturor evenimentelor" @@ -973,6 +972,12 @@ msgstr "" msgid "The enrollment event data could not be found" msgstr "" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "S-au găsit posibile duplicate" @@ -1464,6 +1469,12 @@ msgstr "Data raportului" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Această etapă poate avea un singur eveniment" + msgid "New {{ eventName }} event" msgstr "Eveniment nou {{ eventName }}" @@ -1479,9 +1490,6 @@ msgstr "Resetare listă" msgid "Go to full {{ eventName }}" msgstr "Accesare {{ eventName }} complet" -msgid "This stage can only have one event" -msgstr "Această etapă poate avea un singur eveniment" - msgid "Events could not be retrieved. Please try again later." msgstr "" @@ -1500,6 +1508,15 @@ msgstr "" msgid "Stages and Events" msgstr "Etape și Evenimente" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "" + msgid "Changelog" msgstr "" @@ -1665,9 +1682,6 @@ msgstr "" msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" -msgid "Scheduled" -msgstr "" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "" diff --git a/i18n/si.po b/i18n/si.po index 13abf7e784..996801aea5 100644 --- a/i18n/si.po +++ b/i18n/si.po @@ -1,13 +1,13 @@ # # Translators: -# Malinda Wijeratne, 2023 +# Malinda Wijeratne, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Malinda Wijeratne, 2023\n" +"Last-Translator: Malinda Wijeratne, 2024\n" "Language-Team: Sinhala (https://app.transifex.com/hisp-uio/teams/100509/si/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,6 +36,9 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "More" +msgstr "තව" + msgid "View {{programName}} dashboard" msgstr "" @@ -72,10 +75,6 @@ msgstr "" msgid "error" msgstr "" -msgid "" -"Plugins are not yet available - Please contact your system administrator" -msgstr "" - msgid "This value is validating" msgstr "" @@ -151,6 +150,18 @@ msgstr "" msgid "Enrollment" msgstr "" +msgid "Complete event" +msgstr "" + +msgid "{{ stageName }} - Basic info" +msgstr "" + +msgid "{{ stageName }} - Assignee" +msgstr "" + +msgid "{{ stageName }} - Status" +msgstr "" + msgid "Please select {{categoryName}}" msgstr "" @@ -169,13 +180,19 @@ msgstr "" msgid "Metadata error. see log for details" msgstr "" +msgid "{{ stageName }} - Details" +msgstr "" + +msgid "{{ stageName }} - {{ sectionName }}" +msgstr "" + msgid "Assigned user" msgstr "" msgid "Search for user" msgstr "" -msgid "Complete event" +msgid "Notes" msgstr "" msgid "Basic info" @@ -184,9 +201,6 @@ msgstr "" msgid "Status" msgstr "" -msgid "Comments" -msgstr "" - msgid "Relationships" msgstr "" @@ -215,7 +229,7 @@ msgstr "" msgid "Completed" msgstr "" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -298,6 +312,30 @@ msgstr "" msgid "An error has occurred. See log for details" msgstr "" +msgid "{{programStageName}} completed" +msgstr "" + +msgid "" +"Would you like to complete the enrollment and all active events as well?" +msgstr "" + +msgid "{{count}} event in {{programStageName}}" +msgid_plural "{{count}} event in {{programStageName}}" +msgstr[0] "" +msgstr[1] "" + +msgid "Yes, complete enrollment and events" +msgstr "" + +msgid "Complete enrollment only" +msgstr "" + +msgid "Would you like to complete the enrollment?" +msgstr "" + +msgid "Complete enrollment" +msgstr "" + msgid "A duplicate exists (but there were some errors, see log for details" msgstr "" @@ -323,16 +361,10 @@ msgstr "" msgid "validation failed" msgstr "" -msgid "Errors" -msgstr "" - -msgid "Feedback" +msgid "No feedback for this event yet" msgstr "" -msgid "Indicators" -msgstr "" - -msgid "Warnings" +msgid "No indicator output for this event yet" msgstr "" msgid "Generate new event" @@ -445,18 +477,6 @@ msgstr "" msgid "Yes" msgstr "ඔව්" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "අවුරුදු" - -msgid "Months" -msgstr "මාස" - -msgid "Days" -msgstr "දින" - msgid "Uploading file" msgstr "" @@ -508,6 +528,9 @@ msgstr "" msgid "suggestions could not be retrieved" msgstr "" +msgid "No results found" +msgstr "" + msgid "No items to display" msgstr "" @@ -520,6 +543,9 @@ msgstr "" msgid "Column" msgstr "" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "" @@ -559,7 +585,7 @@ msgstr "" msgid "Program doesn't exist" msgstr "" -msgid "Selected program is invalid for selected registering unit" +msgid "Selected program is invalid for selected organisation unit" msgstr "" msgid "Online" @@ -571,13 +597,13 @@ msgstr "" msgid "Syncing" msgstr "" -msgid "Add comment" +msgid "Add note" msgstr "" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -625,26 +651,25 @@ msgstr "" msgid "Opt out for {{programName}}" msgstr "" +msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" +msgstr "" + msgid "Tracked entity instance with id \"{{teiId}}\" does not exist" msgstr "" -msgid "" -"There is an error while opening this enrollment. Please enter a valid url." +msgid "Program with id \"{{programId}}\" does not exist" msgstr "" msgid "" "An error occurred while fetching enrollments. Please enter a valid url." msgstr "" -msgid "Enrollment Dashboard" +msgid "No feedback for this enrollment yet" msgstr "" msgid "No indicator output for this enrollment yet" msgstr "" -msgid "No feedback for this enrollment yet" -msgstr "" - msgid "Quick actions" msgstr "" @@ -722,19 +747,10 @@ msgstr "" msgid "There was an error opening the Page" msgstr "" -msgid "Enrollment{{escape}} New Event" -msgstr "" - msgid "There was an error loading the page" msgstr "" -msgid "Choose a registering unit to start reporting" -msgstr "" - -msgid "There are no feedbacks for this event" -msgstr "" - -msgid "There are no indicators for this event" +msgid "Choose an organisation unit to start reporting" msgstr "" msgid "Program stage is invalid" @@ -764,19 +780,12 @@ msgstr "" msgid "Stage" msgstr "" -msgid "Enrollment{{escape}} View Event" -msgstr "" - -msgid "Enrollment{{escape}} Edit Event" -msgstr "" - -msgid "The enrollment event data could not be found" -msgstr "" - -msgid "There are no feedback for this event" +msgid "Registered events" msgstr "" -msgid "Registered events" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." msgstr "" msgid "Please select {{category}}." @@ -791,8 +800,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "නව" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -800,8 +811,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "නව" msgid "Create for" msgstr "" @@ -879,6 +890,9 @@ msgstr "" msgid "Edit event" msgstr "" +msgid "View changelog" +msgstr "" + msgid "Event details" msgstr "" @@ -887,16 +901,16 @@ msgid "" "relationship" msgstr "" -msgid "No one is assigned to this event" +msgid "Errors" msgstr "" -msgid "Assign" +msgid "Feedback" msgstr "" -msgid "Event assigned to {{name}}" +msgid "Indicators" msgstr "" -msgid "Feedbacks" +msgid "Warnings" msgstr "" msgid "Show all events" @@ -911,10 +925,42 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Possible duplicates found" +msgid "Dashboard" msgstr "" -msgid "No results found" +msgid "Edit Event" +msgstr "" + +msgid "View Event" +msgstr "" + +msgid "Selected program" +msgstr "" + +msgid "Search {{uniqueAttrName}}" +msgstr "" + +msgid "Search by attributes" +msgstr "" + +msgid "Fill in at least {{count}} attribute to search" +msgid_plural "Fill in at least {{count}} attribute to search" +msgstr[0] "" +msgstr[1] "" + +msgid "Could not retrieve metadata. Please try again later." +msgstr "" + +msgid "The enrollment event data could not be found" +msgstr "" + +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + +msgid "Possible duplicates found" msgstr "" msgid "An error occurred loading possible duplicates" @@ -932,10 +978,7 @@ msgstr "" msgid "No results found for " msgstr "" -msgid "Registering unit" -msgstr "" - -msgid "Choose a registering unit" +msgid "Choose an organisation unit" msgstr "" msgid "Clear selection" @@ -947,7 +990,7 @@ msgstr "" msgid "Search for a program" msgstr "" -msgid "Some programs are being filtered by the chosen registering unit" +msgid "Some programs are being filtered by the chosen organisation unit" msgstr "" msgid "Show all programs" @@ -975,9 +1018,6 @@ msgstr "" msgid "Search by {{name}}" msgstr "" -msgid "Search by attributes" -msgstr "" - msgid "all programs" msgstr "" @@ -1029,12 +1069,6 @@ msgstr "" msgid "Results found" msgstr "" -msgid "Selected program" -msgstr "" - -msgid "Search {{uniqueAttrName}}" -msgstr "" - msgid "Saved lists in this program" msgstr "" @@ -1049,16 +1083,34 @@ msgstr "" msgid "Create saved list" msgstr "" -msgid "New {{trackedEntityName}} in {{programName}}" +msgid "Create new in another program" +msgstr "" + +msgid "Create new event" msgstr "" msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "" -msgid "To work with the selected program," +msgid "No tracked entity types available" msgstr "" -msgid "open the Tracker Capture app" +msgid "Assigned to" +msgstr "" + +msgid "You don't have access to edit this assignee" +msgstr "" + +msgid "Edit" +msgstr "වෙනස් කරන්න" + +msgid "No one is assigned to this event" +msgstr "" + +msgid "You don't have access to assign an assignee" +msgstr "" + +msgid "Assign" msgstr "" msgid "This program is protected" @@ -1080,9 +1132,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "" - msgid "Enrollment actions" msgstr "" @@ -1121,9 +1170,57 @@ msgstr "" msgid "Mark for follow-up" msgstr "" +msgid "Transfer" +msgstr "" + +msgid "An error occurred while transferring ownership" +msgstr "" + msgid "Existing dates for auto-generated events will not be updated." msgstr "" +msgid "Latitude" +msgstr "" + +msgid "Longitude" +msgstr "" + +msgid "Set coordinates" +msgstr "" + +msgid "Coordinates" +msgstr "" + +msgid "Delete polygon" +msgstr "" + +msgid "Close without saving" +msgstr "" + +msgid "Finish drawing before saving" +msgstr "" + +msgid "Set area" +msgstr "" + +msgid "" +"Transferring enrollment ownership from {{ownerOrgUnit}} to " +"{{newOrgUnit}}{{escape}}" +msgstr "" + +msgid "" +"You will lose access to the enrollment when transferring ownership to " +"{{organisationUnit}}." +msgstr "" + +msgid "Transfer Ownership" +msgstr "" + +msgid "" +"Choose the organisation unit to which enrollment ownership should be " +"transferred." +msgstr "" + msgid "Enrollment date" msgstr "" @@ -1142,19 +1239,16 @@ msgstr "" msgid "Owned by {{ownerOrgUnit}}" msgstr "" -msgid "Last updated {{date}}" -msgstr "" - msgid "Cancelled" msgstr "" -msgid "Comments about this enrollment" +msgid "Add coordinates" msgstr "" -msgid "Write a comment about this enrollment" +msgid "Add area" msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Please add or cancel the note before saving the event" msgstr "" msgid "organisation unit could not be retrieved. Please try again later." @@ -1166,21 +1260,21 @@ msgstr "" msgid "program or stage is invalid" msgstr "" -msgid "Error" -msgstr "දෝෂය" - -msgid "Warning" -msgstr "අවවාදය" - -msgid "Comments about this event" +msgid "Notes about this enrollment" msgstr "" -msgid "Write a comment about this event" +msgid "Write a note about this enrollment" msgstr "" -msgid "This event doesn't have any comments" +msgid "This enrollment doesn't have any notes" msgstr "" +msgid "Error" +msgstr "දෝෂය" + +msgid "Warning" +msgstr "අවවාදය" + msgid "stage not found in rules execution" msgstr "" @@ -1202,6 +1296,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1212,12 +1315,24 @@ msgid "" "The scheduled date matches the suggested date, but can be changed if needed." msgstr "" +msgid "The scheduled date is {{count}} days {{position}} the suggested date." +msgid_plural "" +"The scheduled date is {{count}} days {{position}} the suggested date." +msgstr[0] "" +msgstr[1] "" + msgid "after" msgstr "" msgid "before" msgstr "" +msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day." +msgid_plural "" +"There are {{count}} scheduled event in {{orgUnitName}} on this day." +msgstr[0] "" +msgstr[1] "" + msgid "" "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" @@ -1228,10 +1343,13 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" +msgstr "" + +msgid "Save note" msgstr "" msgid "" @@ -1264,18 +1382,74 @@ msgstr "" msgid "Fix errors in the form to continue." msgstr "" -msgid "Profile widget could not be loaded. Please try again later" +msgid "You do not have access to delete this {{trackedEntityTypeName}}" msgstr "" -msgid "{{TETName}} profile" +msgid "Delete {{trackedEntityTypeName}}" msgstr "" -msgid "Edit" -msgstr "වෙනස් කරන්න" +msgid "" +"Are you sure you want to delete this {{trackedEntityTypeName}}? This will " +"permanently remove the {{trackedEntityTypeName}} and all its associated " +"enrollments and events in all programs." +msgstr "" + +msgid "There was a problem deleting the {{trackedEntityTypeName}}" +msgstr "" + +msgid "Yes, delete {{trackedEntityTypeName}}" +msgstr "" + +msgid "Profile widget could not be loaded. Please try again later" +msgstr "" + +msgid "{{trackedEntityTypeName}} profile" +msgstr "" msgid "tracked entity instance" msgstr "" +msgid "Link to an existing {{linkableStageLabel}}" +msgstr "" + +msgid "Choose a {{linkableStageLabel}}" +msgstr "" + +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + +msgid "Ambiguous relationships, contact system administrator" +msgstr "" + +msgid "" +"Enter {{linkableStageLabel}} details in the next step after completing this " +"{{currentStageLabel}}." +msgstr "" + +msgid "Enter details now" +msgstr "" + +msgid "Link to an existing" +msgstr "" + +msgid "Scheduled date" +msgstr "" + +msgid "Report date" +msgstr "" + +msgid "Please select a valid event" +msgstr "" + +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "" + msgid "New {{ eventName }} event" msgstr "" @@ -1291,14 +1465,13 @@ msgstr "" msgid "Go to full {{ eventName }}" msgstr "" -msgid "This stage can only have one event" -msgstr "" - msgid "Events could not be retrieved. Please try again later." msgstr "" -msgid "{{ totalEvents }} events" -msgstr "" +msgid "{{ count }} event" +msgid_plural "{{ count }} event" +msgstr[0] "" +msgstr[1] "" msgid "{{ overdueEvents }} overdue" msgstr "" @@ -1309,28 +1482,97 @@ msgstr "" msgid "Stages and Events" msgstr "" -msgid "Working list could not be loaded" +msgid "An error occurred while loading the widget." msgstr "" -msgid "Download as JSON" +msgid "View linked event" msgstr "" -msgid "Download as XML" +msgid "Scheduled" msgstr "" -msgid "Download as CSV" +msgid "Changelog" msgstr "" -msgid "Download with current filters" +msgid "No changes to display" msgstr "" -msgid "Download data..." +msgid "Created" msgstr "" -msgid "an error occurred loading working lists" +msgid "Deleted" msgstr "" -msgid "Assigned to" +msgid "Date" +msgstr "දිනය" + +msgid "User" +msgstr "" + +msgid "Data item" +msgstr "" + +msgid "Change" +msgstr "" + +msgid "New {{trackedEntityTypeName}} relationship" +msgstr "" + +msgid "Missing implementation step" +msgstr "" + +msgid "Go back without saving relationship" +msgstr "" + +msgid "New Relationship" +msgstr "" + +msgid "Link to an existing {{tetName}}" +msgstr "" + +msgid "An error occurred while adding the relationship" +msgstr "" + +msgid "" +"Something went wrong while loading relationships. Please try again later." +msgstr "" + +msgid "{{trackedEntityTypeName}} relationships" +msgstr "" + +msgid "Delete relationship" +msgstr "" + +msgid "" +"Deleting the relationship is permanent and cannot be undone. Are you sure " +"you want to delete this relationship?" +msgstr "" + +msgid "Yes, delete relationship" +msgstr "" + +msgid "An error occurred while deleting the relationship." +msgstr "" + +msgid "To open this relationship, please wait until saving is complete" +msgstr "" + +msgid "Type" +msgstr "" + +msgid "Created date" +msgstr "" + +msgid "Program stage name" +msgstr "" + +msgid "Working list could not be loaded" +msgstr "" + +msgid "Download data..." +msgstr "" + +msgid "an error occurred loading working lists" msgstr "" msgid "Registration Date" @@ -1342,6 +1584,9 @@ msgstr "" msgid "Enrollment status" msgstr "" +msgid "Follow up" +msgstr "" + msgid "Choose a program stage to filter by {{label}}" msgstr "" @@ -1396,13 +1641,19 @@ msgstr "" msgid "Show All" msgstr "" -msgid "An error has occured. See log for details" +msgid "Download as JSON" msgstr "" -msgid "Scheduled{{ escape }} due {{ time }}" +msgid "Download as CSV" msgstr "" -msgid "Scheduled" +msgid "Download with current filters" +msgstr "" + +msgid "An error has occured. See log for details" +msgstr "" + +msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" msgid "Overdue{{ escape }} due {{ time }}" @@ -1462,11 +1713,11 @@ msgstr "" msgid "Error editing the event, the changes made were not saved" msgstr "" -msgid "Set coordinate" +msgid "Error updating the Assignee" msgstr "" -msgid "Date" -msgstr "දිනය" +msgid "Set coordinate" +msgstr "" msgid "Time" msgstr "" @@ -1486,12 +1737,6 @@ msgstr "" msgid "Page {{currentPage}}" msgstr "" -msgid "Delete polygon" -msgstr "" - -msgid "Set area" -msgstr "" - msgid "Area on map saved" msgstr "" diff --git a/i18n/zh.po b/i18n/zh.po index c38f86a638..8058b5a3eb 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -1,16 +1,16 @@ # # Translators: # Philip Larsen Donnelly, 2024 -# easylin , 2024 # 晓东 林 <13981924470@126.com>, 2024 # Viktor Varland , 2024 +# easylin , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: easylin , 2024\n" "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -481,18 +481,6 @@ msgstr "包含文本" msgid "Yes" msgstr "是" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "年" - -msgid "Months" -msgstr "月" - -msgid "Days" -msgstr "天" - msgid "Uploading file" msgstr "上传文件" @@ -976,7 +964,7 @@ msgid "Loading" msgstr "载入" msgid "An error occurred while loading the form" -msgstr "" +msgstr "加载表格时发生错误" msgid "Possible duplicates found" msgstr "发现可能的重复" @@ -1464,6 +1452,12 @@ msgstr "报告日期" msgid "Please select a valid event" msgstr "请选择一个有效的事件" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "这个阶段只能有一个事件" + msgid "New {{ eventName }} event" msgstr "新的 {{ eventName }} 事件" @@ -1479,9 +1473,6 @@ msgstr "重置列表" msgid "Go to full {{ eventName }}" msgstr "转到完整的{{ eventName }}" -msgid "This stage can only have one event" -msgstr "这个阶段只能有一个事件" - msgid "Events could not be retrieved. Please try again later." msgstr "无法检索事件。请稍后再试。" @@ -1499,10 +1490,10 @@ msgid "Stages and Events" msgstr "阶段与活动" msgid "An error occurred while loading the widget." -msgstr "" +msgstr "加载小部件时发生错误。" msgid "View linked event" -msgstr "" +msgstr "查看链接事件" msgid "Scheduled" msgstr "已经调度" From 3dcc8da2d3ea053f45b00e62d4e4434f72743ec0 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 25 Aug 2024 01:56:05 +0000 Subject: [PATCH 06/16] chore(release): cut 101.2.1 [skip release] ## [101.2.1](https://github.com/dhis2/capture-app/compare/v101.2.0...v101.2.1) (2024-08-25) ### Bug Fixes * **translations:** sync translations from transifex (master) ([7971aa4](https://github.com/dhis2/capture-app/commit/7971aa4d5975aa6976912c0fdeb45957955477dc)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e61a3ddf..baaaeb4db4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.2.1](https://github.com/dhis2/capture-app/compare/v101.2.0...v101.2.1) (2024-08-25) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([7971aa4](https://github.com/dhis2/capture-app/commit/7971aa4d5975aa6976912c0fdeb45957955477dc)) + # [101.2.0](https://github.com/dhis2/capture-app/compare/v101.1.3...v101.2.0) (2024-08-22) diff --git a/package.json b/package.json index 9e0a9abd76..ab2107d6f1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.2.0", + "version": "101.2.1", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.2.0", + "@dhis2/rules-engine-javascript": "101.2.1", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index d155540271..25d980d96d 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.2.0", + "version": "101.2.1", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 334297c91fca8ef427729a6454f5a8f8dd550453 Mon Sep 17 00:00:00 2001 From: Eirik Haugstulen Date: Wed, 28 Aug 2024 12:05:56 +0200 Subject: [PATCH 07/16] fix: [DHIS2-17953] Invalid dateFormat conversion in related stages (#3774) fix: use relevant date format --- .../validators/form/date.validator.js | 1 + .../getConvertedRelatedStageEvent.js | 14 +++++++++----- .../converters/date/stringToMomentDateFormat.js | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/core_modules/capture-core-utils/validators/form/date.validator.js b/src/core_modules/capture-core-utils/validators/form/date.validator.js index 3c298feb88..fe14203f11 100644 --- a/src/core_modules/capture-core-utils/validators/form/date.validator.js +++ b/src/core_modules/capture-core-utils/validators/form/date.validator.js @@ -4,6 +4,7 @@ import { parseDate } from '../../parsers'; * * @export * @param {string} value + * @param {string} format * @returns {boolean} */ export function isValidDate(value: string, format: string) { diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js index 3bae2a173c..061f7a5fe4 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js +++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js @@ -3,8 +3,12 @@ import log from 'loglevel'; import { generateUID } from '../../../../utils/uid/generateUID'; import { actions as RelatedStageModes } from '../../../WidgetRelatedStages/constants'; import type { ConvertedRelatedStageEventProps } from './getConvertedRelatedStageEvent.types'; -import { errorCreator } from '../../../../../capture-core-utils'; +import { errorCreator, pipe } from '../../../../../capture-core-utils'; import { type LinkedRequestEvent } from '../validated.types'; +import { convertClientToServer, convertFormToClient } from '../../../../converters'; +import { dataElementTypes } from '../../../../metaData'; + +const convertFn = pipe(convertFormToClient, convertClientToServer); const getEventDetailsByLinkMode = ({ relatedStageDataValues, @@ -47,8 +51,8 @@ const getEventDetailsByLinkMode = ({ return ({ linkedEvent: { ...baseEventDetails, - scheduledAt: linkedEventScheduledAt, - orgUnit: linkedEventOrgUnit.id, + scheduledAt: convertFn(linkedEventScheduledAt, dataElementTypes.DATE), + orgUnit: convertFn(linkedEventOrgUnit, dataElementTypes.ORGANISATION_UNIT), }, linkedEventId: baseEventDetails.event, }); @@ -56,8 +60,8 @@ const getEventDetailsByLinkMode = ({ return ({ linkedEvent: { ...baseEventDetails, - scheduledAt: clientRequestEvent.occurredAt, - orgUnit: clientRequestEvent.orgUnit, + scheduledAt: convertFn(clientRequestEvent.scheduledAt, dataElementTypes.DATE), + orgUnit: convertFn(clientRequestEvent.orgUnit, dataElementTypes.ORGANISATION_UNIT), }, linkedEventId: baseEventDetails.event, }); diff --git a/src/core_modules/capture-core/utils/converters/date/stringToMomentDateFormat.js b/src/core_modules/capture-core/utils/converters/date/stringToMomentDateFormat.js index 54ca885689..eed1df7957 100644 --- a/src/core_modules/capture-core/utils/converters/date/stringToMomentDateFormat.js +++ b/src/core_modules/capture-core/utils/converters/date/stringToMomentDateFormat.js @@ -11,6 +11,6 @@ import { systemSettingsStore } from '../../../metaDataMemoryStores'; export function convertStringToDateFormat(date: string) { if (!date || !date.length) { return ''; } const dateFormat = systemSettingsStore.get().dateFormat; - const formattedDateString = moment(date, dateFormat).format('YYYY-MM-DD'); + const formattedDateString = moment(date, dateFormat).format(dateFormat); return formattedDateString; } From 6ab93938521443bca57f612f66c34a6197c589be Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 28 Aug 2024 10:11:32 +0000 Subject: [PATCH 08/16] chore(release): cut 101.2.2 [skip release] ## [101.2.2](https://github.com/dhis2/capture-app/compare/v101.2.1...v101.2.2) (2024-08-28) ### Bug Fixes * [DHIS2-17953] Invalid dateFormat conversion in related stages ([#3774](https://github.com/dhis2/capture-app/issues/3774)) ([334297c](https://github.com/dhis2/capture-app/commit/334297c91fca8ef427729a6454f5a8f8dd550453)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index baaaeb4db4..f939a52ef4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.2.2](https://github.com/dhis2/capture-app/compare/v101.2.1...v101.2.2) (2024-08-28) + + +### Bug Fixes + +* [DHIS2-17953] Invalid dateFormat conversion in related stages ([#3774](https://github.com/dhis2/capture-app/issues/3774)) ([334297c](https://github.com/dhis2/capture-app/commit/334297c91fca8ef427729a6454f5a8f8dd550453)) + ## [101.2.1](https://github.com/dhis2/capture-app/compare/v101.2.0...v101.2.1) (2024-08-25) diff --git a/package.json b/package.json index ab2107d6f1..66ccd453eb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.2.1", + "version": "101.2.2", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.2.1", + "@dhis2/rules-engine-javascript": "101.2.2", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 25d980d96d..c3379f7408 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.2.1", + "version": "101.2.2", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From ed3ed5a58f602ea487b90bb5997aad9f3b6e22cb Mon Sep 17 00:00:00 2001 From: henrikmv <110386561+henrikmv@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:48:51 +0200 Subject: [PATCH 09/16] feat: [DHIS2-11836] respect block entry form (#3759) * feat: respect block entry form * feat: respect block entry form and authorities * fix: tooltip * feat: cypress test for disabled edit event button * fix: set tracker auto test restricted * fix: cypress test * feat: cy test for disabled button --- .../EnrollmentEditEventPageForm.feature | 6 +++++ .../EnrollmentEditEventPageForm.js | 6 +++++ i18n/en.pot | 3 +++ .../WidgetEventEdit.container.js | 17 +++++++++--- .../WidgetEventEdit/constants/status.const.js | 10 +++++++ .../components/WidgetEventEdit/hooks/index.js | 2 ++ .../WidgetEventEdit/hooks/useAuthorities.js | 27 +++++++++++++++++++ .../metaData/Program/ProgramStage.js | 9 +++++++ .../programStage/ProgramStageFactory.js | 1 + .../quickStoreOperations/storePrograms.js | 2 +- .../storageControllers/cache.types.js | 1 + 11 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/constants/status.const.js create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js create mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature index 72271b0594..594b821007 100644 --- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature +++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature @@ -101,6 +101,12 @@ Scenario: User can see disabled scheduled date for active event Then the user see the following text: Enrollment: Edit Event Then the user see the schedule date field with tooltip: Scheduled date cannot be changed for Active events +@user:trackerAutoTestRestricted +Scenario: The user cannot enter edit mode for completed events + Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=nUVwTLuQ6FT&orgUnitId=DiszpKrYNg8 + And the user see the following text: Enrollment: View Event + Then the edit button should be disabled + Scenario: User can edit the event and complete the enrollment Given you land on the enrollment event page with selected Malaria Entity by having typed #/enrollmentEventEdit?eventId=MHR4Zj6KLz0&orgUnitId=DiszpKrYNg8 And the enrollment status is active diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js index bd82268d44..bd8c7855fc 100644 --- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js +++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js @@ -204,3 +204,9 @@ And('you open the Birth stage event', () => { }); }); +Then('the edit button should be disabled', () => { + cy.get('[data-test="widget-enrollment-event"]') + .find('[data-test="dhis2-uicore-button"]') + .eq(1) + .should('be.disabled'); +}); diff --git a/i18n/en.pot b/i18n/en.pot index 7e93f8ab6a..5612718d04 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -1341,6 +1341,9 @@ msgstr "Scheduled date cannot be changed for {{ eventStatus }} events" msgid "Event completed" msgstr "Event completed" +msgid "The event cannot be edited after it has been completed" +msgstr "The event cannot be edited after it has been completed" + msgid "Back to all stages and events" msgstr "Back to all stages and events" diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js index 147934a992..f953852223 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js +++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js @@ -31,6 +31,8 @@ import { OverflowButton } from '../Buttons'; import { EventChangelogWrapper } from './EventChangelogWrapper'; import { FEATURES, useFeature } from '../../../capture-core-utils'; import { inMemoryFileStore } from '../DataEntry/file/inMemoryFileStore'; +import { eventStatuses } from './constants/status.const'; +import { useAuthorities } from './hooks'; const styles = { header: { @@ -99,6 +101,14 @@ export const WidgetEventEditPlain = ({ const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues); const eventAccess = getProgramEventAccess(programId, stageId); + const { canEditCompletedEvent } = useAuthorities(); + const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED; + const disableEdit = !eventAccess?.write || blockEntryForm; + + const tooltipContent = blockEntryForm ? + i18n.t('The event cannot be edited after it has been completed') : + i18n.t('You don\'t have access to edit this event'); + const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId); const { programCategory } = useCategoryCombinations(programId); if (error) { @@ -117,14 +127,14 @@ export const WidgetEventEditPlain = ({ {currentPageMode === dataEntryKeys.VIEW && (
+ : null); - const renderResetButton = () => (displayedRowNumber > DEFAULT_NUMBER_OF_ROW ? : null); - const renderViewAllButton = () => (events.length > 1 ? : null); const renderCreateNewButton = () => ( - +
+ +
); return ( - - - {renderShowMoreButton()} - {renderViewAllButton()} - {renderCreateNewButton()} - {renderResetButton()} - - +
+ {renderShowMoreButton()} + {renderViewAllButton()} + {renderCreateNewButton()} +
+ ); } @@ -249,19 +272,23 @@ const StageDetailPlain = (props: Props) => { } return (
- - - {renderHeader()} - - - {renderRows()} - - +
+ + + {renderHeader()} + + + {renderRows()} + + +
+ +
{renderFooter()} - - +
+
); }; diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js index b7b576500d..c2e7731421 100644 --- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js @@ -3,7 +3,9 @@ import React, { type ComponentType } from 'react'; import cx from 'classnames'; import { withStyles } from '@material-ui/core'; import { useTimeZoneConversion } from '@dhis2/app-runtime'; -import { colors, spacersNum, IconInfo16, IconWarning16, IconCalendar16, IconClockHistory16, Tooltip } from '@dhis2/ui'; +import { + colors, spacers, spacersNum, IconInfo16, IconWarning16, IconCalendar16, IconClockHistory16, Tooltip, +} from '@dhis2/ui'; import i18n from '@dhis2/d2-i18n'; import moment from 'moment'; import { statusTypes } from 'capture-core/events/statusTypes'; @@ -15,6 +17,10 @@ const styles = { container: { display: 'flex', alignItems: 'center', + padding: '0', + justifyContent: 'space-between', + width: '100%', + marginLeft: '-4px', }, icon: { paddingRight: spacersNum.dp8, @@ -24,22 +30,32 @@ const styles = { marginRight: spacersNum.dp8, height: '16px', }, + infoTitles: { + display: 'flex', + alignItems: 'center', + }, + infoItems: { + display: 'flex', + gap: spacers.dp12, + }, indicatorIcon: { paddingRight: spacersNum.dp4, height: '16px', }, title: { - fontSize: '14px', + fontSize: '18px', lineHeight: '19px', fontWeight: 500, color: colors.grey900, display: 'flex', + marginInlineEnd: spacers.dp4, }, indicator: { - padding: spacersNum.dp8, color: colors.grey800, - fontSize: '14px', + fontSize: '12px', + lineHeight: '16px', fontWeight: 400, + height: '100%', display: 'flex', alignItems: 'center', }, @@ -76,24 +92,26 @@ export const StageOverviewPlain = ({ title, icon, description, events, classes } const scheduledEvents = events.filter(event => event.status === statusTypes.SCHEDULE).length; return (
- { - icon && ( -
- -
- ) - } +
+ { + icon && ( +
+ +
+ ) + } +
-
- {title} -
- { description && +
+ {title} +
+ { description &&
- } -
- {i18n.t('{{ count }} event', { - count: totalEvents, - defaultValue: '{{ count }} event', - defaultValue_plural: '{{count}} events', - })} + }
- {overdueEvents > 0 ?
-
- -
- {i18n.t('{{ overdueEvents }} overdue', { overdueEvents })} -
: null} - {scheduledEvents > 0 ?
-
- +
+
+ {i18n.t('{{ count }} event', { + count: totalEvents, + defaultValue: '{{ count }} event', + defaultValue_plural: '{{count}} events', + })}
- {i18n.t('{{ scheduledEvents }} scheduled', { scheduledEvents })} -
: null } - {totalEvents > 0 &&
-
- -
- {getLastUpdatedAt(events, fromServerDate)} -
} + {overdueEvents > 0 ?
+
+ +
+ {i18n.t('{{ overdueEvents }} overdue', { overdueEvents })} +
: null} + {scheduledEvents > 0 ?
+
+ +
+ {i18n.t('{{ scheduledEvents }} scheduled', { scheduledEvents })} +
: null } + {totalEvents > 0 &&
+
+ +
+ {getLastUpdatedAt(events, fromServerDate)} +
} +
); }; From 1f2273c3bce9544360d5683729435ba37e82b5ce Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 29 Aug 2024 07:26:50 +0000 Subject: [PATCH 12/16] chore(release): cut 101.3.1 [skip release] ## [101.3.1](https://github.com/dhis2/capture-app/compare/v101.3.0...v101.3.1) (2024-08-29) ### Bug Fixes * [DHIS2-17651] enrollment dashboard UI changes ([#3767](https://github.com/dhis2/capture-app/issues/3767)) ([012b60d](https://github.com/dhis2/capture-app/commit/012b60d3c297eea1bc3bfb62d9329ba37a9c0f94)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d41cd0e03..4c354b0a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.3.1](https://github.com/dhis2/capture-app/compare/v101.3.0...v101.3.1) (2024-08-29) + + +### Bug Fixes + +* [DHIS2-17651] enrollment dashboard UI changes ([#3767](https://github.com/dhis2/capture-app/issues/3767)) ([012b60d](https://github.com/dhis2/capture-app/commit/012b60d3c297eea1bc3bfb62d9329ba37a9c0f94)) + # [101.3.0](https://github.com/dhis2/capture-app/compare/v101.2.2...v101.3.0) (2024-08-28) diff --git a/package.json b/package.json index 24c14b1770..a8dc5d72ca 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.3.0", + "version": "101.3.1", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.3.0", + "@dhis2/rules-engine-javascript": "101.3.1", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 0ab5a52299..9ff5cf689d 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.3.0", + "version": "101.3.1", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 3dfd4240ad9d5ef4512b283dc222eb54891aa896 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 1 Sep 2024 03:44:36 +0200 Subject: [PATCH 13/16] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/ar_IQ.po | 29 +++++---------- i18n/ckb.po | 93 ++++++++++++++++++++++++++-------------------- i18n/cs.po | 6 +-- i18n/es.po | 6 +-- i18n/es_419.po | 93 ++++++++++++++++++++++++++-------------------- i18n/fr.po | 6 +-- i18n/id.po | 6 +-- i18n/km.po | 29 +++++---------- i18n/lo.po | 56 ++++++++++++++-------------- i18n/my.po | 29 +++++---------- i18n/nb.po | 29 +++++---------- i18n/nl.po | 6 +-- i18n/prs.po | 29 +++++---------- i18n/ps.po | 29 +++++---------- i18n/pt.po | 29 +++++---------- i18n/pt_BR.po | 29 +++++---------- i18n/ro.po | 6 +-- i18n/ru.po | 29 +++++---------- i18n/sv.po | 89 +++++++++++++++++++++++++------------------- i18n/tet.po | 89 +++++++++++++++++++++++++------------------- i18n/tg.po | 29 +++++---------- i18n/uk.po | 29 +++++---------- i18n/ur.po | 29 +++++---------- i18n/uz_UZ_Cyrl.po | 29 +++++---------- i18n/uz_UZ_Latn.po | 29 +++++---------- i18n/vi.po | 29 +++++---------- i18n/zh.po | 6 +-- i18n/zh_CN.po | 29 +++++---------- 28 files changed, 413 insertions(+), 513 deletions(-) diff --git a/i18n/ar_IQ.po b/i18n/ar_IQ.po index 01af8b5790..cbeeaaf0e3 100644 --- a/i18n/ar_IQ.po +++ b/i18n/ar_IQ.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: KRG HIS , 2024\n" "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n" @@ -491,18 +491,6 @@ msgstr "يحتوي على نص" msgid "Yes" msgstr "نعم" -msgid "mm/dd/yyyy" -msgstr "شهر / يوم / سنة" - -msgid "Years" -msgstr "السنوات" - -msgid "Months" -msgstr "الأشهر" - -msgid "Days" -msgstr "‏‏الأيام" - msgid "Uploading file" msgstr "تحميل ملف" @@ -1323,6 +1311,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1482,22 +1473,22 @@ msgstr "" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/ckb.po b/i18n/ckb.po index 9ca0dee15f..1a33d92772 100644 --- a/i18n/ckb.po +++ b/i18n/ckb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Central Kurdish (https://app.transifex.com/hisp-uio/teams/100509/ckb/)\n" @@ -45,6 +45,9 @@ msgstr "" "تکایە پەیجەکەت ریفرێش بکەوە بۆ ئەوەی ئەم وەشانە بکەیتەوە بەڵام ئاگاداربکە " "ئەم کردارە وەشانەکانیتر دادەخات" +msgid "More" +msgstr "" + msgid "View {{programName}} dashboard" msgstr "" @@ -375,17 +378,11 @@ msgstr "کەسی تۆمارکراو" msgid "validation failed" msgstr "سەلماندنەکە سەرکەوتوونەبوو" -msgid "Errors" -msgstr "هەڵەکان" - -msgid "Feedback" -msgstr "ڕاووبۆچون" - -msgid "Indicators" -msgstr "نیشاندەر" +msgid "No feedback for this event yet" +msgstr "" -msgid "Warnings" -msgstr "ئاگادارکردنەوەکان" +msgid "No indicator output for this event yet" +msgstr "" msgid "Generate new event" msgstr "" @@ -499,18 +496,6 @@ msgstr "نووسینی تێدایە" msgid "Yes" msgstr "بەڵێ" -msgid "mm/dd/yyyy" -msgstr "مانگ/رۆژ/ساڵ" - -msgid "Years" -msgstr "ساڵەکان" - -msgid "Months" -msgstr "مانگەکان" - -msgid "Days" -msgstr "رۆژەکان" - msgid "Uploading file" msgstr "سەرخستنی فایل" @@ -577,6 +562,9 @@ msgstr "ستونەکانی دەتەوێ دەربکەوێ لە خشتەکە" msgid "Column" msgstr "ستوون" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "نوێ کردنەوە" @@ -784,12 +772,6 @@ msgstr "" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "" @@ -820,6 +802,11 @@ msgstr "" msgid "Registered events" msgstr "حالەتە تۆمارکراوەکان" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "" @@ -935,6 +922,18 @@ msgstr "" "بەجێهێشتنی ئەم پەڕەیە هەڵبژاردنەکانت هەڵدەسپێری کە بۆ پەیوەندیە نوێیەکان " "کردووتە" +msgid "Errors" +msgstr "هەڵەکان" + +msgid "Feedback" +msgstr "ڕاووبۆچون" + +msgid "Indicators" +msgstr "نیشاندەر" + +msgid "Warnings" +msgstr "ئاگادارکردنەوەکان" + msgid "Show all events" msgstr "هەموو حاڵەتەکان پیشان بدە" @@ -976,6 +975,12 @@ msgstr "" msgid "The enrollment event data could not be found" msgstr "" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "ڕەنگە دووبارەبوونەوە دۆزرابێتەوە" @@ -1255,9 +1260,6 @@ msgstr "" msgid "Owned by {{ownerOrgUnit}}" msgstr "" -msgid "Last updated {{date}}" -msgstr "" - msgid "Cancelled" msgstr "" @@ -1312,6 +1314,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1463,22 +1468,22 @@ msgstr "" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." @@ -1498,6 +1503,15 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "" + msgid "Changelog" msgstr "" @@ -1663,9 +1677,6 @@ msgstr "هەڵەیک ڕوویدا، تکایە سەیری لۆگ فایل بکە msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" -msgid "Scheduled" -msgstr "" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "" diff --git a/i18n/cs.po b/i18n/cs.po index 9248d56299..62ef1badcc 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -1354,6 +1354,9 @@ msgstr "Naplánované datum nelze změnit pro události {{ eventStatus }}" msgid "Event completed" msgstr "Událost dokončena" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Zpět ke všem fázím a událostem" @@ -1538,9 +1541,6 @@ msgstr "Chcete-li otevřít tuto událost, počkejte na dokončení ukládání" msgid "Show {{ rest }} more" msgstr "Zobrazit {{ rest }} více" -msgid "Reset list" -msgstr "Resetovat seznam" - msgid "Go to full {{ eventName }}" msgstr "Přejít na celou {{ eventName }}" diff --git a/i18n/es.po b/i18n/es.po index c876e8fa4f..1b377c622d 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -1393,6 +1393,9 @@ msgstr "" msgid "Event completed" msgstr "Evento completado" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Volver a todas las etapas y eventos" @@ -1583,9 +1586,6 @@ msgstr "Para abrir este evento, espere hasta que se complete el guardado." msgid "Show {{ rest }} more" msgstr "Mostrar más {{ rest }} " -msgid "Reset list" -msgstr "Resetear lista" - msgid "Go to full {{ eventName }}" msgstr "Ir a {{ eventName }} completado" diff --git a/i18n/es_419.po b/i18n/es_419.po index c4288e743b..8bc4508cd5 100644 --- a/i18n/es_419.po +++ b/i18n/es_419.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Jaime Bosque , 2024\n" "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n" @@ -46,6 +46,9 @@ msgstr "" " a utilizar esta versión, pero tenga en cuenta que esto cerrará otras " "versiones." +msgid "More" +msgstr "" + msgid "View {{programName}} dashboard" msgstr "Ver panel de {{programName}}" @@ -384,17 +387,11 @@ msgstr "persona registrada" msgid "validation failed" msgstr "La validación ha fallado" -msgid "Errors" -msgstr "Errores" - -msgid "Feedback" -msgstr "Retroalimentación" - -msgid "Indicators" -msgstr "Indicadores" +msgid "No feedback for this event yet" +msgstr "" -msgid "Warnings" -msgstr "Advertencias" +msgid "No indicator output for this event yet" +msgstr "" msgid "Generate new event" msgstr "Generar nuevo evento" @@ -509,18 +506,6 @@ msgstr "Contiene texto" msgid "Yes" msgstr "Sí" -msgid "mm/dd/yyyy" -msgstr "mm/dd/aaaa" - -msgid "Years" -msgstr "Años" - -msgid "Months" -msgstr "Meses" - -msgid "Days" -msgstr "Días" - msgid "Uploading file" msgstr "Subiendo archivo" @@ -587,6 +572,9 @@ msgstr "Columns to show in table" msgid "Column" msgstr "Columna" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "Actualizar" @@ -816,12 +804,6 @@ msgstr "Hubo un error al cargar la página" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "La etapa del programa no es válida" @@ -852,6 +834,11 @@ msgstr "Etapa" msgid "Registered events" msgstr "Eventos registrados" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "Seleccione {{category}}." @@ -969,6 +956,18 @@ msgstr "" "Al salir de esta página, se descartarán las selecciones que haya realizado " "para una nueva relación." +msgid "Errors" +msgstr "Errores" + +msgid "Feedback" +msgstr "Retroalimentación" + +msgid "Indicators" +msgstr "Indicadores" + +msgid "Warnings" +msgstr "Advertencias" + msgid "Show all events" msgstr "Mostrar todos los eventos" @@ -1012,6 +1011,12 @@ msgstr "" msgid "The enrollment event data could not be found" msgstr "No se pudieron encontrar los datos del evento de inscripción" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "Posibles duplicados encontrados." @@ -1294,9 +1299,6 @@ msgstr "" msgid "Owned by {{ownerOrgUnit}}" msgstr "" -msgid "Last updated {{date}}" -msgstr "" - msgid "Cancelled" msgstr "Cancelar" @@ -1351,6 +1353,9 @@ msgstr "" msgid "Event completed" msgstr "Evento completado" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Volver a todas las etapas y eventos" @@ -1504,6 +1509,12 @@ msgstr "Fecha de reporte" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "" + msgid "New {{ eventName }} event" msgstr "Nuevo evento {{ eventName }}" @@ -1513,15 +1524,9 @@ msgstr "" msgid "Show {{ rest }} more" msgstr "" -msgid "Reset list" -msgstr "" - msgid "Go to full {{ eventName }}" msgstr "" -msgid "This stage can only have one event" -msgstr "" - msgid "Events could not be retrieved. Please try again later." msgstr "" @@ -1540,6 +1545,15 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "" + msgid "Changelog" msgstr "" @@ -1705,9 +1719,6 @@ msgstr " Ha ocurrido un error. Ver el registro para más detalles." msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" -msgid "Scheduled" -msgstr "" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "" diff --git a/i18n/fr.po b/i18n/fr.po index cb371ad974..894d0c288e 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -1368,6 +1368,9 @@ msgstr "" msgid "Event completed" msgstr "Événement terminé" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Retour à tous les stades et événements" @@ -1551,9 +1554,6 @@ msgstr "" msgid "Show {{ rest }} more" msgstr "Afficher {{ rest }} plus" -msgid "Reset list" -msgstr "Réinitialiser la liste" - msgid "Go to full {{ eventName }}" msgstr "Aller à l'intégralité de {{ eventName }}" diff --git a/i18n/id.po b/i18n/id.po index 85a7841d2d..e251484c4c 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -1332,6 +1332,9 @@ msgstr "" msgid "Event completed" msgstr "Even selesai" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1496,9 +1499,6 @@ msgstr "" msgid "Show {{ rest }} more" msgstr "" -msgid "Reset list" -msgstr "Mengatur ulang daftar" - msgid "Go to full {{ eventName }}" msgstr "" diff --git a/i18n/km.po b/i18n/km.po index 488cdcbe42..04fa91cdc5 100644 --- a/i18n/km.po +++ b/i18n/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Khmer (https://app.transifex.com/hisp-uio/teams/100509/km/)\n" @@ -478,18 +478,6 @@ msgstr "" msgid "Yes" msgstr "បាទ/ចាស" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "ឆ្នាំ" - -msgid "Months" -msgstr "ខែ" - -msgid "Days" -msgstr "ថ្ងៃ" - msgid "Uploading file" msgstr "" @@ -1305,6 +1293,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1454,22 +1445,22 @@ msgstr "ថ្ងៃខែឆ្នាំរាយការណ៏" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/lo.po b/i18n/lo.po index da0a57c457..b2da06a4c5 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -1335,6 +1335,9 @@ msgstr "ວັນທີທີ່ກຳນົດໄວ້ບໍ່ສາມາດ msgid "Event completed" msgstr "ກິດຈະກຳສຳເລັດແລ້ວ" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ" @@ -1508,9 +1511,6 @@ msgstr "ເພື່ອເປີດເຫດການນີ້, ກະລຸນ msgid "Show {{ rest }} more" msgstr "ສະແດງ {{ rest }} ເພີ່ມເຕີມ" -msgid "Reset list" -msgstr "ເຮັດລາຍຊື່ຄືນໃໝ່" - msgid "Go to full {{ eventName }}" msgstr "ໄປທີ່ {{ eventName }} ແບບເຕັມ" @@ -1701,13 +1701,13 @@ msgid "Download with current filters" msgstr "ດາວໂຫຼດດ້ວຍຕົວກອງປັດຈຸບັນ" msgid "An error has occured. See log for details" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດຂຶ້ນ. ເບິ່ງລາຍລະອຽດ" msgid "Scheduled{{ escape }} due {{ time }}" -msgstr "" +msgstr "ກຳນົດເວລາ {{ escape }} ຈົນເຖິງ {{ time }}" msgid "Overdue{{ escape }} due {{ time }}" -msgstr "" +msgstr "ເກີນກຳນົດ {{ escape }} ຈົນເຖິງ {{ time }}" msgid "Overdue" msgstr "ກາຍເວລາທີ່ກໍານົດ" @@ -1719,76 +1719,76 @@ msgid "Visited" msgstr "ເຂົ້າຊົມ" msgid "{{trackedEntityName}} in program{{escape}} {{programName}}" -msgstr "" +msgstr "{{trackedEntityName}} ໃນໂປຣແກຣມ {{escape}} {{programName}}" msgid "Program not found" -msgstr "" +msgstr "ບໍ່ພົບໂປຣແກຣມ" msgid "Program is not a tracker program" -msgstr "" +msgstr "ໂປແກຣມນີ້ບໍ່ແມ່ນໂປແກຣມຕິດຕາມ" msgid "Error saving event" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການບັນທຶກເຫດການ" msgid "Could not save event" -msgstr "" +msgstr "ບໍ່ສາມາດບັນທຶກເຫດການໄດ້" msgid "Could not delete event" -msgstr "" +msgstr "ບໍ່ສາມາດລົບເຫດການໄດ້" msgid "Could not save working list" -msgstr "" +msgstr "ບໍ່ສາມາດບັນທຶກລາຍຊື່ການເຮັດວຽກໄດ້" msgid "Could not add working list" -msgstr "" +msgstr "ບໍ່ສາມາດເພີ່ມລາຍຊື່ການເຮັດວຽກໄດ້" msgid "Could not delete working list" -msgstr "" +msgstr "ບໍ່ສາມາດລົບລາຍຊື່ການເຮັດວຽກໄດ້" msgid "Organisation unit search failed." -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການຄົ້ນຫາຫົວໜ່ວຍການຈັດຕັ້ງ" msgid "Error saving tracked entity instance" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການບັນທຶກການຕິດຕາມລາຍບຸກຄົນ" msgid "Error saving enrollment" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການບັນທຶກການລົງທະບຽນ" msgid "Error saving the enrollment event" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການບັນທຶກການລົງທະບຽນເຫດການ" msgid "Error deleting the enrollment event" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການລົບການລົງທະບຽນເຫດການ" msgid "Error editing the event, the changes made were not saved" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການແກ້ໄຂເຫດການ, ການປ່ຽນແປງທີ່ເຮັດບໍ່ໄດ້ມີການບັນທຶກ" msgid "Error updating the Assignee" -msgstr "" +msgstr "ເກີດຄວາມຜິດພາດໃນການອັບເດດຜູ້ຮັບຜິດຊອບ" msgid "Set coordinate" msgstr "ຕັ້ງຄ່າເສັ້ນສະແດງ" msgid "Time" -msgstr "" +msgstr "ເວລາ" msgid "From date" msgstr "From date" msgid "From time" -msgstr "" +msgstr "ຈາກເວລາ" msgid "To date" msgstr "ເຖີງວັນທີ່" msgid "To time" -msgstr "" +msgstr "ເຖິງເວລາ" msgid "Page {{currentPage}}" -msgstr "" +msgstr "ໜ້າ {{currentPage}}" msgid "Area on map saved" -msgstr "" +msgstr "ບັນທຶກພື້ນທີ່ໃນແຜນທີ່ແລ້ວ" msgid "Compatibility mode" -msgstr "" +msgstr "ຮູບແບບຄວາມເຂົ້າກັນໄດ້" diff --git a/i18n/my.po b/i18n/my.po index c244ccbdf3..5bc6407800 100644 --- a/i18n/my.po +++ b/i18n/my.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Burmese (https://app.transifex.com/hisp-uio/teams/100509/my/)\n" @@ -479,18 +479,6 @@ msgstr "" msgid "Yes" msgstr "Yes" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "နှစ်များ" - -msgid "Months" -msgstr "လများ" - -msgid "Days" -msgstr "" - msgid "Uploading file" msgstr "" @@ -1306,6 +1294,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1455,22 +1446,22 @@ msgstr "" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/nb.po b/i18n/nb.po index 9577fef16d..12080b29b7 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Caroline Hesthagen Holen , 2024\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" @@ -496,18 +496,6 @@ msgstr "Inneholder tekst" msgid "Yes" msgstr "Ja" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "År" - -msgid "Months" -msgstr "Måneder" - -msgid "Days" -msgstr "Dager" - msgid "Uploading file" msgstr "Laster opp fil" @@ -1362,6 +1350,9 @@ msgstr "Planlagt dato kan ikke endres for {{ eventStatus }} hendelser" msgid "Event completed" msgstr "Hendelse fullført" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Tilbake til alle faser og hendelser" @@ -1522,6 +1513,12 @@ msgstr "Rapporteringsdato" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Denne fasen kan bare ha en hendelse" + msgid "New {{ eventName }} event" msgstr "Ny {{ eventName }} hendelse" @@ -1531,15 +1528,9 @@ msgstr "For å åpne denne hendelsen, vennligst vent til lagringen er fullført" msgid "Show {{ rest }} more" msgstr "Vis {{ rest }} flere" -msgid "Reset list" -msgstr "Nullstill liste" - msgid "Go to full {{ eventName }}" msgstr "Gå til hele {{ eventName }}" -msgid "This stage can only have one event" -msgstr "Denne fasen kan bare ha en hendelse" - msgid "Events could not be retrieved. Please try again later." msgstr "Hendelser kunne ikke hentes. Prøv igjen senere." diff --git a/i18n/nl.po b/i18n/nl.po index 1af9d52450..05303720b5 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -1372,6 +1372,9 @@ msgstr "" msgid "Event completed" msgstr "Evenement voltooid" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Terug naar alle stadium en evenementen" @@ -1551,9 +1554,6 @@ msgstr "Wacht tot het opslaan is voltooid om dit evenement te openen" msgid "Show {{ rest }} more" msgstr "Toon {{ rest }} meer" -msgid "Reset list" -msgstr "Lijst resetten" - msgid "Go to full {{ eventName }}" msgstr "Ga naar volledige {{ eventName }}" diff --git a/i18n/prs.po b/i18n/prs.po index 14e21b32d3..e8fcb7ddf2 100644 --- a/i18n/prs.po +++ b/i18n/prs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Persian (Afghanistan) (https://app.transifex.com/hisp-uio/teams/100509/fa_AF/)\n" @@ -477,18 +477,6 @@ msgstr "" msgid "Yes" msgstr "بلی" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "سالانه" - -msgid "Months" -msgstr "ماه ها" - -msgid "Days" -msgstr "روزها" - msgid "Uploading file" msgstr "" @@ -1305,6 +1293,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1456,22 +1447,22 @@ msgstr "تاریخ گزارش" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/ps.po b/i18n/ps.po index 419cc4b400..ada1358d93 100644 --- a/i18n/ps.po +++ b/i18n/ps.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Pashto (https://app.transifex.com/hisp-uio/teams/100509/ps/)\n" @@ -478,18 +478,6 @@ msgstr "" msgid "Yes" msgstr "هو [ درست ]" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "کلونه" - -msgid "Months" -msgstr "میاشت" - -msgid "Days" -msgstr "ورځې" - msgid "Uploading file" msgstr "" @@ -1306,6 +1294,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1457,22 +1448,22 @@ msgstr "د راپور نېټه" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/pt.po b/i18n/pt.po index 81fb7ab3b9..c7c2353c06 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" @@ -505,18 +505,6 @@ msgstr "Contém texto" msgid "Yes" msgstr "sim" -msgid "mm/dd/yyyy" -msgstr "mm/dd/aaaa" - -msgid "Years" -msgstr "Anos" - -msgid "Months" -msgstr "Meses" - -msgid "Days" -msgstr "Dias" - msgid "Uploading file" msgstr "Carregando arquivo" @@ -1380,6 +1368,9 @@ msgstr "A data agendada não pode ser alterada para eventos {{ eventStatus }}" msgid "Event completed" msgstr "Evento concluído" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Voltar para todos os palcos e eventos" @@ -1543,6 +1534,12 @@ msgstr "Data do relatório" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Esta etapa só pode ter um evento" + msgid "New {{ eventName }} event" msgstr "Novo evento de {{ eventName }}" @@ -1553,15 +1550,9 @@ msgstr "" msgid "Show {{ rest }} more" msgstr "Mostrar mais {{ rest }}" -msgid "Reset list" -msgstr "Reiniciar lista" - msgid "Go to full {{ eventName }}" msgstr "Vá para o {{ eventName }} completo" -msgid "This stage can only have one event" -msgstr "Esta etapa só pode ter um evento" - msgid "Events could not be retrieved. Please try again later." msgstr "" "Os eventos não puderam ser recuperados. Por favor, tente novamente mais " diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index 59779dc49f..b968595bfc 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/hisp-uio/teams/100509/pt_BR/)\n" @@ -481,18 +481,6 @@ msgstr "" msgid "Yes" msgstr "Sim" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "Anos" - -msgid "Months" -msgstr "Meses" - -msgid "Days" -msgstr "Dias" - msgid "Uploading file" msgstr "" @@ -1310,6 +1298,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1463,22 +1454,22 @@ msgstr "Data do relatório" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/ro.po b/i18n/ro.po index 3b2ff70faf..310d3bc638 100644 --- a/i18n/ro.po +++ b/i18n/ro.po @@ -1315,6 +1315,9 @@ msgstr "" msgid "Event completed" msgstr "Eveniment finalizat" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Înapoi la toate etapele și evenimentele" @@ -1484,9 +1487,6 @@ msgstr "" msgid "Show {{ rest }} more" msgstr "" -msgid "Reset list" -msgstr "Resetare listă" - msgid "Go to full {{ eventName }}" msgstr "Accesare {{ eventName }} complet" diff --git a/i18n/ru.po b/i18n/ru.po index 39bdd2d94b..cfd4926b7f 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Russian (https://app.transifex.com/hisp-uio/teams/100509/ru/)\n" @@ -503,18 +503,6 @@ msgstr "Содержит текст" msgid "Yes" msgstr "Да" -msgid "mm/dd/yyyy" -msgstr "мм/дд/гггг" - -msgid "Years" -msgstr "Годы" - -msgid "Months" -msgstr "Месяцы" - -msgid "Days" -msgstr "Дни" - msgid "Uploading file" msgstr "Загрузка файла" @@ -1397,6 +1385,9 @@ msgstr "" msgid "Event completed" msgstr "Событие завершено" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "Обратно ко всем этапам и событиям" @@ -1578,6 +1569,12 @@ msgstr "Дата отчета" msgid "Please select a valid event" msgstr "Выберите действительное событие" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "Данный этап позволяет создать только одно событие" + msgid "New {{ eventName }} event" msgstr "Новое событие {{ eventName }} " @@ -1587,15 +1584,9 @@ msgstr "Чтобы открыть это событие, дождитесь за msgid "Show {{ rest }} more" msgstr "Показать {{ rest }} подробнее" -msgid "Reset list" -msgstr "Сброс списка" - msgid "Go to full {{ eventName }}" msgstr "Перейти к полной версии события {{ eventName }}" -msgid "This stage can only have one event" -msgstr "Данный этап позволяет создать только одно событие" - msgid "Events could not be retrieved. Please try again later." msgstr "Не удалось загрузить события. Повторите попытку позже." diff --git a/i18n/sv.po b/i18n/sv.po index 9113f74852..62edd96eb5 100644 --- a/i18n/sv.po +++ b/i18n/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Swedish (https://app.transifex.com/hisp-uio/teams/100509/sv/)\n" @@ -39,6 +39,9 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "More" +msgstr "" + msgid "View {{programName}} dashboard" msgstr "" @@ -361,16 +364,10 @@ msgstr "" msgid "validation failed" msgstr "" -msgid "Errors" +msgid "No feedback for this event yet" msgstr "" -msgid "Feedback" -msgstr "Återkoppling" - -msgid "Indicators" -msgstr "indikatorer" - -msgid "Warnings" +msgid "No indicator output for this event yet" msgstr "" msgid "Generate new event" @@ -483,18 +480,6 @@ msgstr "" msgid "Yes" msgstr "Ja" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "År" - -msgid "Months" -msgstr "Månader" - -msgid "Days" -msgstr "Dagar" - msgid "Uploading file" msgstr "" @@ -561,6 +546,9 @@ msgstr "" msgid "Column" msgstr "" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "Uppdatera" @@ -768,12 +756,6 @@ msgstr "" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "" @@ -804,6 +786,11 @@ msgstr "Skede" msgid "Registered events" msgstr "" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "" @@ -917,6 +904,18 @@ msgid "" "relationship" msgstr "" +msgid "Errors" +msgstr "" + +msgid "Feedback" +msgstr "Återkoppling" + +msgid "Indicators" +msgstr "indikatorer" + +msgid "Warnings" +msgstr "" + msgid "Show all events" msgstr "" @@ -958,6 +957,12 @@ msgstr "" msgid "The enrollment event data could not be found" msgstr "" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1237,9 +1242,6 @@ msgstr "" msgid "Owned by {{ownerOrgUnit}}" msgstr "" -msgid "Last updated {{date}}" -msgstr "" - msgid "Cancelled" msgstr "Avbruten" @@ -1294,6 +1296,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1445,22 +1450,22 @@ msgstr "Rapportdatum" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." @@ -1480,6 +1485,15 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "Schemalagd" + msgid "Changelog" msgstr "" @@ -1645,9 +1659,6 @@ msgstr "" msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" -msgid "Scheduled" -msgstr "Schemalagd" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "" diff --git a/i18n/tet.po b/i18n/tet.po index 844f679277..719938fd39 100644 --- a/i18n/tet.po +++ b/i18n/tet.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Tetum (Tetun) (https://app.transifex.com/hisp-uio/teams/100509/tet/)\n" @@ -37,6 +37,9 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "More" +msgstr "" + msgid "View {{programName}} dashboard" msgstr "" @@ -358,16 +361,10 @@ msgstr "" msgid "validation failed" msgstr "" -msgid "Errors" +msgid "No feedback for this event yet" msgstr "" -msgid "Feedback" -msgstr "Feedback" - -msgid "Indicators" -msgstr "Indikadores" - -msgid "Warnings" +msgid "No indicator output for this event yet" msgstr "" msgid "Generate new event" @@ -480,18 +477,6 @@ msgstr "" msgid "Yes" msgstr "Sim" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "Tinan" - -msgid "Months" -msgstr "Fulan" - -msgid "Days" -msgstr "" - msgid "Uploading file" msgstr "" @@ -558,6 +543,9 @@ msgstr "" msgid "Column" msgstr "Koluna" +msgid "Visible" +msgstr "" + msgid "Update" msgstr "Atualiza" @@ -765,12 +753,6 @@ msgstr "" msgid "Choose an organisation unit to start reporting" msgstr "" -msgid "No feedback for this event yet" -msgstr "" - -msgid "No indicator output for this event yet" -msgstr "" - msgid "Program stage is invalid" msgstr "" @@ -801,6 +783,11 @@ msgstr "" msgid "Registered events" msgstr "" +msgid "" +"The category option is not valid for the selected organisation unit. Please " +"select a valid combination." +msgstr "" + msgid "Please select {{category}}." msgstr "" @@ -914,6 +901,18 @@ msgid "" "relationship" msgstr "" +msgid "Errors" +msgstr "" + +msgid "Feedback" +msgstr "Feedback" + +msgid "Indicators" +msgstr "Indikadores" + +msgid "Warnings" +msgstr "" + msgid "Show all events" msgstr "" @@ -954,6 +953,12 @@ msgstr "" msgid "The enrollment event data could not be found" msgstr "" +msgid "Loading" +msgstr "" + +msgid "An error occurred while loading the form" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1233,9 +1238,6 @@ msgstr "" msgid "Owned by {{ownerOrgUnit}}" msgstr "" -msgid "Last updated {{date}}" -msgstr "" - msgid "Cancelled" msgstr "" @@ -1290,6 +1292,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1439,22 +1444,22 @@ msgstr "" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." @@ -1473,6 +1478,15 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "An error occurred while loading the widget." +msgstr "" + +msgid "View linked event" +msgstr "" + +msgid "Scheduled" +msgstr "" + msgid "Changelog" msgstr "" @@ -1638,9 +1652,6 @@ msgstr "" msgid "Scheduled{{ escape }} due {{ time }}" msgstr "" -msgid "Scheduled" -msgstr "" - msgid "Overdue{{ escape }} due {{ time }}" msgstr "" diff --git a/i18n/tg.po b/i18n/tg.po index d3195081c7..1346766a62 100644 --- a/i18n/tg.po +++ b/i18n/tg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Tajik (https://app.transifex.com/hisp-uio/teams/100509/tg/)\n" @@ -478,18 +478,6 @@ msgstr "" msgid "Yes" msgstr "Ҳа" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "Солҳо" - -msgid "Months" -msgstr "Моҳҳо" - -msgid "Days" -msgstr "" - msgid "Uploading file" msgstr "" @@ -1306,6 +1294,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1457,22 +1448,22 @@ msgstr "Санаи ҳисобот" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/uk.po b/i18n/uk.po index 382b45618d..dd5ad8b73b 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Ukrainian (https://app.transifex.com/hisp-uio/teams/100509/uk/)\n" @@ -483,18 +483,6 @@ msgstr "" msgid "Yes" msgstr "Так" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "Роки" - -msgid "Months" -msgstr "Місяці" - -msgid "Days" -msgstr "Дні" - msgid "Uploading file" msgstr "" @@ -1313,6 +1301,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1468,22 +1459,22 @@ msgstr "Дата звіту" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/ur.po b/i18n/ur.po index 8e95fe396d..69cec58a92 100644 --- a/i18n/ur.po +++ b/i18n/ur.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Urdu (https://app.transifex.com/hisp-uio/teams/100509/ur/)\n" @@ -478,18 +478,6 @@ msgstr "" msgid "Yes" msgstr "ہاں" -msgid "mm/dd/yyyy" -msgstr "" - -msgid "Years" -msgstr "سال" - -msgid "Months" -msgstr "مہینے" - -msgid "Days" -msgstr "دن" - msgid "Uploading file" msgstr "" @@ -1306,6 +1294,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1457,22 +1448,22 @@ msgstr "رپورٹ کی تاریخ" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index cd49eaf87b..96a05d6a51 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Khurshid Ibatov , 2024\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" @@ -496,18 +496,6 @@ msgstr "Матнни ўз ичига олади" msgid "Yes" msgstr "Ҳа" -msgid "mm/dd/yyyy" -msgstr "кун/ой/йил" - -msgid "Years" -msgstr "Йиллар" - -msgid "Months" -msgstr "Ойлар" - -msgid "Days" -msgstr "Кунлар" - msgid "Uploading file" msgstr "Файл юкланмоқда" @@ -1341,6 +1329,9 @@ msgstr "" msgid "Event completed" msgstr "Ҳодиса/тадбир якунланди" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1491,22 +1482,22 @@ msgstr "Ҳисобот санаси" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po index 3c876c6abd..217bfb6e90 100644 --- a/i18n/uz_UZ_Latn.po +++ b/i18n/uz_UZ_Latn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Yury Rogachev , 2024\n" "Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n" @@ -496,18 +496,6 @@ msgstr "Matnni oʼz ichiga oladi" msgid "Yes" msgstr "Ha" -msgid "mm/dd/yyyy" -msgstr "kun/oy/yil" - -msgid "Years" -msgstr "Yillar" - -msgid "Months" -msgstr "Oylar" - -msgid "Days" -msgstr "Kunlar" - msgid "Uploading file" msgstr "Fayl yuklanmoqda" @@ -1330,6 +1318,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1479,22 +1470,22 @@ msgstr "Hisobot sanasi" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/vi.po b/i18n/vi.po index f4fdf8ca07..6df6022cce 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" @@ -493,18 +493,6 @@ msgstr "Chứa văn bản" msgid "Yes" msgstr "Có" -msgid "mm/dd/yyyy" -msgstr "mm / dd / yyyy" - -msgid "Years" -msgstr "Năm" - -msgid "Months" -msgstr "Tháng" - -msgid "Days" -msgstr "Ngày" - msgid "Uploading file" msgstr "Đang tải tập tin lên" @@ -1328,6 +1316,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1477,22 +1468,22 @@ msgstr "Ngày báo cáo" msgid "Please select a valid event" msgstr "" -msgid "New {{ eventName }} event" +msgid "You do not have access to create events in this stage" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "This stage can only have one event" msgstr "" -msgid "Show {{ rest }} more" +msgid "New {{ eventName }} event" msgstr "" -msgid "Reset list" +msgid "To open this event, please wait until saving is complete" msgstr "" -msgid "Go to full {{ eventName }}" +msgid "Show {{ rest }} more" msgstr "" -msgid "This stage can only have one event" +msgid "Go to full {{ eventName }}" msgstr "" msgid "Events could not be retrieved. Please try again later." diff --git a/i18n/zh.po b/i18n/zh.po index 8058b5a3eb..a5216b482f 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -1301,6 +1301,9 @@ msgstr "无法更改 {{ eventStatus }} 事件的预定日期" msgid "Event completed" msgstr "事件完成" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "回到所有阶段和事件" @@ -1467,9 +1470,6 @@ msgstr "要打开此活动,请等待保存完成" msgid "Show {{ rest }} more" msgstr "显示 {{ rest }} 更多" -msgid "Reset list" -msgstr "重置列表" - msgid "Go to full {{ eventName }}" msgstr "转到完整的{{ eventName }}" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index 29a3101e26..a23db1a424 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n" +"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: 晓东 林 <13981924470@126.com>, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" @@ -480,18 +480,6 @@ msgstr "包含文本" msgid "Yes" msgstr "是" -msgid "mm/dd/yyyy" -msgstr "mm/dd/yyyy" - -msgid "Years" -msgstr "年" - -msgid "Months" -msgstr "月" - -msgid "Days" -msgstr "天" - msgid "Uploading file" msgstr "上传文件" @@ -1312,6 +1300,9 @@ msgstr "无法更改 {{ eventStatus }} 事件的预定日期" msgid "Event completed" msgstr "事件完成" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "回到所有阶段和事件" @@ -1461,6 +1452,12 @@ msgstr "报告日期" msgid "Please select a valid event" msgstr "" +msgid "You do not have access to create events in this stage" +msgstr "" + +msgid "This stage can only have one event" +msgstr "这个阶段只能有一个事件" + msgid "New {{ eventName }} event" msgstr "新的 {{ eventName }} 事件" @@ -1470,15 +1467,9 @@ msgstr "要打开此活动,请等待保存完成" msgid "Show {{ rest }} more" msgstr "显示 {{ rest }} 更多" -msgid "Reset list" -msgstr "重置列表" - msgid "Go to full {{ eventName }}" msgstr "转到完整的{{ eventName }}" -msgid "This stage can only have one event" -msgstr "这个阶段只能有一个事件" - msgid "Events could not be retrieved. Please try again later." msgstr "无法检索事件。请稍后再试。" From e8b9593559192710980e29dd7e10be5d95b9aa6e Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 1 Sep 2024 01:49:55 +0000 Subject: [PATCH 14/16] chore(release): cut 101.3.2 [skip release] ## [101.3.2](https://github.com/dhis2/capture-app/compare/v101.3.1...v101.3.2) (2024-09-01) ### Bug Fixes * **translations:** sync translations from transifex (master) ([3dfd424](https://github.com/dhis2/capture-app/commit/3dfd4240ad9d5ef4512b283dc222eb54891aa896)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c354b0a76..3ce973047b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.3.2](https://github.com/dhis2/capture-app/compare/v101.3.1...v101.3.2) (2024-09-01) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([3dfd424](https://github.com/dhis2/capture-app/commit/3dfd4240ad9d5ef4512b283dc222eb54891aa896)) + ## [101.3.1](https://github.com/dhis2/capture-app/compare/v101.3.0...v101.3.1) (2024-08-29) diff --git a/package.json b/package.json index a8dc5d72ca..d392f8367a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.3.1", + "version": "101.3.2", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.3.1", + "@dhis2/rules-engine-javascript": "101.3.2", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 9ff5cf689d..c31500497a 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.3.1", + "version": "101.3.2", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From cd06e414fc2162397f3844887e1b3f902d18a874 Mon Sep 17 00:00:00 2001 From: Tony Valle <79843014+superskip@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:54:06 +0200 Subject: [PATCH 15/16] fix: [DHIS2-17971] trigger program stage specific rules on opening new event page (#3776) --- .../common/ProgramStage/buildProgramStageMetadata.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/buildProgramStageMetadata.js b/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/buildProgramStageMetadata.js index 8c3977382e..dbebc546bb 100644 --- a/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/buildProgramStageMetadata.js +++ b/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/buildProgramStageMetadata.js @@ -28,6 +28,9 @@ export const buildProgramStageMetadata = async ({ const storageController = getUserStorageController(); const cachedRelationshipTypes = await storageController.getAll(userStores.RELATIONSHIP_TYPES); + const cachedProgramRules = await storageController.getAll(userStores.PROGRAM_RULES, { + predicate: rule => rule.programStageId === cachedProgramStage.id, + }); const programStageFactory = new ProgramStageFactory({ cachedOptionSets: new Map(cachedOptionSets.map(optionSet => [optionSet.id, optionSet])), @@ -41,5 +44,8 @@ export const buildProgramStageMetadata = async ({ return programStageFactory.build( cachedProgramStage, programId, - ); + ).then((stage) => { + stage.programRules = cachedProgramRules; + return stage; + }); }; From 325c63887f7e6cddd35944f0a70ea494042f4634 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Mon, 2 Sep 2024 10:59:29 +0000 Subject: [PATCH 16/16] chore(release): cut 101.3.3 [skip release] ## [101.3.3](https://github.com/dhis2/capture-app/compare/v101.3.2...v101.3.3) (2024-09-02) ### Bug Fixes * [DHIS2-17971] trigger program stage specific rules on opening new event page ([#3776](https://github.com/dhis2/capture-app/issues/3776)) ([cd06e41](https://github.com/dhis2/capture-app/commit/cd06e414fc2162397f3844887e1b3f902d18a874)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ce973047b..5182a15d63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.3.3](https://github.com/dhis2/capture-app/compare/v101.3.2...v101.3.3) (2024-09-02) + + +### Bug Fixes + +* [DHIS2-17971] trigger program stage specific rules on opening new event page ([#3776](https://github.com/dhis2/capture-app/issues/3776)) ([cd06e41](https://github.com/dhis2/capture-app/commit/cd06e414fc2162397f3844887e1b3f902d18a874)) + ## [101.3.2](https://github.com/dhis2/capture-app/compare/v101.3.1...v101.3.2) (2024-09-01) diff --git a/package.json b/package.json index d392f8367a..dc54a5992a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.3.2", + "version": "101.3.3", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.3.2", + "@dhis2/rules-engine-javascript": "101.3.3", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index c31500497a..fd771bc637 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.3.2", + "version": "101.3.3", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": {